diff --git a/.github/workflows/android-beta.yaml b/.github/workflows/android-beta.yaml
index 55880bd400..2f70d6437c 100644
--- a/.github/workflows/android-beta.yaml
+++ b/.github/workflows/android-beta.yaml
@@ -26,9 +26,6 @@ on:
       - track_generator/**
       - xcode/**
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   android-google-beta:
     name: Android Google Beta
diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml
index 80223719be..3498d71511 100644
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -25,9 +25,6 @@ on:
       - track_generator/**
       - xcode/**
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   lint:
     name: Android Lint
diff --git a/.github/workflows/android-monkey.yaml b/.github/workflows/android-monkey.yaml
index be17f66671..ef313cfb36 100644
--- a/.github/workflows/android-monkey.yaml
+++ b/.github/workflows/android-monkey.yaml
@@ -4,9 +4,6 @@ on:
   schedule:
     - cron:  '0 5 * * *' # Once per day at 05:00 UTC
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   precondition:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/android-release-metadata.yaml b/.github/workflows/android-release-metadata.yaml
index 0cb6e93e6a..0505a997ea 100644
--- a/.github/workflows/android-release-metadata.yaml
+++ b/.github/workflows/android-release-metadata.yaml
@@ -2,9 +2,6 @@ name: Android Release Metadata
 on:
   workflow_dispatch: # Manual trigger
 
-env:
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
-
 jobs:
   android-release-metadata:
     name: Upload Google Play metadata
diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
index 8a2a9ecb57..821417d962 100644
--- a/.github/workflows/android-release.yaml
+++ b/.github/workflows/android-release.yaml
@@ -5,7 +5,6 @@ on:
 env:
   RELEASE_NOTES: android/src/google/play/release-notes/en-US/default.txt
   FDROID_VERSION: android/src/fdroid/play/version.yaml
-  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
 
 jobs:
   tag:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 7262ce8c17..0000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1 +0,0 @@
-See [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
\ No newline at end of file
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4400a72ddf..67838d9f8b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -38,7 +38,6 @@ Code contributions:
   Roman Tsisyk <roman@tsisyk.com>
   Caspar Nuël <casparnuel@yandex.com>
   Konstantin Pastbin
-  Nishant Bhandari <nishantbhandari0019@gmail.com>
 
 Porting to Tizen platform:
   Sergey Pisarchik
diff --git a/INSTALL.md b/INSTALL.md
deleted file mode 100644
index 2738249474..0000000000
--- a/INSTALL.md
+++ /dev/null
@@ -1 +0,0 @@
-See [docs/INSTALL.md](docs/INSTALL.md)
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 5e35d7ff5e..54ae2407d0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -12,8 +12,8 @@ buildscript {
 
   // Detect flavors from the task name.
   def taskName = getGradle().getStartParameter().getTaskRequests().toString().toLowerCase()
-  def isFdroid = taskName.contains('fdroid')
-  def isBeta = taskName.contains('beta')
+  def isFdroid = taskName.contains("fdroid")
+  def isBeta = taskName.contains("beta")
 
   // Enable Google Mobile Services for all flavors except fdroid.
   def googleMobileServicesDefault = !isFdroid
@@ -26,25 +26,25 @@ buildscript {
   ext.googleFirebaseServicesEnabled = project.hasProperty('firebase') ?: googleFirebaseServicesDefault
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.0.1'
+    classpath 'com.android.tools.build:gradle:7.4.2'
 
     if (googleMobileServicesEnabled) {
-      println('Building with Google Mobile Services')
+      println("Building with Google Mobile Services")
       classpath 'com.google.gms:google-services:4.3.15'
     } else {
-      println('Building without Google Services')
+      println("Building without Google Services")
     }
 
     if (googleFirebaseServicesEnabled) {
-      println('Building with Google Firebase Services')
-      classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+      println("Building with Google Firebase Services")
+      classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
       classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0'
     } else {
-      println('Building without Google Firebase Services')
+      println("Building without Google Firebase Services")
     }
 
-    classpath('com.github.triplet.gradle:play-publisher:3.8.2')
-    classpath('ru.cian:huawei-publish-gradle-plugin:1.4.0')
+    classpath("com.github.triplet.gradle:play-publisher:3.8.1")
+    classpath("ru.cian:huawei-publish-gradle-plugin:1.3.5")
   }
 }
 
@@ -75,7 +75,7 @@ dependencies {
   // Google Firebase Services
   if (googleFirebaseServicesEnabled) {
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:32.0.0')
+    implementation platform('com.google.firebase:firebase-bom:31.2.3')
     // Add the dependencies for the Crashlytics and Analytics libraries
     // When using the BoM, you don't specify versions in Firebase library dependencies
     implementation 'com.google.firebase:firebase-crashlytics'
@@ -88,23 +88,23 @@ dependencies {
   // This line is added as a workaround for duplicate classes error caused by some outdated dependency:
   // > A failure occurred while executing com.android.build.gradle.internal.tasks.CheckDuplicatesRunnable
   // We don't use Kotlin, but some dependencies are actively using it.
-  implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.8.21'))
+  implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.8.10'))
   implementation 'androidx.annotation:annotation:1.6.0'
   implementation 'androidx.appcompat:appcompat:1.6.1'
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-  implementation 'androidx.fragment:fragment:1.5.7'
+  implementation 'androidx.fragment:fragment:1.5.5'
   implementation 'androidx.preference:preference:1.2.0'
   implementation 'androidx.recyclerview:recyclerview:1.3.0'
-  implementation 'androidx.work:work-runtime:2.8.1'
-  implementation 'com.google.android.material:material:1.9.0'
+  implementation 'androidx.work:work-runtime:2.8.0'
+  implementation 'com.google.android.material:material:1.8.0'
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha'
   implementation 'net.jcip:jcip-annotations:1.0'
 
   // Test Dependencies
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-core:5.3.1'
-  testImplementation 'org.mockito:mockito-inline:5.2.0'
+  testImplementation 'org.mockito:mockito-core:5.1.1'
+  testImplementation 'org.mockito:mockito-inline:5.1.1'
 }
 
 def run(cmd) {
@@ -162,7 +162,8 @@ android {
     buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"'
     // Should be customized in flavors.
     buildConfigField 'String', 'REVIEW_URL', '""'
-    resourceConfigurations += [project.ext.supportedLocalizations]
+    
+    resConfigs project.ext.supportedLocalizations
 
     multiDexEnabled true
     multiDexKeepFile file('multidex-config.txt')
diff --git a/android/gradle.properties b/android/gradle.properties
index e8a20bffbe..193756a26a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -7,9 +7,5 @@ org.gradle.caching=true
 org.gradle.jvmargs=-Xmx1024m -Xms256m
 android.useAndroidX=true
 android.native.buildOutput=verbose
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
-
 # Autogenerated by tools/unix/generate_localizations.sh
 supportedLocalizations=ar,be,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,eu,fa,fi,fr,fr_CA,iw,hi,hu,in,it,ja,ko,mr,nb,nl,pl,pt,pt_BR,ro,ru,sk,sv,sw,th,tr,uk,vi,zh,zh_HK,zh_MO,zh_TW
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index c1962a79e2..943f0cbfa7 100644
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f0..f398c33c4b 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/gradlew b/android/gradlew
index aeb74cbb43..65dcd68d65 100755
--- a/android/gradlew
+++ b/android/gradlew
@@ -85,6 +85,9 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -141,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/android/jni/app/organicmaps/Framework.cpp b/android/jni/app/organicmaps/Framework.cpp
index c32c4e616b..4bd1fe626f 100644
--- a/android/jni/app/organicmaps/Framework.cpp
+++ b/android/jni/app/organicmaps/Framework.cpp
@@ -245,9 +245,9 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
   m_work.SetMyPositionModeListener(bind(&Framework::MyPositionModeChanged, this, _1, _2));
 
   if (m_vulkanContextFactory)
-    m_work.CreateDrapeEngine(make_ref(m_vulkanContextFactory), std::move(p));
+    m_work.CreateDrapeEngine(make_ref(m_vulkanContextFactory), move(p));
   else
-    m_work.CreateDrapeEngine(make_ref(m_oglContextFactory), std::move(p));
+    m_work.CreateDrapeEngine(make_ref(m_oglContextFactory), move(p));
   m_work.EnterForeground();
 
   return true;
@@ -685,7 +685,7 @@ void Framework::ApplyWidgets()
   for (auto const & widget : m_guiPositions)
     layout[widget.first] = widget.second.m_pixelPivot;
 
-  m_work.SetWidgetLayout(std::move(layout));
+  m_work.SetWidgetLayout(move(layout));
 }
 
 void Framework::CleanWidgets()
diff --git a/android/jni/app/organicmaps/SearchEngine.cpp b/android/jni/app/organicmaps/SearchEngine.cpp
index 72dbb410f7..be8719d249 100644
--- a/android/jni/app/organicmaps/SearchEngine.cpp
+++ b/android/jni/app/organicmaps/SearchEngine.cpp
@@ -295,7 +295,7 @@ extern "C"
         {},  // Default timeout
         static_cast<bool>(isCategory),
         {},  // Empty m_onStarted callback
-        {},  // Empty m_onCompleted callback
+        bind(&OnResults, _1, std::vector<search::ProductInfo>{}, timestamp, isMapAndTable, hasPosition, lat, lon),  // Empty m_onCompleted callback
     };
 
     // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use
@@ -303,19 +303,19 @@ extern "C"
     // Don't move vparams here, because it's used below.
     g_framework->NativeFramework()->GetSearchAPI().SearchInViewport(vparams);
 
-    if (isMapAndTable)
-    {
-      search::EverywhereSearchParams eparams{
-          std::move(vparams.m_query),
-          std::move(vparams.m_inputLocale),
-          {},   // default timeout
-          static_cast<bool>(isCategory),
-          bind(&OnResults, _1, _2, timestamp, isMapAndTable, hasPosition, lat, lon)
-      };
-
-      if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(eparams)))
-        g_queryTimestamp = timestamp;
-    }
+//    if (isMapAndTable)
+//    {
+//      search::EverywhereSearchParams eparams{
+//          std::move(vparams.m_query),
+//          std::move(vparams.m_inputLocale),
+//          {},   // default timeout
+//          static_cast<bool>(isCategory),
+//          bind(&OnResults, _1, _2, timestamp, isMapAndTable, hasPosition, lat, lon)
+//      };
+//
+//      if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(eparams)))
+//        g_queryTimestamp = timestamp;
+//    }
   }
 
   JNIEXPORT void JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearchMaps(
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml
index abe4998ff8..9e74ce13d2 100644
--- a/android/res/layout/activity_map.xml
+++ b/android/res/layout/activity_map.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/coordinator"
   android:layout_width="match_parent"
@@ -50,9 +51,26 @@
       android:paddingBottom="@dimen/margin_base"
       android:visibility="invisible" />
   </RelativeLayout>
-  <androidx.fragment.app.FragmentContainerView
-    android:id="@+id/place_page_container_fragment"
+  <androidx.core.widget.NestedScrollViewClickFixed
+    android:id="@+id/placepage"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:name="app.organicmaps.widget.placepage.PlacePageController" />
+    android:layout_height="wrap_content"
+    style="?attr/bottomSheetStyle"
+    android:fillViewport="true"
+    app:layout_behavior="@string/placepage_behavior" >
+    <RelativeLayout
+      android:id="@+id/placepage_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?panel" >
+      <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/placepage_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+    </RelativeLayout>
+  </androidx.core.widget.NestedScrollViewClickFixed>
+  <androidx.fragment.app.FragmentContainerView
+    android:id="@+id/pp_buttons_fragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/android/res/layout/place_page_container_fragment.xml b/android/res/layout/place_page_container_fragment.xml
deleted file mode 100644
index f53af67f3a..0000000000
--- a/android/res/layout/place_page_container_fragment.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-  <androidx.core.widget.NestedScrollViewClickFixed
-    android:id="@+id/placepage"
-    style="?attr/bottomSheetStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:fillViewport="true"
-    app:layout_behavior="@string/placepage_behavior">
-    <RelativeLayout
-      android:id="@+id/placepage_container"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?panel">
-      <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/placepage_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-    </RelativeLayout>
-  </androidx.core.widget.NestedScrollViewClickFixed>
-  <androidx.fragment.app.FragmentContainerView
-    android:id="@+id/pp_buttons_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 9a9cce4d3d..ffe5f00af3 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">الأميال</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">موقعي</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">ًلاحقا</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">البحث</string>
@@ -387,10 +387,6 @@
 	<string name="p2p_reroute_from_current">هل ترغب في أن نرسم مسار لك من موقعك الحالي؟</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">التالي</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">من الساعة</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">إلى</string>
 	<string name="editor_time_add">إضافة جدول</string>
 	<string name="editor_time_delete">حذف جدول</string>
 	<!-- Text for allday switch. -->
@@ -734,9 +730,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ar:About_OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">العنوان / البلوك</string>
-	<string name="type.addr_interpolation.even">العنوان / البلوك</string>
-	<string name="type.addr_interpolation.odd">العنوان / البلوك</string>
 	<string name="type.aerialway.cable_car">تلفريك</string>
 	<string name="type.aerialway.station">محطة تلفريك</string>
 	<string name="type.aeroway.aerodrome">مطار</string>
@@ -911,9 +904,8 @@
 	<string name="type.boundary.national_park">منتزه وطني</string>
 	<string name="type.building">مبنى</string>
 	<string name="type.building.address">مبنى</string>
-	<string name="type.building.has_parts">مبنى</string>
-	<string name="type.building_part">مبنى</string>
 	<string name="type.building.garage">جراج</string>
+	<string name="type.building.has_parts">مبنى</string>
 	<string name="type.building.train_station">محطة سكك حديدية</string>
 	<string name="type.building.warehouse">مستودع</string>
 	<string name="type.cemetery.grave">قبر</string>
@@ -934,7 +926,6 @@
 	<string name="type.craft.metal_construction">عامل معادن</string>
 	<string name="type.craft.painter">رسام</string>
 	<string name="type.craft.photographer">مصور فوتوغرافي</string>
-	<string name="type.shop.camera">متجر الكاميرا</string>
 	<string name="type.craft.plumber">سباك</string>
 	<string name="type.craft.sawmill">منشرة</string>
 	<string name="type.craft.shoemaker">تصليح الاحذية</string>
@@ -1290,7 +1281,7 @@
 	<string name="type.leisure.park">موقف سيارات</string>
 	<string name="type.leisure.park.no.access">موقف سيارات</string>
 	<string name="type.leisure.park.permissive">موقف سيارات</string>
-	<string name="type.leisure.park.private">موقف سيارات</string>
+	<string name="type.leisure.park.private">موقف سيارات خاص</string>
 	<string name="type.leisure.picnic_table">ﺔﻫﺰﻨﻟﺍ ﺔﻟﻭﺎﻃ</string>
 	<string name="type.leisure.pitch">ملعب رياضي</string>
 	<string name="type.leisure.playground">ملعب</string>
@@ -1727,7 +1718,6 @@
 	<string name="type.shop.agrarian">محل زراعي</string>
 	<string name="type.shop.antiques">ﻒﺤﺘﻟﺍ</string>
 	<string name="type.shop.appliance">متجر الأجهزة</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ</string>
 	<string name="type.shop.baby_goods">ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ</string>
 	<string name="type.shop.bag">ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ</string>
@@ -1830,5 +1820,6 @@
 	<string name="type.wheelchair.limited">دعم محدود لكراسي المعاقين</string>
 	<string name="type.wheelchair.no">لا يدعم لكراسي المعاقين</string>
 	<string name="type.wheelchair.yes">دعم كامل لكراسي المعاقين</string>
+	<string name="type.building_part">مبنى</string>
 	<string name="type.amenity.events_venue">مكان الأحداث</string>
 </resources>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 4a84f23df3..c3c62d06a3 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">Мілі</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Маё месцазнаходжанне</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Потым</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Шукаць</string>
@@ -383,10 +383,6 @@
 	<string name="p2p_reroute_from_current">Хочаце перапракласці маршрут ад цяперашняга месцазнаходжання?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Далей</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">З</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Да</string>
 	<string name="editor_time_add">Дадаць расклад</string>
 	<string name="editor_time_delete">Выдаліць расклад</string>
 	<!-- Text for allday switch. -->
@@ -728,9 +724,6 @@
 	<string name="translated_om_site_url">https://organicmaps.app/ru/</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Адрас/Блок</string>
-	<string name="type.addr_interpolation.even">Адрас/Блок</string>
-	<string name="type.addr_interpolation.odd">Адрас/Блок</string>
 	<string name="type.amenity.bicycle_parking">Велапаркоўка</string>
 	<string name="type.amenity.charging_station.bicycle">Станцыя для зарадкі ровараў</string>
 	<string name="type.amenity.charging_station.motorcar">Аўтамабільная зарадная станцыя</string>
@@ -816,7 +809,6 @@
 	<string name="type.craft.metal_construction">Металаканструкцыі</string>
 	<string name="type.craft.painter">Мастак</string>
 	<string name="type.craft.photographer">Фатограф</string>
-	<string name="type.shop.camera">Крама фотаапаратаў</string>
 	<string name="type.craft.plumber">Вадаправодчык</string>
 	<string name="type.craft.sawmill">Лесапільня</string>
 	<string name="type.craft.shoemaker">Шавец</string>
@@ -1104,7 +1096,6 @@
 	<string name="type.shop.agrarian">Сельскагаспадарчы магазін</string>
 	<string name="type.shop.antiques">Антыкварыят</string>
 	<string name="type.shop.appliance">Крама бытавой тэхнікі</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Крама мастацтваў</string>
 	<string name="type.shop.baby_goods">Дзіцячая крама</string>
 	<string name="type.shop.bag">Крама сумак</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 03a31c817a..7f1d4ad23b 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">Мили</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Мое местоположение</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">По-късно</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Търсене</string>
@@ -354,10 +354,6 @@
 	<string name="p2p_reroute_from_current">Искате ли да планираме маршрут от текущото ви местоположение?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Напред</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">От</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">До</string>
 	<string name="editor_time_add">Добавяне на график</string>
 	<string name="editor_time_delete">Изтриване на график</string>
 	<!-- Text for allday switch. -->
@@ -660,9 +656,6 @@
 	<string name="splash_subtitle">Картографски данни от OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Адрес/Блок</string>
-	<string name="type.addr_interpolation.even">Адрес/Блок</string>
-	<string name="type.addr_interpolation.odd">Адрес/Блок</string>
 	<string name="type.amenity.charging_station.bicycle">Станция за зареждане на велосипеди</string>
 	<string name="type.amenity.charging_station.motorcar">Станция за зареждане на автомобили</string>
 	<string name="type.leisure.bowling_alley">Боулинг писта</string>
@@ -705,7 +698,6 @@
 	<string name="type.craft.metal_construction">Метални конструкции</string>
 	<string name="type.craft.painter">Художник</string>
 	<string name="type.craft.photographer">Фотограф</string>
-	<string name="type.shop.camera">Магазин за фотоапарати</string>
 	<string name="type.craft.plumber">Водопроводчик</string>
 	<string name="type.craft.sawmill">Дъскорезница</string>
 	<string name="type.craft.shoemaker">Обущар</string>
@@ -964,7 +956,6 @@
 	<string name="type.shop.agrarian">Селскостопански магазин</string>
 	<string name="type.shop.antiques">Антики</string>
 	<string name="type.shop.appliance">Магазин за техника</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Магазин за изкуства</string>
 	<string name="type.shop.baby_goods">Детски магазин</string>
 	<string name="type.shop.bag">Магазин за чанти</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index 0de2ae9c9d..4d2e1c39ea 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Milles</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">La meva posició</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Més tard</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Cerca</string>
@@ -376,10 +376,6 @@
 	<string name="p2p_reroute_from_current">Voleu que planifiquem una ruta des de la vostra ubicació actual?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Següent</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">De</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">A</string>
 	<string name="editor_time_add">Afegeix un horari</string>
 	<string name="editor_time_delete">Esborra l\'horari</string>
 	<!-- Text for allday switch. -->
@@ -722,15 +718,10 @@
 	<string name="enable_show_on_lock_screen_description">Si està activa, no cal desblocar l\'aparell cada vegada mentre l\'aplicació està funcionant.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Dades del mapa de l\'OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/ca/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ca:About</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adreça/Bloc</string>
-	<string name="type.addr_interpolation.even">Adreça/Bloc</string>
-	<string name="type.addr_interpolation.odd">Adreça/Bloc</string>
 	<string name="type.amenity.charging_station.bicycle">Estació de recàrrega de bicicletes</string>
 	<string name="type.amenity.charging_station.motorcar">Estació de recàrrega de cotxes</string>
 	<string name="type.leisure.bowling_alley">Bolera</string>
@@ -740,7 +731,6 @@
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.craft.key_cutter">Tall de claus</string>
 	<string name="type.craft.locksmith">Serraller</string>
-	<string name="type.shop.camera">Botiga de càmeres</string>
 	<!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
 	<string name="type.entrance.main">Entrada principal</string>
 
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 24fea8521f..9082c86d28 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Míle</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Moje poloha</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Později</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Hledat</string>
@@ -367,10 +367,6 @@
 	<string name="p2p_reroute_from_current">Máme naplánovat trasu z vašeho současného umístění?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Další</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Od</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Do</string>
 	<string name="editor_time_add">Přidat rozvrh</string>
 	<string name="editor_time_delete">Smazat rozvrh</string>
 	<!-- Text for allday switch. -->
@@ -699,9 +695,6 @@
 	<string name="translated_om_site_url">https://organicmaps.app/cs/</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresa/blok</string>
-	<string name="type.addr_interpolation.even">Adresa/blok</string>
-	<string name="type.addr_interpolation.odd">Adresa/blok</string>
 	<string name="type.aerialway.station">Stanice lanové dráhy</string>
 	<string name="type.aeroway.aerodrome">Letiště</string>
 	<string name="type.aeroway.aerodrome.international">Letiště</string>
@@ -836,9 +829,8 @@
 	<string name="type.boundary.national_park">Národní park</string>
 	<string name="type.building">Stavba</string>
 	<string name="type.building.address">Stavba</string>
-	<string name="type.building.has_parts">Stavba</string>
-	<string name="type.building_part">Stavba</string>
 	<string name="type.building.garage">Garáž</string>
+	<string name="type.building.has_parts">Stavba</string>
 	<string name="type.building.train_station">Železniční stanice</string>
 	<string name="type.cemetery.grave">Hrob</string>
 	<string name="type.craft">Řemeslo</string>
@@ -858,7 +850,6 @@
 	<string name="type.craft.metal_construction">Kovodílna</string>
 	<string name="type.craft.painter">Malíř</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Obchod s fotoaparáty</string>
 	<string name="type.craft.plumber">Instalatér</string>
 	<string name="type.craft.sawmill">Pila</string>
 	<string name="type.craft.shoemaker">Opravna obuvi</string>
@@ -1578,6 +1569,7 @@
 	<string name="type.shop.greengrocer">Ovoce a zelenina</string>
 	<string name="type.shop.grocery">Potraviny</string>
 	<string name="type.shop.hairdresser">Kadeřnictví</string>
+	<string name="type.shop.hardware">Železářství</string>
 	<string name="type.shop.health_food">Prodejna zdravé výživy</string>
 	<string name="type.shop.herbalist">Obchod s bylinkami</string>
 	<string name="type.shop.hifi">HiFi audio</string>
@@ -1620,7 +1612,6 @@
 	<string name="type.shop.agrarian">Zemědělský obchod</string>
 	<string name="type.shop.antiques">Starožitnosti</string>
 	<string name="type.shop.appliance">Obchod se spotřebiči</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Obchod s uměním</string>
 	<string name="type.shop.baby_goods">Dětský obchod</string>
 	<string name="type.shop.bag">Obchod s taškami</string>
@@ -1718,5 +1709,6 @@
 	<string name="type.wheelchair.limited">Omezený vstup pro vozíčkáře</string>
 	<string name="type.wheelchair.no">Bez přístupu pro vozíčkáře</string>
 	<string name="type.wheelchair.yes">Plný vstup pro vozíčkáře</string>
+	<string name="type.building_part">Stavba</string>
 	<string name="type.amenity.events_venue">Místo konání akcí</string>
 </resources>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 81b049b5ec..245e648b2e 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Mil</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Min position</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senere</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Søg</string>
@@ -363,10 +363,6 @@
 	<string name="p2p_reroute_from_current">Ønsker du, at vi planlægger en rute fra din nuværende placering?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Næste</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Fra</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Til</string>
 	<string name="editor_time_add">Tilføj tidsplan</string>
 	<string name="editor_time_delete">Slet tidsplan</string>
 	<!-- Text for allday switch. -->
@@ -688,9 +684,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Da:Om_OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresse/blok</string>
-	<string name="type.addr_interpolation.even">Adresse/blok</string>
-	<string name="type.addr_interpolation.odd">Adresse/blok</string>
 	<string name="type.aerialway.station">Kabelbanestation</string>
 	<string name="type.aeroway.aerodrome">Lufthavn</string>
 	<string name="type.aeroway.aerodrome.international">Lufthavn</string>
@@ -822,7 +815,6 @@
 	<string name="type.building">Bygning</string>
 	<string name="type.building.address">Bygning</string>
 	<string name="type.building.has_parts">Bygning</string>
-	<string name="type.building_part">Bygning</string>
 	<string name="type.building.train_station">Togstation</string>
 	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft">Håndværk</string>
@@ -842,7 +834,6 @@
 	<string name="type.craft.metal_construction">Metalarbejder</string>
 	<string name="type.craft.painter">Maler</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Kamera butik</string>
 	<string name="type.craft.plumber">VVS-mand</string>
 	<string name="type.craft.sawmill">Savværk</string>
 	<string name="type.craft.shoemaker">Skomager</string>
@@ -878,6 +869,7 @@
 	<string name="type.cuisine.filipino">Filippinsk</string>
 	<string name="type.cuisine.fine_dining">Eksklusiv</string>
 	<string name="type.cuisine.fish">Fisk</string>
+	<string name="type.cuisine.fish_and_chips">Fish and chips</string>
 	<string name="type.cuisine.french">Fransk</string>
 	<string name="type.cuisine.friture">Friture</string>
 	<string name="type.cuisine.georgian">Georgisk</string>
@@ -1558,6 +1550,7 @@
 	<string name="type.shop.greengrocer">Grønthandler</string>
 	<string name="type.shop.grocery">Købmand</string>
 	<string name="type.shop.hairdresser">Frisør</string>
+	<string name="type.shop.hardware">Isenkræmmer</string>
 	<string name="type.shop.health_food">Helsekostbutik</string>
 	<string name="type.shop.herbalist">Urtebutik</string>
 	<string name="type.shop.hifi">HiFi lyd</string>
@@ -1601,7 +1594,6 @@
 	<string name="type.shop.agrarian">Landbrugsbutik</string>
 	<string name="type.shop.antiques">Antikviteter</string>
 	<string name="type.shop.appliance">Hvidevarer butik</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Kunstbutik</string>
 	<string name="type.shop.baby_goods">Børnebutik</string>
 	<string name="type.shop.bag">Tasker butik</string>
@@ -1695,5 +1687,6 @@
 	<string name="type.wheelchair.limited">Begrænset tilgængelighed for kørestol</string>
 	<string name="type.wheelchair.no">Ingen tilgængelighed for kørestol</string>
 	<string name="type.wheelchair.yes">Fuld tilgængelighed for kørestol</string>
+	<string name="type.building_part">Bygning</string>
 	<string name="type.amenity.events_venue">Sted for arrangementer</string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 0f1841177f..20f4a790a8 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Meilen</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Mein Standort</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Später</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Suche</string>
@@ -380,10 +380,6 @@
 	<string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Weiter</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Von</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Bis</string>
 	<string name="editor_time_add">Zeitplan hinzufügen</string>
 	<string name="editor_time_delete">Zeitplan löschen</string>
 	<!-- Text for allday switch. -->
@@ -638,7 +634,7 @@
 	<string name="driving_options_title">Routenbeschränkungen</string>
 	<string name="driving_options_subheader">In jeder Reiseroute vermeiden</string>
 	<string name="avoid_tolls">Mautstraßen</string>
-	<string name="avoid_unpaved">Unbefestigte Straßen</string>
+	<string name="avoid_unpaved">Erdwege</string>
 	<string name="avoid_ferry">Fährstellen</string>
 	<string name="avoid_motorways">Autobahnen</string>
 	<string name="unable_to_calc_alert_title">Route kann nicht berechnet werden</string>
@@ -729,15 +725,10 @@
 	<string name="enable_show_on_lock_screen_description">Wenn aktiviert, muss das Gerät nicht jedes Mal entsperrt werden, wenn die App ausgeführt wird.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Kartendaten von OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/de/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/DE:Über_OSM</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresse/Block</string>
-	<string name="type.addr_interpolation.even">Adresse/Block</string>
-	<string name="type.addr_interpolation.odd">Adresse/Block</string>
 	<string name="type.aerialway">Seilbahn</string>
 	<string name="type.aerialway.cable_car">Pendelbahn</string>
 	<string name="type.aerialway.chair_lift">Sessellift</string>
@@ -917,7 +908,6 @@
 	<string name="type.building">Gebäude</string>
 	<string name="type.building.address">Gebäude</string>
 	<string name="type.building.has_parts">Gebäude</string>
-	<string name="type.building_part">Gebäude</string>
 	<string name="type.building.train_station">Bahnhof</string>
 	<string name="type.cemetery.grave">Grab</string>
 	<string name="type.craft">Handwerk</string>
@@ -937,7 +927,6 @@
 	<string name="type.craft.metal_construction">Schlosser</string>
 	<string name="type.craft.painter">Maler</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Kamerageschäft</string>
 	<string name="type.craft.plumber">Installateur</string>
 	<string name="type.craft.sawmill">Sägewerk</string>
 	<string name="type.craft.shoemaker">Schuhmacher</string>
@@ -973,6 +962,7 @@
 	<string name="type.cuisine.filipino">Philippinisch</string>
 	<string name="type.cuisine.fine_dining">Gehoben</string>
 	<string name="type.cuisine.fish">Fisch</string>
+	<string name="type.cuisine.fish_and_chips">Fish and Chips</string>
 	<string name="type.cuisine.french">Französisch</string>
 	<string name="type.cuisine.friture">Pommes</string>
 	<string name="type.cuisine.georgian">Georgisch</string>
@@ -1763,6 +1753,7 @@
 	<string name="type.shop.greengrocer">Gemüseladen</string>
 	<string name="type.shop.grocery">Lebensmittelgeschäft</string>
 	<string name="type.shop.hairdresser">Friseur</string>
+	<string name="type.shop.hardware">Baumarkt</string>
 	<string name="type.shop.health_food">Reformhaus</string>
 	<string name="type.shop.herbalist">Kräuterladen</string>
 	<string name="type.shop.hifi">HiFi-Audio</string>
@@ -1806,7 +1797,6 @@
 	<string name="type.shop.agrarian">Landwirtschaftliches Geschäft</string>
 	<string name="type.shop.antiques">Antiquitäten</string>
 	<string name="type.shop.appliance">Laden für Haushaltsgeräte</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Kunstgeschäft</string>
 	<string name="type.shop.baby_goods">Babybedarf</string>
 	<string name="type.shop.bag">Taschen Shop</string>
@@ -1937,5 +1927,6 @@
 	<string name="type.piste_type.downhill.novice">Anfängerfreundliche Abfahrt</string>
 	<string name="type.piste_type.nordic">Langlaufloipe</string>
 	<string name="type.piste_type.sled">Rodelbahn</string>
+	<string name="type.building_part">Gebäude</string>
 	<string name="type.amenity.events_venue">Veranstaltungszentrum</string>
 </resources>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 91dcbaf42c..83c05cfcb1 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -22,7 +22,7 @@
 	<string name="miles">Μίλια</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Η θέση μου</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Αργότερα</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Αναζήτηση</string>
@@ -366,10 +366,6 @@
 	<string name="p2p_reroute_from_current">Θέλετε να σχεδιάσουμε μια διαδρομή από την τρέχουσα θέση σας;</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Επόμενη</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Από τις</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Έως Τις</string>
 	<string name="editor_time_add">Προσθέσετε χρονοδιάγραμμα</string>
 	<string name="editor_time_delete">Διαγραφή χρονοδιαγράμματος</string>
 	<!-- Text for allday switch. -->
@@ -680,9 +676,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/El:About_OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Διεύθυνση/Μπλοκ</string>
-	<string name="type.addr_interpolation.even">Διεύθυνση/Μπλοκ</string>
-	<string name="type.addr_interpolation.odd">Διεύθυνση/Μπλοκ</string>
 	<string name="type.aerialway">Τελεφερίκ</string>
 	<string name="type.aerialway.cable_car">Τελεφερίκ</string>
 	<string name="type.aerialway.chair_lift">Τελεφερίκ</string>
@@ -825,9 +818,8 @@
 	<string name="type.boundary.national_park">Εθνικό πάρκο</string>
 	<string name="type.building">Κτίριο</string>
 	<string name="type.building.address">Κτίριο</string>
-	<string name="type.building.has_parts">Κτίριο</string>
-	<string name="type.building_part">Κτίριο</string>
 	<string name="type.building.garage">Γκαράζ</string>
+	<string name="type.building.has_parts">Κτίριο</string>
 	<string name="type.building.train_station">Σιδηροδρομικός σταθμός</string>
 	<string name="type.cemetery.grave">Τάφος</string>
 	<string name="type.craft">Τεχνική</string>
@@ -847,7 +839,6 @@
 	<string name="type.craft.metal_construction">Μεταλλουργός</string>
 	<string name="type.craft.painter">Μπογιατζής</string>
 	<string name="type.craft.photographer">Φωτογράφος</string>
-	<string name="type.shop.camera">Κατάστημα φωτογραφικών μηχανών</string>
 	<string name="type.craft.plumber">Υδραυλικός</string>
 	<string name="type.craft.sawmill">Πριστήριο</string>
 	<string name="type.craft.shoemaker">Υποδηματοποιός</string>
@@ -1615,7 +1606,6 @@
 	<string name="type.shop.agrarian">Αγροτικό κατάστημα</string>
 	<string name="type.shop.antiques">Αντίκες</string>
 	<string name="type.shop.appliance">Κατάστημα οικιακών συσκευών</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Κατάστημα Τεχνών</string>
 	<string name="type.shop.baby_goods">Παιδικό κατάστημα</string>
 	<string name="type.shop.bag">Κατάστημα τσαντών</string>
@@ -1716,5 +1706,6 @@
 	<string name="type.wheelchair.limited">Μερικώς εξοπλισμένο για άτομα με ειδικές ανάγκες</string>
 	<string name="type.wheelchair.no">Δεν υπάρχει πρόβλεψη για άτομα με ειδικές ανάγκες</string>
 	<string name="type.wheelchair.yes">Εξοπλισμένο για άτομα με ειδικές ανάγκες</string>
+	<string name="type.building_part">Κτίριο</string>
 	<string name="type.amenity.events_venue">Κέντρο εκδηλώσεων</string>
 </resources>
diff --git a/android/res/values-en-rGB/strings.xml b/android/res/values-en-rGB/strings.xml
index 284133eeab..ecc1ae8d9c 100644
--- a/android/res/values-en-rGB/strings.xml
+++ b/android/res/values-en-rGB/strings.xml
@@ -14,13 +14,6 @@
 	<!-- SECTION: Search categories -->
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
 	<string name="fuel">Petrol</string>
-	<!-- gray color -->
-	<string name="gray">Grey</string>
-	<!-- blue gray color -->
-	<string name="blue_gray">Blue Grey</string>
-
-	<!-- SECTION: Routing dialogs strings -->
-	<string name="dialog_routing_disclaimer_borders">— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.</string>
 
 	<!-- SECTION: Strings for downloading map from search -->
 	<string name="editor_zip_code">Postcode</string>
@@ -29,141 +22,128 @@
 	<string name="subway_data_unavailable">Metro map is unavailable</string>
 
 	<!-- SECTION: Bookmark types used for sorting -->
-	<string name="fuel_places">Petrol Stations</string>
 	<string name="transit_not_found">Metro navigation in this region is not available yet</string>
 	<string name="dialog_pedestrian_route_is_long_header">Metro route is not found</string>
 	<string name="dialog_pedestrian_route_is_long_message">Please choose a start or end point closer to a metro station</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.amenity.arts_centre">Arts Centre</string>
 	<string name="type.amenity.fuel">Petrol Station</string>
-	<string name="type.amenity.loading_dock">Loading Bay</string>
-	<string name="type.amenity.post_box">Postbox</string>
-
-	<!-- SECTION: Types: Recycling -->
-	<string name="type.amenity.recycling.centre">Recycling Centre</string>
-	<string name="type.amenity.waste_basket">Rubbish Bin</string>
-	<string name="type.cuisine.donut">Doughnut</string>
-	<string name="type.cuisine.savory_pancakes">Savoury Pancakes</string>
-	<string name="type.healthcare.blood_donation">Blood Donation Centre</string>
 
 	<!-- SECTION: Types: Roads -->
 	<string name="type.highway.elevator">Lift</string>
 
 	<!-- SECTION: Types: Historic -->
 	<string name="type.leisure.common">Common Land</string>
-	<string name="type.leisure.sports_centre">Sports Centre</string>
-	<string name="type.office.government">Governmental Office</string>
-	<string name="type.railway.station.subway">Metro Station</string>
-	<string name="type.railway.station.subway.adana">Metro Station</string>
-	<string name="type.railway.station.subway.algiers">Metro Station</string>
-	<string name="type.railway.station.subway.almaty">Metro Station</string>
-	<string name="type.railway.station.subway.amsterdam">Metro Station</string>
-	<string name="type.railway.station.subway.ankara">Metro Station</string>
-	<string name="type.railway.station.subway.athens">Metro Station</string>
-	<string name="type.railway.station.subway.baku">Metro Station</string>
-	<string name="type.railway.station.subway.bangkok">Metro Station</string>
-	<string name="type.railway.station.subway.barcelona">Metro Station</string>
-	<string name="type.railway.station.subway.beijing">Metro Station</string>
-	<string name="type.railway.station.subway.bengalore">Metro Station</string>
-	<string name="type.railway.station.subway.berlin">Metro Station</string>
-	<string name="type.railway.station.subway.bilbao">Metro Station</string>
-	<string name="type.railway.station.subway.brasilia">Metro Station</string>
-	<string name="type.railway.station.subway.brescia">Metro Station</string>
-	<string name="type.railway.station.subway.brussels">Metro Station</string>
-	<string name="type.railway.station.subway.bucharest">Metro Station</string>
-	<string name="type.railway.station.subway.budapest">Metro Station</string>
-	<string name="type.railway.station.subway.buenos_aires">Metro Station</string>
-	<string name="type.railway.station.subway.bursa">Metro Station</string>
-	<string name="type.railway.station.subway.cairo">Metro Station</string>
-	<string name="type.railway.station.subway.caracas">Metro Station</string>
-	<string name="type.railway.station.subway.catania">Metro Station</string>
-	<string name="type.railway.station.subway.changchun">Metro Station</string>
-	<string name="type.railway.station.subway.chengdu">Metro Station</string>
-	<string name="type.railway.station.subway.chicago">Metro Station</string>
-	<string name="type.railway.station.subway.chongqing">Metro Station</string>
-	<string name="type.railway.station.subway.dalian">Metro Station</string>
-	<string name="type.railway.station.subway.delhi">Metro Station</string>
-	<string name="type.railway.station.subway.dnepro">Metro Station</string>
-	<string name="type.railway.station.subway.dubai">Metro Station</string>
-	<string name="type.railway.station.subway.ekb">Metro Station</string>
-	<string name="type.railway.station.subway.fukuoka">Metro Station</string>
-	<string name="type.railway.station.subway.glasgow">Metro Station</string>
-	<string name="type.railway.station.subway.guangzhou">Metro Station</string>
-	<string name="type.railway.station.subway.hamburg">Metro Station</string>
-	<string name="type.railway.station.subway.helsinki">Metro Station</string>
-	<string name="type.railway.station.subway.hiroshima">Metro Station</string>
-	<string name="type.railway.station.subway.isfahan">Metro Station</string>
-	<string name="type.railway.station.subway.istanbul">Metro Station</string>
-	<string name="type.railway.station.subway.izmir">Metro Station</string>
-	<string name="type.railway.station.subway.kazan">Metro Station</string>
-	<string name="type.railway.station.subway.kharkiv">Metro Station</string>
-	<string name="type.railway.station.subway.kiev">Metro Station</string>
-	<string name="type.railway.station.subway.kobe">Metro Station</string>
-	<string name="type.railway.station.subway.kolkata">Metro Station</string>
-	<string name="type.railway.station.subway.kunming">Metro Station</string>
-	<string name="type.railway.station.subway.kyoto">Metro Station</string>
-	<string name="type.railway.station.subway.la">Metro Station</string>
-	<string name="type.railway.station.subway.lausanne">Metro Station</string>
-	<string name="type.railway.station.subway.lille">Metro Station</string>
-	<string name="type.railway.station.subway.lima">Metro Station</string>
-	<string name="type.railway.station.subway.lisboa">Metro Station</string>
+	<string name="type.railway.station.subway">Metro</string>
+	<string name="type.railway.station.subway.adana">Metro</string>
+	<string name="type.railway.station.subway.algiers">Metro</string>
+	<string name="type.railway.station.subway.almaty">Metro</string>
+	<string name="type.railway.station.subway.amsterdam">Metro</string>
+	<string name="type.railway.station.subway.ankara">Metro</string>
+	<string name="type.railway.station.subway.athens">Metro</string>
+	<string name="type.railway.station.subway.baku">Metro</string>
+	<string name="type.railway.station.subway.bangkok">Metro</string>
+	<string name="type.railway.station.subway.barcelona">Metro</string>
+	<string name="type.railway.station.subway.beijing">Metro</string>
+	<string name="type.railway.station.subway.bengalore">Metro</string>
+	<string name="type.railway.station.subway.berlin">Metro</string>
+	<string name="type.railway.station.subway.bilbao">Metro</string>
+	<string name="type.railway.station.subway.brasilia">Metro</string>
+	<string name="type.railway.station.subway.brescia">Metro</string>
+	<string name="type.railway.station.subway.brussels">Metro</string>
+	<string name="type.railway.station.subway.bucharest">Metro</string>
+	<string name="type.railway.station.subway.budapest">Metro</string>
+	<string name="type.railway.station.subway.buenos_aires">Metro</string>
+	<string name="type.railway.station.subway.bursa">Metro</string>
+	<string name="type.railway.station.subway.cairo">Metro</string>
+	<string name="type.railway.station.subway.caracas">Metro</string>
+	<string name="type.railway.station.subway.catania">Metro</string>
+	<string name="type.railway.station.subway.changchun">Metro</string>
+	<string name="type.railway.station.subway.chengdu">Metro</string>
+	<string name="type.railway.station.subway.chicago">Metro</string>
+	<string name="type.railway.station.subway.chongqing">Metro</string>
+	<string name="type.railway.station.subway.dalian">Metro</string>
+	<string name="type.railway.station.subway.delhi">Metro</string>
+	<string name="type.railway.station.subway.dnepro">Metro</string>
+	<string name="type.railway.station.subway.dubai">Metro</string>
+	<string name="type.railway.station.subway.ekb">Metro</string>
+	<string name="type.railway.station.subway.fukuoka">Metro</string>
+	<string name="type.railway.station.subway.glasgow">Metro</string>
+	<string name="type.railway.station.subway.guangzhou">Metro</string>
+	<string name="type.railway.station.subway.hamburg">Metro</string>
+	<string name="type.railway.station.subway.helsinki">Metro</string>
+	<string name="type.railway.station.subway.hiroshima">Metro</string>
+	<string name="type.railway.station.subway.isfahan">Metro</string>
+	<string name="type.railway.station.subway.istanbul">Metro</string>
+	<string name="type.railway.station.subway.izmir">Metro</string>
+	<string name="type.railway.station.subway.kazan">Metro</string>
+	<string name="type.railway.station.subway.kharkiv">Metro</string>
+	<string name="type.railway.station.subway.kiev">Metro</string>
+	<string name="type.railway.station.subway.kobe">Metro</string>
+	<string name="type.railway.station.subway.kolkata">Metro</string>
+	<string name="type.railway.station.subway.kunming">Metro</string>
+	<string name="type.railway.station.subway.kyoto">Metro</string>
+	<string name="type.railway.station.subway.la">Metro</string>
+	<string name="type.railway.station.subway.lausanne">Metro</string>
+	<string name="type.railway.station.subway.lille">Metro</string>
+	<string name="type.railway.station.subway.lima">Metro</string>
+	<string name="type.railway.station.subway.lisboa">Metro</string>
 	<string name="type.railway.station.subway.london">Underground Station</string>
-	<string name="type.railway.station.subway.lyon">Metro Station</string>
-	<string name="type.railway.station.subway.madrid">Metro Station</string>
-	<string name="type.railway.station.subway.malaga">Metro Station</string>
-	<string name="type.railway.station.subway.manila">Metro Station</string>
-	<string name="type.railway.station.subway.maracaibo">Metro Station</string>
-	<string name="type.railway.station.subway.mashhad">Metro Station</string>
-	<string name="type.railway.station.subway.mecca">Metro Station</string>
-	<string name="type.railway.station.subway.medellin">Metro Station</string>
-	<string name="type.railway.station.subway.mexico">Metro Station</string>
-	<string name="type.railway.station.subway.milan">Metro Station</string>
-	<string name="type.railway.station.subway.minsk">Metro Station</string>
-	<string name="type.railway.station.subway.montreal">Metro Station</string>
-	<string name="type.railway.station.subway.moscow">Metro Station</string>
-	<string name="type.railway.station.subway.munchen">Metro Station</string>
-	<string name="type.railway.station.subway.nagoya">Metro Station</string>
-	<string name="type.railway.station.subway.newyork">Metro Station</string>
-	<string name="type.railway.station.subway.nnov">Metro Station</string>
-	<string name="type.railway.station.subway.novosibirsk">Metro Station</string>
-	<string name="type.railway.station.subway.osaka">Metro Station</string>
-	<string name="type.railway.station.subway.oslo">Metro Station</string>
-	<string name="type.railway.station.subway.palma">Metro Station</string>
-	<string name="type.railway.station.subway.panama">Metro Station</string>
-	<string name="type.railway.station.subway.paris">Metro Station</string>
-	<string name="type.railway.station.subway.philadelphia">Metro Station</string>
-	<string name="type.railway.station.subway.pyongyang">Metro Station</string>
-	<string name="type.railway.station.subway.rennes">Metro Station</string>
-	<string name="type.railway.station.subway.rio">Metro Station</string>
-	<string name="type.railway.station.subway.roma">Metro Station</string>
-	<string name="type.railway.station.subway.rotterdam">Metro Station</string>
-	<string name="type.railway.station.subway.samara">Metro Station</string>
-	<string name="type.railway.station.subway.santiago">Metro Station</string>
-	<string name="type.railway.station.subway.santo_domingo">Metro Station</string>
-	<string name="type.railway.station.subway.saopaulo">Metro Station</string>
-	<string name="type.railway.station.subway.sapporo">Metro Station</string>
-	<string name="type.railway.station.subway.sendai">Metro Station</string>
-	<string name="type.railway.station.subway.sf">Metro Station</string>
-	<string name="type.railway.station.subway.shanghai">Metro Station</string>
-	<string name="type.railway.station.subway.shiraz">Metro Station</string>
-	<string name="type.railway.station.subway.sofia">Metro Station</string>
-	<string name="type.railway.station.subway.spb">Metro Station</string>
-	<string name="type.railway.station.subway.stockholm">Metro Station</string>
-	<string name="type.railway.station.subway.tabriz">Metro Station</string>
-	<string name="type.railway.station.subway.taipei">Metro Station</string>
-	<string name="type.railway.station.subway.taoyuan">Metro Station</string>
-	<string name="type.railway.station.subway.tashkent">Metro Station</string>
-	<string name="type.railway.station.subway.tbilisi">Metro Station</string>
-	<string name="type.railway.station.subway.tianjin">Metro Station</string>
-	<string name="type.railway.station.subway.tokyo">Metro Station</string>
-	<string name="type.railway.station.subway.valencia">Metro Station</string>
-	<string name="type.railway.station.subway.vienna">Metro Station</string>
-	<string name="type.railway.station.subway.warszawa">Metro Station</string>
-	<string name="type.railway.station.subway.washington">Metro Station</string>
-	<string name="type.railway.station.subway.wuhan">Metro Station</string>
-	<string name="type.railway.station.subway.yerevan">Metro Station</string>
-	<string name="type.railway.station.subway.yokohama">Metro Station</string>
+	<string name="type.railway.station.subway.lyon">Metro</string>
+	<string name="type.railway.station.subway.madrid">Metro</string>
+	<string name="type.railway.station.subway.malaga">Metro</string>
+	<string name="type.railway.station.subway.manila">Metro</string>
+	<string name="type.railway.station.subway.maracaibo">Metro</string>
+	<string name="type.railway.station.subway.mashhad">Metro</string>
+	<string name="type.railway.station.subway.mecca">Metro</string>
+	<string name="type.railway.station.subway.medellin">Metro</string>
+	<string name="type.railway.station.subway.mexico">Metro</string>
+	<string name="type.railway.station.subway.milan">Metro</string>
+	<string name="type.railway.station.subway.minsk">Metro</string>
+	<string name="type.railway.station.subway.montreal">Metro</string>
+	<string name="type.railway.station.subway.moscow">Metro</string>
+	<string name="type.railway.station.subway.munchen">Metro</string>
+	<string name="type.railway.station.subway.nagoya">Metro</string>
+	<string name="type.railway.station.subway.newyork">Metro</string>
+	<string name="type.railway.station.subway.nnov">Metro</string>
+	<string name="type.railway.station.subway.novosibirsk">Metro</string>
+	<string name="type.railway.station.subway.osaka">Metro</string>
+	<string name="type.railway.station.subway.oslo">Metro</string>
+	<string name="type.railway.station.subway.palma">Metro</string>
+	<string name="type.railway.station.subway.panama">Metro</string>
+	<string name="type.railway.station.subway.paris">Metro</string>
+	<string name="type.railway.station.subway.philadelphia">Metro</string>
+	<string name="type.railway.station.subway.pyongyang">Metro</string>
+	<string name="type.railway.station.subway.rennes">Metro</string>
+	<string name="type.railway.station.subway.rio">Metro</string>
+	<string name="type.railway.station.subway.roma">Metro</string>
+	<string name="type.railway.station.subway.rotterdam">Metro</string>
+	<string name="type.railway.station.subway.samara">Metro</string>
+	<string name="type.railway.station.subway.santiago">Metro</string>
+	<string name="type.railway.station.subway.santo_domingo">Metro</string>
+	<string name="type.railway.station.subway.saopaulo">Metro</string>
+	<string name="type.railway.station.subway.sapporo">Metro</string>
+	<string name="type.railway.station.subway.sendai">Metro</string>
+	<string name="type.railway.station.subway.sf">Metro</string>
+	<string name="type.railway.station.subway.shanghai">Metro</string>
+	<string name="type.railway.station.subway.shiraz">Metro</string>
+	<string name="type.railway.station.subway.sofia">Metro</string>
+	<string name="type.railway.station.subway.spb">Metro</string>
+	<string name="type.railway.station.subway.stockholm">Metro</string>
+	<string name="type.railway.station.subway.tabriz">Metro</string>
+	<string name="type.railway.station.subway.taipei">Metro</string>
+	<string name="type.railway.station.subway.taoyuan">Metro</string>
+	<string name="type.railway.station.subway.tashkent">Metro</string>
+	<string name="type.railway.station.subway.tbilisi">Metro</string>
+	<string name="type.railway.station.subway.tianjin">Metro</string>
+	<string name="type.railway.station.subway.tokyo">Metro</string>
+	<string name="type.railway.station.subway.valencia">Metro</string>
+	<string name="type.railway.station.subway.vienna">Metro</string>
+	<string name="type.railway.station.subway.warszawa">Metro</string>
+	<string name="type.railway.station.subway.washington">Metro</string>
+	<string name="type.railway.station.subway.wuhan">Metro</string>
+	<string name="type.railway.station.subway.yerevan">Metro</string>
+	<string name="type.railway.station.subway.yokohama">Metro</string>
 	<string name="type.railway.subway">Metro Line</string>
 	<string name="type.railway.subway.bridge">Metro Line Bridge</string>
 	<string name="type.railway.subway.tunnel">Metro Line Tunnel</string>
@@ -277,37 +257,5 @@
 	<string name="type.railway.subway_entrance.wuhan">Metro Entrance</string>
 	<string name="type.railway.subway_entrance.yerevan">Metro Entrance</string>
 	<string name="type.railway.subway_entrance.yokohama">Metro Entrance</string>
-	<string name="type.shop.books">Bookshop</string>
-	<string name="type.shop.car_repair">Car Repair Garage</string>
-	<string name="type.shop.caravan">Caravan Dealership</string>
-	<string name="type.shop.computer">Computer Shop</string>
-	<string name="type.shop.confectionery">Sweet Shop</string>
-	<string name="type.shop.convenience">Convenience Shop</string>
-	<string name="type.shop.doityourself">DIY Shop</string>
-	<string name="type.shop.furniture">Furniture Shop</string>
-	<string name="type.shop.garden_centre">Garden Centre</string>
-	<string name="type.shop.grocery">Grocery Shop</string>
-	<string name="type.shop.hardware">Ironmongers</string>
-	<string name="type.shop.houseware">Housewares Shop</string>
-	<string name="type.shop.jewelry">Jewellery Shop</string>
-	<string name="type.shop.kitchen">Kitchen Shop</string>
-	<string name="type.shop.laundry">Launderette</string>
-	<string name="type.shop.mall">Shopping Centre</string>
-	<string name="type.shop.mobile_phone">Mobile Phone Shop</string>
-	<string name="type.shop.music">Record Shop</string>
-	<string name="type.shop.pet">Pet Shop</string>
-	<string name="type.shop.toys">Toy Shop</string>
-	<string name="type.shop.variety_store">Variety Shop</string>
-	<string name="type.shop.craft">Arts and Crafts Shop</string>
-	<string name="type.shop.electrical">Electrical Supplies Shop</string>
-	<string name="type.shop.fishing">Fishing Shop</string>
-	<string name="type.shop.interior_decoration">Interior Decorations Shop</string>
-	<string name="type.shop.medical_supply">Medical Supplies Shop</string>
-	<string name="type.shop.nutrition_supplements">Nutrition Supplement Shop</string>
-	<string name="type.shop.tobacco">Tobacco Shop</string>
-	<string name="type.shop.watches">Watch Shop</string>
-	<string name="type.shop.wholesale">Wholesale Shop</string>
-	<string name="type.sport.soccer">Football</string>
-	<string name="type.tourism.camp_site">Campsite</string>
-	<string name="type.tourism.caravan_site">Caravan Park</string>
+	<string name="type.shop.mobile_phone">Mobile Phones</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 049c9a83ff..c3e350c860 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Millas</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Mi posición</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Luego</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Buscar</string>
@@ -384,10 +384,6 @@
 	<string name="p2p_reroute_from_current">¿Quiere que planeemos un ruta desde su ubicación actual?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Siguiente</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">De</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">A</string>
 	<string name="editor_time_add">Añadir horario</string>
 	<string name="editor_time_delete">Eliminar horario</string>
 	<!-- Text for allday switch. -->
@@ -733,15 +729,10 @@
 	<string name="enable_show_on_lock_screen_description">Cuando está habilitado, no tiene que desbloquear su dispositivo mientras la aplicación se está ejecutando.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Datos de mapas de OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/es/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Dirección/Bloque</string>
-	<string name="type.addr_interpolation.even">Dirección/Bloque</string>
-	<string name="type.addr_interpolation.odd">Dirección/Bloque</string>
 	<string name="type.aerialway">Transporte aéreo</string>
 	<string name="type.aerialway.cable_car">Teleférico</string>
 	<string name="type.aerialway.chair_lift">Telesilla</string>
@@ -937,9 +928,8 @@
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<string name="type.building">Edificio</string>
 	<string name="type.building.address">Edificio</string>
-	<string name="type.building.has_parts">Edificio</string>
-	<string name="type.building_part">Edificio</string>
 	<string name="type.building.garage">Garaje</string>
+	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Estación de tren</string>
 	<string name="type.building.warehouse">Almacén</string>
 	<string name="type.cemetery.grave">Tumba</string>
@@ -960,7 +950,6 @@
 	<string name="type.craft.metal_construction">Trabajador del metal</string>
 	<string name="type.craft.painter">Pintor</string>
 	<string name="type.craft.photographer">Fotógrafo</string>
-	<string name="type.shop.camera">Tienda de cámaras</string>
 	<string name="type.craft.plumber">Fontanero</string>
 	<string name="type.craft.sawmill">Serrería</string>
 	<string name="type.craft.shoemaker">Zapatero</string>
@@ -1757,6 +1746,7 @@
 	<string name="type.shop.greengrocer">Frutería</string>
 	<string name="type.shop.grocery">Tienda de comestibles</string>
 	<string name="type.shop.hairdresser">Peluquería</string>
+	<string name="type.shop.hardware">Ferretería</string>
 	<string name="type.shop.health_food">Tienda de comida saludable</string>
 	<string name="type.shop.herbalist">Tienda de hierbas</string>
 	<string name="type.shop.hifi">Audio de alta fidelidad</string>
@@ -1801,7 +1791,6 @@
 	<string name="type.shop.agrarian">Tienda agrícola</string>
 	<string name="type.shop.antiques">Antigüedades</string>
 	<string name="type.shop.appliance">Tienda de electrodomésticos</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Tienda de arte</string>
 	<string name="type.shop.baby_goods">Tienda de niños</string>
 	<string name="type.shop.bag">Tienda de bolsos</string>
@@ -1932,5 +1921,6 @@
 	<string name="type.piste_type.downhill.novice">Pista de esquí alpino</string>
 	<string name="type.piste_type.nordic">Pista de esquí nórdico</string>
 	<string name="type.piste_type.sled">Pista para trineos</string>
+	<string name="type.building_part">Edificio</string>
 	<string name="type.amenity.events_venue">Lugar para eventos</string>
 </resources>
diff --git a/android/res/values-et/strings.xml b/android/res/values-et/strings.xml
index d11f5d5ed5..e7e98aea0e 100644
--- a/android/res/values-et/strings.xml
+++ b/android/res/values-et/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Miilid</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Minu asukoht</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Hiljem</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Otsi</string>
@@ -374,10 +374,6 @@
 	<string name="p2p_reroute_from_current">Kas soovid, et planeeriksime marsruudi Sinu praegusest asukohast?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Järgmine</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Kell</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Kuni</string>
 	<string name="editor_time_add">Lisa ajakava</string>
 	<string name="editor_time_delete">Kustuta ajakava</string>
 	<!-- Text for allday switch. -->
@@ -722,9 +718,6 @@
 	<string name="splash_subtitle">OpenStreetMap kaardiandmed</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Aadress/plokk</string>
-	<string name="type.addr_interpolation.even">Aadress/plokk</string>
-	<string name="type.addr_interpolation.odd">Aadress/plokk</string>
 	<string name="type.aerialway">Õhutee</string>
 	<string name="type.aerialway.cable_car">Tramm</string>
 	<string name="type.aerialway.chair_lift">Tooltõstuk</string>
@@ -920,9 +913,8 @@
 	<string name="type.boundary.national_park">Rahvuspark</string>
 	<string name="type.building">Hoone</string>
 	<string name="type.building.address">Hoone</string>
-	<string name="type.building.has_parts">Hoone</string>
-	<string name="type.building_part">Hoone</string>
 	<string name="type.building.garage">Garaaž</string>
+	<string name="type.building.has_parts">Hoone</string>
 	<string name="type.building.train_station">Rongijaam</string>
 	<string name="type.building.warehouse">Ladu</string>
 	<string name="type.cemetery.grave">Haud</string>
@@ -943,7 +935,6 @@
 	<string name="type.craft.metal_construction">Metallitööline</string>
 	<string name="type.craft.painter">Maaler</string>
 	<string name="type.craft.photographer">Fotograaf</string>
-	<string name="type.shop.camera">Kaamerapood</string>
 	<string name="type.craft.plumber">Santehnik</string>
 	<string name="type.craft.sawmill">Saeveski</string>
 	<string name="type.craft.shoemaker">Kingsepp</string>
@@ -1828,7 +1819,6 @@
 	<string name="type.shop.agrarian">Põllumajanduspood</string>
 	<string name="type.shop.antiques">Antikvariaat</string>
 	<string name="type.shop.appliance">Tehnikapood</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Kunstipood</string>
 	<string name="type.shop.baby_goods">Lastekaubad</string>
 	<string name="type.shop.bag">Kotipood</string>
@@ -1959,5 +1949,6 @@
 	<string name="type.piste_type.downhill.novice">Algajasõbralik laskumine</string>
 	<string name="type.piste_type.nordic">Murdmaa suusarada</string>
 	<string name="type.piste_type.sled">Kelgurada</string>
+	<string name="type.building_part">Hoone</string>
 	<string name="type.amenity.events_venue">Ürituste toimumiskoht</string>
 </resources>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 0ca6d8c317..9bdda2d9ef 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -9,19 +9,19 @@
 	<!-- Button text (should be short) -->
 	<string name="cancel">Utzi</string>
 	<!-- Button which deletes downloaded country -->
-	<string name="delete">Ezabatu</string>
+	<string name="delete">Kendu</string>
 	<string name="download_maps">Deskargatu mapak</string>
 	<!-- Settings/Downloader - info for country when download fails -->
 	<string name="download_has_failed">Errore bat gertatu da deskargatzean, hasi berriro</string>
 	<!-- Settings/Downloader - info for country which started downloading -->
 	<string name="downloading">Deskargatzen…</string>
 	<!-- Choose measurement on first launch alert - choose metric system button -->
-	<string name="kilometres">Kilometro</string>
+	<string name="kilometres">Kilometroak</string>
 	<!-- Choose measurement on first launch alert - choose imperial system button -->
 	<string name="miles">Milia</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
-	<string name="core_my_position">Nire kokapena</string>
-	<!-- Update maps later button text -->
+	<string name="core_my_position">Nire posizioa</string>
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Geroago</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Bilatu</string>
@@ -30,47 +30,39 @@
 	<!-- Location services are disabled by user alert - message -->
 	<string name="location_is_disabled_long_text">Ezin da kokapen-zerbitzuetara sartu. Mesedez, aktibatu ezarpenetan.</string>
 	<!-- View and button titles for accessibility -->
-	<string name="zoom_to_country">Erakutsi mapan</string>
+	<string name="zoom_to_country">Mapan erakutsi</string>
 	<!-- Message to display at the center of the screen when the country download has failed -->
-	<string name="country_status_download_failed">Deskargak huts egin du</string>
+	<string name="country_status_download_failed">Errore bat deskargatzean</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Saiatu berriro</string>
-	<string name="about_menu_title">Organic Maps-i buruz</string>
-	<!-- Text in About screen -->
-	<string name="about_headline">Denontzat doan, maitasunez egina</string>
-	<!-- Text in About screen -->
-	<string name="about_proposition_1">• Ez iragarkirik, ez jarraipenik, ez datu-bilketarik</string>
+	<string name="about_menu_title">Organic Maps buruz</string>
 	<!-- Text in About screen -->
 	<string name="about_proposition_2">• Bateria aurrezten du, ez du atzeko planoko daturik erabiltzen</string>
-	<!-- Text in About screen -->
-	<string name="about_proposition_3">• Azkarra, minimalista, zaborrik gabe</string>
-	<!-- Text in About screen -->
-	<string name="about_developed_by_enthusiasts">Kode irekiko aplikazioa zaleek eta boluntarioek sortutakoa.</string>
 	<string name="connection_settings">Konexio ezarpenak</string>
 	<string name="close">Itxi</string>
-	<string name="unsupported_phone">Aplikazioak hardwarez azeleratutako OpenGL behar du. Zoritxarrez, zure gailua ez da onartzen.</string>
+	<string name="unsupported_phone">Aplikazioak hardware-azeleratutako OpenGL behar du. Zoritxarrez, zure gailua ez da onartzen.</string>
 	<string name="download">Deskargatu</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="disconnect_usb_cable">Mesedez, deskonektatu USB kablea edo sartu SD memoria Organic Maps erabiltzeko</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="not_enough_free_space_on_sdcard">Mesedez, egin lekua SD memorian/USB biltegian aplikazioa erabiltzeko</string>
-	<string name="download_resources">Hasi baino lehen, utzi mundu-mapa orokor bat zure gailuan deskargatzen.\nDatuen %s beharrezkoa da.</string>
+	<string name="download_resources">Hasi baino lehen, utzi mundu-mapa orokor bat zure gailura deskargatzeko.\nDatuen %s beharrezkoa da.</string>
 	<string name="download_resources_continue">Joan mapara</string>
 	<string name="downloading_country_can_proceed">%s deskargatzen. Orain mapara\n joan zaitezke.</string>
 	<string name="download_country_ask">%s deskargatu?</string>
-	<string name="update_country_ask">%s eguneratu?</string>
+	<string name="update_country_ask">%s eguneratzeko?</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
 	<string name="pause">Pausa</string>
 	<!-- REMOVE THIS STRING AFTER REFACTORING -->
 	<string name="continue_download">Jarraitu</string>
 	<!-- Show popup notification on top of the map when country download has failed. -->
-	<string name="download_country_failed">%s deskargak huts egin du</string>
+	<string name="download_country_failed">%s deskargatu huts egin du</string>
 	<!-- "Add new bookmark list" dialog title -->
-	<string name="add_new_set">Gehitu zerrenda berri bat</string>
+	<string name="add_new_set">Gehitu talde berri bat</string>
 	<!-- Bookmark Color dialog title -->
-	<string name="bookmark_color">Markagailuaren kolorea</string>
+	<string name="bookmark_color">Markatzailearen kolorea</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
-	<string name="bookmark_set_name">Markagailuen zerrendaren izena</string>
+	<string name="bookmark_set_name">Markatzaile taldearen izena</string>
 	<!-- "Bookmarks" dialog title, please also edit it in iphone/plist.txt -->
 	<string name="bookmarks">Markagailuak</string>
 	<!-- Default bookmark list name -->
@@ -78,35 +70,23 @@
 	<!-- Add bookmark dialog - bookmark name -->
 	<string name="name">Izena</string>
 	<!-- Editor title above street and house number -->
-	<string name="address">Helbidea</string>
+	<string name="address">Norabidea</string>
 	<!-- Add Bookmark dialog/Bookmark list; Bookmarks dialog/Bookmark list cell. -->
 	<string name="list">Zerrenda</string>
 	<!-- Settings button in system menu -->
 	<string name="settings">Ezarpenak</string>
 	<!-- Header of settings activity where user defines storage path -->
-	<string name="maps_storage">Mapak gordetzeko tokia</string>
+	<string name="maps_storage">Mapak gordetzeko</string>
 	<!-- Detailed description of Maps Storage settings button -->
 	<string name="maps_storage_summary">Hautatu mapak non deskargatu behar diren</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-	<string name="maps_storage_downloaded">Deskargatutako mapak</string>
-	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-	<string name="maps_storage_internal">Barne biltegiratze pribatua</string>
-	<!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-	<string name="maps_storage_shared">Barne biltegiratze partekatua</string>
-	<!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-	<string name="maps_storage_removable">SD txartela</string>
-	<!-- Generic external storage type in Maps Storage settings -->
-	<string name="maps_storage_external">Kanpoko biltegiratze partekatua</string>
-	<!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
-	<string name="maps_storage_free_size">%2$s-tik %1$s libre</string>
+	<string name="maps_storage_downloaded">Mapak</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Mapak mugitu?</string>
-	<!-- Error moving map files from one storage to another -->
-	<string name="move_maps_error">Ezin izan dira mapak mugitu</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Honek minutu batzuk iraun ditzake.\n Itxaron mesedez…</string>
 	<!-- Measurement units title in settings activity -->
-	<string name="measurement_units">Neurketa unitateak</string>
+	<string name="measurement_units">Neurketa-unitateak</string>
 	<!-- Detailed description of Measurement Units settings button -->
 	<string name="measurement_units_summary">Aukeratu mila eta kilometroen artean</string>
 
@@ -114,11 +94,11 @@
 	<!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! -->
 	<string name="eat">Non jan</string>
 	<!-- Search category for grocery stores; any changes should be duplicated in categories.txt @food! -->
-	<string name="food">Janari-denda</string>
+	<string name="food">Janariak</string>
 	<!-- Search category for public transport; any changes should be duplicated in categories.txt @transport! -->
 	<string name="transport">Garraioa</string>
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
-	<string name="fuel">Gasolindegia</string>
+	<string name="fuel">Erregai-geltokia</string>
 	<!-- Search category for parking lots; any changes should be duplicated in categories.txt @parking! -->
 	<string name="parking">Aparkalekua</string>
 	<!-- Search category for clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @shopping! -->
@@ -132,7 +112,7 @@
 	<!-- Search category for ATMs; any changes should be duplicated in categories.txt @atm! -->
 	<string name="atm">Kutxazain automatikoa</string>
 	<!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! -->
-	<string name="nightlife">Gaueko giroa</string>
+	<string name="nightlife">Gaueko bizitza</string>
 	<!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! -->
 	<string name="children">Familiako jarduerak</string>
 	<!-- Search category for banks; any changes should be duplicated in categories.txt @bank! -->
@@ -142,7 +122,7 @@
 	<!-- Search category for hospitals; any changes should be duplicated in categories.txt @hospital! -->
 	<string name="hospital">Ospitalea</string>
 	<!-- Search category for toilets; any changes should be duplicated in categories.txt @toilet! -->
-	<string name="toilet">Komuna</string>
+	<string name="toilet">Komunak</string>
 	<!-- Search category for post offices; any changes should be duplicated in categories.txt @post! -->
 	<string name="post">Posta bulegoa</string>
 	<!-- Search category for police; any changes should be duplicated in categories.txt @police! -->
@@ -156,16 +136,16 @@
 	<!-- Search category for RV facilities; any changes should be duplicated in categories.txt @rv! -->
 	<string name="rv">Karabanak</string>
 	<!-- Notes field in Bookmarks view -->
-	<string name="description">Oharrak</string>
+	<string name="description">Notak</string>
 	<!-- Email Subject when sharing bookmark list -->
-	<string name="share_bookmarks_email_subject">Organic Maps markagailuak zurekin partekatu dira</string>
-	<string name="share_bookmarks_email_body">Kaixo!\nNire markagailuak Organic Maps aplikazioan erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin!</string>
+	<string name="share_bookmarks_email_subject">Organic Maps markatzaileak zurekin partekatu dira</string>
+	<string name="share_bookmarks_email_body">Kaixo!\nNire markatzaileak Mapak organikoak aplikaziotik erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin!</string>
 	<!-- message title of loading file -->
-	<string name="load_kmz_title">Markagailuak kargatzen</string>
+	<string name="load_kmz_title">Markatzaileak kargatzen</string>
 	<!-- Kmz file successful loading -->
-	<string name="load_kmz_successful">Markagailuak behar bezala kargatu dira! Mapan edo markagailuak kudeatzeko pantailan aurki ditzakezu.</string>
+	<string name="load_kmz_successful">Gogokoak behar bezala kargatu dira! Mapan edo kudeatu gogokoak pantailan aurki ditzakezu.</string>
 	<!-- Kml file loading failed -->
-	<string name="load_kmz_failed">Ezin izan dira markagailuak kargatu. Fitxategia hondatuta edo akastuna izan daiteke.</string>
+	<string name="load_kmz_failed">Ezin izan da gogokoak kargatu. Fitxategia hondatuta edo akastuna izan daiteke.</string>
 	<!-- resource for context menu -->
 	<string name="edit">Editatu</string>
 	<!-- Warning message when doing search around current position -->
@@ -175,17 +155,17 @@
 	<!-- Alert message that downloading is in progress. -->
 	<string name="downloading_is_active">Mapak deskargatzen ari dira.</string>
 	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Ikusi nire uneko kokapena Organic Maps-en! %1$s edo %2$s Ez al duzu lineaz kanpoko maparik? Deskargatu hemendik: https://omaps.app/get</string>
+	<string name="my_position_share_sms">Ikusi nire uneko kokapena Organic Maps-en! %1$s edo %2$s Ez al duzu lineaz kanpoko maparik? Deskargatu hemen: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
-	<string name="bookmark_share_email_subject">Begiratu nire markagailua Organic Maps mapan!</string>
+	<string name="bookmark_share_email_subject">Begiratu nire markatzailea Map organikoak mapan!</string>
 	<!-- Subject for emailed position -->
-	<string name="my_position_share_email_subject">Ikusi nire uneko kokapena Organic Maps mapan!</string>
+	<string name="my_position_share_email_subject">Ikusi nire uneko kokapena mapan Organic Maps-en!</string>
 	<!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
 	<string name="my_position_share_email">Kaixo:\n\nOrain hemen nago: %1$s. Egin klik esteka honetan %2$s edo %3$s honetan mapan ikusteko.\n\nEskerrik asko.</string>
 	<!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
 	<string name="share">Partekatu</string>
 	<!-- Share by email button text, also used in editor and About. -->
-	<string name="email">Posta elektronikoa</string>
+	<string name="email">Email</string>
 	<!-- Text for message when used successfully copied something -->
 	<string name="copied_to_clipboard">Arbelean kopiatu da: %1$s</string>
 	<!-- Used for bookmark editing -->
@@ -195,17 +175,17 @@
 	<!-- Confirmation in downloading countries dialog -->
 	<string name="are_you_sure">Ziur jarraitu nahi duzula?</string>
 	<!-- Title for tracks category in bookmarks manager -->
-	<string name="tracks_title">Arrastoak</string>
+	<string name="tracks_title">Ibilbideak</string>
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Luzera</string>
 	<string name="share_my_location">Partekatu nire kokapena</string>
 	<!-- Settings general group in settings screen -->
-	<string name="prefs_group_general">Ezarpen orokorrak</string>
+	<string name="prefs_group_general">Doikuntza orokorrak</string>
 	<!-- Settings information group in settings screen -->
 	<string name="prefs_group_information">Informazioa</string>
 	<string name="prefs_group_route">Nabigazioa</string>
 	<string name="pref_zoom_title">Zoom botoiak</string>
-	<string name="pref_zoom_summary">Erakutsi mapan</string>
+	<string name="pref_zoom_summary">Pantailan bistaratzea</string>
 	<!-- Settings «Map» category: «Night style» title -->
 	<string name="pref_map_style_title">Gaueko modua</string>
 	<!-- «Map style» entry value -->
@@ -219,7 +199,7 @@
 	<!-- Settings «Map» category: «3D buildings» title -->
 	<string name="pref_map_3d_buildings_title">3D eraikinak</string>
 	<!-- A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled -->
-	<string name="pref_map_3d_buildings_disabled_summary">3D eraikinak desgaituta daude energia aurrezteko moduan</string>
+	<string name="pref_map_3d_buildings_disabled_summary">3D eraikinak itzalita daude energia aurrezteko moduan</string>
 	<!-- Settings «Route» category: «Tts enabled» title -->
 	<string name="pref_tts_enable_title">Ahots argibideak</string>
 	<!-- Settings «Route» category: «Tts language» title -->
@@ -228,18 +208,14 @@
 	<string name="pref_tts_unavailable">Ez dago erabilgarri</string>
 	<string name="pref_map_auto_zoom">Zoom automatikoa</string>
 	<string name="duration_disabled">Desaktibatuta</string>
-	<string name="duration_1_hour">ordu 1</string>
+	<string name="duration_1_hour">1 ordu</string>
 	<string name="duration_2_hours">2 ordu</string>
 	<string name="duration_6_hours">6 ordu</string>
 	<string name="duration_12_hours">12 ordu</string>
-	<string name="duration_1_day">egun 1</string>
+	<string name="duration_1_day">1 egun</string>
 	<string name="search_show_on_map">Ikusi mapan</string>
-	<!-- Menu button -->
-	<string name="menu">Menua</string>
 	<!-- Text in menu -->
 	<string name="website">Webgunea</string>
-	<!-- Text in About menu, opens Organic Maps news website -->
-	<string name="news">Albisteak</string>
 	<!-- Settings: Send feedback button and dialog title -->
 	<string name="feedback">Iruzkinak</string>
 	<!-- Text in menu -->
@@ -247,21 +223,21 @@
 	<!-- Text in menu -->
 	<string name="help">Laguntza</string>
 	<!-- Button in the main Help dialog -->
-	<string name="faq">Ohiko galderak</string>
+	<string name="faq">Maiz galderak</string>
 	<!-- Button in the main menu -->
 	<string name="donate">Dohaintza eman</string>
 	<!-- Button in the main Help dialog -->
-	<string name="how_to_support_us">Proiektuari laguntza eman</string>
+	<string name="how_to_support_us">Proiektuari laguntza ematea</string>
 	<!-- Button in the main Help dialog -->
-	<string name="copyright">Egile eskubideak</string>
+	<string name="copyright">Copyright</string>
 	<!-- Text in menu + Button in the main Help dialog -->
-	<string name="report_a_bug">Errore baten berri eman</string>
+	<string name="report_a_bug">Errore bat dago</string>
 	<!-- Update all button text -->
 	<string name="downloader_update_all_button">Eguneratu guztiak</string>
 	<!-- Cancel all button text -->
-	<string name="downloader_cancel_all">Utzi guztiak</string>
+	<string name="downloader_cancel_all">Guztiak bertan behera utzi</string>
 	<!-- Downloaded maps list header -->
-	<string name="downloader_downloaded_subtitle">Deskargatuta</string>
+	<string name="downloader_downloaded_subtitle">Alta</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">Ilaran</string>
 	<string name="downloader_near_me_subtitle">Nigandik gertu</string>
@@ -270,27 +246,27 @@
 	<string name="downloader_download_all_button">Deskargatu guztiak</string>
 	<string name="downloader_downloading">Deskargatzen:</string>
 	<!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-	<string name="downloader_delete_map_while_routing_dialog">Mapa ezabatzeko, gelditu nabigazioa.</string>
+	<string name="downloader_delete_map_while_routing_dialog">Mapa kentzeko, utzi nabigazioa.</string>
 	<!-- PointsInDifferentMWM -->
-	<string name="routing_failed_cross_mwm_building">Eskualde bakarreko mapa batean guztiz bilduta dauden arrastoak soilik sor daitezke.</string>
+	<string name="routing_failed_cross_mwm_building">Eskualde bakarreko mapa batean guztiz bilduta dauden ibilbideak soilik sor daitezke.</string>
 	<!-- Context menu item for downloader. -->
 	<string name="downloader_download_map">Deskargatu mapa</string>
 	<!-- Item status in downloader. -->
 	<string name="downloader_retry">Saiatu berriro</string>
 	<!-- Item in context menu. -->
-	<string name="downloader_delete_map">Ezabatu mapa</string>
+	<string name="downloader_delete_map">Mapa ezabatu</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_update_map">Eguneratu mapa</string>
 	<!-- Preference title -->
 	<string name="google_play_services">Google Play Zerbitzuak</string>
 	<!-- Preference text -->
-	<string name="pref_use_google_play">Erabili Google Play zerbitzuak zure uneko kokapena zehazteko</string>
+	<string name="pref_use_google_play">Erabili Google Play zerbitzuak zure uneko kokapena lortzeko</string>
 	<!-- Text for routing error dialog -->
-	<string name="routing_download_maps_along">Deskargatu zure arrastoaren mapa guztiak</string>
+	<string name="routing_download_maps_along">Deskargatu zure ibilbidearen mapa guztiak</string>
 	<!-- Text for routing error dialog -->
-	<string name="routing_requires_all_map">Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.</string>
+	<string name="routing_requires_all_map">Ibilbide bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatu eta eguneratzea.</string>
 	<!-- Text for routing error dialog -->
-	<string name="routing_not_enough_space">Leku nahikorik ez</string>
+	<string name="routing_not_enough_space">Leku nahikoa ez</string>
 	<!-- location service disabled -->
 	<string name="enable_location_services">Mesedez, aktibatu kokapen zerbitzuak</string>
 	<string name="save">Gorde</string>
@@ -317,11 +293,11 @@
 	<!-- light blue color -->
 	<string name="light_blue">Urdin argia</string>
 	<!-- cyan color -->
-	<string name="cyan">Ziana</string>
+	<string name="cyan">Zian</string>
 	<!-- teal color -->
 	<string name="teal">Berde urdinxka</string>
 	<!-- lime color -->
-	<string name="lime">Lima</string>
+	<string name="lime">Karea</string>
 	<!-- deep orange color -->
 	<string name="deep_orange">Laranja iluna</string>
 	<!-- gray color -->
@@ -330,28 +306,28 @@
 	<string name="blue_gray">Gris urdinxka</string>
 
 	<!-- SECTION: Routing dialogs strings -->
-	<string name="dialog_routing_disclaimer_title">Arrastoa jarraitzean, kontuan izan:</string>
-	<string name="dialog_routing_disclaimer_priority">— Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;</string>
-	<string name="dialog_routing_disclaimer_precision">— Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
-	<string name="dialog_routing_disclaimer_recommendations">— Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;</string>
+	<string name="dialog_routing_disclaimer_title">Ibilbidea jarraitzean, kontuan izan:</string>
+	<string name="dialog_routing_disclaimer_priority">— Ibilbideen baldintzek, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;</string>
+	<string name="dialog_routing_disclaimer_precision">— Mapa zehaztugabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;</string>
+	<string name="dialog_routing_disclaimer_recommendations">— Iradokitako ibilbideak gomendio gisa soilik ulertu behar dira;</string>
 	<string name="dialog_routing_disclaimer_borders">— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan;</string>
 	<string name="dialog_routing_disclaimer_beware">Egon adi eta seguru errepideetan!</string>
 	<string name="dialog_routing_check_gps">Egiaztatu GPS seinalea</string>
 	<string name="dialog_routing_error_location_not_found">Ezin da ibilbidea sortu. Ezin izan dira uneko GPS koordenatuak identifikatu.</string>
-	<string name="dialog_routing_location_turn_wifi">Egiaztatu GPS seinalea. WiFi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da.</string>
+	<string name="dialog_routing_location_turn_wifi">Egiaztatu GPS seinalea. Wi-Fi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da.</string>
 	<string name="dialog_routing_location_turn_on">Aktibatu kokapen zerbitzuak</string>
-	<string name="dialog_routing_location_unknown_turn_on">Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.</string>
+	<string name="dialog_routing_location_unknown_turn_on">Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak ibilbidea kalkulatzeko.</string>
 	<string name="dialog_routing_unable_locate_route">Ezin da ibilbiderik aurkitu</string>
 	<string name="dialog_routing_cant_build_route">Ezin da ibilbidea sortu.</string>
 	<string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edo helmuga.</string>
 	<string name="dialog_routing_change_start">Ezarri abiapuntua</string>
 	<string name="dialog_routing_start_not_determined">Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.</string>
-	<string name="dialog_routing_select_closer_start">Hautatu errepide batetik gertuko abiapuntua.</string>
-	<string name="dialog_routing_change_end">Zehaztu helmuga</string>
+	<string name="dialog_routing_select_closer_start">Hautatu errepide batetik gertu abiapuntua.</string>
+	<string name="dialog_routing_change_end">Helmuga ezarri</string>
 	<string name="dialog_routing_end_not_determined">Ibilbidea ez da sortu. Ezin izan da helmuga aurkitu.</string>
 	<string name="dialog_routing_select_closer_end">Hautatu helmuga puntu bat errepide batetik gertu.</string>
-	<string name="dialog_routing_change_intermediate">Ezin izan da tarteko puntua kokatu.</string>
-	<string name="dialog_routing_intermediate_not_determined">Mesedez, zehaztu tarteko puntua.</string>
+	<string name="dialog_routing_change_intermediate">Ezin izan da tarteko geralekua kokatu.</string>
+	<string name="dialog_routing_intermediate_not_determined">Mesedez, egokitu tarteko geldialdia.</string>
 	<string name="dialog_routing_system_error">Sistemaren errorea</string>
 	<string name="dialog_routing_application_error">Ibilbidea ezin izan da sortu aplikazioaren errore baten ondorioz.</string>
 	<string name="dialog_routing_try_again">Saiatu berriro</string>
@@ -366,14 +342,14 @@
 	<!-- «Hide» context menu -->
 	<string name="hide">Ezkutatu</string>
 	<!-- Arrive routing message in navigation view -->
-	<string name="routing_arrive">Iristeko unea: %s</string>
+	<string name="routing_arrive">Iritsiera: %s</string>
 	<string name="categories">Kategoriak</string>
-	<string name="history">Historiala</string>
+	<string name="history">Grabatu</string>
 	<string name="search_not_found">Barkatu, ez dut ezer aurkitu.</string>
-	<string name="search_not_found_query">Saiatu bilaketa-irizpideak aldatzen.</string>
-	<string name="search_history_title">Bilaketa historia</string>
+	<string name="search_not_found_query">Mesedez, saiatu beste kontsulta bat.</string>
+	<string name="search_history_title">Bilaketa-historia</string>
 	<string name="search_history_text">Ikusi azken bilaketak.</string>
-	<string name="clear_search">Garbitu bilaketa historia</string>
+	<string name="clear_search">Ezabatu bilaketa-historia</string>
 	<string name="p2p_your_location">Zure kokapena</string>
 	<string name="p2p_start">Hasi</string>
 	<string name="p2p_from_here">Hemendik</string>
@@ -381,11 +357,7 @@
 	<string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.</string>
 	<string name="p2p_reroute_from_current">Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
-	<string name="next_button">Hurrengoa</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">etatik</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Etara</string>
+	<string name="next_button">Jarraian</string>
 	<string name="editor_time_add">Gehitu ordutegia</string>
 	<string name="editor_time_delete">Ezabatu ordutegia</string>
 	<!-- Text for allday switch. -->
@@ -393,88 +365,85 @@
 	<string name="editor_time_open">Ireki</string>
 	<string name="editor_time_close">Itxita</string>
 	<string name="editor_time_add_closed">Gehitu ixteko ordutegia</string>
-	<string name="editor_time_title">Irekitzeko ordutegia</string>
+	<string name="editor_time_title">Ordutegiak</string>
 	<string name="editor_time_advanced">Modu aurreratua</string>
 	<string name="editor_time_simple">Modu erraza</string>
 	<string name="editor_hours_closed">Ixteko orduak</string>
-	<string name="editor_example_values">Adibide balioak</string>
-	<string name="editor_correct_mistake">Konpondu akatsa</string>
+	<string name="editor_example_values">Adibide-balioak</string>
+	<string name="editor_correct_mistake">Akats zuzena</string>
 	<string name="editor_add_select_location">Kokapena</string>
 	<string name="editor_report_problem_desription_1">Mesedez, deskribatu arazoa xehetasunez, OpenStreetMap komunitateak akatsa konpondu dezan.</string>
-	<string name="editor_report_problem_desription_2">Edo zuk zeuk egin hemen https://www.openstreetmap.org/ helbidean</string>
+	<string name="editor_report_problem_desription_2">Edo egin ezazu zeure burua https://www.openstreetmap.org/ helbidean</string>
 	<string name="editor_report_problem_send_button">Bidali</string>
 	<string name="editor_report_problem_title">Arazoa</string>
 	<string name="editor_report_problem_no_place_title">Tokia ez da existitzen</string>
-	<string name="editor_report_problem_under_construction_title">Mantentze lanetarako itxita</string>
+	<string name="editor_report_problem_under_construction_title">Mantentze-lanetarako itxita</string>
 	<string name="editor_report_problem_duplicate_place_title">Toki bikoiztua</string>
 	<string name="autodownload">Deskarga automatikoa</string>
 	<!-- Place Page opening hours text -->
 	<string name="daily">Egunero</string>
 	<string name="twentyfour_seven">24/7</string>
 	<string name="day_off_today">Gaur atseden eguna</string>
-	<string name="day_off">Itxita</string>
+	<string name="day_off">Egun librea</string>
 	<string name="today">Gaur</string>
-	<string name="opens_in">%s barru irekiko da</string>
-	<string name="closes_in">%s barru itxiko da</string>
+	<string name="opens_in">%s barru irekitzen da</string>
+	<string name="closes_in">%s barru ixten da</string>
 	<string name="closed">Itxita</string>
 	<string name="edit_opening_hours">Editatu ordutegia</string>
 	<string name="no_osm_account">Ez al duzu OpenStreetMap konturik?</string>
-	<string name="register_at_openstreetmap">Eman izena OpenStreetMap-en</string>
+	<string name="register_at_openstreetmap">Eman izena OpenStreetMap</string>
 	<string name="login">Saioa hasi</string>
 	<string name="login_osm">Hasi saioa OpenStreetMap-en</string>
 	<string name="password">Pasahitza</string>
-	<string name="forgot_password">Pasahitza ahaztu duzu?</string>
+	<string name="forgot_password">Pasahitza ahaztu al duzu?</string>
 	<string name="logout">Saioa itxi</string>
 	<string name="edit_place">Editatu tokia</string>
 	<string name="add_language">Gehitu hizkuntza bat</string>
 	<string name="street">Kalea</string>
 	<!-- Editable House Number text field (in address block). -->
-	<string name="house_number">Etxeko zenbakia</string>
+	<string name="house_number">Etxe zenbakia</string>
 	<string name="details">Xehetasunak</string>
 	<!-- Text field to enter non-existing street name, below list of known streets around -->
 	<string name="add_street">Gehitu kale bat</string>
 	<!-- Error to display when a new street name is not entered in the New street dialog -->
-	<string name="empty_street_name_error">Sartu kalearen izena</string>
-	<string name="choose_language">Aukeratu hizkuntza bat</string>
-	<string name="choose_street">Aukeratu kale bat</string>
+	<string name="empty_street_name_error">Sartu kale-izena</string>
+	<string name="choose_language">Hizkuntza bat aukeratu</string>
+	<string name="choose_street">Kale bat aukeratu</string>
 	<string name="postal_code">Posta kodea</string>
 	<string name="cuisine">Sukaldea</string>
 	<string name="select_cuisine">Aukeratu sukaldea</string>
 	<!-- login text field -->
 	<string name="email_or_username">Posta elektronikoa edo erabiltzailea</string>
-	<string name="editor_add_phone">Gehitu telefonoa</string>
 	<string name="level">Solairua</string>
 	<string name="downloader_delete_map_dialog">Maparen aldaketa guztiak maparekin batera ezabatuko dira.</string>
-	<string name="downloader_update_maps">Eguneratu mapak</string>
+	<string name="downloader_update_maps">Mapak deskargatu automatikoki</string>
 	<string name="downloader_mwm_migration_dialog">Ibilbide bat sortzeko, beharrezkoa da mapa guztiak eguneratzea eta ibilbidea berriro planifikatzea.</string>
-	<string name="downloader_search_field_hint">Bilatu mapa</string>
+	<string name="downloader_search_field_hint">Bilatu mapan</string>
 	<string name="common_check_internet_connection_dialog">Mesedez, egiaztatu ezarpenak eta ziurtatu zure gailua Internetera konektatuta dagoela.</string>
-	<string name="downloader_no_space_title">Leku nahikorik ez</string>
+	<string name="downloader_no_space_title">Leku nahikoa ez</string>
 	<string name="downloader_no_space_message">Ezabatu beharrezkoak ez diren datuak</string>
 	<string name="editor_login_error_dialog">Saioa hasteko errorea.</string>
 	<string name="editor_profile_changes">Egiaztatutako aldaketak</string>
 	<string name="editor_focus_map_on_location">Arrastatu mapa objektuaren kokapen zuzena hautatzeko.</string>
-	<string name="editor_edit_place_title">Editatzen</string>
-	<string name="editor_add_place_title">Gehitzen</string>
+	<string name="editor_edit_place_title">Editatu</string>
+	<string name="editor_add_place_title">Gehitu</string>
 	<string name="editor_edit_place_name_hint">Tokiaren izena</string>
 	<string name="editor_edit_place_category_title">Kategoria</string>
 	<string name="detailed_problem_description">Arazoaren deskribapen zehatza</string>
 	<string name="editor_report_problem_other_title">Beste arazo bat</string>
-	<string name="placepage_add_business_button">Gehitu aktibitatea</string>
+	<string name="placepage_add_business_button">Negozioa gehitu</string>
 	<string name="message_invalid_feature_position">Hemen ezin da objekturik jarri</string>
-	<!-- Text in About and OSM Login screens. %@ is replaced by a local, human readable date. -->
-	<string name="osm_presentation">OpenStreetMap-eko datu kartografikoak %s-tik aurrera. OSM mapen Wikipedia bezalakoa da, non mundu osoko erabiltzaile guztientzat lekuak gehitu edo edita ditzakezun</string>
-	<string name="login_to_make_edits_visible">Hasi saioa OpenStreetMapen beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.</string>
+	<string name="login_to_make_edits_visible">Hasi saioa beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
 	<string name="downloader_of">%1$d/%2$d</string>
 	<string name="download_over_mobile_header">Deskargatu sare mugikorreko konexioarekin?</string>
-	<string name="download_over_mobile_message">Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.</string>
-	<string name="error_enter_correct_house_number">Sartu etxeko zenbaki baliozkoa</string>
+	<string name="download_over_mobile_message">Oso garestia izan daiteke plan batzuekin edo datu-ibiltaritzarekin.</string>
+	<string name="error_enter_correct_house_number">Sartu etxe-zenbaki zuzena</string>
 	<string name="editor_storey_number">Solairu kopurua (gehienez %d)</string>
 	<!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
-	<string name="error_enter_correct_storey_number">Solairu kopurua ez da %d-tik gorakoa izan behar</string>
+	<string name="error_enter_correct_storey_number">Landare kopurua ez da %detik gorakoa izan behar</string>
 	<string name="editor_zip_code">Posta kodea</string>
-	<string name="error_enter_correct_zip_code">Sartu baliozko posta-kodea</string>
+	<string name="error_enter_correct_zip_code">Mesedez, idatzi posta-kode zuzena</string>
 	<!-- Place Page title for long tap -->
 	<string name="core_placepage_unknown_place">Toki ezezaguna</string>
 	<string name="editor_other_info">Bidali oharra OSM editoreei</string>
@@ -487,39 +456,36 @@
 	<!-- Error title that appears after certain time without location. -->
 	<string name="current_location_unknown_title">Zure uneko kokapena detektatzen jarraitu nahi duzu?</string>
 	<!-- Error that appears after certain time without location. -->
-	<string name="current_location_unknown_message">Uneko kokapena ezezaguna da. Agian eraikin batean edo tunel batean zaudelako.</string>
+	<string name="current_location_unknown_message">Uneko kokapena ezezaguna da. Eraikin batean edo tunel batean egon daiteke.</string>
 	<string name="current_location_unknown_continue_button">Jarraitu</string>
 	<string name="current_location_unknown_stop_button">Gelditu</string>
 	<string name="meter">m</string>
 	<string name="kilometer">km</string>
 	<string name="kilometers_per_hour">km/h</string>
-	<string name="mile">mi</string>
+	<string name="mile">ni</string>
 	<!-- A unit of measure -->
-	<string name="foot">oin</string>
+	<string name="foot">oina</string>
 	<string name="miles_per_hour">mph</string>
 	<string name="hour">h</string>
 	<string name="minute">min</string>
 	<string name="placepage_place_description">Deskribapena</string>
-	<string name="placepage_more_button">Gehiago</string>
-	<string name="placepage_call_button">Deitu</string>
-	<string name="placepage_edit_bookmark_button">Editatu markagailua</string>
+	<string name="placepage_more_button">Gainera</string>
+	<string name="placepage_call_button">Deitzeko</string>
+	<string name="placepage_edit_bookmark_button">Editatu laster-marka</string>
 	<string name="editor_comment_hint">Iruzkina…</string>
 	<string name="editor_reset_edits_message">Tokiko aldaketa guztiak berrezarri nahi dituzu?</string>
 	<string name="editor_reset_edits_button">Berreskuratu</string>
 	<string name="editor_remove_place_message">Gehitutako tokia ezabatu?</string>
-	<string name="editor_remove_place_button">Ezabatu</string>
+	<string name="editor_remove_place_button">Kendu</string>
 	<string name="editor_place_doesnt_exist">Tokia ez da existitzen</string>
-	<!-- Error message for "Place doesn't exist" dialog when comment is empty -->
-	<string name="delete_place_empty_comment_error">Zehaztu tokia ezabatzeko arrazoia</string>
 	<!-- Phone number error message -->
-	<string name="error_enter_correct_phone">Idatzi baliozko telefono zenbaki bat</string>
-	<string name="error_enter_correct_web">Sartu baliozko web helbide bat</string>
+	<string name="error_enter_correct_phone">Mesedez, idatzi telefono-zenbaki zuzena</string>
+	<string name="error_enter_correct_web">Mesedez, sartu baliozko web-helbide bat</string>
 	<string name="error_enter_correct_email">Sartu baliozko posta elektroniko bat</string>
-	<string name="error_enter_correct_facebook_page">Idatzi baliozko Facebook-eko web helbide, kontu edo orri izena</string>
+	<string name="error_enter_correct_facebook_page">Mesedez, idatzi baliozko Facebook-eko web-helbide, kontu edo orri-izena</string>
 	<string name="error_enter_correct_instagram_page">Sartu baliozko Instagram kontuaren izena edo web helbidea</string>
-	<string name="error_enter_correct_twitter_page">Sartu baliozko Twitter erabiltzaile izena edo web helbide bat</string>
-	<string name="error_enter_correct_vk_page">Sartu baliozko web helbide bat edo VK kontuaren izena</string>
-	<string name="error_enter_correct_line_page">Sartu baliozko web helbidea edo LINEko IDa</string>
+	<string name="error_enter_correct_twitter_page">Sartu baliozko Twitter erabiltzaile-izena edo web-helbide bat</string>
+	<string name="error_enter_correct_vk_page">Mesedez, idatzi baliozko web helbide bat edo VK kontuaren izena</string>
 	<string name="placepage_add_place_button">Gehitu toki bat mapan</string>
 	<!-- Displayed when saving some edits to the map to warn against publishing personal data -->
 	<string name="editor_share_to_all_dialog_title">Erabiltzaile guztiei bidali nahi diezu?</string>
@@ -527,104 +493,88 @@
 	<string name="editor_share_to_all_dialog_message_1">Ziurtatu ez duzula datu pertsonalik sartu.</string>
 	<string name="editor_share_to_all_dialog_message_2">OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero.</string>
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
-	<string name="about_description">Organic Maps lineaz kanpoko mapa aplikazio doako eta irekia da. Iragarkirik ez. Ez dago jarraipenik. Mapan errore bat ikusten baduzu, konpondu OpenStreetMap-en. Proiektua zaleek sortu dute haien aisialdian, beraz, zure iritzia eta laguntza behar dugu.</string>
+	<string name="about_description">Organic Maps lineaz kanpoko mapa aplikazio doako eta irekia da. Iragarkirik ez. Ez dago jarraipenik. Mapan errore bat ikusten baduzu, konpondu OpenStreetMap-en. Proiektua zaleek sortu dute gure aisialdian, beraz, zure iritzia eta laguntza behar dugu.</string>
 	<!-- For the first routing -->
-	<string name="accept">Onartu</string>
+	<string name="accept">Onartzeko</string>
 	<!-- For the first routing -->
-	<string name="decline">Ukatu</string>
+	<string name="decline">Gainbehera</string>
 	<string name="mobile_data_dialog">Internet mugikorra erabili informazio zehatza bistaratzeko?</string>
-	<string name="mobile_data_option_always">Erabili beti</string>
+	<string name="mobile_data_option_always">Beti erabili</string>
 	<string name="mobile_data_option_today">Gaur bakarrik</string>
 	<string name="mobile_data_option_not_today">Ez erabili gaur</string>
 	<string name="mobile_data">Internet mugikorra</string>
 	<!-- NOTE to translators: please synchronize your translation with the English one. -->
 	<string name="mobile_data_description">Internet mugikorra behar da tokiei buruzko informazio zehatza bistaratzeko, hala nola argazkiak, prezioak eta iritziak.</string>
-	<string name="mobile_data_option_never">Ez erabili inoiz</string>
-	<string name="mobile_data_option_ask">Galdetu beti</string>
+	<string name="mobile_data_option_never">Inoiz erabili</string>
+	<string name="mobile_data_option_ask">Beti galdetu</string>
 	<string name="traffic_update_maps_text">Trafiko datuak bistaratzeko, mapak eguneratu behar dira.</string>
-	<string name="big_font">Handitu letra tamaina mapan</string>
-	<string name="traffic_update_app">Eguneratu Organic Maps</string>
+	<string name="big_font">Handitu letra-tamaina mapan</string>
+	<string name="traffic_update_app">Mesedez, eguneratu Organic Maps</string>
 	<!-- "traffic" as in "road congestion" -->
 	<string name="traffic_data_unavailable">Trafiko datuak ez daude eskuragarri</string>
 	<string name="enable_logging">Historia gaitu</string>
 	<!-- Settings: "Send general feedback" button -->
 	<string name="feedback_general">Iritzi orokorra</string>
-	<string name="on">Martxan</string>
-	<string name="off">Itzalita</string>
-	<string name="prefs_languages_information">TTS sistema erabiltzen dugu ahots argibideetarako. Android gailu askok Google TTS erabiltzen dute. Google Play-tik deskargatu edo egunera dezakezu (https://play.google.com/store/apps/details?idu003dcom.google.android.tts)</string>
+	<string name="on">Ekin.</string>
+	<string name="off">Itzali</string>
+	<string name="prefs_languages_information">TTS sistema erabiltzen dugu ahots-argibideetarako. Android gailu askok Google TTS erabiltzen dute. Google Play-tik deskargatu edo egunera dezakezu (https://play.google.com/store/apps/details?idu003dcom.google.android.tts)</string>
 	<string name="prefs_languages_information_off">Zenbait hizkuntzatan, beste ahots-sintetizadore bat edo hizkuntza-pakete gehigarri bat instalatu behar duzu aplikazio-dendatik (Google Play, Galaxy Store, App Gallery, FDroid). Ireki gailua Ezarpenak > Hizkuntza eta sarrera > Hizkera > Hizketarako testurako aukerak. Hemen ahots-sintesiaren ezarpenak kudea ditzakezu (adibidez, hizkuntza pakete bat deskargatu, konexiorik gabe erabiltzeko) edo testu-hizketarako beste motor bat hauta dezakezu.</string>
 	<string name="prefs_languages_information_off_link">Informazio gehiago lortzeko, ikusi gida hau.</string>
 	<string name="transliteration_title">Latinezko transliterazioa</string>
 	<string name="learn_more">Irakurri gehiago</string>
 	<!-- Subway exits for public transport marks on the map -->
-	<string name="core_exit">Irten</string>
-	<string name="routing_add_start_point">Gehitu abiapuntu bat ibilbide bat antolatzeko</string>
-	<string name="routing_add_finish_point">Gehitu helmuga bat ibilbide bat antolatzeko</string>
-	<string name="button_exit">Irten</string>
+	<string name="core_exit">Irteera</string>
+	<string name="routing_add_start_point">Bilatu ibilbide-planaren iturria</string>
+	<string name="routing_add_finish_point">Bilatu ibilbide-planaren helmuga</string>
+	<string name="button_exit">Utzi</string>
 	<string name="placepage_remove_stop">Kendu</string>
-	<string name="placepage_add_stop">Gehitu geldiunea</string>
+	<string name="placepage_add_stop">Gehitu stop</string>
 	<string name="dialog_error_storage_title">Biltegiratze sarbidearen arazoa</string>
-	<string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support\@organicmaps.app helbidera</string>
+	<string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi-sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support\@organicmaps.app helbidera</string>
 	<string name="setting_emulate_bad_storage">Emulatu kaltetutako biltegiratzea</string>
 	<string name="core_entrance">Sarrera</string>
-	<string name="error_enter_correct_name">Mesedez, idatzi baliozko izen bat</string>
+	<string name="error_enter_correct_name">Mesedez, idatzi izen zuzena</string>
 	<string name="bookmark_lists">Zerrendak</string>
 	<!-- Do not display all bookmark lists on the map -->
 	<string name="bookmark_lists_hide_all">Ezkutatu guztiak</string>
-	<string name="bookmark_lists_show_all">Erakutsi guztiak</string>
+	<string name="bookmark_lists_show_all">Erakutsi dena</string>
 	<string name="bookmarks_create_new_group">Sortu zerrenda berria</string>
 	<!-- Bookmark categories screen -->
-	<string name="bookmarks_import">Inportatu markagailuak</string>
+	<string name="bookmarks_import">Inportatu laster-markak</string>
 	<string name="bookmarks_error_message_share_general">Ezin izan da partekatu aplikazioaren errore baten ondorioz</string>
 	<string name="bookmarks_error_title_share_empty">Partekatzeak huts egin du</string>
 	<string name="bookmarks_error_message_share_empty">Ezin da partekatu zerrenda hutsik</string>
 	<string name="bookmarks_error_title_empty_list_name">Izena ezin da hutsik egon</string>
-	<string name="bookmarks_error_message_empty_list_name">Idatzi zerrendaren izena</string>
+	<string name="bookmarks_error_message_empty_list_name">Mesedez, idatzi zerrendaren izena</string>
 	<string name="bookmarks_new_list_hint">Zerrenda berria</string>
 	<string name="bookmarks_error_title_list_name_already_taken">Izen hau dagoeneko hartua da</string>
-	<string name="bookmarks_error_message_list_name_already_taken">Aukeratu beste izen bat</string>
+	<string name="bookmarks_error_message_list_name_already_taken">Mesedez, aukeratu beste izen bat</string>
 	<string name="please_wait">Itxaron mesedez…</string>
 	<string name="phone_number">Telefono zenbakia</string>
 	<string name="profile">OpenStreetMap profila</string>
-	<plurals name="bookmarks_detect_message">
-	  <item quantity="one">fitxategi %d aurkitu da. Elkarrizketaren ondoren ikusiko duzu.</item>
-	  <item quantity="other">%d fitxategi aurkitu dira. Elkarrizketaren ondoren ikusiko dituzu.</item>
-	</plurals>
 	<string name="common_check_internet_connection_dialog_title">Ez dago Interneteko konexiorik</string>
-	<plurals name="objects">
-	  <item quantity="one">objektu %d</item>
-	  <item quantity="other">%d objektu</item>
-	</plurals>
-	<plurals name="places">
-	  <item quantity="one">toki %d</item>
-	  <item quantity="other">%d toki</item>
-	</plurals>
-	<plurals name="tracks">
-	  <item quantity="one">arrasto %d</item>
-	  <item quantity="other">%d arrasto</item>
-	</plurals>
 	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Jarraipen ezarpenak</string>
-	<string name="crash_reports">Akatsen txostena</string>
+	<string name="crash_reports">Gertakarien txostena</string>
 	<string name="crash_reports_description">Zure datuak Organic Maps-en esperientzia hobetzeko erabil ditzakegu. Aldaketak aplikazioa berrabiarazi ondoren jarriko dira indarrean.</string>
-	<string name="privacy_policy">Pribatutasun politika</string>
+	<string name="privacy_policy">Pribatutasun-politika</string>
 	<string name="terms_of_use">Erabilera baldintzak</string>
 	<string name="button_layer_traffic">Trafikoa</string>
 	<string name="button_layer_subway">Metroa</string>
-	<string name="layers_title">Mapako geruzak</string>
+	<string name="layers_title">Mapa geruzak</string>
 	<string name="subway_data_unavailable">Metroaren mapa ez dago erabilgarri</string>
 	<string name="bookmarks_empty_list_title">Zerrenda hau hutsik dago</string>
-	<string name="bookmarks_empty_list_message">Markagailu bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa</string>
-	<string name="category_desc_more">…gehiago</string>
-	<string name="export_file">Esportatu fitxategia</string>
-	<string name="list_settings">Zerrendaren ezarpenak</string>
-	<string name="delete_list">Ezabatu zerrenda</string>
+	<string name="bookmarks_empty_list_message">Pin bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa</string>
+	<string name="category_desc_more">…gehi</string>
+	<string name="export_file">Esportatu fitxategi gisa</string>
+	<string name="list_settings">Zerrenda konfiguratu</string>
+	<string name="delete_list">Zerrenda ezabatu</string>
 	<string name="public_access">Sarbide publikoa</string>
-	<string name="limited_access">Sarbide mugatua</string>
+	<string name="limited_access">Sarbide pribatua</string>
 	<string name="bookmark_list_description_hint">Gehitu deskribapen bat (testua edo html)</string>
 	<string name="not_shared">Pribatua</string>
 	<string name="speedcams_alert_title">Abiadura kamerak</string>
-	<string name="speedcam_option_auto">Automatikoa</string>
+	<string name="speedcam_option_auto">Kotxea</string>
 	<string name="speedcam_option_always">Beti</string>
 	<string name="speedcam_option_never">Inoiz ez</string>
 	<string name="place_description_title">Tokiaren deskribapena</string>
@@ -634,20 +584,20 @@
 	<string name="power_managment_description">Energia aurrezteko modua aktibatuta badago, aplikazioak energia kontsumitzen duten funtzioak itzaliko ditu, telefonoaren uneko kargaren arabera.</string>
 	<string name="power_managment_setting_never">Inoiz ez</string>
 	<string name="power_managment_setting_auto">Automatikoa</string>
-	<string name="power_managment_setting_manual_max">Energia aurrezpen handiena</string>
-	<string name="enable_logging_warning_message">Aukera hau diagnostiko helburua duten erregistro ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera Organic Maps laguntzari eskatuta soilik.</string>
-	<string name="access_rules_author_only">Sarean editatzen</string>
-	<string name="driving_options_title">Bideratzeko aukerak</string>
+	<string name="power_managment_setting_manual_max">Energia-aurrezpen handiena</string>
+	<string name="enable_logging_warning_message">Aukera hau diagnostiko-helburuetarako erregistro-ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera Organic Maps laguntzari eskatuta soilik.</string>
+	<string name="access_rules_author_only">Sarean editatzen da</string>
+	<string name="driving_options_title">Birbidali ezarpenak</string>
 	<string name="driving_options_subheader">Ibilbide guztietan saihestu</string>
 	<string name="avoid_tolls">Ordainpeko errepideak</string>
 	<string name="avoid_unpaved">Asfaltatu gabeko errepideak</string>
 	<string name="avoid_ferry">Ferry pasabideak</string>
 	<string name="avoid_motorways">Autobideak</string>
-	<string name="unable_to_calc_alert_title">Ezin da ibilbidea proposatu</string>
-	<string name="unable_to_calc_alert_subtitle">Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik proposatu. Aldatu ezarpenak eta saiatu berriro</string>
-	<string name="define_to_avoid_btn">Zehaztu saihestu beharreko bideak</string>
-	<string name="change_driving_options_btn">Bideratze aukerak gaituta</string>
-	<string name="toll_road">Ordainpeko errepidea</string>
+	<string name="unable_to_calc_alert_title">Ezin da ibilbiderik eraiki</string>
+	<string name="unable_to_calc_alert_subtitle">Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik egin. Aldatu ezarpenak eta saiatu berriro</string>
+	<string name="define_to_avoid_btn">Pertsonalizatu saihesbidearen ibilbidea</string>
+	<string name="change_driving_options_btn">Birbidaltze ezarpena aktibatuta dago</string>
+	<string name="toll_road">Bidesaria</string>
 	<string name="unpaved_road">Asfaltatu gabeko errepidea</string>
 	<string name="ferry_crossing">Ferry zeharkaldia</string>
 	<string name="avoid_toll_roads_placepage">Saihestu ordainpeko errepideak</string>
@@ -658,20 +608,20 @@
 	<!-- A generic "No" button in dialogs -->
 	<string name="no">Ez</string>
 	<!-- E.g. "WiFi:Yes" -->
-	<string name="yes_available">bai</string>
+	<string name="yes_available">Bai</string>
 	<!-- E.g. "WiFi:No" -->
-	<string name="no_available">ez</string>
-	<string name="ok">Ados</string>
+	<string name="no_available">Ez</string>
+	<string name="ok">Ok</string>
 	<!-- max. 10 symbols, both iOS and Android -->
-	<string name="sort">Ordenatu…</string>
+	<string name="sort">Agindu…</string>
 	<!-- Android, title, max 20-22 symbols -->
-	<string name="sort_bookmarks">Ordenatu markagailuak</string>
+	<string name="sort_bookmarks">Ordenatu laster-markak</string>
 	<!-- Android -->
 	<string name="by_default">Lehenetsia</string>
 	<!-- Android -->
 	<string name="by_type">Motaren arabera</string>
 	<!-- Android -->
-	<string name="by_distance">Distantziaren arabera</string>
+	<string name="by_distance">Distantziaz</string>
 	<!-- Android -->
 	<string name="by_date">Dataren arabera</string>
 	<string name="week_ago_sorttype">Duela aste bat</string>
@@ -682,62 +632,49 @@
 	<string name="others_sorttype">Beste batzuk</string>
 
 	<!-- SECTION: Bookmark types used for sorting -->
-	<string name="food_places">Janariak</string>
+	<string name="food_places">Janari</string>
 	<string name="tourist_places">Toki interesgarriak</string>
 	<string name="museums">Museoak</string>
 	<string name="parks">Parkeak</string>
-	<string name="swim_places">Igerilekua</string>
+	<string name="swim_places">Igeriketa</string>
 	<string name="mountains">Mendiak</string>
 	<string name="animals">Animaliak</string>
 	<string name="hotels">Hotelak</string>
 	<string name="buildings">Eraikinak</string>
 	<string name="money">Dirua</string>
 	<string name="shops">Dendak</string>
-	<string name="parkings">Aparkalekuak</string>
-	<string name="fuel_places">Gasolindegiak</string>
+	<string name="parkings">Aparkaleku</string>
+	<string name="fuel_places">Erregai-geltokia</string>
 	<string name="medicine">Medikuntza</string>
 	<string name="search_in_the_list">Bilatu zerrendan</string>
-	<string name="religious_places">Erlijio guneak</string>
+	<string name="religious_places">Erlijio-guneak</string>
 	<string name="select_list">Hautatu zerrenda</string>
-	<string name="transit_not_found">Metroko nabigazioa oraindik ez dago erabilgarri eskualde honetan</string>
-	<string name="dialog_pedestrian_route_is_long_header">Ez da aurkitu metroko ibilbiderik</string>
+	<string name="transit_not_found">Metro-nabigazioa oraindik ez dago erabilgarri eskualde honetan</string>
+	<string name="dialog_pedestrian_route_is_long_header">Ez da aurkitu metroko ibilbidea</string>
 	<string name="dialog_pedestrian_route_is_long_message">Aukeratu metrotik hurbilen dagoen ibilbidearen hasiera edo amaiera puntua</string>
-	<string name="button_layer_isolines">Sestra kurbak</string>
-	<string name="isolines_activation_error_dialog">Sestra kurbak erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa</string>
+	<string name="button_layer_isolines">Altuerak</string>
+	<string name="isolines_activation_error_dialog">Erliebe-altuera erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa</string>
 	<string name="isolines_location_error_dialog">Erliebearen altitudea oraindik ez dago eskuragarri eskualde honetan</string>
-	<string name="elevation_profile_ascent">Maldan gora</string>
-	<string name="elevation_profile_descent">Maldan behera</string>
+	<string name="elevation_profile_ascent">Igoera</string>
+	<string name="elevation_profile_descent">Gainbehera</string>
 	<string name="elevation_profile_minaltitude">Gutxieneko altuera</string>
 	<string name="elevation_profile_maxaltitude">Gehieneko altuera</string>
 	<string name="elevation_profile_difficulty">Zailtasuna</string>
 	<string name="elevation_profile_distance">Distantzia:</string>
-	<string name="elevation_profile_time">Denbora:</string>
-	<string name="isolines_toast_zooms_1_10">Handitu mapa sestra kurbak ikusteko</string>
+	<string name="elevation_profile_time">Hutsunea:</string>
+	<string name="isolines_toast_zooms_1_10">Handitu mapa isolineak ikusteko</string>
 	<string name="download_map_title">Deskargatu munduko mapa</string>
 	<!-- Used in DownloadResources startup screen -->
-	<string name="disk_error">Ezin da karpeta sortu eta fitxategiak mugitu barneko gailuaren memorian edo sd txartelan</string>
-	<!-- Used in DownloadResources startup screen -->
-	<string name="disk_error_title">Diskoaren akatsa</string>
-	<!-- Used in DownloadResources startup screen -->
 	<string name="connection_failure">Konexio arazoa</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="disconnect_usb_cable_title">Deskonektatu USB kablea</string>
 	<string name="enable_screen_sleep">Utzi pantailari lo egiten</string>
 	<!-- Description in preferences -->
 	<string name="enable_screen_sleep_description">Gaituta dagoenean, pantailak lo egin ahal izango du jarduerarik gabe egon ondoren.</string>
-	<!-- A preference title; keep short! -->
-	<string name="enable_show_on_lock_screen">Erakutsi pantaila blokeatuan</string>
-	<!-- Description in preferences -->
-	<string name="enable_show_on_lock_screen_description">Gaituta dagoenean, ez duzu gailua desblokeatu beharrik aplikazioa abian dagoen bitartean.</string>
 	<!-- OpenStreetMap text on splash screen -->
-	<string name="splash_subtitle">Maparen datuak OpenStreetMap-etik</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/eu/</string>
+	<string name="splash_subtitle">Maparen datuak OpenStreetMap-en</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Helbidea/Blokea</string>
-	<string name="type.addr_interpolation.even">Helbidea/Blokea</string>
-	<string name="type.addr_interpolation.odd">Helbidea/Blokea</string>
 	<string name="type.aerialway">Aire Garraioa</string>
 	<string name="type.aerialway.cable_car">Teleferikoa</string>
 	<string name="type.aerialway.chair_lift">Teleaulkia</string>
@@ -928,9 +865,8 @@
 	<string name="type.boundary.national_park">Parke Nazionala</string>
 	<string name="type.building">Eraikin</string>
 	<string name="type.building.address">Eraikin</string>
-	<string name="type.building.has_parts">Eraikin</string>
-	<string name="type.building_part">Eraikin</string>
 	<string name="type.building.garage">Garajea</string>
+	<string name="type.building.has_parts">Eraikin</string>
 	<string name="type.building.train_station">Tren geltokian</string>
 	<string name="type.building.warehouse">Denda</string>
 	<string name="type.cemetery.grave">Hilobia</string>
@@ -951,7 +887,6 @@
 	<string name="type.craft.metal_construction">Metalgintzako langilea</string>
 	<string name="type.craft.painter">Margolaria</string>
 	<string name="type.craft.photographer">Argazkilaria</string>
-	<string name="type.shop.camera">Kamera Denda</string>
 	<string name="type.craft.plumber">Iturgina</string>
 	<string name="type.craft.sawmill">Zerrategi</string>
 	<string name="type.craft.shoemaker">Zapataria</string>
@@ -1725,7 +1660,6 @@
 	<string name="type.shop.agrarian">Nekazaritza denda</string>
 	<string name="type.shop.antiques">Antigoalekoak</string>
 	<string name="type.shop.appliance">Etxetresna elektrikoen denda</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Arte Denda</string>
 	<string name="type.shop.baby_goods">Haurrentzako denda</string>
 	<string name="type.shop.bag">Poltsen Denda</string>
@@ -1823,5 +1757,6 @@
 	<string name="type.wheelchair.limited">Ezinduentzako partzialki hornitua</string>
 	<string name="type.wheelchair.no">Ezinduentzako ekipatuta ez dago</string>
 	<string name="type.wheelchair.yes">Ezinduentzako hornitua</string>
+	<string name="type.building_part">Eraikin</string>
 	<string name="type.amenity.events_venue">Ekitaldien Lekua</string>
 </resources>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index ae9f0345f5..f398eca797 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">مایل</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">مکان من</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">بعداً</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">جست‌وجو</string>
@@ -358,10 +358,6 @@
 	<string name="p2p_reroute_from_current">آیا می خواهید یک مسیر را از موقعیت فعلیتان برنامه ریزی کنیم؟</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">بعدی</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">از ساعت</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">الی</string>
 	<string name="editor_time_add">اضافه کردن برنامه ریزی</string>
 	<string name="editor_time_delete">حذف کردن برنامه ریزی</string>
 	<!-- Text for allday switch. -->
@@ -688,9 +684,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Fa:About_OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">آدرس/بلاک</string>
-	<string name="type.addr_interpolation.even">آدرس/بلاک</string>
-	<string name="type.addr_interpolation.odd">آدرس/بلاک</string>
 	<string name="type.aeroway.aerodrome">فرودگاه</string>
 	<string name="type.aeroway.aerodrome.international">فرودگاه</string>
 	<string name="type.aeroway.helipad">پد فرود بالگرد</string>
@@ -826,9 +819,8 @@
 	<string name="type.boundary.national_park">پارک ملی</string>
 	<string name="type.building">ساختمان</string>
 	<string name="type.building.address">ساختمان</string>
-	<string name="type.building.has_parts">ساختمان</string>
-	<string name="type.building_part">ساختمان</string>
 	<string name="type.building.garage">گاراژ</string>
+	<string name="type.building.has_parts">ساختمان</string>
 	<string name="type.building.train_station">ایستگاه قطار</string>
 	<string name="type.cemetery.grave">ﺮﺒﻗ</string>
 	<string name="type.craft">صنعت‌گری</string>
@@ -848,7 +840,6 @@
 	<string name="type.craft.metal_construction">اهن کار</string>
 	<string name="type.craft.painter">نقاش</string>
 	<string name="type.craft.photographer">عکاس</string>
-	<string name="type.shop.camera">فروشگاه دوربین</string>
 	<string name="type.craft.plumber">لوله کش</string>
 	<string name="type.craft.sawmill">کارخانه چوب‌بری</string>
 	<string name="type.craft.shoemaker">کفاش</string>
@@ -1526,7 +1517,6 @@
 	<string name="type.shop.agrarian">مغازه کشاورزی</string>
 	<string name="type.shop.antiques">ﺕﺎﺟ ﻪﻘﯿﺘﻋ</string>
 	<string name="type.shop.appliance">فروشگاه لوازم خانگی</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.baby_goods">ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.bag">ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ</string>
@@ -1626,5 +1616,6 @@
 	<string name="type.wheelchair.limited">دسترسی محدود با صندلی چرخ دار</string>
 	<string name="type.wheelchair.no">بدون دسترسی با صندلی چرخ دار</string>
 	<string name="type.wheelchair.yes">دسترسی کامل با صندلی چرخ دار</string>
+	<string name="type.building_part">ساختما</string>
 	<string name="type.amenity.events_venue">محل برگزاری رویدادها</string>
 </resources>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 563d84a874..2d6b4c42e7 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -23,7 +23,7 @@
 	<string name="miles">Mailit</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Sijaintini</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Myöhemmin</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Haku</string>
@@ -369,10 +369,6 @@
 	<string name="p2p_reroute_from_current">Haluatko valita vaihtoehtoisen reitin?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Seuraava</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">alkaen</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Asti</string>
 	<string name="editor_time_add">Lisää aikataulu</string>
 	<string name="editor_time_delete">Poista aikataulu</string>
 	<!-- Text for allday switch. -->
@@ -697,9 +693,6 @@
 	<string name="splash_subtitle">OpenStreetMapin karttatiedot</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Osoite/lohko</string>
-	<string name="type.addr_interpolation.even">Osoite/lohko</string>
-	<string name="type.addr_interpolation.odd">Osoite/lohko</string>
 	<string name="type.aerialway">Köysirata</string>
 	<string name="type.aerialway.cable_car">Kabiinihissi</string>
 	<string name="type.aerialway.chair_lift">Tuolihissi</string>
@@ -877,9 +870,8 @@
 	<string name="type.boundary.national_park">Kansallispuisto</string>
 	<string name="type.building">Rakennus</string>
 	<string name="type.building.address">Rakennus</string>
-	<string name="type.building.has_parts">Rakennus</string>
-	<string name="type.building_part">Rakennus</string>
 	<string name="type.building.garage">Autotalli</string>
+	<string name="type.building.has_parts">Rakennus</string>
 	<string name="type.building.train_station">Rautatieasema</string>
 	<string name="type.building.warehouse">Varasto</string>
 	<string name="type.cemetery.grave">Hauta</string>
@@ -900,7 +892,6 @@
 	<string name="type.craft.metal_construction">Metallimies</string>
 	<string name="type.craft.painter">Maalari</string>
 	<string name="type.craft.photographer">Valokuvaaja</string>
-	<string name="type.shop.camera">Kamerakauppa</string>
 	<string name="type.craft.plumber">Putkimies</string>
 	<string name="type.craft.sawmill">Saha</string>
 	<string name="type.craft.shoemaker">Suutari</string>
@@ -936,6 +927,7 @@
 	<string name="type.cuisine.filipino">Filippiiniläinen keittiö</string>
 	<string name="type.cuisine.fine_dining">Hieno ravintola</string>
 	<string name="type.cuisine.fish">Kala</string>
+	<string name="type.cuisine.fish_and_chips">Fish &amp; chips</string>
 	<string name="type.cuisine.french">Ranskalainen keittiö</string>
 	<string name="type.cuisine.friture">Uppopaistettu</string>
 	<string name="type.cuisine.georgian">Georgialainen keittiö</string>
@@ -1620,6 +1612,7 @@
 	<string name="type.shop.greengrocer">Vihanneskauppias</string>
 	<string name="type.shop.grocery">Päivittäistavarakauppa</string>
 	<string name="type.shop.hairdresser">Kampaamo</string>
+	<string name="type.shop.hardware">Rautakauppa</string>
 	<string name="type.shop.health_food">Terveysruokakauppa</string>
 	<string name="type.shop.herbalist">Yrttikauppa</string>
 	<string name="type.shop.hifi">HiFi Audio</string>
@@ -1664,7 +1657,6 @@
 	<string name="type.shop.agrarian">Maatalouskauppa</string>
 	<string name="type.shop.antiques">Antiikkia</string>
 	<string name="type.shop.appliance">Kodinkoneet kauppa</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Taidekauppa</string>
 	<string name="type.shop.baby_goods">Lasten kauppa</string>
 	<string name="type.shop.bag">Laukkukauppa</string>
@@ -1787,5 +1779,6 @@
 	<string name="type.piste_type.downhill.novice">Laskettelurinne</string>
 	<string name="type.piste_type.nordic">Latu</string>
 	<string name="type.piste_type.sled">Kelkkarata</string>
+	<string name="type.building_part">Rakennus</string>
 	<string name="type.amenity.events_venue">Tapahtumapaikka</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index a124126c44..c8f736ff7b 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -23,7 +23,7 @@
 	<string name="miles">Miles</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Ma position</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Plus tard</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Recherche</string>
@@ -386,10 +386,6 @@
 	<string name="p2p_reroute_from_current">Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Suivant</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">De</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">À</string>
 	<string name="editor_time_add">Ajouter un horaire d\'ouverture</string>
 	<string name="editor_time_delete">Supprimer un horaire d\'ouverture</string>
 	<!-- Text for allday switch. -->
@@ -734,15 +730,10 @@
 	<string name="enable_show_on_lock_screen_description">Lorsqu\'il est activé, vous n\'avez pas besoin de déverrouiller votre appareil à chaque fois que l\'application est en fonctionnement.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Données cartographiques d\'OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/fr/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresse/Bloc</string>
-	<string name="type.addr_interpolation.even">Adresse/Bloc</string>
-	<string name="type.addr_interpolation.odd">Adresse/Bloc</string>
 	<string name="type.aerialway">Transport par câble aérien</string>
 	<string name="type.aerialway.cable_car">Téléphérique</string>
 	<string name="type.aerialway.chair_lift">Télésiège</string>
@@ -922,7 +913,6 @@
 	<string name="type.building">Bâtiment</string>
 	<string name="type.building.address">Bâtiment</string>
 	<string name="type.building.has_parts">Bâtiment</string>
-	<string name="type.building_part">Bâtiment</string>
 	<string name="type.building.train_station">Gare</string>
 	<string name="type.building.warehouse">Entrepôt</string>
 	<string name="type.cemetery.grave">Tombe</string>
@@ -943,7 +933,6 @@
 	<string name="type.craft.metal_construction">Métallo</string>
 	<string name="type.craft.painter">Peintre</string>
 	<string name="type.craft.photographer">Photographe</string>
-	<string name="type.shop.camera">Boutique d\'appareils photo</string>
 	<string name="type.craft.plumber">Plombier</string>
 	<string name="type.craft.sawmill">Scierie</string>
 	<string name="type.craft.shoemaker">Cordonnier</string>
@@ -979,6 +968,7 @@
 	<string name="type.cuisine.filipino">Cuisine philippine</string>
 	<string name="type.cuisine.fine_dining">Restaurant gastronomique</string>
 	<string name="type.cuisine.fish">Poisson</string>
+	<string name="type.cuisine.fish_and_chips">Fish and chips</string>
 	<string name="type.cuisine.french">Cuisine française</string>
 	<string name="type.cuisine.friture">Friterie</string>
 	<string name="type.cuisine.georgian">Cuisine géorgienne</string>
@@ -1771,7 +1761,6 @@
 	<string name="type.shop.agrarian">Magasin d\'agriculture</string>
 	<string name="type.shop.antiques">Antiquités</string>
 	<string name="type.shop.appliance">Magasin d\'électroménager</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Boutique d\'art</string>
 	<string name="type.shop.baby_goods">Magasin de puériculture</string>
 	<string name="type.shop.bag">Magasin de sacs</string>
@@ -1884,5 +1873,6 @@
 	<string name="type.piste_type.downhill.novice">Piste de ski alpin</string>
 	<string name="type.piste_type.nordic">Piste de ski de fond</string>
 	<string name="type.piste_type.sled">Piste de luge</string>
+	<string name="type.building_part">Bâtiment</string>
 	<string name="type.amenity.events_venue">Lieu des événements</string>
 </resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 576204b86d..0db704221a 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -21,21 +21,21 @@
 	<string name="miles">Mérföld</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Saját helyzet</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Később</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Keresés</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">Keresés a térképen</string>
 	<!-- Location services are disabled by user alert - message -->
-	<string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Kérjük, engedélyezze őket a Beállításokban.</string>
+	<string name="location_is_disabled_long_text">Ezen az eszközön jelenleg minden helyzetmeghatározó szolgáltatás ki van kapcsolva. Kérjük kapcsolja be ezeket a Beállítások között.</string>
 	<!-- View and button titles for accessibility -->
 	<string name="zoom_to_country">Megjelenítés a térképen</string>
 	<!-- Message to display at the center of the screen when the country download has failed -->
 	<string name="country_status_download_failed">Letöltése sikertelen</string>
 	<!-- Button text for the button under the country_status_download_failed message -->
 	<string name="try_again">Újrapróbálkozás</string>
-	<string name="about_menu_title">Az Organic Mapsről</string>
+	<string name="about_menu_title">A Organic Maps programról</string>
 	<!-- Text in About screen -->
 	<string name="about_headline">Ingyenes mindenkinek, szeretettel készítve</string>
 	<!-- Text in About screen -->
@@ -46,7 +46,7 @@
 	<string name="about_proposition_3">• Gyors, minimalista, nincs szemét</string>
 	<!-- Text in About screen -->
 	<string name="about_developed_by_enthusiasts">A rajongók és az önkéntesek által létrehozott nyílt forráskódú alkalmazás.</string>
-	<string name="connection_settings">Helymeghatározási beállítások</string>
+	<string name="connection_settings">Kapcsolat beállítások</string>
 	<string name="close">Bezár</string>
 	<string name="unsupported_phone">Hardware-s gyorsítású OpenGL szükséges. Sajnos az Ön eszköze nem támogatott.</string>
 	<string name="download">Letöltés</string>
@@ -84,25 +84,13 @@
 	<!-- Settings button in system menu -->
 	<string name="settings">Beállítások</string>
 	<!-- Header of settings activity where user defines storage path -->
-	<string name="maps_storage">Térképek mentési helye</string>
+	<string name="maps_storage">Térképek mentése ide:</string>
 	<!-- Detailed description of Maps Storage settings button -->
 	<string name="maps_storage_summary">Válassza ki, hogy hova töltsük le a térképeket</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-	<string name="maps_storage_downloaded">Letöltött térképek</string>
-	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-	<string name="maps_storage_internal">Belső privát tárhely</string>
-	<!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-	<string name="maps_storage_shared">Belső közös tárhely</string>
-	<!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-	<string name="maps_storage_removable">SD-kártya</string>
-	<!-- Generic external storage type in Maps Storage settings -->
-	<string name="maps_storage_external">Külső közös tárhely</string>
-	<!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
-	<string name="maps_storage_free_size">%1$s szabad %2$s-ból</string>
+	<string name="maps_storage_downloaded">Térképek</string>
 	<!-- Question dialog for transferring maps from one storage to another -->
-	<string name="move_maps">Áthelyezzük a térképfájlokat?</string>
-	<!-- Error moving map files from one storage to another -->
-	<string name="move_maps_error">Hiba történt a térképfájlok áthelyezése közben</string>
+	<string name="move_maps">Áthelyezzük a térképeket?</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
 	<string name="wait_several_minutes">Ez több percig is eltarthat.\nKérjük várjon…</string>
 	<!-- Measurement units title in settings activity -->
@@ -114,9 +102,9 @@
 	<!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @eat! -->
 	<string name="eat">Hol lehet enni valamit</string>
 	<!-- Search category for grocery stores; any changes should be duplicated in categories.txt @food! -->
-	<string name="food">Élelmiszerek</string>
+	<string name="food">Termékek</string>
 	<!-- Search category for public transport; any changes should be duplicated in categories.txt @transport! -->
-	<string name="transport">Tömegközlekedés</string>
+	<string name="transport">Közlekedés</string>
 	<!-- Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! -->
 	<string name="fuel">Benzinkút</string>
 	<!-- Search category for parking lots; any changes should be duplicated in categories.txt @parking! -->
@@ -126,7 +114,7 @@
 	<!-- Search category for places to stay; any changes should be duplicated in categories.txt @hotel! -->
 	<string name="hotel">Szálloda</string>
 	<!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @tourism! -->
-	<string name="tourism">Látnivalók</string>
+	<string name="tourism">Látnivaló</string>
 	<!-- Search category for entertainment; any changes should be duplicated in categories.txt @entertainment! -->
 	<string name="entertainment">Szórakozás</string>
 	<!-- Search category for ATMs; any changes should be duplicated in categories.txt @atm! -->
@@ -134,7 +122,7 @@
 	<!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! -->
 	<string name="nightlife">Éjjeli élet</string>
 	<!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! -->
-	<string name="children">Családi kiruccanás</string>
+	<string name="children">Pihenés a gyerekekkel</string>
 	<!-- Search category for banks; any changes should be duplicated in categories.txt @bank! -->
 	<string name="bank">Bank</string>
 	<!-- Search category for pharmacies; any changes should be duplicated in categories.txt @pharmacy! -->
@@ -198,8 +186,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Hossz</string>
 	<string name="share_my_location">Helyzetem megosztása</string>
-	<!-- Settings information group in settings screen -->
-	<string name="prefs_group_information">Információk</string>
 	<string name="prefs_group_route">Navigáció</string>
 	<string name="pref_zoom_title">Nagyítás/kicsinyítés gombok</string>
 	<string name="pref_zoom_summary">Mutassa a kijelzőn</string>
@@ -234,7 +220,7 @@
 	<!-- Text in menu -->
 	<string name="website">Honlap</string>
 	<!-- Text in About menu, opens Organic Maps news website -->
-	<string name="news">Újdonságok</string>
+	<string name="news">Hírek</string>
 	<!-- Settings: Send feedback button and dialog title -->
 	<string name="feedback">Visszajelzés</string>
 	<!-- Text in menu -->
@@ -242,7 +228,7 @@
 	<!-- Text in menu -->
 	<string name="help">Segítség</string>
 	<!-- Button in the main Help dialog -->
-	<string name="faq">Gyakran Ismételt Kérdések</string>
+	<string name="faq">Kérdések és válaszok</string>
 	<!-- Button in the main menu -->
 	<string name="donate">Adományozni</string>
 	<!-- Button in the main Help dialog -->
@@ -288,7 +274,7 @@
 	<string name="routing_not_enough_space">Nincs elég hely</string>
 	<!-- location service disabled -->
 	<string name="enable_location_services">Kérjük kapcsolja be a helyzetmeghatározó szolgáltatást</string>
-	<string name="save">Mentés</string>
+	<string name="save">Simpan</string>
 	<string name="edit_description_hint">Az ön leírásai (sima szöveg vagy html)</string>
 	<string name="create">létrehoz</string>
 	<!-- red color -->
@@ -371,16 +357,12 @@
 	<string name="clear_search">A keresési előzmények törlése</string>
 	<string name="p2p_your_location">Az Ön helyzete</string>
 	<string name="p2p_start">Indítás</string>
-	<string name="p2p_from_here">Kiindulópont</string>
-	<string name="p2p_to_here">Célpont</string>
+	<string name="p2p_from_here">Innen</string>
+	<string name="p2p_to_here">Ide</string>
 	<string name="p2p_only_from_current">A navigáció csak a jelenlegi helyzetéből érhető el.</string>
 	<string name="p2p_reroute_from_current">Szeretne útvonaltervet készíttetni a jelenlegi pozíciójától?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Következő</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">tól</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Ig</string>
 	<string name="editor_time_add">Időrend felvitele</string>
 	<string name="editor_time_delete">Időrend törlése</string>
 	<!-- Text for allday switch. -->
@@ -521,7 +503,7 @@
 	<string name="mobile_data_option_not_today">Ma nem használhatja</string>
 	<string name="mobile_data">Mobil Internet</string>
 	<!-- NOTE to translators: please synchronize your translation with the English one. -->
-	<string name="mobile_data_description">Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.</string>
+	<string name="mobile_data_description">Mobil internetre van szükség helyszínekre vonatkozó részletes információ, mint például fotók, árak és szemlék megjelenítéséhez.</string>
 	<string name="mobile_data_option_never">Soha se használja</string>
 	<string name="mobile_data_option_ask">Mindig kérdezze meg</string>
 	<string name="traffic_update_maps_text">Forgalmi adatok megjelenítéséhez a térképeket frissíteni kell.</string>
@@ -551,13 +533,11 @@
 	<string name="setting_emulate_bad_storage">Sérült tároló emulálása</string>
 	<string name="core_entrance">Bejárat</string>
 	<string name="error_enter_correct_name">Kérjük adja meg a helyes nevet</string>
-	<string name="bookmark_lists">Listák</string>
+	<string name="bookmark_lists">List</string>
 	<!-- Do not display all bookmark lists on the map -->
 	<string name="bookmark_lists_hide_all">Összes elrejtése</string>
 	<string name="bookmark_lists_show_all">Összes megjelenítése</string>
 	<string name="bookmarks_create_new_group">Új lista létrehozása</string>
-	<!-- Bookmark categories screen -->
-	<string name="bookmarks_import">Könyvjelzők importálása</string>
 	<string name="bookmarks_error_message_share_general">Nem lehet megosztani alkalmazáshiba miatt</string>
 	<string name="bookmarks_error_title_share_empty">Megosztási hiba</string>
 	<string name="bookmarks_error_message_share_empty">Üres lista nem osztható meg</string>
@@ -604,7 +584,7 @@
 	<string name="bookmark_list_description_hint">Leírás hozzáadása (szöveg vagy html)</string>
 	<string name="not_shared">Privát</string>
 	<string name="speedcams_alert_title">Sebességmérő kamerák</string>
-	<string name="speedcam_option_auto">Automatikus</string>
+	<string name="speedcam_option_auto">Autó</string>
 	<string name="speedcam_option_always">Mindig</string>
 	<string name="speedcam_option_never">Soha</string>
 	<string name="place_description_title">A hely ismertetése</string>
@@ -682,7 +662,7 @@
 	<string name="transit_not_found">Metró navigáció ebben a régióban még nem érhető el</string>
 	<string name="dialog_pedestrian_route_is_long_header">Metró útvonal nem található</string>
 	<string name="dialog_pedestrian_route_is_long_message">Válasszon indulási vagy végpontot közelebb a metróállomáshoz</string>
-	<string name="button_layer_isolines">Domborzat</string>
+	<string name="button_layer_isolines">Terep</string>
 	<string name="isolines_activation_error_dialog">A topográfiai réteg aktiválásához és használatához kérjük frissítse vagy töltse le az adott terület térképét</string>
 	<string name="isolines_location_error_dialog">Ezen a területen a topográfiai réteg még nem elérhető</string>
 	<string name="elevation_profile_ascent">Felemelkedés</string>
@@ -702,15 +682,10 @@
 	<string name="enable_show_on_lock_screen_description">Ha engedélyezve van, nem kell minden alkalommal feloldanod a telefonod, amíg az alkalmazás fut.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Térképadatok az OpenStreetMapből</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/hu/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Hu:Névjegy</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Cím/blokk</string>
-	<string name="type.addr_interpolation.even">Cím/blokk</string>
-	<string name="type.addr_interpolation.odd">Cím/blokk</string>
 	<string name="type.aerialway.station">Felvonóállomás</string>
 	<string name="type.aeroway.aerodrome">Repülőtér</string>
 	<string name="type.aeroway.aerodrome.international">Repülőtér</string>
@@ -847,9 +822,8 @@
 	<string name="type.boundary.national_park">Nemzeti park</string>
 	<string name="type.building">Épület</string>
 	<string name="type.building.address">Épület</string>
-	<string name="type.building.has_parts">Épület</string>
-	<string name="type.building_part">Épület</string>
 	<string name="type.building.garage">Garázs</string>
+	<string name="type.building.has_parts">Épület</string>
 	<string name="type.building.train_station">Vonatmegálló</string>
 	<string name="type.cemetery.grave">Sír</string>
 	<string name="type.craft">Kézművesség</string>
@@ -869,7 +843,6 @@
 	<string name="type.craft.metal_construction">Lakatos</string>
 	<string name="type.craft.painter">Festő</string>
 	<string name="type.craft.photographer">Fényképész</string>
-	<string name="type.shop.camera">Fényképezőgép bolt</string>
 	<string name="type.craft.plumber">Vízvezeték-szerelő</string>
 	<string name="type.craft.sawmill">Fűrészmalom</string>
 	<string name="type.craft.shoemaker">Cipész</string>
@@ -1264,7 +1237,7 @@
 	<string name="type.natural.wetland">Vizes terület</string>
 	<string name="type.natural.wetland.bog">Láp</string>
 	<string name="type.natural.wetland.marsh">Mocsár</string>
-	<string name="type.office">Iroda</string>
+	<string name="type.office">Hivatal</string>
 	<string name="type.office.company">Vállalati iroda</string>
 	<string name="type.office.estate_agent">Ingatlanügynök</string>
 	<string name="type.office.government">Állami iroda</string>
@@ -1633,7 +1606,6 @@
 	<string name="type.shop.agrarian">Mezőgazdasági bolt</string>
 	<string name="type.shop.antiques">Régiségek</string>
 	<string name="type.shop.appliance">Készülék bolt</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Művészeti Bolt</string>
 	<string name="type.shop.baby_goods">Bababolt</string>
 	<string name="type.shop.bag">Táskák bolt</string>
@@ -1733,5 +1705,6 @@
 	<string name="type.wheelchair.limited">Korlátozottan akadálymentesített</string>
 	<string name="type.wheelchair.no">Nem akadálymentesített</string>
 	<string name="type.wheelchair.yes">Teljesen akadálymentesített</string>
+	<string name="type.building_part">Épület</string>
 	<string name="type.amenity.events_venue">Rendezvények helyszíne</string>
 </resources>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 3636229d5c..5bb6e53aa6 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -23,7 +23,7 @@
 	<string name="miles">Mil</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Posisi Saya</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Nanti</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Cari</string>
@@ -365,10 +365,6 @@
 	<string name="p2p_reroute_from_current">Apakah Anda ingin kami merencanakan sebuah rute dari lokasi Anda saat ini?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Berikut</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Dari pukul</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Hingga</string>
 	<string name="editor_time_add">Tambah Jadwal</string>
 	<string name="editor_time_delete">Hapus Jadwal</string>
 	<!-- Text for allday switch. -->
@@ -684,13 +680,8 @@
 	<string name="enable_screen_sleep_description">Jika diaktifkan, layar akan diizinkan untuk tidur setelah beberapa saat tidak aktif.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Data peta dari OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/id/</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Alamat/Blokir</string>
-	<string name="type.addr_interpolation.even">Alamat/Blokir</string>
-	<string name="type.addr_interpolation.odd">Alamat/Blokir</string>
 	<string name="type.aerialway.station">Stasiun kereta gantung</string>
 	<string name="type.aeroway.aerodrome">Bandar udara</string>
 	<string name="type.aeroway.aerodrome.international">Bandar udara</string>
@@ -822,9 +813,8 @@
 	<string name="type.boundary.national_park">Taman Nasional</string>
 	<string name="type.building">Gedung</string>
 	<string name="type.building.address">Gedung</string>
-	<string name="type.building.has_parts">Gedung</string>
-	<string name="type.building_part">Gedung</string>
 	<string name="type.building.garage">Garasi</string>
+	<string name="type.building.has_parts">Gedung</string>
 	<string name="type.building.train_station">Rel kereta api</string>
 	<string name="type.cemetery.grave">Kuburan</string>
 	<string name="type.craft">Kerajinan</string>
@@ -844,7 +834,6 @@
 	<string name="type.craft.metal_construction">Tukang besi</string>
 	<string name="type.craft.painter">Tukang cat</string>
 	<string name="type.craft.photographer">Juru foto</string>
-	<string name="type.shop.camera">Toko Kamera</string>
 	<string name="type.craft.plumber">Tukang pipa</string>
 	<string name="type.craft.sawmill">Penggergajian kayu</string>
 	<string name="type.craft.shoemaker">Tukang sepatu</string>
@@ -1563,6 +1552,7 @@
 	<string name="type.shop.greengrocer">Penjual sayuran</string>
 	<string name="type.shop.grocery">Kebutuhan sehari-hari</string>
 	<string name="type.shop.hairdresser">Penata rambut</string>
+	<string name="type.shop.hardware">Toko perangkat keras</string>
 	<string name="type.shop.health_food">Toko Makanan Kesehatan</string>
 	<string name="type.shop.herbalist">Toko jamu</string>
 	<string name="type.shop.hifi">Audio HI FI</string>
@@ -1605,7 +1595,6 @@
 	<string name="type.shop.agrarian">Toko pertanian</string>
 	<string name="type.shop.antiques">Barang antik</string>
 	<string name="type.shop.appliance">Toko peralatan</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Toko Seni</string>
 	<string name="type.shop.baby_goods">Toko anak-anak</string>
 	<string name="type.shop.bag">Toko Tas</string>
@@ -1703,5 +1692,6 @@
 	<string name="type.wheelchair.limited">Akses kursi roda terbatas</string>
 	<string name="type.wheelchair.no">Tidak ada akses kursi roda</string>
 	<string name="type.wheelchair.yes">Akses penuh kursi roda</string>
+	<string name="type.building_part">Gedung</string>
 	<string name="type.amenity.events_venue">Tempat acara</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 0e30424534..00adf3850b 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Miglia</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">La mia posizione</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Più tardi</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Cerca</string>
@@ -368,10 +368,6 @@
 	<string name="p2p_reroute_from_current">Vuoi che pianifichiamo un percorso dalla tua posizione attuale?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Avanti</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Dalle</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Alle</string>
 	<string name="editor_time_add">Aggiungi pianificazione</string>
 	<string name="editor_time_delete">Elimina pianificazione</string>
 	<!-- Text for allday switch. -->
@@ -716,9 +712,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/IT:About</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Indirizzo/Blocco</string>
-	<string name="type.addr_interpolation.even">Indirizzo/Blocco</string>
-	<string name="type.addr_interpolation.odd">Indirizzo/Blocco</string>
 	<string name="type.aerialway">Impianto a fune</string>
 	<string name="type.aerialway.cable_car">Teleferica</string>
 	<string name="type.aerialway.chair_lift">Seggiovia</string>
@@ -902,9 +895,8 @@
 	<string name="type.boundary.national_park">Parco nazionale</string>
 	<string name="type.building">Edificio</string>
 	<string name="type.building.address">Edificio</string>
-	<string name="type.building.has_parts">Edificio</string>
-	<string name="type.building_part">Edificio</string>
 	<string name="type.building.garage">Garage</string>
+	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Stazione ferroviaria</string>
 	<string name="type.building.warehouse">Magazzino</string>
 	<string name="type.cemetery.grave">Tomba</string>
@@ -925,7 +917,6 @@
 	<string name="type.craft.metal_construction">Metalmeccanico</string>
 	<string name="type.craft.painter">Imbianchino</string>
 	<string name="type.craft.photographer">Fotografo</string>
-	<string name="type.shop.camera">Negozio di macchine fotografiche</string>
 	<string name="type.craft.plumber">Idraulico</string>
 	<string name="type.craft.sawmill">Segheria</string>
 	<string name="type.craft.shoemaker">Calzolaio</string>
@@ -961,6 +952,7 @@
 	<string name="type.cuisine.filipino">Cucina filippina</string>
 	<string name="type.cuisine.fine_dining">Ristorante elegante</string>
 	<string name="type.cuisine.fish">Pesce</string>
+	<string name="type.cuisine.fish_and_chips">Fish and chips</string>
 	<string name="type.cuisine.french">Cucina francese</string>
 	<string name="type.cuisine.friture">Fritture</string>
 	<string name="type.cuisine.georgian">Cucina georgiana</string>
@@ -1284,7 +1276,7 @@
 	<string name="type.leisure.park">Parco</string>
 	<string name="type.leisure.park.no.access">Parco</string>
 	<string name="type.leisure.park.permissive">Parco</string>
-	<string name="type.leisure.park.private">Parco</string>
+	<string name="type.leisure.park.private">Parco privato</string>
 	<string name="type.leisure.picnic_table">Tavolo da picnic</string>
 	<string name="type.leisure.pitch">Campo sportivo</string>
 	<string name="type.leisure.playground">Campo giochi</string>
@@ -1702,6 +1694,7 @@
 	<string name="type.shop.greengrocer">Fruttivendolo</string>
 	<string name="type.shop.grocery">Drogheria</string>
 	<string name="type.shop.hairdresser">Parrucchiera</string>
+	<string name="type.shop.hardware">Ferramenta</string>
 	<string name="type.shop.health_food">Negozio di alimenti naturali</string>
 	<string name="type.shop.herbalist">Negozio di erbe</string>
 	<string name="type.shop.hifi">Audio ad alta fedeltà</string>
@@ -1746,7 +1739,6 @@
 	<string name="type.shop.agrarian">Negozio agricolo</string>
 	<string name="type.shop.antiques">Oggetti d\'antiquariato</string>
 	<string name="type.shop.appliance">Negozio di elettrodomestici</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Negozio d\'arte</string>
 	<string name="type.shop.baby_goods">Negozio per neonati</string>
 	<string name="type.shop.bag">Negozio di borse</string>
@@ -1861,5 +1853,6 @@
 	<string name="type.wheelchair.no">Non accessibile ai disabili</string>
 	<string name="type.wheelchair.yes">Accessibile ai disabili</string>
 	<string name="type.piste_type.sled">Pista per slitte</string>
+	<string name="type.building_part">Edificio</string>
 	<string name="type.amenity.events_venue">Sede degli eventi</string>
 </resources>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 577925f004..ba964148b3 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">מ\"ב</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">מיקומי</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">מאוחר יותר</string>
 	<!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
 	<string name="search_map">חפש במפה</string>
@@ -227,10 +227,6 @@
 	<!-- SECTION: Strings for downloading map from search -->
 	<string name="search_without_internet_advertisement">על מנת להתחיל לחפש וליצור מסלולים, הורידו בבקשה את המפה ולא תזדקקו יותר לחיבור לאינטרנט.</string>
 	<string name="search_select_map">בחרו את המפה</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">משעה</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">עד</string>
 	<string name="twentyfour_seven">יום ולילה</string>
 	<string name="login_osm">OpenStreetMap-ל סנכיה</string>
 	<string name="level">קוֹמָה</string>
@@ -251,9 +247,6 @@
 	<string name="splash_subtitle">OpenStreetMap-מ הפמ ינותנ</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">כתובת/חסימה</string>
-	<string name="type.addr_interpolation.even">כתובת/חסימה</string>
-	<string name="type.addr_interpolation.odd">כתובת/חסימה</string>
 	<string name="type.amenity.charging_station.bicycle">תחנת טעינה לאופניים</string>
 	<string name="type.amenity.charging_station.motorcar">תחנת טעינה למכוניות</string>
 	<string name="type.leisure.bowling_alley">גנילואב םלוא</string>
@@ -295,7 +288,6 @@
 	<string name="type.craft.metal_construction">עובד מתכת</string>
 	<string name="type.craft.painter">צייר</string>
 	<string name="type.craft.photographer">צלם</string>
-	<string name="type.shop.camera">חנות מצלמות</string>
 	<string name="type.craft.plumber">שרברב</string>
 	<string name="type.craft.sawmill">מנסרה</string>
 	<string name="type.craft.shoemaker">סנדלר</string>
@@ -633,7 +625,6 @@
 	<string name="type.shop.agrarian">חנות חקלאית</string>
 	<string name="type.shop.antiques">תוֹקיתִעַ</string>
 	<string name="type.shop.appliance">חנות מוצרי חשמל</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">תויונמוא תונח</string>
 	<string name="type.shop.baby_goods">םידליל תונח</string>
 	<string name="type.shop.bag">םיקית תונח</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 28561b2cda..bfeef200d1 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">マイル</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">現在地</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">次の機会に</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">検索</string>
@@ -361,10 +361,6 @@
 	<string name="p2p_reroute_from_current">現在位置からのルートを作成しますか？</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">次へ</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">から</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">まで</string>
 	<string name="editor_time_add">スケジュール追加</string>
 	<string name="editor_time_delete">スケジュール削除</string>
 	<!-- Text for allday switch. -->
@@ -683,9 +679,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/JA:参加する</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">アドレス/ブロック</string>
-	<string name="type.addr_interpolation.even">アドレス/ブロック</string>
-	<string name="type.addr_interpolation.odd">アドレス/ブロック</string>
 	<string name="type.aerialway">索道</string>
 	<string name="type.aerialway.cable_car">ロープウェイ</string>
 	<string name="type.aerialway.chair_lift">チェアリフト</string>
@@ -855,9 +848,8 @@
 	<string name="type.boundary.national_park">国立公園</string>
 	<string name="type.building">建物</string>
 	<string name="type.building.address">建物</string>
-	<string name="type.building.has_parts">建物</string>
-	<string name="type.building_part">建物</string>
 	<string name="type.building.garage">車庫</string>
+	<string name="type.building.has_parts">建物</string>
 	<string name="type.building.train_station">鉄道駅</string>
 	<string name="type.cemetery.grave">墓</string>
 	<string name="type.craft">工房</string>
@@ -877,7 +869,6 @@
 	<string name="type.craft.metal_construction">金属工</string>
 	<string name="type.craft.painter">塗装工</string>
 	<string name="type.craft.photographer">写真家</string>
-	<string name="type.shop.camera">カメラショップ</string>
 	<string name="type.craft.plumber">配管工</string>
 	<string name="type.craft.sawmill">製材所</string>
 	<string name="type.craft.shoemaker">靴修理</string>
@@ -1742,7 +1733,6 @@
 	<string name="type.shop.agrarian">農産物直売所</string>
 	<string name="type.shop.antiques">骨董品</string>
 	<string name="type.shop.appliance">家電店</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">アートショップ</string>
 	<string name="type.shop.baby_goods">キッズストア</string>
 	<string name="type.shop.bag">バッグストア</string>
@@ -1858,5 +1848,6 @@
 	<string name="type.wheelchair.limited">車椅子でのアクセス制限</string>
 	<string name="type.wheelchair.no">車椅子でのアクセスなし</string>
 	<string name="type.wheelchair.yes">車椅子でのアクセスあり</string>
+	<string name="type.building_part">建物</string>
 	<string name="type.amenity.events_venue">イベント会場</string>
 </resources>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 4e6aa3f771..e0927dadf6 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">마일</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">나의 위치</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">나중에</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">검색하기</string>
@@ -363,10 +363,6 @@
 	<string name="p2p_reroute_from_current">현재 위치에서 경로를 계획하시겠습니까?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">다음</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">부터</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">까지</string>
 	<string name="editor_time_add">스케줄 추가</string>
 	<string name="editor_time_delete">스케줄 삭제</string>
 	<!-- Text for allday switch. -->
@@ -685,9 +681,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ko:OpenStreetMap_소개</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">주소/블록</string>
-	<string name="type.addr_interpolation.even">주소/블록</string>
-	<string name="type.addr_interpolation.odd">주소/블록</string>
 	<string name="type.aerialway.station">케이블카 역</string>
 	<string name="type.aeroway.aerodrome">공항</string>
 	<string name="type.aeroway.aerodrome.international">공항</string>
@@ -825,9 +818,8 @@
 	<string name="type.boundary.national_park">국립 공원</string>
 	<string name="type.building">건물</string>
 	<string name="type.building.address">건물</string>
-	<string name="type.building.has_parts">건물</string>
-	<string name="type.building_part">건물</string>
 	<string name="type.building.garage">차고</string>
+	<string name="type.building.has_parts">건물</string>
 	<string name="type.building.train_station">기차역</string>
 	<string name="type.cemetery.grave">무덤</string>
 	<string name="type.craft">공예</string>
@@ -847,7 +839,6 @@
 	<string name="type.craft.metal_construction">금속공</string>
 	<string name="type.craft.painter">페인트공</string>
 	<string name="type.craft.photographer">사진작가</string>
-	<string name="type.shop.camera">카메라 샵</string>
 	<string name="type.craft.plumber">배관공</string>
 	<string name="type.craft.sawmill">제재소</string>
 	<string name="type.craft.shoemaker">구두수선</string>
@@ -1568,6 +1559,7 @@
 	<string name="type.shop.greengrocer">청과상</string>
 	<string name="type.shop.grocery">\"식료품점\"</string>
 	<string name="type.shop.hairdresser">이발사</string>
+	<string name="type.shop.hardware">철물점</string>
 	<string name="type.shop.health_food">\"건강식품 가게\"</string>
 	<string name="type.shop.herbalist">허브 가게</string>
 	<string name="type.shop.hifi">하이파이 오디오</string>
@@ -1612,7 +1604,6 @@
 	<string name="type.shop.agrarian">농산물 가게</string>
 	<string name="type.shop.antiques">고물</string>
 	<string name="type.shop.appliance">가전제품 매장</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">아트샵</string>
 	<string name="type.shop.baby_goods">어린이 가게</string>
 	<string name="type.shop.bag">가방 판매점</string>
@@ -1715,5 +1706,6 @@
 	<string name="type.wheelchair.limited">휠체어 접근 제한</string>
 	<string name="type.wheelchair.no">휠체어 접근 금지</string>
 	<string name="type.wheelchair.yes">휠체어 접근 가능</string>
+	<string name="type.building_part">건물</string>
 	<string name="type.amenity.events_venue">행사장</string>
 </resources>
diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml
index 9f9140ef38..5d3de9fe11 100644
--- a/android/res/values-mr/strings.xml
+++ b/android/res/values-mr/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">मैल</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">माझे स्थान</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">नंतर</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">शोधा</string>
@@ -356,10 +356,6 @@
 	<string name="p2p_reroute_from_current">तुमच्या वर्तमान स्थानापासून मार्ग नियोजन करायचे का?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">पुढे</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">ते</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">पर्यंत</string>
 	<string name="editor_time_add">वेळापत्रक जोडा</string>
 	<string name="editor_time_delete">वेळापत्रक मिटवा</string>
 	<!-- Text for allday switch. -->
@@ -693,13 +689,8 @@
 	<string name="enable_show_on_lock_screen">लॉक पटलावर (स्क्रीनवर) दाखवा</string>
 	<!-- Description in preferences -->
 	<string name="enable_show_on_lock_screen_description">चालू असल्यास, ऍप चालू असताना प्रत्येक वेळी तुम्हाला तुमचे उपकरण अनलॉक करण्याची आवश्यकता नाही.</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/mr/</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">पत्ता/ब्लॉक</string>
-	<string name="type.addr_interpolation.even">पत्ता/ब्लॉक</string>
-	<string name="type.addr_interpolation.odd">पत्ता/ब्लॉक</string>
 	<string name="type.aerialway">हवाई मार्ग</string>
 	<string name="type.aerialway.cable_car">हवाई मार्ग</string>
 	<string name="type.aerialway.chair_lift">हवाई मार्ग</string>
@@ -871,9 +862,8 @@
 	<string name="type.boundary.national_park">राष्ट्रीय उद्यान</string>
 	<string name="type.building">इमारत</string>
 	<string name="type.building.address">इमारत</string>
-	<string name="type.building.has_parts">इमारत</string>
-	<string name="type.building_part">इमारत</string>
 	<string name="type.building.garage">गराज</string>
+	<string name="type.building.has_parts">इमारत</string>
 	<string name="type.building.train_station">रेल्वे स्थानक</string>
 	<string name="type.building.warehouse">वखार</string>
 	<string name="type.craft">हस्तकला</string>
@@ -891,7 +881,6 @@
 	<string name="type.craft.metal_construction">धातू कामगार</string>
 	<string name="type.craft.painter">चित्रकार</string>
 	<string name="type.craft.photographer">छायाचित्रकार</string>
-	<string name="type.shop.camera">कॅमेरा शॉप</string>
 	<string name="type.craft.plumber">नळकामगार</string>
 	<string name="type.craft.sawmill">सुमेल</string>
 	<string name="type.craft.shoemaker">चांभार</string>
@@ -1627,6 +1616,7 @@
 	<string name="type.shop.gift">भेटवस्तूंचे दुकान</string>
 	<string name="type.shop.greengrocer">भाजीवाला</string>
 	<string name="type.shop.hairdresser">न्हावी</string>
+	<string name="type.shop.hardware">हार्डवेअर दुकान</string>
 	<string name="type.shop.herbalist">औषधी वनस्पतींचे दुकान</string>
 	<string name="type.shop.hifi">हायफाय ऑडिओ</string>
 	<string name="type.shop.houseware">हार्डवेअर दुकान</string>
@@ -1746,5 +1736,6 @@
 	<string name="type.wheelchair.limited">चाकखुर्चीसाठी मर्यादित प्रवेश</string>
 	<string name="type.wheelchair.no">चाकखुर्चीसाठी प्रवेश नाही</string>
 	<string name="type.wheelchair.yes">चाकखुर्चीसाठी प्रवेश</string>
+	<string name="type.building_part">इमारत</string>
 	<string name="type.amenity.events_venue">कार्यक्रमाचे ठिकाण</string>
 </resources>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 51cf842a63..3121dc780b 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -23,7 +23,7 @@
 	<string name="miles">Miles</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Min posisjon</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senere</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Søk</string>
@@ -384,10 +384,6 @@
 	<string name="p2p_reroute_from_current">Vil du vi skal planlegge en rute fra din nåværende posisjon?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Neste</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Fra</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Til</string>
 	<string name="editor_time_add">Legg til tidsrom</string>
 	<string name="editor_time_delete">Slett tidsrom</string>
 	<!-- Text for allday switch. -->
@@ -732,9 +728,6 @@
 	<string name="splash_subtitle">Kartdata fra OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresse/blokk</string>
-	<string name="type.addr_interpolation.even">Adresse/blokk</string>
-	<string name="type.addr_interpolation.odd">Adresse/blokk</string>
 	<string name="type.aerialway">Taubane</string>
 	<string name="type.aerialway.cable_car">Pendeltaubane</string>
 	<string name="type.aerialway.chair_lift">Stolheis</string>
@@ -876,9 +869,8 @@
 	<string name="type.boundary.national_park">Nasjonalpark</string>
 	<string name="type.building">Bygning</string>
 	<string name="type.building.address">Bygning</string>
-	<string name="type.building.has_parts">Bygning</string>
-	<string name="type.building_part">Bygning</string>
 	<string name="type.building.garage">Garasje</string>
+	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building.train_station">Togstasjon</string>
 	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft">Håndverk</string>
@@ -898,7 +890,6 @@
 	<string name="type.craft.metal_construction">Metallarbeider</string>
 	<string name="type.craft.painter">Maler</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Kamerabutikk</string>
 	<string name="type.craft.plumber">Rørlegger</string>
 	<string name="type.craft.sawmill">Sagbruk</string>
 	<string name="type.craft.shoemaker">Skoreparasjon</string>
@@ -1625,6 +1616,7 @@
 	<string name="type.shop.greengrocer">Frukt- og grønnsakshandler</string>
 	<string name="type.shop.grocery">Dagligvare</string>
 	<string name="type.shop.hairdresser">Frisør</string>
+	<string name="type.shop.hardware">Jernvareforretning</string>
 	<string name="type.shop.health_food">Helsekostbutikk</string>
 	<string name="type.shop.herbalist">Urtebutikk</string>
 	<string name="type.shop.hifi">HiFi lyd</string>
@@ -1669,7 +1661,6 @@
 	<string name="type.shop.agrarian">Landbruksbutikk</string>
 	<string name="type.shop.antiques">Antikviteter</string>
 	<string name="type.shop.appliance">Hvitevarebutikk</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Kunstbutikk</string>
 	<string name="type.shop.baby_goods">Barnebutikk</string>
 	<string name="type.shop.bag">Veskerbutikk</string>
@@ -1771,5 +1762,6 @@
 	<string name="type.wheelchair.limited">Begrenset tilgang for rullestol</string>
 	<string name="type.wheelchair.no">Ingen tilgang for rullestol</string>
 	<string name="type.wheelchair.yes">Full tilgang for rullestol</string>
+	<string name="type.building_part">Bygning</string>
 	<string name="type.amenity.events_venue">Arrangementssted</string>
 </resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 5399ff0945..7ebfdd4dac 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Mijlen</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Mijn locatie</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Later</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Zoeken</string>
@@ -380,10 +380,6 @@
 	<string name="p2p_reroute_from_current">Wilt u dat wij een route plannen vanaf uw huidige locatie?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Volgende</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Van</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Tot</string>
 	<string name="editor_time_add">Schema toevoegen</string>
 	<string name="editor_time_delete">Schema verwijderen</string>
 	<!-- Text for allday switch. -->
@@ -726,15 +722,10 @@
 	<string name="enable_show_on_lock_screen_description">Indien ingeschakeld, hoeft het scherm niet te worden ontgrendeld wanneer de app actief is.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Kaartgegevens van OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/nl/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adres/blok</string>
-	<string name="type.addr_interpolation.even">Adres/blok</string>
-	<string name="type.addr_interpolation.odd">Adres/blok</string>
 	<string name="type.aerialway">Kabelbaan</string>
 	<string name="type.aerialway.cable_car">Cabinelift</string>
 	<string name="type.aerialway.chair_lift">Stoeltjeslift</string>
@@ -819,8 +810,8 @@
 	<string name="type.amenity.parking_entrance.permissive">Parkeeringang</string>
 	<string name="type.amenity.parking_space">Parkeerplek</string>
 	<string name="type.amenity.parking_space.permissive">Parkeerplek</string>
-	<string name="type.amenity.parking_space.private">Parkeerplek</string>
-	<string name="type.amenity.parking_space.underground">Parkeerplek</string>
+	<string name="type.amenity.parking_space.private">Privé parkeerplek</string>
+	<string name="type.amenity.parking_space.underground">Ondergrondse parkeerplek</string>
 	<string name="type.amenity.parking_space.disabled">Invalide parkeerplaats</string>
 	<string name="type.amenity.payment_terminal">Betaalautomaat</string>
 	<string name="type.amenity.pharmacy">Apotheek</string>
@@ -927,9 +918,8 @@
 	<string name="type.boundary.national_park">Nationaal park</string>
 	<string name="type.building">Gebouw</string>
 	<string name="type.building.address">Gebouw</string>
-	<string name="type.building.has_parts">Gebouw</string>
-	<string name="type.building_part">Gebouw</string>
 	<string name="type.building.garage">Garage</string>
+	<string name="type.building.has_parts">Gebouw</string>
 	<string name="type.building.train_station">Treinstation</string>
 	<string name="type.building.warehouse">Magazijn</string>
 	<string name="type.cemetery.grave">Graf</string>
@@ -950,7 +940,6 @@
 	<string name="type.craft.metal_construction">Metaalarbeider</string>
 	<string name="type.craft.painter">Schilder</string>
 	<string name="type.craft.photographer">Fotograaf</string>
-	<string name="type.shop.camera">Camerawinkel</string>
 	<string name="type.craft.plumber">Loodgieter</string>
 	<string name="type.craft.sawmill">Zagerij</string>
 	<string name="type.craft.shoemaker">Schoenmaker</string>
@@ -986,6 +975,7 @@
 	<string name="type.cuisine.filipino">Filipijns</string>
 	<string name="type.cuisine.fine_dining">Gastronomisch</string>
 	<string name="type.cuisine.fish">Vis</string>
+	<string name="type.cuisine.fish_and_chips">Fish and chips</string>
 	<string name="type.cuisine.french">Frans</string>
 	<string name="type.cuisine.friture">Frituur</string>
 	<string name="type.cuisine.georgian">Georgisch</string>
@@ -1318,9 +1308,9 @@
 	<string name="type.leisure.marina">Jachthaven</string>
 	<string name="type.leisure.nature_reserve">Natuurreservaat</string>
 	<string name="type.leisure.park">Park</string>
-	<string name="type.leisure.park.no.access">Park</string>
+	<string name="type.leisure.park.no.access">Ontoegankelijk park</string>
 	<string name="type.leisure.park.permissive">Park</string>
-	<string name="type.leisure.park.private">Park</string>
+	<string name="type.leisure.park.private">Privé park</string>
 	<string name="type.leisure.picnic_table">Picknicktafel</string>
 	<string name="type.leisure.pitch">Sportveld</string>
 	<string name="type.leisure.playground">Speeltuin</string>
@@ -1831,7 +1821,6 @@
 	<string name="type.shop.agrarian">Agrarische winkel</string>
 	<string name="type.shop.antiques">Antiekhandel</string>
 	<string name="type.shop.appliance">Apparaten winkel</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Kunstwinkel</string>
 	<string name="type.shop.baby_goods">Babyspullenwinkel</string>
 	<string name="type.shop.bag">Tassenwinkel</string>
@@ -1961,5 +1950,6 @@
 	<string name="type.piste_type.downhill.novice">Beginnersafdaling</string>
 	<string name="type.piste_type.nordic">Langlaufroute</string>
 	<string name="type.piste_type.sled">Sleebaan</string>
+	<string name="type.building_part">Gebouw</string>
 	<string name="type.amenity.events_venue">Evenementenlocatie</string>
 </resources>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 344909e675..96e4651aae 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Mile</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Moje położenie</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Później</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Wyszukaj</string>
@@ -384,10 +384,6 @@
 	<string name="p2p_reroute_from_current">Czy chcesz, byśmy zaplanowali trasę z Twojej bieżącej lokalizacji?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Dalej</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Od</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Do</string>
 	<string name="editor_time_add">Dodaj harmonogram</string>
 	<string name="editor_time_delete">Usuń harmonogram</string>
 	<!-- Text for allday switch. -->
@@ -731,15 +727,10 @@
 	<string name="enable_show_on_lock_screen_description">Po włączeniu tej funkcji nie będziesz musieć odblokowywać urządzenia za każdym razem, gdy aplikacja jest uruchomiona.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Dane mapy z OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/pl/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Pl:Wstęp</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adres/Blok</string>
-	<string name="type.addr_interpolation.even">Adres/Blok</string>
-	<string name="type.addr_interpolation.odd">Adres/Blok</string>
 	<string name="type.aerialway">Transport linowy</string>
 	<string name="type.aerialway.cable_car">Kolej linowa</string>
 	<string name="type.aerialway.chair_lift">Wyciąg krzesełkowy</string>
@@ -916,10 +907,9 @@
 	<string name="type.boundary.administrative.suburb">Granica przedmieść</string>
 	<string name="type.boundary.national_park">Park narodowy</string>
 	<string name="type.building">Budynek</string>
-	<string name="type.building.address">Budynek</string>
-	<string name="type.building.has_parts">Budynek</string>
-	<string name="type.building_part">Budynek</string>
+	<string name="type.building.address">Adres</string>
 	<string name="type.building.garage">Garaż</string>
+	<string name="type.building.has_parts">Część budynku</string>
 	<string name="type.building.train_station">Dworzec kolejowy</string>
 	<string name="type.cemetery.grave">Mogiła</string>
 	<string name="type.craft">Rzemiosło</string>
@@ -939,7 +929,6 @@
 	<string name="type.craft.metal_construction">Ślusarz, obrabiacz metalu</string>
 	<string name="type.craft.painter">Malarz</string>
 	<string name="type.craft.photographer">Studio fotograficzne</string>
-	<string name="type.shop.camera">Sklep z aparatami</string>
 	<string name="type.craft.plumber">Hydraulik</string>
 	<string name="type.craft.sawmill">Tartak</string>
 	<string name="type.craft.shoemaker">Szewc</string>
@@ -1756,7 +1745,6 @@
 	<string name="type.shop.agrarian">Sklep rolniczy</string>
 	<string name="type.shop.antiques">Antyki</string>
 	<string name="type.shop.appliance">Sklep AGD</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Sklep artystyczny</string>
 	<string name="type.shop.baby_goods">Sklep dla dzieci</string>
 	<string name="type.shop.bag">Sklep z torbami</string>
@@ -1860,5 +1848,6 @@
 	<string name="type.wheelchair.limited">Częściowo wyposażono dla osób niepełnosprawnych</string>
 	<string name="type.wheelchair.no">Nie wyposażono dla osób niepełnosprawnych</string>
 	<string name="type.wheelchair.yes">Wyposażono dla osób niepełnosprawnych</string>
+	<string name="type.building_part">Część budynku</string>
 	<string name="type.amenity.events_venue">Miejsce wydarzeń</string>
 </resources>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index c508066d4f..5da75d3582 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Milhas</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Minha posição</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mais tarde</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Buscar</string>
@@ -712,13 +712,8 @@
 	<string name="enable_show_on_lock_screen_description">Quando ativado, você não precisará debloquear seu dispositivo toda vez que o aplicativo estiver funcionando</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Dados do mapa do OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/pt-BR/</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Endereço/Bloco</string>
-	<string name="type.addr_interpolation.even">Endereço/Bloco</string>
-	<string name="type.addr_interpolation.odd">Endereço/Bloco</string>
 	<string name="type.aerialway">Transporte aéreo</string>
 	<string name="type.aerialway.cable_car">Teleférico</string>
 	<string name="type.aerialway.chair_lift">Telecadeira</string>
@@ -898,9 +893,8 @@
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<string name="type.building">Edifício</string>
 	<string name="type.building.address">Edifício</string>
-	<string name="type.building.has_parts">Edifício</string>
-	<string name="type.building_part">Edifício</string>
 	<string name="type.building.garage">Garagem</string>
+	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building.train_station">Estação de trem</string>
 	<string name="type.building.warehouse">Armazém</string>
 	<string name="type.cemetery.grave">Túmulo</string>
@@ -909,7 +903,6 @@
 	<string name="type.craft.hvac">Aquecimento, Ventilação e Ar Condicionado</string>
 	<string name="type.craft.key_cutter">Chaveiro</string>
 	<string name="type.craft.locksmith">Serralheiro</string>
-	<string name="type.shop.camera">Loja de câmeras</string>
 	<string name="type.craft.plumber">Encanador</string>
 	<string name="type.craft.winery">Vinícola</string>
 	<string name="type.cuisine.african">Cozinha africana</string>
@@ -1686,7 +1679,6 @@
 	<string name="type.shop.agrarian">Loja agrícola</string>
 	<string name="type.shop.antiques">Antiguidades</string>
 	<string name="type.shop.appliance">Loja de eletrodomésticos</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Loja de artes</string>
 	<string name="type.shop.baby_goods">Loja infantil</string>
 	<string name="type.shop.bag">Loja de bolsas</string>
@@ -1795,5 +1787,6 @@
 	<string name="type.piste_type.downhill.novice">Esqui alpino iniciante</string>
 	<string name="type.piste_type.nordic">Pista tipo nórdico</string>
 	<string name="type.piste_type.sled">Pista para trenós</string>
+	<string name="type.building_part">Parte de edifício</string>
 	<string name="type.amenity.events_venue">Local do evento</string>
 </resources>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 82a613bfe3..e05eb9c164 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Milhas</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">A minha posição</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mais tarde</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Pesquisar</string>
@@ -370,10 +370,6 @@
 	<string name="p2p_reroute_from_current">Quer planear uma rota a partir da sua localização atual?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Próxima</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Das</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Às</string>
 	<string name="editor_time_add">Adicionar horário</string>
 	<string name="editor_time_delete">Eliminar horário</string>
 	<!-- Text for allday switch. -->
@@ -701,9 +697,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Endereço/Bloco</string>
-	<string name="type.addr_interpolation.even">Endereço/Bloco</string>
-	<string name="type.addr_interpolation.odd">Endereço/Bloco</string>
 	<string name="type.aerialway">Transporte aéreo</string>
 	<string name="type.aerialway.cable_car">Teleférico</string>
 	<string name="type.aerialway.chair_lift">Telecadeira</string>
@@ -791,8 +784,8 @@
 	<string name="type.amenity.parking_entrance.permissive">Entrada do estacionamento</string>
 	<string name="type.amenity.parking_space">Lugar de estacionamento</string>
 	<string name="type.amenity.parking_space.permissive">Lugar de estacionamento</string>
-	<string name="type.amenity.parking_space.private">Lugar de estacionamento</string>
-	<string name="type.amenity.parking_space.underground">Lugar de estacionamento</string>
+	<string name="type.amenity.parking_space.private">Lugar de estacionamento privado</string>
+	<string name="type.amenity.parking_space.underground">Lugar de estacionamento subterrâneo</string>
 	<string name="type.amenity.parking_space.disabled">Estacionamento para deficientes</string>
 	<string name="type.amenity.payment_terminal">Terminal de pagamento</string>
 	<string name="type.amenity.pharmacy">Farmácia</string>
@@ -884,9 +877,8 @@
 	<string name="type.boundary.national_park">Parque nacional</string>
 	<string name="type.building">Edifício</string>
 	<string name="type.building.address">Edifício</string>
-	<string name="type.building.has_parts">Edifício</string>
-	<string name="type.building_part">Edifício</string>
 	<string name="type.building.garage">Garagem</string>
+	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building.train_station">Estação de comboios</string>
 	<string name="type.building.warehouse">Armazém</string>
 	<string name="type.cemetery.grave">Túmulo</string>
@@ -907,7 +899,6 @@
 	<string name="type.craft.metal_construction">Serralheiro metálico</string>
 	<string name="type.craft.painter">Pintor</string>
 	<string name="type.craft.photographer">Fotógrafo</string>
-	<string name="type.shop.camera">Loja de câmeras</string>
 	<string name="type.craft.plumber">Picheleiro</string>
 	<string name="type.craft.sawmill">Serraria</string>
 	<string name="type.craft.shoemaker">Sapateiro</string>
@@ -1279,7 +1270,7 @@
 	<string name="type.leisure.park">Parque urbano</string>
 	<string name="type.leisure.park.no.access">Parque urbano</string>
 	<string name="type.leisure.park.permissive">Parque urbano</string>
-	<string name="type.leisure.park.private">Parque urbano</string>
+	<string name="type.leisure.park.private">Parque urbano privado</string>
 	<string name="type.leisure.picnic_table">Mesa de piqueniques</string>
 	<string name="type.leisure.pitch">Campo de desportos</string>
 	<string name="type.leisure.playground">Parque infantil</string>
@@ -1780,7 +1771,6 @@
 	<string name="type.shop.agrarian">Loja agrícola</string>
 	<string name="type.shop.antiques">Antiguidades</string>
 	<string name="type.shop.appliance">Loja de eletrodomésticos</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Loja de artes</string>
 	<string name="type.shop.baby_goods">Loja infantil</string>
 	<string name="type.shop.bag">Loja de bolsas</string>
@@ -1911,5 +1901,6 @@
 	<string name="type.piste_type.downhill.novice">Esqui alpino iniciante</string>
 	<string name="type.piste_type.nordic">Pista tipo nórdico</string>
 	<string name="type.piste_type.sled">Pista para trenós</string>
+	<string name="type.building_part">Parte de edifício</string>
 	<string name="type.amenity.events_venue">Local dos eventos</string>
 </resources>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 60a42d3abf..a9a3359d8e 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Mile</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Poziția mea</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Mai târziu</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Caută</string>
@@ -370,10 +370,6 @@
 	<string name="p2p_reroute_from_current">Vrei să planifici un traseu din poziția ta actuală?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Următorul</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">De la</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">La</string>
 	<string name="editor_time_add">Adaugă planificare</string>
 	<string name="editor_time_delete">Elimină planificarea</string>
 	<!-- Text for allday switch. -->
@@ -712,9 +708,6 @@
 	<string name="splash_subtitle">Date cartografice din OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresă/Bloc</string>
-	<string name="type.addr_interpolation.even">Adresă/Bloc</string>
-	<string name="type.addr_interpolation.odd">Adresă/Bloc</string>
 	<string name="type.aerialway.station">Stație de teleferic</string>
 	<string name="type.aeroway.aerodrome">Aeroport</string>
 	<string name="type.aeroway.aerodrome.international">Aeroport</string>
@@ -843,9 +836,8 @@
 	<string name="type.boundary.national_park">Parcul național</string>
 	<string name="type.building">Clădire</string>
 	<string name="type.building.address">Clădire</string>
-	<string name="type.building.has_parts">Clădire</string>
-	<string name="type.building_part">Clădire</string>
 	<string name="type.building.garage">Garaj</string>
+	<string name="type.building.has_parts">Clădire</string>
 	<string name="type.building.train_station">Feroviar</string>
 	<string name="type.cemetery.grave">Mormânt</string>
 	<string name="type.craft">Meșteșuguri</string>
@@ -865,7 +857,6 @@
 	<string name="type.craft.metal_construction">Metalurgist</string>
 	<string name="type.craft.painter">Pictor</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Magazin de aparate foto</string>
 	<string name="type.craft.plumber">Instalator</string>
 	<string name="type.craft.sawmill">Fabrica de cherestea</string>
 	<string name="type.craft.shoemaker">Reparații încălțăminte</string>
@@ -901,6 +892,7 @@
 	<string name="type.cuisine.filipino">Bucătărie filipinez</string>
 	<string name="type.cuisine.fine_dining">Restaurant elegant</string>
 	<string name="type.cuisine.fish">Pește</string>
+	<string name="type.cuisine.fish_and_chips">Restaurant fish and chips</string>
 	<string name="type.cuisine.french">Bucătărie francez</string>
 	<string name="type.cuisine.friture">Prăjit</string>
 	<string name="type.cuisine.georgian">Bucătărie georgian</string>
@@ -1627,7 +1619,6 @@
 	<string name="type.shop.agrarian">Magazin agricol</string>
 	<string name="type.shop.antiques">Antichități</string>
 	<string name="type.shop.appliance">Magazin de electrocasnice</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Magazin de arte</string>
 	<string name="type.shop.baby_goods">Magazin pentru copii</string>
 	<string name="type.shop.bag">Magazin de genti</string>
@@ -1722,5 +1713,6 @@
 	<string name="type.wheelchair.limited">Parțial utilat pentru invalizi</string>
 	<string name="type.wheelchair.no">Nu este utilat pentru invalizi</string>
 	<string name="type.wheelchair.yes">Utilat pentru invalizi</string>
+	<string name="type.building_part">Clădire</string>
 	<string name="type.amenity.events_venue">Locul de desfășurare a evenimentelor</string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 949e302a0c..995824f070 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">Мили</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Мое местоположение</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не сейчас</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Поиск</string>
@@ -387,10 +387,6 @@
 	<string name="p2p_reroute_from_current">Хотите перестроить маршрут от вашего местоположения?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Далее</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">С</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">До</string>
 	<string name="editor_time_add">Добавить расписание</string>
 	<string name="editor_time_delete">Удалить расписание</string>
 	<!-- Text for allday switch. -->
@@ -758,9 +754,6 @@
 	<string name="aa_continue_in_car">Продолжить в авто</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Адрес/Блок</string>
-	<string name="type.addr_interpolation.even">Адрес/Блок</string>
-	<string name="type.addr_interpolation.odd">Адрес/Блок</string>
 	<string name="type.aerialway">Канатная дорога</string>
 	<string name="type.aerialway.cable_car">Канатная дорога</string>
 	<string name="type.aerialway.chair_lift">Кресельная канатная дорога</string>
@@ -956,9 +949,8 @@
 	<string name="type.boundary.national_park">Национальный парк</string>
 	<string name="type.building">Здание</string>
 	<string name="type.building.address">Здание</string>
-	<string name="type.building.has_parts">Здание</string>
-	<string name="type.building_part">Здание</string>
 	<string name="type.building.garage">Гараж</string>
+	<string name="type.building.has_parts">Здание</string>
 	<string name="type.building.train_station">Ж/д вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
 	<string name="type.cemetery.grave">Могила</string>
@@ -979,7 +971,6 @@
 	<string name="type.craft.metal_construction">Металлоконструкции</string>
 	<string name="type.craft.painter">Маляр</string>
 	<string name="type.craft.photographer">Фотограф</string>
-	<string name="type.shop.camera">Магазин фотоаппаратов</string>
 	<string name="type.craft.plumber">Сантехник</string>
 	<string name="type.craft.sawmill">Лесопилка</string>
 	<string name="type.craft.shoemaker">Ремонт обуви</string>
@@ -1868,7 +1859,6 @@
 	<string name="type.shop.agrarian">Сельскохозяйственный магазин</string>
 	<string name="type.shop.antiques">Антиквариат</string>
 	<string name="type.shop.appliance">Магазин бытовой техники</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Художественный магазин</string>
 	<string name="type.shop.baby_goods">Детский магазин</string>
 	<string name="type.shop.bag">Магазин сумок</string>
@@ -1999,5 +1989,6 @@
 	<string name="type.piste_type.downhill.novice">Горнолыжная трасса для новичков</string>
 	<string name="type.piste_type.nordic">Лыжня</string>
 	<string name="type.piste_type.sled">Трасса для саней</string>
+	<string name="type.building_part">Здание</string>
 	<string name="type.amenity.events_venue">Место проведения мероприятий</string>
 </resources>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index c6c0cff2de..5889e3a5a8 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Míle</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Moja poloha</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Neskôr</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Hľadať</string>
@@ -361,10 +361,6 @@
 	<string name="p2p_reroute_from_current">Doriți să vă planificăm o rută având ca punct de pornire locația actuală?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Nasledujúca</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Od</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Do</string>
 	<string name="editor_time_add">Pridať rozvrh</string>
 	<string name="editor_time_delete">Zmazať rozvrh</string>
 	<!-- Text for allday switch. -->
@@ -683,9 +679,6 @@
 	<string name="splash_subtitle">Mapové údaje z OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adresa/blok</string>
-	<string name="type.addr_interpolation.even">Adresa/blok</string>
-	<string name="type.addr_interpolation.odd">Adresa/blok</string>
 	<string name="type.aerialway.station">Lanovka</string>
 	<string name="type.aeroway.aerodrome">Letisko</string>
 	<string name="type.aeroway.aerodrome.international">Letisko</string>
@@ -821,9 +814,8 @@
 	<string name="type.boundary.national_park">Národný park</string>
 	<string name="type.building">Budova</string>
 	<string name="type.building.address">Budova</string>
-	<string name="type.building.has_parts">Budova</string>
-	<string name="type.building_part">Budova</string>
 	<string name="type.building.garage">Garáž</string>
+	<string name="type.building.has_parts">Budova</string>
 	<string name="type.building.train_station">Železničná stanica</string>
 	<string name="type.cemetery.grave">Hrob</string>
 	<string name="type.craft">Remeslo</string>
@@ -843,7 +835,6 @@
 	<string name="type.craft.metal_construction">Kovorobotník</string>
 	<string name="type.craft.painter">Maliar natierač</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Obchod s fotoaparátmi</string>
 	<string name="type.craft.plumber">Klampiarstvo</string>
 	<string name="type.craft.sawmill">Píla</string>
 	<string name="type.craft.shoemaker">Oprava obuvy</string>
@@ -1561,6 +1552,7 @@
 	<string name="type.shop.greengrocer">Zelovoc</string>
 	<string name="type.shop.grocery">Potraviny</string>
 	<string name="type.shop.hairdresser">Kaderníctvo</string>
+	<string name="type.shop.hardware">Železiarstvo</string>
 	<string name="type.shop.health_food">Obchod so zdravou výživou</string>
 	<string name="type.shop.herbalist">Obchod s bylinkami</string>
 	<string name="type.shop.hifi">HiFi audio</string>
@@ -1603,7 +1595,6 @@
 	<string name="type.shop.agrarian">Poľnohospodársky obchod</string>
 	<string name="type.shop.antiques">Starožitnosti</string>
 	<string name="type.shop.appliance">Obchod so spotrebičmi</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Obchod s umením</string>
 	<string name="type.shop.baby_goods">Obchod pre deti</string>
 	<string name="type.shop.bag">Obchod s taškami</string>
@@ -1699,5 +1690,6 @@
 	<string name="type.wheelchair.limited">Obmedzený bezbariérový prístup</string>
 	<string name="type.wheelchair.no">Žiaden bezbariérový prístup</string>
 	<string name="type.wheelchair.yes">Úplný bezbariérový prístup</string>
+	<string name="type.building_part">Budova</string>
 	<string name="type.amenity.events_venue">Miesto konania podujatí</string>
 </resources>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index f8b6514cc3..28e1b190f3 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Mil</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Min position</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Senare</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Sök</string>
@@ -361,10 +361,6 @@
 	<string name="p2p_reroute_from_current">Vill du att vi planerar en färdväg från din nuvarande plats?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Nästa</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Från</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Till</string>
 	<string name="editor_time_add">Lägg till schema</string>
 	<string name="editor_time_delete">Ta bort schema</string>
 	<!-- Text for allday switch. -->
@@ -680,13 +676,8 @@
 	<string name="enable_screen_sleep_description">När den är aktiverad får skärmen sova efter en period av inaktivitet.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Kartdata från OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/sv/</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adress/Block</string>
-	<string name="type.addr_interpolation.even">Adress/Block</string>
-	<string name="type.addr_interpolation.odd">Adress/Block</string>
 	<string name="type.aerialway.station">Linbanestation</string>
 	<string name="type.aeroway.aerodrome">Flygplats</string>
 	<string name="type.aeroway.aerodrome.international">Flygplats</string>
@@ -822,7 +813,6 @@
 	<string name="type.building">Byggnad</string>
 	<string name="type.building.address">Byggnad</string>
 	<string name="type.building.has_parts">Byggnad</string>
-	<string name="type.building_part">Byggnad</string>
 	<string name="type.building.train_station">Tågstation</string>
 	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft">Hantverk</string>
@@ -842,7 +832,6 @@
 	<string name="type.craft.metal_construction">Metallarbetare</string>
 	<string name="type.craft.painter">Målare</string>
 	<string name="type.craft.photographer">Fotograf</string>
-	<string name="type.shop.camera">Kameraaffär</string>
 	<string name="type.craft.plumber">Vvs-montör</string>
 	<string name="type.craft.sawmill">Sågverk</string>
 	<string name="type.craft.shoemaker">Skomakare</string>
@@ -1602,7 +1591,6 @@
 	<string name="type.shop.agrarian">Lantbruksbutik</string>
 	<string name="type.shop.antiques">Antikviteter</string>
 	<string name="type.shop.appliance">Vitvarubutik</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Konstaffär</string>
 	<string name="type.shop.baby_goods">Barnbutik</string>
 	<string name="type.shop.bag">Väskor butik</string>
@@ -1700,5 +1688,6 @@
 	<string name="type.wheelchair.limited">Delvis utrustad för handikappade</string>
 	<string name="type.wheelchair.no">Ej utrustad för handikappade</string>
 	<string name="type.wheelchair.yes">Utrustad för handikappade</string>
+	<string name="type.building_part">Byggnad</string>
 	<string name="type.amenity.events_venue">Evenemangslokal</string>
 </resources>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 950ea0abe0..cac4d5adf7 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -242,9 +242,6 @@
 	<string name="splash_subtitle">Data ya ramani kutoka OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Anwani/Zuia</string>
-	<string name="type.addr_interpolation.even">Anwani/Zuia</string>
-	<string name="type.addr_interpolation.odd">Anwani/Zuia</string>
 	<string name="type.amenity">Kistawishi</string>
 	<string name="type.amenity.arts_centre">Kituo cha sanaa</string>
 	<string name="type.amenity.bicycle_repair_station">Cykelreparationsstation</string>
@@ -296,7 +293,6 @@
 	<string name="type.craft.metal_construction">Mfanyikazi wa chuma</string>
 	<string name="type.craft.painter">Mchoraji</string>
 	<string name="type.craft.photographer">Mpiga picha</string>
-	<string name="type.shop.camera">Duka la Kamera</string>
 	<string name="type.craft.plumber">Fundi bomba</string>
 	<string name="type.craft.sawmill">Sumel</string>
 	<string name="type.craft.shoemaker">Mtengeneza viatu</string>
@@ -677,7 +673,6 @@
 	<string name="type.shop.agrarian">Duka la kilimo</string>
 	<string name="type.shop.antiques">Mambo ya kale</string>
 	<string name="type.shop.appliance">Duka la vifaa</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Duka la Sanaa</string>
 	<string name="type.shop.baby_goods">Duka la watoto</string>
 	<string name="type.shop.bag">Hifadhi ya Mifuko</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index aa45f7d75d..eab70b3123 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -23,7 +23,7 @@
 	<string name="miles">ไมล์</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">ตำแหน่งของฉัน</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">ภายหลัง</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">ค้นหา</string>
@@ -365,10 +365,6 @@
 	<string name="p2p_reroute_from_current">คุณต้องการให้เราาวงแผนเส้นทางจากสถานที่ตั้งปัจจุบันของคุณหรือไม่?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">ถัดไป</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">เวลา</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">น</string>
 	<string name="editor_time_add">เพิ่มวัน</string>
 	<string name="editor_time_delete">ลบวัน</string>
 	<!-- Text for allday switch. -->
@@ -685,9 +681,6 @@
 	<string name="splash_subtitle">ข้อมูลแผนที่จาก OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">ที่อยู่/บล็อค</string>
-	<string name="type.addr_interpolation.even">ที่อยู่/บล็อค</string>
-	<string name="type.addr_interpolation.odd">ที่อยู่/บล็อค</string>
 	<string name="type.aerialway.station">สถานีกระเช้าลอยฟ้า</string>
 	<string name="type.aeroway.aerodrome">สนามบิน</string>
 	<string name="type.aeroway.aerodrome.international">สนามบิน</string>
@@ -826,9 +819,8 @@
 	<string name="type.boundary.national_park">อุทยานแห่งชาติ</string>
 	<string name="type.building">อาคาร</string>
 	<string name="type.building.address">อาคาร</string>
-	<string name="type.building.has_parts">อาคาร</string>
-	<string name="type.building_part">อาคาร</string>
 	<string name="type.building.garage">อาคารจอดรถ</string>
+	<string name="type.building.has_parts">อาคาร</string>
 	<string name="type.building.train_station">สถานีรถไฟ</string>
 	<string name="type.cemetery.grave">หลุมฝังศพ</string>
 	<string name="type.craft">งานฝีมือ</string>
@@ -848,7 +840,6 @@
 	<string name="type.craft.metal_construction">ช่างเหล็ก</string>
 	<string name="type.craft.painter">ช่างทาสี</string>
 	<string name="type.craft.photographer">ช่างภาพ</string>
-	<string name="type.shop.camera">ร้านกล้อง</string>
 	<string name="type.craft.plumber">ช่างประปา</string>
 	<string name="type.craft.sawmill">ซูเมล</string>
 	<string name="type.craft.shoemaker">ช่างซ่อมรองเท้า</string>
@@ -1613,7 +1604,6 @@
 	<string name="type.shop.agrarian">ร้านเกษตร</string>
 	<string name="type.shop.antiques">ของเก่า</string>
 	<string name="type.shop.appliance">ร้านเครื่องใช้ไฟฟ้า</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">ร้านศิลปะ</string>
 	<string name="type.shop.baby_goods">ร้านขายของสำหรับเด็ก</string>
 	<string name="type.shop.bag">ร้านกระเป๋า</string>
@@ -1713,5 +1703,6 @@
 	<string name="type.wheelchair.limited">พื้นที่จำกัดการใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุ</string>
 	<string name="type.wheelchair.no">พื้นที่ไม่สามารถใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุ</string>
 	<string name="type.wheelchair.yes">พื้นใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุได้</string>
+	<string name="type.building_part">อาคาร</string>
 	<string name="type.amenity.events_venue">สถานที่จัดงาน</string>
 </resources>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 099905a867..754c79cf1b 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -23,7 +23,7 @@
 	<string name="miles">Mil</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Konumum</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Daha sonra</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Ara</string>
@@ -384,10 +384,6 @@
 	<string name="p2p_reroute_from_current">Mevcut konumunuzdan bir rota planlamamızı ister misiniz?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Sonraki</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Den itibaren</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">A</string>
 	<string name="editor_time_add">Plan Ekle</string>
 	<string name="editor_time_delete">Planı Sil</string>
 	<!-- Text for allday switch. -->
@@ -739,9 +735,6 @@
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Tr:About</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Adres/Blok</string>
-	<string name="type.addr_interpolation.even">Adres/Blok</string>
-	<string name="type.addr_interpolation.odd">Adres/Blok</string>
 	<string name="type.aerialway">Teleferik</string>
 	<string name="type.aerialway.cable_car">Teleferik</string>
 	<string name="type.aerialway.chair_lift">Telesiyej</string>
@@ -932,9 +925,8 @@
 	<string name="type.boundary.national_park">Ulusal Park</string>
 	<string name="type.building">Bina</string>
 	<string name="type.building.address">Bina</string>
-	<string name="type.building.has_parts">Bina</string>
-	<string name="type.building_part">Bina</string>
 	<string name="type.building.garage">Garaj</string>
+	<string name="type.building.has_parts">Bina</string>
 	<string name="type.building.train_station">Tren İstasyonu</string>
 	<string name="type.building.warehouse">Depo</string>
 	<string name="type.cemetery.grave">Mezar</string>
@@ -955,7 +947,6 @@
 	<string name="type.craft.metal_construction">Dökümcü</string>
 	<string name="type.craft.painter">Boyacı</string>
 	<string name="type.craft.photographer">Fotoğraf Stüdyosu</string>
-	<string name="type.shop.camera">Kamera Dükkanı</string>
 	<string name="type.craft.plumber">Tesisatçı</string>
 	<string name="type.craft.sawmill">Kereste Fabrikası</string>
 	<string name="type.craft.shoemaker">Ayakkabı Tamircisi</string>
@@ -1833,7 +1824,6 @@
 	<string name="type.shop.agrarian">Tarım dükkanı</string>
 	<string name="type.shop.antiques">Antikalar</string>
 	<string name="type.shop.appliance">Beyaz eşya dükkanı</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Sanat Mağazası</string>
 	<string name="type.shop.baby_goods">Çocuk mağazası</string>
 	<string name="type.shop.bag">Çanta Mağazası</string>
@@ -1964,5 +1954,6 @@
 	<string name="type.piste_type.downhill.novice">Yeni başlayanlar için kayak pisti</string>
 	<string name="type.piste_type.nordic">İskandinav Kayak Pisti</string>
 	<string name="type.piste_type.sled">Kızak Pisti</string>
+	<string name="type.building_part">Bina</string>
 	<string name="type.amenity.events_venue">Etkinlik mekanı</string>
 </resources>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index d2b2c78974..fd0c24bfbf 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">Милі</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Моє місцезнаходження</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Не зараз</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Пошук</string>
@@ -380,10 +380,6 @@
 	<string name="p2p_reroute_from_current">Хочете спланувати маршрут із поточного місцезнаходження?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Далі</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">З</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">До</string>
 	<string name="editor_time_add">Додати розклад</string>
 	<string name="editor_time_delete">Видалити розклад</string>
 	<!-- Text for allday switch. -->
@@ -715,15 +711,10 @@
 	<string name="enable_show_on_lock_screen_description">Якщо ввімкнено, вам не потрібно щоразу розблоковувати пристрій під час роботи програми.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Картографічні дані з OpenStreetMap</string>
-	<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-	<string name="translated_om_site_url">https://organicmaps.app/uk/</string>
 	<!-- Link to OSM wiki for Editor, Profile and About pages -->
 	<string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Uk:Про_проект</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Адреса/блок</string>
-	<string name="type.addr_interpolation.even">Адреса/блок</string>
-	<string name="type.addr_interpolation.odd">Адреса/блок</string>
 	<string name="type.aerialway">Канатна дорога</string>
 	<string name="type.aerialway.cable_car">Канатна дорога</string>
 	<string name="type.aerialway.chair_lift">Канатна дорога</string>
@@ -915,9 +906,8 @@
 	<string name="type.boundary.national_park">Національний парк</string>
 	<string name="type.building">Будівля</string>
 	<string name="type.building.address">Будівля</string>
-	<string name="type.building.has_parts">Будівля</string>
-	<string name="type.building_part">Будівля</string>
 	<string name="type.building.garage">Гараж</string>
+	<string name="type.building.has_parts">Будівля</string>
 	<string name="type.building.train_station">Залізничний вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
 	<string name="type.cemetery.grave">Могила</string>
@@ -938,7 +928,6 @@
 	<string name="type.craft.metal_construction">Металоконструкції</string>
 	<string name="type.craft.painter">Маляр</string>
 	<string name="type.craft.photographer">Фотограф</string>
-	<string name="type.shop.camera">Магазин фотоапаратів</string>
 	<string name="type.craft.plumber">Сантехнік</string>
 	<string name="type.craft.sawmill">Лісопильня</string>
 	<string name="type.craft.shoemaker">Ремонт взуття</string>
@@ -1817,7 +1806,6 @@
 	<string name="type.shop.agrarian">Сільськогосподарський магазин</string>
 	<string name="type.shop.antiques">Антикваріат</string>
 	<string name="type.shop.appliance">Магазин побутової техніки</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Магазин мистецтв</string>
 	<string name="type.shop.baby_goods">Дитячий магазин</string>
 	<string name="type.shop.bag">Магазин сумок</string>
@@ -1948,5 +1936,6 @@
 	<string name="type.piste_type.downhill.novice">Гірськолижна траса для новеньких</string>
 	<string name="type.piste_type.nordic">Лижня</string>
 	<string name="type.piste_type.sled">Траса для санок</string>
+	<string name="type.building_part">Будівля</string>
 	<string name="type.amenity.events_venue">Місце проведення подій</string>
 </resources>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 36a998c8b8..8b2ccefe24 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">Dặm</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">Vị trí của Tôi</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Để sau</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Tìm kiếm</string>
@@ -363,10 +363,6 @@
 	<string name="p2p_reroute_from_current">Bạn có muốn chúng tôi vạch đường từ vị trí hiện tại của bạn không?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Tiếp theo</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">Từ</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">Đến</string>
 	<string name="editor_time_add">Thêm lịch biểu</string>
 	<string name="editor_time_delete">Xóa lịch biểu</string>
 	<!-- Text for allday switch. -->
@@ -684,9 +680,6 @@
 	<string name="splash_subtitle">Dữ liệu bản đồ từ OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Địa chỉ/Khối</string>
-	<string name="type.addr_interpolation.even">Địa chỉ/Khối</string>
-	<string name="type.addr_interpolation.odd">Địa chỉ/Khối</string>
 	<string name="type.aerialway.station">Trạm Cáp Treo</string>
 	<string name="type.aeroway.aerodrome">Sân bay</string>
 	<string name="type.aeroway.aerodrome.international">Sân bay</string>
@@ -823,9 +816,8 @@
 	<string name="type.boundary.national_park">Công viên quốc gia</string>
 	<string name="type.building">Tòa nhà</string>
 	<string name="type.building.address">Tòa nhà</string>
-	<string name="type.building.has_parts">Tòa nhà</string>
-	<string name="type.building_part">Tòa nhà</string>
 	<string name="type.building.garage">Gara</string>
+	<string name="type.building.has_parts">Tòa nhà</string>
 	<string name="type.building.train_station">Đường tàu hỏa</string>
 	<string name="type.cemetery.grave">Phần mộ</string>
 	<string name="type.craft">Thủ công</string>
@@ -845,7 +837,6 @@
 	<string name="type.craft.metal_construction">Nhà kim khí</string>
 	<string name="type.craft.painter">Họa sỹ</string>
 	<string name="type.craft.photographer">Thợ chụp ảnh</string>
-	<string name="type.shop.camera">Cửa hàng máy ảnh</string>
 	<string name="type.craft.plumber">Thợ đường ống</string>
 	<string name="type.craft.sawmill">Sumel</string>
 	<string name="type.craft.shoemaker">Sửa giày</string>
@@ -1564,6 +1555,7 @@
 	<string name="type.shop.greengrocer">Cửa hàng rau củ</string>
 	<string name="type.shop.grocery">Cửa hàng tạp hóa</string>
 	<string name="type.shop.hairdresser">Tiệm làm tóc</string>
+	<string name="type.shop.hardware">Cửa hàng phần cứng</string>
 	<string name="type.shop.health_food">Cửa hàng thực phẩm sức khỏe</string>
 	<string name="type.shop.herbalist">Cửa hàng thảo mộc</string>
 	<string name="type.shop.hifi">Âm thanh hifi</string>
@@ -1608,7 +1600,6 @@
 	<string name="type.shop.agrarian">Cửa hàng nông sản</string>
 	<string name="type.shop.antiques">Đồ cổ</string>
 	<string name="type.shop.appliance">Cửa hàng đồ gia dụng</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">Cửa hàng nghệ thuật</string>
 	<string name="type.shop.baby_goods">Cửa hàng trẻ em</string>
 	<string name="type.shop.bag">Cửa hàng túi xách</string>
@@ -1710,5 +1701,6 @@
 	<string name="type.wheelchair.limited">Được trang bị một phần cho người khuyết tật</string>
 	<string name="type.wheelchair.no">Không trang bị cho người khuyết tật</string>
 	<string name="type.wheelchair.yes">Được trang bị cho người khuyết tật</string>
+	<string name="type.building_part">Tòa nhà</string>
 	<string name="type.amenity.events_venue">Địa điểm tổ chức sự kiện</string>
 </resources>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index dfa4ca334d..a73c8ead26 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">英哩</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">我的位置</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">稍後</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">搜尋</string>
@@ -376,10 +376,6 @@
 	<string name="p2p_reroute_from_current">你是否想要規劃目前位置的路線？</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">下一頁</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">從</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">到</string>
 	<string name="editor_time_add">新增排程</string>
 	<string name="editor_time_delete">刪除排程</string>
 	<!-- Text for allday switch. -->
@@ -705,9 +701,6 @@
 	<string name="splash_subtitle">來自 OpenStreetMap 的地圖數據</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">地址/區塊</string>
-	<string name="type.addr_interpolation.even">地址/區塊</string>
-	<string name="type.addr_interpolation.odd">地址/區塊</string>
 	<string name="type.aerialway">纜車要素</string>
 	<string name="type.aerialway.cable_car">纜車</string>
 	<string name="type.aerialway.drag_lift">纜車要素</string>
@@ -858,9 +851,8 @@
 	<string name="type.boundary.national_park">國家公園</string>
 	<string name="type.building">建築物</string>
 	<string name="type.building.address">建築物</string>
-	<string name="type.building.has_parts">建築物</string>
-	<string name="type.building_part">建築物</string>
 	<string name="type.building.garage">車庫</string>
+	<string name="type.building.has_parts">建築物</string>
 	<string name="type.building.train_station">鐵道</string>
 	<string name="type.cemetery.grave">墓穴</string>
 	<string name="type.craft">工藝作坊</string>
@@ -880,7 +872,6 @@
 	<string name="type.craft.metal_construction">鐵工</string>
 	<string name="type.craft.painter">油漆工</string>
 	<string name="type.craft.photographer">攝影師</string>
-	<string name="type.shop.camera">相機店</string>
 	<string name="type.craft.plumber">水管工人</string>
 	<string name="type.craft.sawmill">鋸木廠</string>
 	<string name="type.craft.shoemaker">修鞋工</string>
@@ -1655,7 +1646,6 @@
 	<string name="type.shop.agrarian">農產品店</string>
 	<string name="type.shop.antiques">古董</string>
 	<string name="type.shop.appliance">家電店</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">藝術商店</string>
 	<string name="type.shop.baby_goods">兒童商店</string>
 	<string name="type.shop.bag">箱包店</string>
@@ -1758,5 +1748,6 @@
 	<string name="type.wheelchair.limited">部分配備為殘疾人專用</string>
 	<string name="type.wheelchair.no">未配備殘疾人專用</string>
 	<string name="type.wheelchair.yes">配備殘疾人專用</string>
+	<string name="type.building_part">建築物</string>
 	<string name="type.amenity.events_venue">活動場所</string>
 </resources>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 96f4557dd3..e69423f2de 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -21,7 +21,7 @@
 	<string name="miles">英里</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">我的位置</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">稍后</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">搜索</string>
@@ -373,10 +373,6 @@
 	<string name="p2p_reroute_from_current">你是否想要规划当前位置的路线？</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">下一页</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">从</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">到</string>
 	<string name="editor_time_add">添加计划</string>
 	<string name="editor_time_delete">删除计划</string>
 	<!-- Text for allday switch. -->
@@ -693,9 +689,6 @@
 	<string name="splash_subtitle">地图数据来自OpenStreetMap</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">地址/区块</string>
-	<string name="type.addr_interpolation.even">地址/区块</string>
-	<string name="type.addr_interpolation.odd">地址/区块</string>
 	<string name="type.aerialway">缆车要素</string>
 	<string name="type.aerialway.cable_car">缆车</string>
 	<string name="type.aerialway.chair_lift">登山吊椅</string>
@@ -874,9 +867,8 @@
 	<string name="type.boundary.national_park">国家公园</string>
 	<string name="type.building">建筑物</string>
 	<string name="type.building.address">建筑物</string>
-	<string name="type.building.has_parts">建筑物</string>
-	<string name="type.building_part">建筑物</string>
 	<string name="type.building.garage">独立1车库</string>
+	<string name="type.building.has_parts">建筑物</string>
 	<string name="type.building.train_station">火车站建筑</string>
 	<string name="type.building.warehouse">仓库</string>
 	<string name="type.cemetery.grave">墓穴</string>
@@ -897,7 +889,6 @@
 	<string name="type.craft.metal_construction">金属制造工</string>
 	<string name="type.craft.painter">油漆匠</string>
 	<string name="type.craft.photographer">摄影棚</string>
-	<string name="type.shop.camera">相机店</string>
 	<string name="type.craft.plumber">管道工</string>
 	<string name="type.craft.sawmill">锯木厂</string>
 	<string name="type.craft.shoemaker">鞋匠</string>
@@ -1744,7 +1735,6 @@
 	<string name="type.shop.agrarian">农产品店</string>
 	<string name="type.shop.antiques">古董</string>
 	<string name="type.shop.appliance">家电店</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
 	<string name="type.shop.art">艺术商店</string>
 	<string name="type.shop.baby_goods">儿童商店</string>
 	<string name="type.shop.bag">箱包店</string>
@@ -1857,5 +1847,6 @@
 	<string name="type.wheelchair.limited">部分配备为残疾人专用</string>
 	<string name="type.wheelchair.no">未配备残疾人专用</string>
 	<string name="type.wheelchair.yes">配备残疾人专用</string>
+	<string name="type.building_part">建筑部分</string>
 	<string name="type.amenity.events_venue">活动场所</string>
 </resources>
diff --git a/android/res/values/strings-tts.xml b/android/res/values/strings-tts.xml
index 2f066e4228..153b57188e 100644
--- a/android/res/values/strings-tts.xml
+++ b/android/res/values/strings-tts.xml
@@ -12,7 +12,7 @@
     zh_TW, zh_MO and zh_HK correspond to zh-Hant.
     Otherwise we consider that this is zh-Hans.
 
-    TODO: Move language list to core, now sync manually with platform/languages.hpp
+    TODO: Move language list to core.
 
     languages should be added alphabetically in tts_language_names
   -->
@@ -24,7 +24,6 @@
     <item>da</item>
     <item>de</item>
     <item>es</item>
-    <item>es-MX</item>
     <item>eu</item>
     <item>fr</item>
     <item>hr</item>
@@ -35,7 +34,6 @@
     <item>nb</item>
     <item>pl</item>
     <item>pt</item>
-    <item>pt-BR</item>
     <item>ro</item>
     <item>sk</item>
     <item>fi</item>
@@ -66,7 +64,6 @@
     <item>Dansk</item>
     <item>Deutsch</item>
     <item>Español</item>
-    <item>Español (México)</item>
     <item>Euskara</item>
     <item>Français</item>
     <item>Hrvatski</item>
@@ -77,7 +74,6 @@
     <item>Norsk Bokmål</item>
     <item>Polski</item>
     <item>Português</item>
-    <item>Português (Brasil)</item>
     <item>Română</item>
     <item>Slovenčina</item>
     <item>Suomi</item>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index becffeae7c..24610bf462 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -24,7 +24,7 @@
 	<string name="miles">Miles</string>
 	<!-- A text for current gps location point/arrow selected on the map -->
 	<string name="core_my_position">My Position</string>
-	<!-- Update maps later button text -->
+	<!-- Update maps later/Buy pro version later button text -->
 	<string name="later">Later</string>
 	<!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
 	<string name="search">Search</string>
@@ -57,7 +57,7 @@
 	<string name="disconnect_usb_cable">Please disconnect USB cable or insert memory card to use Organic Maps</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="not_enough_free_space_on_sdcard">Please free up some space on the SD card/USB storage first in order to use the app</string>
-	<string name="download_resources">Before you start using the app, please download the general world map to your device.\nIt will use %s of storage.</string>
+	<string name="download_resources">Before you start using the app, allow us to download the general world map to your device.\nIt will use %s of storage.</string>
 	<string name="download_resources_continue">Go to Map</string>
 	<string name="downloading_country_can_proceed">Downloading %s. You can now\nproceed to the map.</string>
 	<string name="download_country_ask">Download %s?</string>
@@ -69,7 +69,7 @@
 	<!-- Show popup notification on top of the map when country download has failed. -->
 	<string name="download_country_failed">%s download has failed</string>
 	<!-- "Add new bookmark list" dialog title -->
-	<string name="add_new_set">Add a New List</string>
+	<string name="add_new_set">Add New List</string>
 	<!-- Bookmark Color dialog title -->
 	<string name="bookmark_color">Bookmark Color</string>
 	<!-- Add Bookmark list dialog - hint when the list name is empty -->
@@ -89,7 +89,7 @@
 	<!-- Header of settings activity where user defines storage path -->
 	<string name="maps_storage">Save maps to</string>
 	<!-- Detailed description of Maps Storage settings button -->
-	<string name="maps_storage_summary">Select the folder to download maps to.</string>
+	<string name="maps_storage_summary">Select the place where maps should be downloaded to</string>
 	<!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
 	<string name="maps_storage_downloaded">Downloaded maps</string>
 	<!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -162,7 +162,7 @@
 	<string name="description">Notes</string>
 	<!-- Email Subject when sharing bookmark list -->
 	<string name="share_bookmarks_email_subject">Organic Maps bookmarks were shared with you</string>
-	<string name="share_bookmarks_email_body">Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don\'t have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!</string>
+	<string name="share_bookmarks_email_body">Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don\'t, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!</string>
 	<!-- message title of loading file -->
 	<string name="load_kmz_title">Loading Bookmarks</string>
 	<!-- Kmz file successful loading -->
@@ -178,7 +178,7 @@
 	<!-- Alert message that downloading is in progress. -->
 	<string name="downloading_is_active">Map download is in progress now.</string>
 	<!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-	<string name="my_position_share_sms">Check out my current location in Organic Maps! %1$s or %2$s Don\'t have offline maps? Download here: https://omaps.app/get</string>
+	<string name="my_position_share_sms">Hey, check out my current location in Organic Maps! %1$s or %2$s Don\'t have offline maps? Download here: https://omaps.app/get</string>
 	<!-- Subject for emailed bookmark -->
 	<string name="bookmark_share_email_subject">Hey, check out my pin in Organic Maps!</string>
 	<!-- Subject for emailed position -->
@@ -222,7 +222,7 @@
 	<!-- Settings «Map» category: «3D buildings» title -->
 	<string name="pref_map_3d_buildings_title">3D buildings</string>
 	<!-- A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled -->
-	<string name="pref_map_3d_buildings_disabled_summary">3D buildings are disabled in power saving mode</string>
+	<string name="pref_map_3d_buildings_disabled_summary">3D buildings are turned off in power saving mode</string>
 	<!-- Settings «Route» category: «Tts enabled» title -->
 	<string name="pref_tts_enable_title">Voice Instructions</string>
 	<!-- Settings «Route» category: «Tts language» title -->
@@ -248,7 +248,7 @@
 	<!-- Text in menu -->
 	<string name="telegram">Telegram</string>
 	<!-- Text in menu -->
-	<string name="matrix">[Matrix]</string>
+	<string name="matrix">[matrix]</string>
 	<!-- Text in menu -->
 	<string name="mastodon">Mastodon</string>
 	<!-- Text in menu -->
@@ -366,7 +366,7 @@
 	<string name="dialog_routing_location_unknown_turn_on">Unable to locate current GPS coordinates. Enable location services to calculate route.</string>
 	<string name="dialog_routing_unable_locate_route">Unable to locate route</string>
 	<string name="dialog_routing_cant_build_route">Unable to create route.</string>
-	<string name="dialog_routing_change_start_or_end">Please adjust your starting point or destination.</string>
+	<string name="dialog_routing_change_start_or_end">Please adjust your starting point or your destination.</string>
 	<string name="dialog_routing_change_start">Adjust starting point</string>
 	<string name="dialog_routing_start_not_determined">Route was not created. Unable to locate starting point.</string>
 	<string name="dialog_routing_select_closer_start">Please select a starting point closer to a road.</string>
@@ -395,7 +395,7 @@
 	<string name="search_not_found">Oops, no results found.</string>
 	<string name="search_not_found_query">Try changing your search criteria.</string>
 	<string name="search_history_title">Search History</string>
-	<string name="search_history_text">View your recent searches.</string>
+	<string name="search_history_text">View recent searches.</string>
 	<string name="clear_search">Clear Search History</string>
 	<!-- Place Page link to Wikipedia article (if map object has it). -->
 	<string name="read_in_wikipedia">Wikipedia</string>
@@ -405,14 +405,10 @@
 	<string name="p2p_start">Start</string>
 	<string name="p2p_from_here">Route from</string>
 	<string name="p2p_to_here">Route to</string>
-	<string name="p2p_only_from_current">Navigation is only available from your current location.</string>
-	<string name="p2p_reroute_from_current">Do you want to plan a route from your current location?</string>
+	<string name="p2p_only_from_current">Navigation is available only from your current location.</string>
+	<string name="p2p_reroute_from_current">Do you want us to plan a route from your current location?</string>
 	<!-- Edit open hours/set time and minutes dialog -->
 	<string name="next_button">Next</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_from">From</string>
-	<!-- Tab title in the Edit Opening Hours time picker -->
-	<string name="editor_time_to">To</string>
 	<string name="editor_time_add">Add Schedule</string>
 	<string name="editor_time_delete">Delete Schedule</string>
 	<!-- Text for allday switch. -->
@@ -427,14 +423,14 @@
 	<string name="editor_example_values">Example Values</string>
 	<string name="editor_correct_mistake">Correct mistake</string>
 	<string name="editor_add_select_location">Location</string>
-	<string name="editor_report_problem_desription_1">Please describe the problem in detail so that the OpenStreetMap community can fix it.</string>
+	<string name="editor_report_problem_desription_1">Please describe the problem in detail so that the OpenStreetMap community can fix the error.</string>
 	<string name="editor_report_problem_desription_2">Or do it yourself at https://www.openstreetmap.org/</string>
 	<string name="editor_report_problem_send_button">Send</string>
 	<string name="editor_report_problem_title">Issue</string>
-	<string name="editor_report_problem_no_place_title">This place does not exist</string>
+	<string name="editor_report_problem_no_place_title">The place does not exist</string>
 	<string name="editor_report_problem_under_construction_title">Сlosed for maintenance</string>
-	<string name="editor_report_problem_duplicate_place_title">Duplicate place</string>
-	<string name="autodownload">Auto-download maps</string>
+	<string name="editor_report_problem_duplicate_place_title">Duplicated place</string>
+	<string name="autodownload">Auto-download</string>
 	<!-- Place Page opening hours text -->
 	<string name="daily">Daily</string>
 	<string name="twentyfour_seven">24/7</string>
@@ -447,7 +443,7 @@
 	<string name="edit_opening_hours">Edit business hours</string>
 	<string name="no_osm_account">Don\'t have an OpenStreetMap account?</string>
 	<string name="register_at_openstreetmap">Register at OpenStreetMap</string>
-	<string name="login">OpenStreetMap Login</string>
+	<string name="login">Log In</string>
 	<string name="login_osm">Login to OpenStreetMap</string>
 	<string name="password">Password</string>
 	<string name="forgot_password">Forgot your password?</string>
@@ -471,11 +467,11 @@
 	<string name="email_or_username">Email or username</string>
 	<string name="editor_add_phone">Add Phone</string>
 	<string name="level">Floor</string>
-	<string name="downloader_delete_map_dialog">All of your map edits will be deleted with the map.</string>
+	<string name="downloader_delete_map_dialog">All of your map edits will be deleted together with the map.</string>
 	<string name="downloader_update_maps">Update Maps</string>
 	<string name="downloader_mwm_migration_dialog">To create a route, you need to update all maps and then plan the route again.</string>
 	<string name="downloader_search_field_hint">Find map</string>
-	<string name="common_check_internet_connection_dialog">Please make sure your device is connected to the Internet.</string>
+	<string name="common_check_internet_connection_dialog">Please check your settings and make sure your device is connected to the Internet.</string>
 	<string name="downloader_no_space_title">Not enough space</string>
 	<string name="downloader_no_space_message">Please delete any unnecessary data</string>
 	<string name="editor_login_error_dialog">Login error.</string>
@@ -490,8 +486,8 @@
 	<string name="placepage_add_business_button">Add business</string>
 	<string name="message_invalid_feature_position">No object can be located here</string>
 	<!-- Text in About and OSM Login screens. %@ is replaced by a local, human readable date. -->
-	<string name="osm_presentation">Cartographic data from OpenStreetMap as of %s. OSM is like Wikipedia for maps, where you can add and edit places for users around the world.</string>
-	<string name="login_to_make_edits_visible">Log in to openstreetmap.org to publish your changes to the world.</string>
+	<string name="osm_presentation">Cartographic data from OpenStreetMap as of %s. OSM is like Wikipedia for maps, where you can add or edit places for all users around the world.</string>
+	<string name="login_to_make_edits_visible">Log in to OpenStreetMap.org so other users can see the changes you have made.</string>
 	<!-- Downloaded 10 **of** 20 <- it is that "of" -->
 	<string name="downloader_of">%1$d of %2$d</string>
 	<string name="download_over_mobile_header">Download over a cellular network connection?</string>
@@ -506,15 +502,15 @@
 	<string name="core_placepage_unknown_place">Unknown Place</string>
 	<string name="editor_other_info">Send a note to OSM editors</string>
 	<string name="editor_detailed_description_hint">Detailed comment</string>
-	<string name="editor_detailed_description">Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in Organic Maps.</string>
+	<string name="editor_detailed_description">Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in Organic Maps.</string>
 	<string name="editor_more_about_osm">More about OpenStreetMap</string>
 	<string name="editor_operator">Owner</string>
 	<string name="downloader_no_downloaded_maps_title">You haven\'t downloaded any maps</string>
-	<string name="downloader_no_downloaded_maps_message">Download maps to search and navigate offline.</string>
+	<string name="downloader_no_downloaded_maps_message">Download maps to search for a location and use navigation offline.</string>
 	<!-- Error title that appears after certain time without location. -->
-	<string name="current_location_unknown_title">Continue detecting your location?</string>
+	<string name="current_location_unknown_title">Continue detecting your current location?</string>
 	<!-- Error that appears after certain time without location. -->
-	<string name="current_location_unknown_message">Current location is unknown. You may be in a building or tunnel.</string>
+	<string name="current_location_unknown_message">Current location is unknown. Maybe you are in a building or in a tunnel.</string>
 	<string name="current_location_unknown_continue_button">Continue</string>
 	<string name="current_location_unknown_stop_button">Stop</string>
 	<string name="meter">m</string>
@@ -543,16 +539,16 @@
 	<string name="error_enter_correct_web">Enter a valid web address</string>
 	<string name="error_enter_correct_email">Enter a valid email</string>
 	<string name="error_enter_correct_facebook_page">Enter a valid Facebook web address, account, or page name</string>
-	<string name="error_enter_correct_instagram_page">Enter a valid Instagram username or web address</string>
-	<string name="error_enter_correct_twitter_page">Enter a valid Twitter username or web address</string>
-	<string name="error_enter_correct_vk_page">Enter a valid VK username or web address</string>
-	<string name="error_enter_correct_line_page">Enter a valid LINE ID or web address</string>
+	<string name="error_enter_correct_instagram_page">Enter a valid Instagram web address or account name</string>
+	<string name="error_enter_correct_twitter_page">Enter a valid Twitter web address or username</string>
+	<string name="error_enter_correct_vk_page">Enter a valid VK web address or account name</string>
+	<string name="error_enter_correct_line_page">Enter a valid LINE web address or LINE ID</string>
 	<string name="placepage_add_place_button">Add a place to the map</string>
 	<!-- Displayed when saving some edits to the map to warn against publishing personal data -->
 	<string name="editor_share_to_all_dialog_title">Do you want to send it to all users?</string>
 	<!-- Dialog before publishing the modifications to the public map. -->
-	<string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data.</string>
-	<string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions.</string>
+	<string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any personal data.</string>
+	<string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and get in contact with you if they have any questions.</string>
 	<!-- Text under the version number in the Help dialog. TODO: Synchronize other translations with English. -->
 	<string name="about_description">Organic Maps is a fast and free offline maps app without ads and tracking. Maps are based on crowd-sourced OpenStreetMap.org data, so you can fix mapping errors and add features there yourself. Organic Maps is an open-source project created by enthusiasts in their spare time. Your feedback and support are much appreciated!</string>
 	<!-- For the first routing -->
@@ -565,11 +561,11 @@
 	<string name="mobile_data_option_not_today">Do not Use Today</string>
 	<string name="mobile_data">Mobile Internet</string>
 	<!-- NOTE to translators: please synchronize your translation with the English one. -->
-	<string name="mobile_data_description">Mobile internet is required for map update notifications and uploading edits.</string>
+	<string name="mobile_data_description">Mobile internet is required for map update notifications and for displaying detailed information about places and bookmarks.</string>
 	<string name="mobile_data_option_never">Never Use</string>
 	<string name="mobile_data_option_ask">Always Ask</string>
 	<string name="traffic_update_maps_text">To display traffic data, maps must be updated.</string>
-	<string name="big_font">Increase size for map labels</string>
+	<string name="big_font">Increase font size on the map</string>
 	<string name="traffic_update_app">Please update Organic Maps</string>
 	<!-- "traffic" as in "road congestion" -->
 	<string name="traffic_data_unavailable">Traffic data is not available</string>
@@ -581,7 +577,7 @@
 	<string name="prefs_languages_information">We use system TTS for voice instructions. Many Android devices use Google TTS, you can download or update it from Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
 	<string name="prefs_languages_information_off">For some languages, you will need to install a speech synthesizer or an additional language pack from the app store (Google Play, Galaxy Store, App Gallery, FDroid).\nOpen your device\'s settings → Language and input → Speech → Text to speech output.\nHere you can manage settings for speech synthesis (for example, download language pack for offline use) and select another text-to-speech engine.</string>
 	<string name="prefs_languages_information_off_link">For more information please check this guide.</string>
-	<string name="transliteration_title">Transliteration into Latin alphabet</string>
+	<string name="transliteration_title">Transliteration into Latin</string>
 	<string name="learn_more">Learn more</string>
 	<!-- Subway exits for public transport marks on the map -->
 	<string name="core_exit">Exit</string>
@@ -594,18 +590,18 @@
 	<string name="dialog_error_storage_message">External storage is not accessible. The SD Card may have been removed, damaged, or the file system is read-only. Please, check your SD Card or contact us at support\@organicmaps.app</string>
 	<string name="setting_emulate_bad_storage">Emulate bad storage</string>
 	<string name="core_entrance">Entrance</string>
-	<string name="error_enter_correct_name">Please enter a correct name</string>
+	<string name="error_enter_correct_name">Please, enter a correct name</string>
 	<string name="bookmark_lists">Lists</string>
 	<!-- Do not display all bookmark lists on the map -->
 	<string name="bookmark_lists_hide_all">Hide all</string>
 	<string name="bookmark_lists_show_all">Show all</string>
-	<string name="bookmarks_create_new_group">Create a new list</string>
+	<string name="bookmarks_create_new_group">Create new list</string>
 	<!-- Bookmark categories screen -->
 	<string name="bookmarks_import">Import bookmarks</string>
 	<string name="bookmarks_error_message_share_general">Unable to share due to an application error</string>
 	<string name="bookmarks_error_title_share_empty">Sharing error</string>
 	<string name="bookmarks_error_message_share_empty">Cannot share an empty list</string>
-	<string name="bookmarks_error_title_empty_list_name">The name can\'t be empty</string>
+	<string name="bookmarks_error_title_empty_list_name">The name couldn\'t be empty</string>
 	<string name="bookmarks_error_message_empty_list_name">Please enter the list name</string>
 	<string name="bookmarks_new_list_hint">New list</string>
 	<string name="bookmarks_error_title_list_name_already_taken">This name is already taken</string>
@@ -633,7 +629,7 @@
 	<!-- used to choose between the Google and Android location services -->
 	<string name="subtittle_opt_out">Tracking settings</string>
 	<string name="crash_reports">Crash report</string>
-	<string name="crash_reports_description">We may use your crash reports to improve Organic Maps. Changes will take effect after you restart the app.</string>
+	<string name="crash_reports_description">We may use your data to improve Organic Maps experience. Changes will take effect after you restart the app.</string>
 	<string name="privacy_policy">Privacy policy</string>
 	<string name="terms_of_use">Terms of use</string>
 	<string name="button_layer_traffic">Traffic</string>
@@ -648,7 +644,7 @@
 	<string name="delete_list">Delete list</string>
 	<string name="public_access">Public access</string>
 	<string name="limited_access">Limited access</string>
-	<string name="bookmark_list_description_hint">Enter a description (text or html)</string>
+	<string name="bookmark_list_description_hint">Type a description (text or html)</string>
 	<string name="not_shared">Private</string>
 	<string name="speedcams_alert_title">Speed cameras</string>
 	<string name="speedcam_option_auto">Auto</string>
@@ -658,11 +654,11 @@
 	<!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
 	<string name="notification_channel_downloader">Map downloader</string>
 	<string name="power_managment_title">Power saving mode</string>
-	<string name="power_managment_description">Try to reduce power usage at the expense of some functionality.</string>
+	<string name="power_managment_description">When automatic mode is selected the application starts to disable battery draining features depending on the current battery charge level</string>
 	<string name="power_managment_setting_never">Never</string>
-	<string name="power_managment_setting_auto">When battery is low</string>
-	<string name="power_managment_setting_manual_max">Always</string>
-	<string name="enable_logging_warning_message">Enable this option temporarily to record and manually send detailed diagnostic logs about your issue to us using \"Report a bug\" in the Help dialog. Logs may include location info.</string>
+	<string name="power_managment_setting_auto">Automatic</string>
+	<string name="power_managment_setting_manual_max">Maximum power saving</string>
+	<string name="enable_logging_warning_message">The option turns on logging for diagnostic purposes. It can be helpful for our team to troubleshoot issues with the app. Enable this option temporarily to record and send detailed logs about your issue to us.</string>
 	<string name="access_rules_author_only">Online editing</string>
 	<string name="driving_options_title">Routing options</string>
 	<string name="driving_options_subheader">Avoid on every route</string>
@@ -671,7 +667,7 @@
 	<string name="avoid_ferry">Ferry crossings</string>
 	<string name="avoid_motorways">Motorways</string>
 	<string name="unable_to_calc_alert_title">Unable to calculate route</string>
-	<string name="unable_to_calc_alert_subtitle">A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.</string>
+	<string name="unable_to_calc_alert_subtitle">Unfortunately, we couldn\'t find a route, probably due to the options you have chosen. Please change the settings and try again.</string>
 	<string name="define_to_avoid_btn">Define roads to avoid</string>
 	<string name="change_driving_options_btn">Routing options enabled</string>
 	<string name="toll_road">Toll road</string>
@@ -729,9 +725,9 @@
 	<string name="transit_not_found">Subway navigation in this region is not available yet</string>
 	<string name="dialog_pedestrian_route_is_long_header">Subway route is not found</string>
 	<string name="dialog_pedestrian_route_is_long_message">Please choose a start or end point closer to a subway station</string>
-	<string name="button_layer_isolines">Contour Lines</string>
-	<string name="isolines_activation_error_dialog">Activating contour lines requires downloading map data for this area</string>
-	<string name="isolines_location_error_dialog">Contour lines are not yet available in this area</string>
+	<string name="button_layer_isolines">Terrain</string>
+	<string name="isolines_activation_error_dialog">To activate and use the topographic layer please update or download the map of the area</string>
+	<string name="isolines_location_error_dialog">The topographic layer is not yet available in this area</string>
 	<string name="elevation_profile_ascent">Ascent</string>
 	<string name="elevation_profile_descent">Descent</string>
 	<string name="elevation_profile_minaltitude">Min. altitude</string>
@@ -749,13 +745,13 @@
 	<string name="connection_failure">Connection failure</string>
 	<!-- Used in DownloadResources startup screen -->
 	<string name="disconnect_usb_cable_title">Disconnect USB cable</string>
-	<string name="enable_screen_sleep">Allow the screen to sleep</string>
+	<string name="enable_screen_sleep">Allow screen to sleep</string>
 	<!-- Description in preferences -->
-	<string name="enable_screen_sleep_description">When enabled, the screen will be allowed to sleep after a period of inactivity.</string>
+	<string name="enable_screen_sleep_description">When enabled the screen will be allowed to sleep after a period of inactivity.</string>
 	<!-- A preference title; keep short! -->
 	<string name="enable_show_on_lock_screen">Show on the lock screen</string>
 	<!-- Description in preferences -->
-	<string name="enable_show_on_lock_screen_description">When enabled, the app will work on the lockscreen even when the device is locked.</string>
+	<string name="enable_show_on_lock_screen_description">When enabled, you don\'t need to unlock your device every time while the app is running.</string>
 	<!-- OpenStreetMap text on splash screen -->
 	<string name="splash_subtitle">Map data from OpenStreetMap</string>
 	<!-- Telegram group url for the "?" About page -->
@@ -778,9 +774,6 @@
 	<string name="aa_continue_in_car">Continue in car</string>
 
 	<!-- SECTION: Types -->
-	<string name="type.addr_interpolation">Address/Block</string>
-	<string name="type.addr_interpolation.even">Address/Block</string>
-	<string name="type.addr_interpolation.odd">Address/Block</string>
 	<string name="type.aerialway">Aerialway</string>
 	<string name="type.aerialway.cable_car">Cable Car</string>
 	<string name="type.aerialway.chair_lift">Chair Lift</string>
@@ -798,7 +791,7 @@
 	<string name="type.aeroway.taxiway">Taxiway</string>
 	<string name="type.aeroway.terminal">Terminal</string>
 	<string name="type.amenity">Amenity</string>
-	<string name="type.amenity.arts_centre">Arts Center</string>
+	<string name="type.amenity.arts_centre">Art Center</string>
 	<string name="type.amenity.atm">ATM</string>
 	<string name="type.amenity.bank">Bank</string>
 	<string name="type.amenity.bar">Bar</string>
@@ -818,7 +811,7 @@
 	<string name="type.amenity.casino">Casino</string>
 	<string name="type.amenity.charging_station">Charging Station</string>
 	<string name="type.amenity.charging_station.bicycle">Bicycle Charging Station</string>
-	<string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
+	<string name="type.amenity.charging_station.motorcar">Motorcar Charging Station</string>
 	<string name="type.amenity.childcare">Nursery</string>
 	<string name="type.amenity.cinema">Cinema</string>
 	<string name="type.leisure.bowling_alley">Bowling Alley</string>
@@ -861,11 +854,11 @@
 	<string name="type.amenity.parking.no.access">Private Parking</string>
 	<string name="type.amenity.parking.permissive">Private Parking</string>
 	<string name="type.amenity.parking.private">Private Parking</string>
-	<string name="type.amenity.parking.park_and_ride">Park And Ride Parking</string>
+	<string name="type.amenity.parking.park_and_ride">Parking</string>
 	<string name="type.amenity.parking.underground">Underground Parking</string>
-	<string name="type.amenity.parking_entrance">Parking Entrance</string>
-	<string name="type.amenity.parking_entrance.private">Parking Entrance</string>
-	<string name="type.amenity.parking_entrance.permissive">Parking Entrance</string>
+	<string name="type.amenity.parking_entrance">Parking entrance</string>
+	<string name="type.amenity.parking_entrance.private">Parking entrance</string>
+	<string name="type.amenity.parking_entrance.permissive">Parking entrance</string>
 	<string name="type.amenity.parking_space">Parking Space</string>
 	<string name="type.amenity.parking_space.permissive">Parking Space</string>
 	<string name="type.amenity.parking_space.private">Parking Space</string>
@@ -874,15 +867,15 @@
 	<string name="type.amenity.payment_terminal">Payment Terminal</string>
 	<string name="type.amenity.pharmacy">Pharmacy</string>
 	<string name="type.amenity.place_of_worship">Place of Worship</string>
-	<string name="type.amenity.place_of_worship.buddhist">Buddhist Temple</string>
+	<string name="type.amenity.place_of_worship.buddhist">Temple</string>
 	<string name="type.amenity.place_of_worship.christian">Church</string>
-	<string name="type.amenity.place_of_worship.hindu">Hindu Temple</string>
+	<string name="type.amenity.place_of_worship.hindu">Temple</string>
 	<string name="type.amenity.place_of_worship.jewish">Synagogue</string>
 	<string name="type.amenity.place_of_worship.muslim">Mosque</string>
-	<string name="type.amenity.place_of_worship.shinto">Shinto Shrine</string>
-	<string name="type.amenity.place_of_worship.taoist">Taoist Temple</string>
+	<string name="type.amenity.place_of_worship.shinto">Shrine</string>
+	<string name="type.amenity.place_of_worship.taoist">Temple</string>
 	<string name="type.amenity.police">Police</string>
-	<string name="type.amenity.post_box">Mailbox</string>
+	<string name="type.amenity.post_box">Post Box</string>
 	<string name="type.amenity.post_office">Post Office</string>
 	<string name="type.amenity.prison">Prison</string>
 	<string name="type.amenity.pub">Pub</string>
@@ -892,7 +885,7 @@
 	<string name="type.amenity.recycling.centre">Recycling Center</string>
 	<string name="type.amenity.recycling">Recycling Container</string>
 	<string name="type.amenity.recycling.container">Recycling Container</string>
-	<string name="type.recycling.batteries">Batteries</string>
+	<string name="type.recycling.batteries">Household Batteries</string>
 	<string name="type.recycling.clothes">Clothes</string>
 	<string name="type.recycling.glass_bottles">Glass Bottles</string>
 	<string name="type.recycling.paper">Paper</string>
@@ -904,7 +897,7 @@
 	<string name="type.recycling.cans">Cans</string>
 	<string name="type.recycling.shoes">Shoes</string>
 	<string name="type.recycling.green_waste">Green/Organic Waste</string>
-	<string name="type.recycling.cartons">Cartons</string>
+	<string name="type.recycling.cartons">Beverage Cartons</string>
 	<string name="type.amenity.restaurant">Restaurant</string>
 	<string name="type.amenity.sanitary_dump_station">Holding Tank Dump Station</string>
 	<string name="type.amenity.school">School</string>
@@ -922,21 +915,21 @@
 	<string name="type.amenity.vending_machine.condoms">Condoms Dispenser</string>
 	<string name="type.amenity.vending_machine.drinks">Drinks Dispenser</string>
 	<string name="type.amenity.vending_machine.food">Food Dispenser</string>
-	<string name="type.amenity.vending_machine.newspapers">Newspaper Dispenser</string>
-	<string name="type.amenity.vending_machine.parking_tickets">Parking Meter</string>
+	<string name="type.amenity.vending_machine.newspapers">Newspapers Dispenser</string>
+	<string name="type.amenity.vending_machine.parking_tickets">Parking Tickets</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Ticket Machine</string>
 	<string name="type.amenity.vending_machine.sweets">Sweets Dispenser</string>
 	<string name="type.amenity.vending_machine.excrement_bags">Excrement Bags Dispenser</string>
 	<string name="type.amenity.parcel_locker">Parcel Locker</string>
-	<string name="type.amenity.vending_machine.fuel">Fuel Pump</string>
+	<string name="type.amenity.vending_machine.fuel">Fuel Dispenser</string>
 	<string name="type.amenity.veterinary">Veterinary Doctor</string>
 	<string name="type.amenity.waste_basket">Trash Bin</string>
 	<string name="type.amenity.waste_disposal">Dumpster</string>
 	<string name="type.amenity.waste_transfer_station">Waste Transfer Station</string>
-	<string name="type.amenity.water_point">Water Tank Refill Point</string>
+	<string name="type.amenity.water_point">RV Water Point</string>
 	<string name="type.barrier">Barrier</string>
 	<string name="type.barrier.block">Block</string>
-	<string name="type.barrier.bollard">Bollard</string>
+	<string name="type.barrier.bollard">Pillar</string>
 	<string name="type.barrier.border_control">Border Control</string>
 	<string name="type.barrier.chain">Chain</string>
 	<string name="type.barrier.city_wall">City Wall</string>
@@ -976,9 +969,8 @@
 	<string name="type.boundary.national_park">National Park</string>
 	<string name="type.building">Building</string>
 	<string name="type.building.address">Building</string>
-	<string name="type.building.has_parts">Building</string>
-	<string name="type.building_part">Building</string>
 	<string name="type.building.garage">Garage</string>
+	<string name="type.building.has_parts">Building</string>
 	<string name="type.building.train_station">Train Station</string>
 	<string name="type.building.warehouse">Warehouse</string>
 	<string name="type.cemetery.grave">Grave</string>
@@ -987,19 +979,18 @@
 	<string name="type.craft.blacksmith">Blacksmith</string>
 	<string name="type.craft.brewery">Craft Brewery</string>
 	<string name="type.craft.carpenter">Carpenter</string>
-	<string name="type.craft.confectionery">Confectioner</string>
+	<string name="type.craft.confectionery">Confectionery</string>
 	<string name="type.craft.electrician">Electrician</string>
 	<string name="type.craft.electronics_repair">Electronics Repair</string>
 	<string name="type.craft.gardener">Gardener</string>
 	<string name="type.craft.handicraft">Handicraft</string>
 	<!-- Heating, Ventilation, and Air Conditioning -->
-	<string name="type.craft.hvac">HVAC Shop</string>
+	<string name="type.craft.hvac">HVAC</string>
 	<string name="type.craft.key_cutter">Key Cutting</string>
 	<string name="type.craft.locksmith">Locksmith</string>
 	<string name="type.craft.metal_construction">Metal Worker</string>
 	<string name="type.craft.painter">Painter</string>
 	<string name="type.craft.photographer">Photographer</string>
-	<string name="type.shop.camera">Camera Shop</string>
 	<string name="type.craft.plumber">Plumber</string>
 	<string name="type.craft.sawmill">Sawmill</string>
 	<string name="type.craft.shoemaker">Shoe Repair</string>
@@ -1065,7 +1056,7 @@
 	<string name="type.cuisine.mexican">Mexican</string>
 	<string name="type.cuisine.moroccan">Moroccan</string>
 	<string name="type.cuisine.noodles">Noodles</string>
-	<string name="type.cuisine.oriental">East Asian</string>
+	<string name="type.cuisine.oriental">Far Eastern</string>
 	<string name="type.cuisine.pancake">Pancake</string>
 	<string name="type.cuisine.pasta">Pasta</string>
 	<string name="type.cuisine.persian">Persian</string>
@@ -1101,13 +1092,13 @@
 	<string name="type.entrance.main">Main Entrance</string>
 	<string name="type.healthcare.laboratory">Medical Laboratory</string>
 	<string name="type.healthcare.physiotherapist">Physiotherapist</string>
-	<string name="type.healthcare.alternative">Alternative Medicine</string>
-	<string name="type.healthcare.audiologist">Audiologist</string>
-	<string name="type.healthcare.blood_donation">Blood Donation Center</string>
-	<string name="type.healthcare.optometrist">Optometrist</string>
-	<string name="type.healthcare.podiatrist">Podiatrist</string>
-	<string name="type.healthcare.psychotherapist">Psychotherapist</string>
-	<string name="type.healthcare.sample_collection">Sample Collection Centre</string>
+	<string name="type.healthcare.alternative">Alternative medicine</string>
+	<string name="type.healthcare.audiologist">Audiology</string>
+	<string name="type.healthcare.blood_donation">Blood donation center</string>
+	<string name="type.healthcare.optometrist">Optometry</string>
+	<string name="type.healthcare.podiatrist">Podiatry</string>
+	<string name="type.healthcare.psychotherapist">Psychotherapy</string>
+	<string name="type.healthcare.sample_collection">Sample collection</string>
 	<string name="type.healthcare.speech_therapist">Logopedics</string>
 
 	<!-- SECTION: Types: Roads -->
@@ -1118,7 +1109,7 @@
 	<string name="type.highway.bridleway.permissive">Bridle Path</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.bridleway.tunnel">Tunnel</string>
-	<string name="type.highway.busway">Dedicated Bus Road</string>
+	<string name="type.highway.busway">Dedicated bus road</string>
 	<string name="type.highway.bus_stop">Bus Stop</string>
 	<string name="type.highway.construction">Road Under Construction</string>
 	<string name="type.highway.cycleway">Cycle Path</string>
@@ -1130,7 +1121,7 @@
 	<string name="type.highway.elevator">Elevator</string>
 	<string name="type.highway.footway">Foot Path</string>
 	<string name="type.highway.footway.alpine_hiking">Path</string>
-	<string name="type.highway.footway.area">Pedestrian Area</string>
+	<string name="type.highway.footway.area">Pedestrian Zone</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Pedestrian Bridge</string>
 	<string name="type.highway.footway.demanding_alpine_hiking">Path</string>
@@ -1173,7 +1164,7 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Pedestrian Street</string>
-	<string name="type.highway.pedestrian.area">Pedestrian Area</string>
+	<string name="type.highway.pedestrian.area">Pedestrian Zone</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.pedestrian.bridge">Pedestrian Bridge</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1189,8 +1180,8 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.primary_link.tunnel">Tunnel</string>
 	<string name="type.highway.raceway">Racetrack</string>
-	<string name="type.highway.residential">Residential Street</string>
-	<string name="type.highway.residential.area">Residential Street</string>
+	<string name="type.highway.residential">Street</string>
+	<string name="type.highway.residential.area">Street</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.residential.bridge">Bridge</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
@@ -1273,7 +1264,7 @@
 	<string name="type.area_highway.path">Path</string>
 	<string name="type.area_highway.pedestrian">Pedestrian Street</string>
 	<string name="type.area_highway.primary">Primary Road</string>
-	<string name="type.area_highway.residential">Residential Street</string>
+	<string name="type.area_highway.residential">Street</string>
 	<string name="type.area_highway.secondary">Secondary Road</string>
 	<string name="type.area_highway.service">Service Road</string>
 	<string name="type.area_highway.tertiary">Tertiary Road</string>
@@ -1285,39 +1276,39 @@
 	<string name="type.highway.world_towns_level">highway-world_towns_level</string>
 
 	<!-- SECTION: Types: Historic -->
-	<string name="type.historic">Historic Object</string>
+	<string name="type.historic">Historic object</string>
 	<string name="type.historic.archaeological_site">Archaeological Site</string>
-	<string name="type.historic.battlefield">Historic Battlefield</string>
+	<string name="type.historic.battlefield">Battlefield</string>
 	<string name="type.historic.boundary_stone">Boundary Stone</string>
 	<string name="type.historic.castle">Castle</string>
-	<string name="type.historic.castle.castrum">Roman Fort</string>
-	<string name="type.historic.castle.defensive">Stronghold Castle</string>
-	<string name="type.historic.castle.fortified_church">Fortified Church</string>
+	<string name="type.historic.castle.castrum">Roman fort</string>
+	<string name="type.historic.castle.defensive">Castle</string>
+	<string name="type.historic.castle.fortified_church">Fortified church</string>
 	<string name="type.historic.castle.fortress">Fortress</string>
 	<string name="type.historic.castle.hillfort">Hillfort</string>
 	<string name="type.historic.castle.kremlin">Kremlin</string>
-	<string name="type.historic.castle.manor">Manor House</string>
+	<string name="type.historic.castle.manor">Manor house</string>
 	<string name="type.historic.castle.palace">Palace</string>
-	<string name="type.historic.castle.shiro">Japanese Castle</string>
-	<string name="type.historic.castle.stately">Stately Castle</string>
-	<string name="type.historic.city_gate">City Gate</string>
+	<string name="type.historic.castle.shiro">Japanese castle</string>
+	<string name="type.historic.castle.stately">Castle</string>
+	<string name="type.historic.city_gate">City gate</string>
 	<string name="type.historic.citywalls">City Wall</string>
 	<string name="type.historic.fort">Fort</string>
 	<string name="type.historic.gallows">Gallows</string>
 	<string name="type.historic.memorial">Memorial</string>
-	<string name="type.historic.memorial.cross">Memorial Cross</string>
-	<string name="type.historic.memorial.plaque">Commemorative Plaque</string>
+	<string name="type.historic.memorial.cross">Memorial cross</string>
+	<string name="type.historic.memorial.plaque">Commemorative plaque</string>
 	<string name="type.historic.memorial.sculpture">Sculpture</string>
 	<string name="type.historic.memorial.statue">Statue</string>
 	<string name="type.historic.memorial.stolperstein">Stolperstein</string>
-	<string name="type.historic.memorial.war_memorial">War Memorial</string>
+	<string name="type.historic.memorial.war_memorial">War memorial</string>
 	<string name="type.historic.monument">Monument</string>
 	<string name="type.historic.pillory">Pillory</string>
-	<string name="type.historic.ruins">Historic Ruins</string>
+	<string name="type.historic.ruins">Ruins</string>
 	<string name="type.historic.ship">Ship</string>
 	<string name="type.historic.tomb">Tomb</string>
-	<string name="type.historic.wayside_cross">Wayside Cross</string>
-	<string name="type.historic.wayside_shrine">Wayside Shrine</string>
+	<string name="type.historic.wayside_cross">Wayside cross</string>
+	<string name="type.historic.wayside_shrine">Wayside shrine</string>
 	<string name="type.hwtag">hwtag</string>
 	<string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
 	<string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
@@ -1345,8 +1336,8 @@
 	<string name="type.landuse.cemetery.christian">Christian Cemetery</string>
 	<string name="type.landuse.churchyard">Churchyard</string>
 	<string name="type.landuse.commercial">Commercial Area</string>
-	<string name="type.landuse.construction">Construction Area</string>
-	<string name="type.landuse.education">Educational Facility</string>
+	<string name="type.landuse.construction">Construction</string>
+	<string name="type.landuse.education">Educational Facilities</string>
 	<string name="type.landuse.farm">Farm</string>
 	<string name="type.landuse.farmland">Farmland</string>
 	<string name="type.landuse.farmyard">Farmyard</string>
@@ -1354,9 +1345,9 @@
 	<string name="type.landuse.forest">Forest</string>
 	<string name="type.landuse.forest.coniferous">Coniferous Forest</string>
 	<string name="type.landuse.forest.deciduous">Deciduous Forest</string>
-	<string name="type.landuse.forest.mixed">Mixed-Leaf Forest</string>
+	<string name="type.landuse.forest.mixed">Mixed Forest</string>
 	<string name="type.landuse.garages">Garages</string>
-	<string name="type.landuse.grass">Grass</string>
+	<string name="type.landuse.grass">Lawn</string>
 	<string name="type.landuse.greenfield">Greenfield</string>
 	<string name="type.landuse.greenhouse_horticulture">Greenhouse</string>
 	<string name="type.landuse.industrial">Industrial Area</string>
@@ -1367,10 +1358,10 @@
 	<string name="type.landuse.quarry">Quarry</string>
 	<string name="type.landuse.railway">Railway Premises</string>
 	<string name="type.landuse.recreation_ground">Recreation Ground</string>
-	<string name="type.landuse.reservoir">Reservoir</string>
+	<string name="type.landuse.reservoir">Water</string>
 	<string name="type.landuse.residential">Residential Area</string>
 	<string name="type.landuse.retail">Retail Area</string>
-	<string name="type.landuse.salt_pond">Salt Pond</string>
+	<string name="type.landuse.salt_pond">Pond</string>
 	<string name="type.landuse.village_green">Land</string>
 	<string name="type.landuse.vineyard">Vineyard</string>
 	<string name="type.leisure">Leisure</string>
@@ -1387,11 +1378,11 @@
 	<string name="type.leisure.marina">Marina</string>
 	<string name="type.leisure.nature_reserve">Nature Reserve</string>
 	<string name="type.leisure.park">Park</string>
-	<string name="type.leisure.park.no.access">Private Park</string>
+	<string name="type.leisure.park.no.access">Park</string>
 	<string name="type.leisure.park.permissive">Park</string>
-	<string name="type.leisure.park.private">Private Park</string>
+	<string name="type.leisure.park.private">Park</string>
 	<string name="type.leisure.picnic_table">Picnic Table</string>
-	<string name="type.leisure.pitch">Sport Pitch</string>
+	<string name="type.leisure.pitch">Sports Ground</string>
 	<string name="type.leisure.playground">Playground</string>
 	<string name="type.leisure.recreation_ground">Recreation Ground</string>
 	<string name="type.leisure.sauna">Sauna</string>
@@ -1409,7 +1400,7 @@
 	<string name="type.man_made">Man Made</string>
 	<string name="type.man_made.breakwater">Breakwater</string>
 	<string name="type.man_made.cairn">Cairn</string>
-	<string name="type.man_made.chimney">Chimney</string>
+	<string name="type.man_made.chimney">Factory Chimney</string>
 	<string name="type.man_made.cutline">Cutline</string>
 	<string name="type.man_made.survey_point">Survey Point</string>
 	<string name="type.man_made.flagpole">Flagpole</string>
@@ -1423,7 +1414,7 @@
 	<string name="type.man_made.surveillance">Surveillance Camera</string>
 	<string name="type.man_made.tower">Tower</string>
 	<string name="type.man_made.tower.communication">Communications Tower</string>
-	<string name="type.man_made.wastewater_plant">Wastewater Treatment Plant</string>
+	<string name="type.man_made.wastewater_plant">Wastewater treatment plant</string>
 	<string name="type.man_made.water_tap">Water Tap</string>
 	<string name="type.man_made.water_tower">Water Tower</string>
 	<string name="type.man_made.water_well">Water Well</string>
@@ -1438,10 +1429,10 @@
 	<string name="type.natural.bare_rock">Bare Rock</string>
 	<string name="type.natural.bay">Bay</string>
 	<string name="type.natural.beach">Beach</string>
-	<string name="type.natural.beach.sand">Sandy Beach</string>
+	<string name="type.natural.beach.sand">Sand Beach</string>
 	<string name="type.natural.beach.gravel">Gravel Beach</string>
 	<string name="type.natural.cape">Cape</string>
-	<string name="type.natural.cave_entrance">Cave Entrance</string>
+	<string name="type.natural.cave_entrance">Cave</string>
 	<string name="type.natural.cliff">Cliff</string>
 	<string name="type.natural.earth_bank">Earth Bank</string>
 	<string name="type.man_made.embankment">Embankment</string>
@@ -1465,13 +1456,13 @@
 	<string name="type.natural.saddle">Mountain Saddle</string>
 	<string name="type.natural.rock">Rock</string>
 	<string name="type.natural.scrub">Scrub</string>
-	<string name="type.natural.spring">Natural Spring</string>
+	<string name="type.natural.spring">Spring</string>
 	<string name="type.natural.strait">Strait</string>
 	<string name="type.natural.tree">Tree</string>
 	<string name="type.natural.tree_row">Tree Row</string>
 	<string name="type.natural.vineyard">Vineyard</string>
 	<string name="type.natural.volcano">Volcano</string>
-	<string name="type.natural.water">Water</string>
+	<string name="type.natural.water">Waterbody</string>
 	<string name="type.natural.wetland">Wetland</string>
 	<string name="type.natural.wetland.bog">Bog</string>
 	<string name="type.natural.wetland.marsh">Marsh</string>
@@ -1504,7 +1495,7 @@
 	<string name="type.place.farm">Farm</string>
 	<string name="type.place.hamlet">Hamlet</string>
 	<string name="type.place.island">Island</string>
-	<string name="type.place.islet">Islet</string>
+	<string name="type.place.islet">Island</string>
 	<string name="type.place.isolated_dwelling">Isolated Dwelling</string>
 	<string name="type.place.locality">Locality</string>
 	<string name="type.place.neighbourhood">Neighbourhood</string>
@@ -1518,21 +1509,21 @@
 	<string name="type.place.town">Town</string>
 	<string name="type.place.village">Village</string>
 	<string name="type.power">Power</string>
-	<string name="type.power.generator">Power Generator</string>
+	<string name="type.power.generator">Generator</string>
 	<string name="type.power.generator.solar">Solar Generator</string>
 	<string name="type.power.generator.wind">Wind Generator</string>
-	<string name="type.power.generator.gas">Gas Turbine Power Plant</string>
+	<string name="type.power.generator.gas">Gas turbine Power Plant</string>
 	<string name="type.power.generator.hydro">Hydroelectric Power Plant</string>
 	<string name="type.power.line">Power Line</string>
 	<string name="type.power.line.underground">Underground Power Line</string>
 	<string name="type.power.minor_line">Minor Power Line</string>
 	<string name="type.power.plant">Power Plant</string>
 	<string name="type.power.plant.coal">Coal Power Plant</string>
-	<string name="type.power.plant.gas">Gas Turbine Power Plant</string>
+	<string name="type.power.plant.gas">Gas turbine Power Plant</string>
 	<string name="type.power.plant.hydro">Hydroelectric Power Plant</string>
 	<string name="type.power.plant.solar">Solar Power Plant</string>
 	<string name="type.power.plant.wind">Wind Power Plant</string>
-	<string name="type.power.pole">Power Pole</string>
+	<string name="type.power.pole">Power Tower</string>
 	<string name="type.power.station">Power Station</string>
 	<string name="type.power.substation">Substation</string>
 	<string name="type.power.tower">Power Tower</string>
@@ -1549,11 +1540,11 @@
 	<string name="type.railway.abandoned.tunnel">Abandoned Railway Tunnel</string>
 	<string name="type.railway.construction">Railway Construction</string>
 	<string name="type.railway.crossing">Railway Crossing</string>
-	<string name="type.railway.disused">Disused Railway</string>
+	<string name="type.railway.disused">Disused railway</string>
 	<string name="type.railway.funicular">Funicular</string>
 	<string name="type.railway.funicular.bridge">Funicular Bridge</string>
 	<string name="type.railway.funicular.tunnel">Funicular Tunnel</string>
-	<string name="type.railway.halt">Rail Halt</string>
+	<string name="type.railway.halt">Train Station</string>
 	<string name="type.railway.level_crossing">Level Crossing</string>
 	<string name="type.railway.light_rail">Light Rail</string>
 	<string name="type.railway.light_rail.bridge">Light Rail Bridge</string>
@@ -1580,118 +1571,118 @@
 	<string name="type.railway.spur.bridge">Spur Rail Bridge</string>
 	<string name="type.railway.spur.tunnel">Spur Rail Tunnel</string>
 	<string name="type.railway.station">Train Station</string>
-	<string name="type.railway.station.light_rail">Light Rail Station</string>
-	<string name="type.railway.station.monorail">Monorail Station</string>
-	<string name="type.railway.station.subway">Subway Station</string>
-	<string name="type.railway.station.subway.adana">Subway Station</string>
-	<string name="type.railway.station.subway.algiers">Subway Station</string>
-	<string name="type.railway.station.subway.almaty">Subway Station</string>
-	<string name="type.railway.station.subway.amsterdam">Subway Station</string>
-	<string name="type.railway.station.subway.ankara">Subway Station</string>
-	<string name="type.railway.station.subway.athens">Subway Station</string>
-	<string name="type.railway.station.subway.baku">Subway Station</string>
-	<string name="type.railway.station.subway.bangkok">Subway Station</string>
-	<string name="type.railway.station.subway.barcelona">Subway Station</string>
-	<string name="type.railway.station.subway.beijing">Subway Station</string>
-	<string name="type.railway.station.subway.bengalore">Subway Station</string>
-	<string name="type.railway.station.subway.berlin">Subway Station</string>
-	<string name="type.railway.station.subway.bilbao">Subway Station</string>
-	<string name="type.railway.station.subway.brasilia">Subway Station</string>
-	<string name="type.railway.station.subway.brescia">Subway Station</string>
-	<string name="type.railway.station.subway.brussels">Subway Station</string>
-	<string name="type.railway.station.subway.bucharest">Subway Station</string>
-	<string name="type.railway.station.subway.budapest">Subway Station</string>
-	<string name="type.railway.station.subway.buenos_aires">Subway Station</string>
-	<string name="type.railway.station.subway.bursa">Subway Station</string>
-	<string name="type.railway.station.subway.cairo">Subway Station</string>
-	<string name="type.railway.station.subway.caracas">Subway Station</string>
-	<string name="type.railway.station.subway.catania">Subway Station</string>
-	<string name="type.railway.station.subway.changchun">Subway Station</string>
-	<string name="type.railway.station.subway.chengdu">Subway Station</string>
-	<string name="type.railway.station.subway.chicago">Subway Station</string>
-	<string name="type.railway.station.subway.chongqing">Subway Station</string>
-	<string name="type.railway.station.subway.dalian">Subway Station</string>
-	<string name="type.railway.station.subway.delhi">Subway Station</string>
-	<string name="type.railway.station.subway.dnepro">Subway Station</string>
-	<string name="type.railway.station.subway.dubai">Subway Station</string>
-	<string name="type.railway.station.subway.ekb">Subway Station</string>
-	<string name="type.railway.station.subway.fukuoka">Subway Station</string>
-	<string name="type.railway.station.subway.glasgow">Subway Station</string>
-	<string name="type.railway.station.subway.guangzhou">Subway Station</string>
-	<string name="type.railway.station.subway.hamburg">Subway Station</string>
-	<string name="type.railway.station.subway.helsinki">Subway Station</string>
-	<string name="type.railway.station.subway.hiroshima">Subway Station</string>
-	<string name="type.railway.station.subway.isfahan">Subway Station</string>
-	<string name="type.railway.station.subway.istanbul">Subway Station</string>
-	<string name="type.railway.station.subway.izmir">Subway Station</string>
-	<string name="type.railway.station.subway.kazan">Subway Station</string>
-	<string name="type.railway.station.subway.kharkiv">Subway Station</string>
-	<string name="type.railway.station.subway.kiev">Subway Station</string>
-	<string name="type.railway.station.subway.kobe">Subway Station</string>
-	<string name="type.railway.station.subway.kolkata">Subway Station</string>
-	<string name="type.railway.station.subway.kunming">Subway Station</string>
-	<string name="type.railway.station.subway.kyoto">Subway Station</string>
-	<string name="type.railway.station.subway.la">Subway Station</string>
-	<string name="type.railway.station.subway.lausanne">Subway Station</string>
-	<string name="type.railway.station.subway.lille">Subway Station</string>
-	<string name="type.railway.station.subway.lima">Subway Station</string>
-	<string name="type.railway.station.subway.lisboa">Subway Station</string>
+	<string name="type.railway.station.light_rail">Train Station</string>
+	<string name="type.railway.station.monorail">Train Station</string>
+	<string name="type.railway.station.subway">Subway</string>
+	<string name="type.railway.station.subway.adana">Subway</string>
+	<string name="type.railway.station.subway.algiers">Subway</string>
+	<string name="type.railway.station.subway.almaty">Subway</string>
+	<string name="type.railway.station.subway.amsterdam">Subway</string>
+	<string name="type.railway.station.subway.ankara">Subway</string>
+	<string name="type.railway.station.subway.athens">Subway</string>
+	<string name="type.railway.station.subway.baku">Subway</string>
+	<string name="type.railway.station.subway.bangkok">Subway</string>
+	<string name="type.railway.station.subway.barcelona">Subway</string>
+	<string name="type.railway.station.subway.beijing">Subway</string>
+	<string name="type.railway.station.subway.bengalore">Subway</string>
+	<string name="type.railway.station.subway.berlin">Subway</string>
+	<string name="type.railway.station.subway.bilbao">Subway</string>
+	<string name="type.railway.station.subway.brasilia">Subway</string>
+	<string name="type.railway.station.subway.brescia">Subway</string>
+	<string name="type.railway.station.subway.brussels">Subway</string>
+	<string name="type.railway.station.subway.bucharest">Subway</string>
+	<string name="type.railway.station.subway.budapest">Subway</string>
+	<string name="type.railway.station.subway.buenos_aires">Subway</string>
+	<string name="type.railway.station.subway.bursa">Subway</string>
+	<string name="type.railway.station.subway.cairo">Subway</string>
+	<string name="type.railway.station.subway.caracas">Subway</string>
+	<string name="type.railway.station.subway.catania">Subway</string>
+	<string name="type.railway.station.subway.changchun">Subway</string>
+	<string name="type.railway.station.subway.chengdu">Subway</string>
+	<string name="type.railway.station.subway.chicago">Subway</string>
+	<string name="type.railway.station.subway.chongqing">Subway</string>
+	<string name="type.railway.station.subway.dalian">Subway</string>
+	<string name="type.railway.station.subway.delhi">Subway</string>
+	<string name="type.railway.station.subway.dnepro">Subway</string>
+	<string name="type.railway.station.subway.dubai">Subway</string>
+	<string name="type.railway.station.subway.ekb">Subway</string>
+	<string name="type.railway.station.subway.fukuoka">Subway</string>
+	<string name="type.railway.station.subway.glasgow">Subway</string>
+	<string name="type.railway.station.subway.guangzhou">Subway</string>
+	<string name="type.railway.station.subway.hamburg">Subway</string>
+	<string name="type.railway.station.subway.helsinki">Subway</string>
+	<string name="type.railway.station.subway.hiroshima">Subway</string>
+	<string name="type.railway.station.subway.isfahan">Subway</string>
+	<string name="type.railway.station.subway.istanbul">Subway</string>
+	<string name="type.railway.station.subway.izmir">Subway</string>
+	<string name="type.railway.station.subway.kazan">Subway</string>
+	<string name="type.railway.station.subway.kharkiv">Subway</string>
+	<string name="type.railway.station.subway.kiev">Subway</string>
+	<string name="type.railway.station.subway.kobe">Subway</string>
+	<string name="type.railway.station.subway.kolkata">Subway</string>
+	<string name="type.railway.station.subway.kunming">Subway</string>
+	<string name="type.railway.station.subway.kyoto">Subway</string>
+	<string name="type.railway.station.subway.la">Subway</string>
+	<string name="type.railway.station.subway.lausanne">Subway</string>
+	<string name="type.railway.station.subway.lille">Subway</string>
+	<string name="type.railway.station.subway.lima">Subway</string>
+	<string name="type.railway.station.subway.lisboa">Subway</string>
 	<string name="type.railway.station.subway.london">Underground Station</string>
-	<string name="type.railway.station.subway.lyon">Subway Station</string>
-	<string name="type.railway.station.subway.madrid">Subway Station</string>
-	<string name="type.railway.station.subway.malaga">Subway Station</string>
-	<string name="type.railway.station.subway.manila">Subway Station</string>
-	<string name="type.railway.station.subway.maracaibo">Subway Station</string>
-	<string name="type.railway.station.subway.mashhad">Subway Station</string>
-	<string name="type.railway.station.subway.mecca">Subway Station</string>
-	<string name="type.railway.station.subway.medellin">Subway Station</string>
-	<string name="type.railway.station.subway.mexico">Subway Station</string>
-	<string name="type.railway.station.subway.milan">Subway Station</string>
-	<string name="type.railway.station.subway.minsk">Subway Station</string>
-	<string name="type.railway.station.subway.montreal">Subway Station</string>
-	<string name="type.railway.station.subway.moscow">Subway Station</string>
-	<string name="type.railway.station.subway.munchen">Subway Station</string>
-	<string name="type.railway.station.subway.nagoya">Subway Station</string>
-	<string name="type.railway.station.subway.newyork">Subway Station</string>
-	<string name="type.railway.station.subway.nnov">Subway Station</string>
-	<string name="type.railway.station.subway.novosibirsk">Subway Station</string>
-	<string name="type.railway.station.subway.osaka">Subway Station</string>
-	<string name="type.railway.station.subway.oslo">Subway Station</string>
-	<string name="type.railway.station.subway.palma">Subway Station</string>
-	<string name="type.railway.station.subway.panama">Subway Station</string>
-	<string name="type.railway.station.subway.paris">Subway Station</string>
-	<string name="type.railway.station.subway.philadelphia">Subway Station</string>
-	<string name="type.railway.station.subway.pyongyang">Subway Station</string>
-	<string name="type.railway.station.subway.rennes">Subway Station</string>
-	<string name="type.railway.station.subway.rio">Subway Station</string>
-	<string name="type.railway.station.subway.roma">Subway Station</string>
-	<string name="type.railway.station.subway.rotterdam">Subway Station</string>
-	<string name="type.railway.station.subway.samara">Subway Station</string>
-	<string name="type.railway.station.subway.santiago">Subway Station</string>
-	<string name="type.railway.station.subway.santo_domingo">Subway Station</string>
-	<string name="type.railway.station.subway.saopaulo">Subway Station</string>
-	<string name="type.railway.station.subway.sapporo">Subway Station</string>
-	<string name="type.railway.station.subway.sendai">Subway Station</string>
-	<string name="type.railway.station.subway.sf">Subway Station</string>
-	<string name="type.railway.station.subway.shanghai">Subway Station</string>
-	<string name="type.railway.station.subway.shiraz">Subway Station</string>
-	<string name="type.railway.station.subway.sofia">Subway Station</string>
-	<string name="type.railway.station.subway.spb">Subway Station</string>
-	<string name="type.railway.station.subway.stockholm">Subway Station</string>
-	<string name="type.railway.station.subway.tabriz">Subway Station</string>
-	<string name="type.railway.station.subway.taipei">Subway Station</string>
-	<string name="type.railway.station.subway.taoyuan">Subway Station</string>
-	<string name="type.railway.station.subway.tashkent">Subway Station</string>
-	<string name="type.railway.station.subway.tbilisi">Subway Station</string>
-	<string name="type.railway.station.subway.tianjin">Subway Station</string>
-	<string name="type.railway.station.subway.tokyo">Subway Station</string>
-	<string name="type.railway.station.subway.valencia">Subway Station</string>
-	<string name="type.railway.station.subway.vienna">Subway Station</string>
-	<string name="type.railway.station.subway.warszawa">Subway Station</string>
-	<string name="type.railway.station.subway.washington">Subway Station</string>
-	<string name="type.railway.station.subway.wuhan">Subway Station</string>
-	<string name="type.railway.station.subway.yerevan">Subway Station</string>
-	<string name="type.railway.station.subway.yokohama">Subway Station</string>
+	<string name="type.railway.station.subway.lyon">Subway</string>
+	<string name="type.railway.station.subway.madrid">Subway</string>
+	<string name="type.railway.station.subway.malaga">Subway</string>
+	<string name="type.railway.station.subway.manila">Subway</string>
+	<string name="type.railway.station.subway.maracaibo">Subway</string>
+	<string name="type.railway.station.subway.mashhad">Subway</string>
+	<string name="type.railway.station.subway.mecca">Subway</string>
+	<string name="type.railway.station.subway.medellin">Subway</string>
+	<string name="type.railway.station.subway.mexico">Subway</string>
+	<string name="type.railway.station.subway.milan">Subway</string>
+	<string name="type.railway.station.subway.minsk">Subway</string>
+	<string name="type.railway.station.subway.montreal">Subway</string>
+	<string name="type.railway.station.subway.moscow">Subway</string>
+	<string name="type.railway.station.subway.munchen">Subway</string>
+	<string name="type.railway.station.subway.nagoya">Subway</string>
+	<string name="type.railway.station.subway.newyork">Subway</string>
+	<string name="type.railway.station.subway.nnov">Subway</string>
+	<string name="type.railway.station.subway.novosibirsk">Subway</string>
+	<string name="type.railway.station.subway.osaka">Subway</string>
+	<string name="type.railway.station.subway.oslo">Subway</string>
+	<string name="type.railway.station.subway.palma">Subway</string>
+	<string name="type.railway.station.subway.panama">Subway</string>
+	<string name="type.railway.station.subway.paris">Subway</string>
+	<string name="type.railway.station.subway.philadelphia">Subway</string>
+	<string name="type.railway.station.subway.pyongyang">Subway</string>
+	<string name="type.railway.station.subway.rennes">Subway</string>
+	<string name="type.railway.station.subway.rio">Subway</string>
+	<string name="type.railway.station.subway.roma">Subway</string>
+	<string name="type.railway.station.subway.rotterdam">Subway</string>
+	<string name="type.railway.station.subway.samara">Subway</string>
+	<string name="type.railway.station.subway.santiago">Subway</string>
+	<string name="type.railway.station.subway.santo_domingo">Subway</string>
+	<string name="type.railway.station.subway.saopaulo">Subway</string>
+	<string name="type.railway.station.subway.sapporo">Subway</string>
+	<string name="type.railway.station.subway.sendai">Subway</string>
+	<string name="type.railway.station.subway.sf">Subway</string>
+	<string name="type.railway.station.subway.shanghai">Subway</string>
+	<string name="type.railway.station.subway.shiraz">Subway</string>
+	<string name="type.railway.station.subway.sofia">Subway</string>
+	<string name="type.railway.station.subway.spb">Subway</string>
+	<string name="type.railway.station.subway.stockholm">Subway</string>
+	<string name="type.railway.station.subway.tabriz">Subway</string>
+	<string name="type.railway.station.subway.taipei">Subway</string>
+	<string name="type.railway.station.subway.taoyuan">Subway</string>
+	<string name="type.railway.station.subway.tashkent">Subway</string>
+	<string name="type.railway.station.subway.tbilisi">Subway</string>
+	<string name="type.railway.station.subway.tianjin">Subway</string>
+	<string name="type.railway.station.subway.tokyo">Subway</string>
+	<string name="type.railway.station.subway.valencia">Subway</string>
+	<string name="type.railway.station.subway.vienna">Subway</string>
+	<string name="type.railway.station.subway.warszawa">Subway</string>
+	<string name="type.railway.station.subway.washington">Subway</string>
+	<string name="type.railway.station.subway.wuhan">Subway</string>
+	<string name="type.railway.station.subway.yerevan">Subway</string>
+	<string name="type.railway.station.subway.yokohama">Subway</string>
 	<string name="type.railway.subway">Subway Line</string>
 	<string name="type.railway.subway.bridge">Subway Line Bridge</string>
 	<string name="type.railway.subway.tunnel">Subway Line Tunnel</string>
@@ -1812,11 +1803,11 @@
 	<string name="type.railway.yard">Railway Yard</string>
 	<string name="type.railway.yard.bridge">Railway Yard Bridge</string>
 	<string name="type.railway.yard.tunnel">Railway Yard Tunnel</string>
-	<string name="type.route">Route</string>
+	<string name="type.route">route</string>
 	<string name="type.route.ferry">Ferry</string>
 	<string name="type.route.shuttle_train">Shuttle Train</string>
 	<string name="type.shop">Shop</string>
-	<string name="type.shop.alcohol">Liquor Shop</string>
+	<string name="type.shop.alcohol">Liquor Store</string>
 	<string name="type.shop.bakery">Bakery</string>
 	<string name="type.shop.bathroom_furnishing">Bathroom Furnishings</string>
 	<string name="type.shop.beauty">Beauty Shop</string>
@@ -1824,110 +1815,109 @@
 	<string name="type.shop.bicycle">Bicycle Shop</string>
 	<string name="type.shop.bookmaker">Bookmaker</string>
 	<string name="type.shop.books">Bookstore</string>
-	<string name="type.shop.butcher">Butcher</string>
-	<string name="type.shop.cannabis">Cannabis Shop</string>
+	<string name="type.shop.butcher">Butcher’s</string>
+	<string name="type.shop.cannabis">Cannabis Store</string>
 	<string name="type.shop.car">Car Dealership</string>
-	<string name="type.shop.car_parts">Car Parts Shop</string>
-	<string name="type.shop.car_repair">Car Repair Workshop</string>
+	<string name="type.shop.car_parts">Car Parts</string>
+	<string name="type.shop.car_repair">Car Repair Shop</string>
 	<string name="type.shop.car_repair.tyres">Tyre Repair</string>
 	<string name="type.shop.caravan">RV Dealership</string>
-	<string name="type.shop.carpet">Carpet Shop</string>
-	<string name="type.shop.chemist">Chemist</string>
+	<string name="type.shop.carpet">Carpets</string>
+	<string name="type.shop.chemist">Chemist Shop</string>
 	<string name="type.shop.chocolate">Chocolate Shop</string>
 	<string name="type.shop.clothes">Clothes Shop</string>
-	<string name="type.shop.coffee">Coffee Shop</string>
+	<string name="type.shop.coffee">Coffee Store</string>
 	<string name="type.shop.computer">Computer Store</string>
-	<string name="type.shop.confectionery">Candy Shop</string>
+	<string name="type.shop.confectionery">Sweets</string>
 	<string name="type.shop.convenience">Convenience Store</string>
-	<string name="type.shop.copyshop">Copyshop</string>
-	<string name="type.shop.cosmetics">Cosmetics Shop</string>
-	<string name="type.shop.curtain">Curtain Shop</string>
-	<string name="type.shop.deli">Delicatessen</string>
+	<string name="type.shop.copyshop">Copy Shop</string>
+	<string name="type.shop.cosmetics">Cosmetics</string>
+	<string name="type.shop.curtain">Curtains</string>
+	<string name="type.shop.deli">Delicatessen Shop</string>
 	<string name="type.shop.department_store">Department Store</string>
-	<string name="type.shop.doityourself">Home Improvement Store</string>
-	<string name="type.shop.dry_cleaning">Dry Cleaner</string>
-	<string name="type.shop.electronics">Electronics Shop</string>
+	<string name="type.shop.doityourself">Hardware Store</string>
+	<string name="type.shop.dry_cleaning">Dry Cleaning</string>
+	<string name="type.shop.electronics">Electronics</string>
 	<string name="type.shop.erotic">Erotic Shop</string>
 	<string name="type.shop.fabric">Fabric Shop</string>
 	<string name="type.shop.farm">Farm Food Shop</string>
 	<string name="type.shop.fashion_accessories">Fashion Accessories</string>
-	<string name="type.shop.florist">Florist</string>
+	<string name="type.shop.florist">Florist’s</string>
 	<string name="type.shop.funeral_directors">Funeral Directors</string>
 	<string name="type.shop.furniture">Furniture Store</string>
-	<string name="type.shop.garden_centre">Garden Center</string>
+	<string name="type.shop.garden_centre">Garden Store</string>
 	<string name="type.shop.gas">Gas Store</string>
 	<string name="type.shop.gift">Gift Shop</string>
 	<string name="type.shop.greengrocer">Greengrocer</string>
-	<string name="type.shop.grocery">Grocery Store</string>
+	<string name="type.shop.grocery">Grocery</string>
 	<string name="type.shop.hairdresser">Hairdresser</string>
 	<string name="type.shop.hardware">Hardware Store</string>
 	<string name="type.shop.health_food">Health Food Shop</string>
-	<string name="type.shop.herbalist">Herbalist</string>
-	<string name="type.shop.hifi">HiFi Audio Shop</string>
-	<string name="type.shop.houseware">Housewares Store</string>
-	<string name="type.shop.jewelry">Jewelry Store</string>
+	<string name="type.shop.herbalist">Herbs Store</string>
+	<string name="type.shop.hifi">HiFi Audio</string>
+	<string name="type.shop.houseware">Houseware</string>
+	<string name="type.shop.jewelry">Jewelry</string>
 	<string name="type.shop.kiosk">Kiosk</string>
 	<string name="type.shop.kitchen">Kitchen Store</string>
 	<string name="type.shop.laundry">Laundry</string>
 	<string name="type.shop.mall">Mall</string>
 	<string name="type.shop.massage">Massage Salon</string>
-	<string name="type.shop.mobile_phone">Cell Phone Store</string>
+	<string name="type.shop.mobile_phone">Cell Phones</string>
 	<string name="type.shop.money_lender">Money Lender</string>
 	<string name="type.shop.motorcycle">Motorcycle Shop</string>
 	<string name="type.shop.motorcycle_repair">Motorcycle Repair</string>
 	<string name="type.shop.music">Record Store</string>
-	<string name="type.shop.musical_instrument">Musical Instrument Shop</string>
+	<string name="type.shop.musical_instrument">Musical Instruments</string>
 	<string name="type.shop.newsagent">Newspaper Stand</string>
-	<string name="type.shop.optician">Optician</string>
-	<string name="type.shop.outdoor">Outdoor Equipment Shop</string>
+	<string name="type.shop.optician">Optician’s</string>
+	<string name="type.shop.outdoor">Outdoor Equipment</string>
 	<string name="type.shop.outpost">Pickup Point</string>
-	<string name="type.shop.pastry">Pastry Shop</string>
+	<string name="type.shop.pastry">Pastry</string>
 	<string name="type.shop.pawnbroker">Pawnbroker</string>
 	<string name="type.shop.pet">Pet Store</string>
 	<string name="type.shop.pet_grooming">Pet Grooming</string>
 	<string name="type.shop.photo">Photo Shop</string>
-	<string name="type.shop.seafood">Fishmonger</string>
-	<string name="type.shop.second_hand">Second Hand Shop</string>
-	<string name="type.shop.shoes">Shoe Shop</string>
-	<string name="type.shop.sports">Sports Shop</string>
+	<string name="type.shop.seafood">Seafood Shop</string>
+	<string name="type.shop.second_hand">Second Hand</string>
+	<string name="type.shop.shoes">Shoe Store</string>
+	<string name="type.shop.sports">Sports Goods</string>
 	<string name="type.shop.stationery">Stationery Shop</string>
 	<string name="type.shop.supermarket">Supermarket</string>
 	<string name="type.shop.tattoo">Tattoo Parlour</string>
-	<string name="type.shop.tea">Tea Shop</string>
+	<string name="type.shop.tea">Tea Store</string>
 	<string name="type.shop.ticket">Ticket Shop</string>
 	<string name="type.shop.toys">Toy Store</string>
 	<string name="type.shop.travel_agency">Travel Agency</string>
 	<string name="type.shop.tyres">Tyre Shop</string>
 	<string name="type.shop.variety_store">Variety Store</string>
 	<string name="type.shop.video">Video Shop</string>
-	<string name="type.shop.video_games">Video Game Shop</string>
+	<string name="type.shop.video_games">Video Games Shop</string>
 	<string name="type.shop.wine">Wine Shop</string>
 	<string name="type.shop.agrarian">Agricultural Shop</string>
-	<string name="type.shop.antiques">Antiques Shop</string>
-	<string name="type.shop.appliance">Appliance Shop</string>
-	<!-- maybe change to Art Gallery for en-US when supported -->
-	<string name="type.shop.art">Artwork Shop</string>
-	<string name="type.shop.baby_goods">Baby Goods Shop</string>
-	<string name="type.shop.bag">Bag Shop</string>
-	<string name="type.shop.bed">Bed Shop</string>
+	<string name="type.shop.antiques">Antiques</string>
+	<string name="type.shop.appliance">Appliances Shop</string>
+	<string name="type.shop.art">Arts Shop</string>
+	<string name="type.shop.baby_goods">Baby Goods</string>
+	<string name="type.shop.bag">Bags Store</string>
+	<string name="type.shop.bed">Beds Shop</string>
 	<string name="type.shop.boutique">Boutique</string>
 	<string name="type.shop.charity">Charity Shop</string>
-	<string name="type.shop.cheese">Cheese Shop</string>
-	<string name="type.shop.craft">Craft Supplies Store</string>
-	<string name="type.shop.dairy">Dairy Shop</string>
-	<string name="type.shop.electrical">Electrical Supplies Store</string>
+	<string name="type.shop.cheese">Cheese Store</string>
+	<string name="type.shop.craft">Arts and Crafts</string>
+	<string name="type.shop.dairy">Dairy Products</string>
+	<string name="type.shop.electrical">Electrical Store</string>
 	<string name="type.shop.fishing">Fishing Store</string>
-	<string name="type.shop.interior_decoration">Interior Decorations Store</string>
+	<string name="type.shop.interior_decoration">Interior Decorations</string>
 	<string name="type.shop.lottery">Lottery Tickets</string>
-	<string name="type.shop.medical_supply">Medical Supplies Store</string>
-	<string name="type.shop.nutrition_supplements">Nutrition Supplement Store</string>
-	<string name="type.shop.paint">Paint Shop</string>
-	<string name="type.shop.perfumery">Perfume Shop</string>
-	<string name="type.shop.sewing">Sewing Supplies Shop</string>
+	<string name="type.shop.medical_supply">Medical Supplies</string>
+	<string name="type.shop.nutrition_supplements">Nutrition Supplements</string>
+	<string name="type.shop.paint">Paints</string>
+	<string name="type.shop.perfumery">Perfumery</string>
+	<string name="type.shop.sewing">Sewing Supplies</string>
 	<string name="type.shop.storage_rental">Storage Rental</string>
-	<string name="type.shop.tobacco">Smoke Shop</string>
-	<string name="type.shop.trade">Trade Supplies</string>
-	<string name="type.shop.watches">Watch Store</string>
+	<string name="type.shop.tobacco">Tobacco</string>
+	<string name="type.shop.trade">Trades Supplies</string>
+	<string name="type.shop.watches">Watches</string>
 	<string name="type.shop.wholesale">Wholesale Store</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">American Football</string>
@@ -1936,7 +1926,7 @@
 	<string name="type.sport.australian_football">Australian Football</string>
 	<string name="type.sport.baseball">Baseball</string>
 	<string name="type.sport.basketball">Basketball</string>
-	<string name="type.sport.beachvolleyball">Beach Volleyball</string>
+	<string name="type.sport.beachvolleyball">Beach volleyball</string>
 	<string name="type.sport.bowls">Bowls</string>
 	<string name="type.sport.chess">Chess</string>
 	<string name="type.sport.cricket">Cricket</string>
@@ -1947,13 +1937,13 @@
 	<string name="type.sport.handball">Handball</string>
 	<string name="type.sport.multi">Various Sports</string>
 	<!-- Used to tag a scuba diving site. -->
-	<string name="type.sport.scuba_diving">Scuba Diving Site</string>
+	<string name="type.sport.scuba_diving">Scuba diving site</string>
 	<string name="type.sport.shooting">Shooting</string>
 	<string name="type.sport.skateboard">Skateboarding</string>
 	<string name="type.sport.skiing">Skiing</string>
 	<string name="type.sport.soccer">Soccer</string>
 	<string name="type.sport.swimming">Swimming</string>
-	<string name="type.sport.table_tennis">Table Tennis</string>
+	<string name="type.sport.table_tennis">Table tennis</string>
 	<string name="type.sport.tennis">Tennis Court</string>
 	<string name="type.sport.volleyball">Volleyball</string>
 	<string name="type.sport.10pin">Bowling</string>
@@ -1963,22 +1953,22 @@
 	<string name="type.sport.ice_hockey">Ice Hockey</string>
 	<string name="type.sport.field_hockey">Field Hockey</string>
 	<string name="type.sport.badminton">Badminton</string>
-	<string name="type.sport.pelota">Basque Pelota</string>
+	<string name="type.sport.pelota">Basque pelota</string>
 	<string name="type.tourism">Tourism</string>
-	<string name="type.tourism.alpine_hut">Alpine Lodging</string>
-	<string name="type.tourism.apartment">Holiday Apartment</string>
+	<string name="type.tourism.alpine_hut">Mountains Lodging</string>
+	<string name="type.tourism.apartment">Apartments</string>
 	<string name="type.tourism.artwork">Artwork</string>
-	<string name="type.tourism.artwork.architecture">Architectural Artwork</string>
-	<string name="type.tourism.artwork.painting">Painting</string>
-	<string name="type.tourism.artwork.sculpture">Sculpture</string>
-	<string name="type.tourism.artwork.statue">Statue</string>
+	<string name="type.tourism.artwork.architecture">Artwork</string>
+	<string name="type.tourism.artwork.painting">Artwork</string>
+	<string name="type.tourism.artwork.sculpture">Artwork</string>
+	<string name="type.tourism.artwork.statue">Artwork</string>
 	<string name="type.tourism.attraction">Attraction</string>
-	<string name="type.tourism.attraction.animal">Animal Enclosure</string>
+	<string name="type.tourism.attraction.animal">Animal enclosure</string>
 	<string name="type.tourism.attraction.specified">Attraction</string>
-	<string name="type.tourism.camp_site">Campground</string>
+	<string name="type.tourism.camp_site">Camping</string>
 	<string name="type.tourism.caravan_site">RV Park</string>
 	<string name="type.tourism.chalet">Chalet</string>
-	<string name="type.tourism.gallery">Art Gallery</string>
+	<string name="type.tourism.gallery">Gallery</string>
 	<string name="type.tourism.guest_house">Guest House</string>
 	<string name="type.tourism.hostel">Hostel</string>
 	<string name="type.tourism.hotel">Hotel</string>
@@ -2000,7 +1990,7 @@
 	<string name="type.traffic_calming.hump">Traffic Hump</string>
 	<string name="type.waterway">Waterway</string>
 	<string name="type.waterway.canal">Canal</string>
-	<string name="type.waterway.canal.tunnel">Canal Tunnel</string>
+	<string name="type.waterway.canal.tunnel">Canal</string>
 	<string name="type.waterway.dam">Dam</string>
 	<string name="type.waterway.ditch">Ditch</string>
 	<string name="type.waterway.ditch.tunnel">Ditch</string>
@@ -2011,10 +2001,10 @@
 	<string name="type.waterway.river">River</string>
 	<string name="type.waterway.river.tunnel">River</string>
 	<string name="type.waterway.riverbank">River</string>
-	<string name="type.waterway.stream">Stream</string>
-	<string name="type.waterway.stream.ephemeral">Ephemeral Stream</string>
-	<string name="type.waterway.stream.intermittent">Intermittent Stream</string>
-	<string name="type.waterway.stream.tunnel">Stream</string>
+	<string name="type.waterway.stream">River</string>
+	<string name="type.waterway.stream.ephemeral">River</string>
+	<string name="type.waterway.stream.intermittent">River</string>
+	<string name="type.waterway.stream.tunnel">River</string>
 	<string name="type.waterway.waterfall">Waterfall</string>
 	<string name="type.waterway.weir">Weir</string>
 	<string name="type.wheelchair">Wheelchair</string>
@@ -2028,13 +2018,14 @@
 	<string name="type.aerialway.t.bar">T-bar Lift</string>
 	<string name="type.piste_type">Piste Type</string>
 	<string name="type.piste_type.downhill">Downhill Ski Run</string>
-	<string name="type.piste_type.downhill.advanced">Advanced Downhill Ski Run</string>
-	<string name="type.piste_type.downhill.easy">Easy Downhill Ski Run</string>
-	<string name="type.piste_type.downhill.expert">Expert Downhill Ski Run</string>
+	<string name="type.piste_type.downhill.advanced">Downhill Ski Run</string>
+	<string name="type.piste_type.downhill.easy">Downhill Ski Run</string>
+	<string name="type.piste_type.downhill.expert">Downhill Ski Run</string>
 	<string name="type.piste_type.downhill.freeride">Downhill Ski Run</string>
-	<string name="type.piste_type.downhill.intermediate">Intermediate Downhill Ski Run</string>
-	<string name="type.piste_type.downhill.novice">Novice Downhill Ski Run</string>
+	<string name="type.piste_type.downhill.intermediate">Downhill Ski Run</string>
+	<string name="type.piste_type.downhill.novice">Downhill Ski Run</string>
 	<string name="type.piste_type.nordic">Nordic Ski Trail</string>
 	<string name="type.piste_type.sled">Sledding Piste</string>
+	<string name="type.building_part">Building</string>
 	<string name="type.amenity.events_venue">Events Venue</string>
 </resources>
diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/src/app/organicmaps/MwmActivity.java
index 0b44f8d08f..eb2ac7e01e 100644
--- a/android/src/app/organicmaps/MwmActivity.java
+++ b/android/src/app/organicmaps/MwmActivity.java
@@ -19,15 +19,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.ViewModelProvider;
 
 import app.organicmaps.Framework.PlacePageActivationListener;
 import app.organicmaps.api.Const;
@@ -60,7 +60,6 @@ import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;
 import app.organicmaps.location.LocationState;
 import app.organicmaps.maplayer.MapButtonsController;
-import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.maplayer.Mode;
 import app.organicmaps.maplayer.ToggleMapLayerFragment;
 import app.organicmaps.maplayer.isolines.IsolinesManager;
@@ -94,15 +93,18 @@ import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import app.organicmaps.util.log.Logger;
 import app.organicmaps.widget.menu.MainMenu;
+import app.organicmaps.widget.placepage.PlacePageButtons;
 import app.organicmaps.widget.placepage.PlacePageController;
 import app.organicmaps.widget.placepage.PlacePageData;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
+import app.organicmaps.widget.placepage.PlacePageView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Stack;
 
+import static app.organicmaps.widget.placepage.PlacePageButtons.PLACEPAGE_MORE_MENU_ID;
+
 public class MwmActivity extends BaseMwmFragmentActivity
     implements PlacePageActivationListener,
                View.OnTouchListener,
@@ -115,10 +117,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
                RoutingBottomMenuListener,
                BookmarkManager.BookmarksLoadingListener,
                FloatingSearchToolbarController.SearchToolbarListener,
+               PlacePageController.SlideListener,
                NoConnectionListener,
                MenuBottomSheetFragment.MenuBottomSheetInterfaceWithHeader,
-               PlacePageController.PlacePageRouteSettingsListener,
-               MapButtonsController.MapButtonClickListener
+               ToggleMapLayerFragment.LayerItemClickListener,
+               PlacePageButtons.PlacePageButtonClickListener,
+               PlacePageView.PlacePageViewListener
 {
   private static final String TAG = MwmActivity.class.getSimpleName();
 
@@ -133,6 +137,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
                                                      EditorHostFragment.class.getName(),
                                                      ReportFragment.class.getName() };
 
+  private static final String EXTRA_CURRENT_LAYOUT_MODE = "CURRENT_LAYOUT_MODE";
+  private static final String EXTRA_IS_FULLSCREEN = "IS_FULLSCREEN";
   public static final int REQ_CODE_ERROR_DRIVING_OPTIONS_DIALOG = 5;
   public static final int REQ_CODE_DRIVING_OPTIONS = 6;
   private static final int REQ_CODE_ISOLINES_ERROR = 8;
@@ -170,7 +176,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private PanelAnimator mPanelAnimator;
   @Nullable
   private OnmapDownloader mOnmapDownloader;
+
+  @Nullable
+  private MapButtonsController mMapButtonsController;
+
   private boolean mIsTabletLayout;
+  private boolean mIsFullscreen;
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
   private FloatingSearchToolbarController mSearchController;
@@ -178,15 +189,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private boolean mRestoreRoutingPlanFragmentNeeded;
   @Nullable
   private Bundle mSavedForTabletState;
+  @SuppressWarnings("NotNullFieldNotInitialized")
+  @NonNull
+  private PlacePageController mPlacePageController;
+  private MapButtonsController.LayoutMode mCurrentLayoutMode;
+
   private String mDonatesUrl;
 
   private int mNavBarHeight;
 
-  private PlacePageViewModel mPlacePageViewModel;
-  private MapButtonsViewModel mMapButtonsViewModel;
-  private MapButtonsController.LayoutMode mPreviousMapLayoutMode;
-  private Mode mPreviousLayerMode;
-
   @Nullable
   private WindowInsetsCompat mCurrentWindowInsets;
 
@@ -271,6 +282,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mPanelAnimator.show(fragmentClass, args, completionListener);
   }
 
+  public boolean containsFragment(@NonNull Class<? extends Fragment> fragmentClass)
+  {
+    return mIsTabletLayout && getFragment(fragmentClass) != null;
+  }
+
   private void showBookmarks()
   {
     BookmarkCategoriesActivity.start(this);
@@ -386,6 +402,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
   protected void onSafeCreate(@Nullable Bundle savedInstanceState)
   {
     super.onSafeCreate(savedInstanceState);
+    if (savedInstanceState != null)
+    {
+      mCurrentLayoutMode = MapButtonsController.LayoutMode.values()[savedInstanceState.getInt(EXTRA_CURRENT_LAYOUT_MODE)];
+      mIsFullscreen = savedInstanceState.getBoolean(EXTRA_IS_FULLSCREEN);
+    }
+    else
+    {
+      mCurrentLayoutMode = MapButtonsController.LayoutMode.regular;
+    }
     mIsTabletLayout = getResources().getBoolean(R.bool.tabletLayout);
 
     if (!mIsTabletLayout)
@@ -394,13 +419,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
     setContentView(R.layout.activity_map);
     UiUtils.setupTransparentStatusBar(this);
 
-    mPlacePageViewModel = new ViewModelProvider(this).get(PlacePageViewModel.class);
-    mMapButtonsViewModel = new ViewModelProvider(this).get(MapButtonsViewModel.class);
-    // We don't need to manually handle removing the observers it follows the activity lifecycle
-    mMapButtonsViewModel.getBottomButtonsHeight().observe(this, this::onMapBottomButtonsHeightChange);
-    mMapButtonsViewModel.getLayoutMode().observe(this, this::initNavigationButtons);
-    mPreviousLayerMode = mMapButtonsViewModel.getMapLayerMode().getValue();
-    mMapButtonsViewModel.getMapLayerMode().observe(this, this::onLayerChange);
+    mPlacePageController = new PlacePageController(this, this);
+    mPlacePageController.initialize(this);
 
     mSearchController = new FloatingSearchToolbarController(this, this);
     mSearchController.getToolbar()
@@ -441,7 +461,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
       UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
 
-      mNavBarHeight = isFullscreen() ? 0 : windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
+      mNavBarHeight = mIsFullscreen ? 0 : windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
       // For the first loading, set compass top margin to status bar size
       // The top inset will be then be updated by the routing controller
       if (mCurrentWindowInsets == null)
@@ -483,7 +503,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       removeCurrentFragment(false);
     }
 
-    mNavigationController = new NavigationController(this, v -> onSettingsOptionSelected(), this::updateBottomWidgetsOffset);
+    mNavigationController = new NavigationController(this, mMapButtonsController, v -> onSettingsOptionSelected(), this::updateBottomWidgetsOffset);
     //TrafficManager.INSTANCE.attach(mNavigationController);
 
     initMainMenu();
@@ -583,7 +603,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mPointChooserMode = mode;
     closeFloatingToolbarsAndPanels(false);
     UiUtils.show(mPointChooser);
-    mMapButtonsViewModel.setButtonsHidden(true);
+    mMapButtonsController.showMapButtons(false);
     Framework.nativeTurnOnChoosePositionMode(isBusiness, applyPosition);
     refreshLightStatusBar();
   }
@@ -592,7 +612,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     UiUtils.hide(mPointChooser);
     Framework.nativeTurnOffChoosePositionMode();
-    mMapButtonsViewModel.setButtonsHidden(false);
+    mMapButtonsController.showMapButtons(true);
     if (mPointChooserMode == PointChooserMode.API)
       finish();
     mPointChooserMode = PointChooserMode.NONE;
@@ -633,39 +653,43 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  private void initNavigationButtons()
+  public boolean isMapAttached()
   {
-    initNavigationButtons(mMapButtonsViewModel.getLayoutMode().getValue(), false /* force */);
+    return mMapFragment != null && mMapFragment.isAdded();
   }
 
-  private void initNavigationButtons(MapButtonsController.LayoutMode layoutMode)
+
+  private void initNavigationButtons()
   {
-    initNavigationButtons(layoutMode, false /* force */);
+    initNavigationButtons(mCurrentLayoutMode, false /* force */);
   }
 
   private void initNavigationButtons(MapButtonsController.LayoutMode layoutMode, boolean force)
   {
-    // Recreate the navigation buttons with the correct layout when it changes
-    if (mPreviousMapLayoutMode != layoutMode || force)
+    if (mMapButtonsController == null || mMapButtonsController.getLayoutMode() != layoutMode)
     {
+      mCurrentLayoutMode = layoutMode;
+
+      mMapButtonsController = new MapButtonsController();
+      mMapButtonsController.init(
+          layoutMode,
+          LocationState.nativeGetMode(),
+          this::onMapButtonClick,
+          (v) -> closeSearchToolbar(true, true),
+          mPlacePageController,
+          this::updateBottomWidgetsOffset);
+
+
       FragmentTransaction transaction = getSupportFragmentManager()
-          .beginTransaction().replace(R.id.map_buttons, new MapButtonsController());
+          .beginTransaction().replace(R.id.map_buttons, mMapButtonsController);
       if (force)
         transaction.commitNowAllowingStateLoss();
       else
         transaction.commit();
-      mPreviousMapLayoutMode = layoutMode;
     }
   }
 
-  @Override
-  public void onSearchCanceled()
-  {
-    closeSearchToolbar(true, true);
-  }
-
-  @Override
-  public void onMapButtonClick(MapButtonsController.MapButtons button)
+  void onMapButtonClick(MapButtonsController.MapButtons button)
   {
     switch (button)
     {
@@ -726,10 +750,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
    */
   public boolean closePlacePage()
   {
-    if (mPlacePageViewModel.getMapObject().getValue() == null)
+    if (mPlacePageController.isClosed())
       return false;
 
-    mPlacePageViewModel.setMapObject(null);
+    mPlacePageController.close(true);
     return true;
   }
 
@@ -789,7 +813,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       if (stopSearch)
       {
         mSearchController.cancelSearchApiAndHide(clearText);
-        mMapButtonsViewModel.setSearchOption(null);
+        mMapButtonsController.resetSearch();
       }
       else
       {
@@ -856,6 +880,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Override
   protected void onSaveInstanceState(@NonNull Bundle outState)
   {
+    mPlacePageController.onSave(outState);
     if (!mIsTabletLayout && RoutingController.get().isPlanning())
       mRoutingPlanInplaceController.onSaveState(outState);
 
@@ -869,6 +894,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mNavigationController.onActivitySaveInstanceState(this, outState);
 
     RoutingController.get().onSaveState();
+    outState.putInt(EXTRA_CURRENT_LAYOUT_MODE, mCurrentLayoutMode.ordinal());
+    outState.putBoolean(EXTRA_IS_FULLSCREEN, mIsFullscreen);
 
     if (!isChangingConfigurations())
       RoutingController.get().saveRoute();
@@ -884,6 +911,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState)
   {
     super.onRestoreInstanceState(savedInstanceState);
+    mPlacePageController.onRestore(savedInstanceState);
     if (mIsTabletLayout)
     {
       RoutingPlanFragment fragment = (RoutingPlanFragment) getFragment(RoutingPlanFragment.class);
@@ -912,8 +940,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (resultCode != Activity.RESULT_OK)
       return;
 
-    if (requestCode == REQ_CODE_DRIVING_OPTIONS)
-      rebuildLastRoute();
+    switch (requestCode)
+    {
+      case REQ_CODE_DRIVING_OPTIONS:
+        rebuildLastRoute();
+        break;
+    }
   }
 
   private void rebuildLastRoute()
@@ -1010,11 +1042,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     super.onResume();
     refreshSearchToolbar();
-    setFullscreen(isFullscreen());
+    setFullscreen(mIsFullscreen);
     if (Framework.nativeIsInChoosePositionMode())
     {
       UiUtils.show(mPointChooser);
-      mMapButtonsViewModel.setButtonsHidden(true);
+      mMapButtonsController.showMapButtons(false);
     }
     if (mOnmapDownloader != null)
       mOnmapDownloader.onResume();
@@ -1055,12 +1087,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
   protected void onStart()
   {
     super.onStart();
-    Framework.nativePlacePageActivationListener(this);
     BookmarkManager.INSTANCE.addLoadingListener(this);
-    RoutingController.get().attach(this);
     IsolinesManager.from(getApplicationContext()).attach(this::onIsolinesStateChanged);
     if (mDisplayManager.isDeviceDisplayUsed())
     {
+      Logger.d(TAG, "Activate");
+      RoutingController.get().attach(this);
+      Framework.nativePlacePageActivationListener(this);
       LocationState.nativeSetListener(this);
       onMyPositionModeChanged(LocationState.nativeGetMode());
     }
@@ -1075,13 +1108,16 @@ public class MwmActivity extends BaseMwmFragmentActivity
   protected void onStop()
   {
     super.onStop();
-    Framework.nativeRemovePlacePageActivationListener();
     BookmarkManager.INSTANCE.removeLoadingListener(this);
     LocationHelper.INSTANCE.removeListener(this);
     if (mDisplayManager.isDeviceDisplayUsed())
+    {
+      Logger.d(TAG, "Deactivate");
+      Framework.nativeRemovePlacePageActivationListener();
       LocationState.nativeRemoveListener();
+      RoutingController.get().detach();
+    }
     LocationHelper.INSTANCE.detach();
-    RoutingController.get().detach();
     IsolinesManager.from(getApplicationContext()).detach();
     mSearchController.detach();
     Utils.keepScreenOn(false, getWindow());
@@ -1093,6 +1129,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     super.onSafeDestroy();
     mNavigationController.destroy();
+    //TrafficManager.INSTANCE.detachAll();
+    mPlacePageController.destroy();
   }
 
   @Override
@@ -1172,8 +1210,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onPlacePageActivated(@NonNull PlacePageData data)
   {
     setFullscreen(false);
-    // This will open the place page
-    mPlacePageViewModel.setMapObject((MapObject) data);
+
+    mPlacePageController.openFor(data);
   }
 
   // Called from JNI.
@@ -1186,7 +1224,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
           UiUtils.isVisible(mSearchController.getToolbar()))
         return;
 
-      setFullscreen(!isFullscreen());
+      setFullscreen(!mIsFullscreen);
     }
     else
     {
@@ -1201,14 +1239,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
         || RoutingController.get().isPlanning())
       return;
 
-    mMapButtonsViewModel.setButtonsHidden(isFullscreen);
+    mIsFullscreen = isFullscreen;
+    mMapButtonsController.showMapButtons(!isFullscreen);
     UiUtils.setFullscreen(this, isFullscreen);
   }
 
-  private boolean isFullscreen()
+  @Override
+  public void onPlacePageSlide(int top)
   {
-    // Buttons are hidden in position chooser mode but we are not in fullscreen
-    return Boolean.TRUE.equals(mMapButtonsViewModel.getButtonsHidden().getValue()) && !Framework.nativeIsInChoosePositionMode();
+    mMapButtonsController.move(top);
   }
 
   @Override
@@ -1243,10 +1282,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
       Map.onCompassUpdated(north, true);
   }
 
-  public void onMapBottomButtonsHeightChange(float height) {
-    updateBottomWidgetsOffset();
-  }
-
   public void updateBottomWidgetsOffset()
   {
     updateBottomWidgetsOffset(-1);
@@ -1258,9 +1293,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
 
     int offsetY = mNavBarHeight;
-    final Float bottomButtonHeight = mMapButtonsViewModel.getBottomButtonsHeight().getValue();
-    if (bottomButtonHeight != null)
-      offsetY = Math.max(offsetY, bottomButtonHeight.intValue() + mNavBarHeight);
+    if (mMapButtonsController != null)
+      offsetY = Math.max(offsetY, (int) mMapButtonsController.getBottomButtonsHeight() + mNavBarHeight);
     if (mMainMenu != null)
       offsetY = Math.max(offsetY, mMainMenu.getMenuHeight());
 
@@ -1290,17 +1324,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
     {
       mNavigationController.show(true);
       closeSearchToolbar(false, false);
-      mMainMenu.setState(MainMenu.State.NAVIGATION, isFullscreen());
+      mMainMenu.setState(MainMenu.State.NAVIGATION, mIsFullscreen);
       return;
     }
 
     if (RoutingController.get().isPlanning())
     {
-      mMainMenu.setState(MainMenu.State.ROUTE_PREPARE, isFullscreen());
+      mMainMenu.setState(MainMenu.State.ROUTE_PREPARE, mIsFullscreen);
       return;
     }
 
-    mMainMenu.setState(MainMenu.State.MENU, isFullscreen());
+    mMainMenu.setState(MainMenu.State.MENU, mIsFullscreen);
   }
 
   private boolean adjustMenuLineFrameVisibility()
@@ -1487,7 +1521,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void showNavigation(boolean show)
   {
     // TODO:
-    // mPlacePage.refreshViews();
+//    mPlacePage.refreshViews();
     mNavigationController.show(show);
     if (mOnmapDownloader != null)
       mOnmapDownloader.updateState(false);
@@ -1527,8 +1561,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     mRoutingPlanInplaceController.hideDrivingOptionsView();
     mNavigationController.stop(this);
-    mMapButtonsViewModel.setSearchOption(null);
-    mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.regular);
+    initNavigationButtons(MapButtonsController.LayoutMode.regular, false /* force */);
     refreshLightStatusBar();
   }
 
@@ -1538,7 +1571,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     closeFloatingToolbarsAndPanels(true);
     ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
     mNavigationController.start(this);
-    mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.navigation);
+    initNavigationButtons(MapButtonsController.LayoutMode.navigation, false /* force */);
     refreshLightStatusBar();
   }
 
@@ -1546,7 +1579,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onPlanningCancelled()
   {
     closeFloatingToolbarsAndPanels(true);
-    mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.regular);
+    initNavigationButtons(MapButtonsController.LayoutMode.regular, false /* force */);
     refreshLightStatusBar();
   }
 
@@ -1554,7 +1587,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onPlanningStarted()
   {
     closeFloatingToolbarsAndPanels(true);
-    mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.planning);
+    initNavigationButtons(MapButtonsController.LayoutMode.planning, false /* force */);
     refreshLightStatusBar();
   }
 
@@ -1564,8 +1597,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     closeFloatingToolbarsAndPanels(true);
     ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
     mNavigationController.stop(this);
-    mMapButtonsViewModel.setSearchOption(null);
-    mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.planning);
+    initNavigationButtons(MapButtonsController.LayoutMode.planning, false /* force */);
     refreshLightStatusBar();
   }
 
@@ -1625,9 +1657,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
   }
 
   @Override
-  public void onShowDisclaimer(@Nullable MapObject startPoint, @Nullable MapObject endPoint)
+  public void onShowDisclaimer()
   {
-    final StringBuilder builder = new StringBuilder();
+    StringBuilder builder = new StringBuilder();
     for (int resId : new int[] { R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision,
         R.string.dialog_routing_disclaimer_recommendations, R.string.dialog_routing_disclaimer_borders,
         R.string.dialog_routing_disclaimer_beware })
@@ -1640,7 +1672,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         .setNegativeButton(R.string.decline, null)
         .setPositiveButton(R.string.accept, (dlg, which) -> {
           Config.acceptRoutingDisclaimer();
-          RoutingController.get().prepare(startPoint, endPoint);
+          RoutingController.get().prepare();
         })
         .show();
   }
@@ -1653,7 +1685,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         .setCancelable(false)
         .setNegativeButton(R.string.cancel, null);
 
-    final TextView titleView = (TextView)View.inflate(this, R.layout.dialog_suggest_reroute_title, null);
+    TextView titleView = (TextView)View.inflate(this, R.layout.dialog_suggest_reroute_title, null);
     titleView.setText(R.string.p2p_only_from_current);
     builder.setCustomTitle(titleView);
 
@@ -1674,7 +1706,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onMyPositionModeChanged(int newMode)
   {
     Logger.d(TAG, "location newMode = " + newMode);
-    mMapButtonsViewModel.setMyPositionMode(newMode);
+    mMapButtonsController.updateNavMyPositionButton(newMode);
     RoutingController controller = RoutingController.get();
     if (controller.isPlanning())
       showAddStartOrFinishFrame(controller, true);
@@ -1850,11 +1882,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
     shareMyLocation();
   }
 
-  public void onLayerChange(Mode mode)
+  @Override
+  public void onLayerItemClick(@NonNull Mode mode)
   {
-    if (mPreviousLayerMode != mode)
-      closeFloatingPanels();
-    mPreviousLayerMode = mode;
+    closeFloatingPanels();
+    if (mMapButtonsController != null)
+      mMapButtonsController.toggleMapLayer(mode);
   }
 
   @Override
@@ -1878,6 +1911,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
       items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected));
       return items;
     }
+    else if (id.equals(PLACEPAGE_MORE_MENU_ID))
+      return mPlacePageController.getMenuBottomSheetItems(id);
     return null;
   }
 
@@ -1890,6 +1925,30 @@ public class MwmActivity extends BaseMwmFragmentActivity
     return null;
   }
 
+  @Override
+  public void onPlacePageButtonClick(PlacePageButtons.ButtonType item)
+  {
+    mPlacePageController.onPlacePageButtonClick(item);
+  }
+
+  @Override
+  public void onPlacePageContentChanged(int previewHeight, int frameHeight)
+  {
+    mPlacePageController.onPlacePageContentChanged(previewHeight, frameHeight);
+  }
+
+  @Override
+  public void onPlacePageRequestClose()
+  {
+    mPlacePageController.onPlacePageRequestClose();
+  }
+
+  @Override
+  public void onPlacePageRequestToggleState()
+  {
+    mPlacePageController.onPlacePageRequestToggleState();
+  }
+
   @Override
   public void onPlacePageRequestToggleRouteSettings(@NonNull RoadType roadType)
   {
@@ -1910,19 +1969,25 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private void disableControls()
   {
     initNavigationButtons(MapButtonsController.LayoutMode.regular, true /* force */);
-    mMapButtonsViewModel.setButtonsHidden(true);
-    mPlacePageViewModel.setMapObject(null);
+    if (mMapButtonsController != null)
+      mMapButtonsController.showMapButtons(false);
+    mPlacePageController.close(false);
     mMainMenu.show(false);
     mNavigationController.show(false);
     mRoutingPlanInplaceController.show(false);
     closeFloatingToolbarsAndPanels(false);
-    Framework.nativeDeactivatePopup();
+    Logger.d(TAG, "Deactivate");
+    Framework.nativeRemovePlacePageActivationListener();
     if (mOnmapDownloader != null)
       mOnmapDownloader.onPause();
+    RoutingController.get().onSaveState();
+    RoutingController.get().detach();
   }
 
   private void enableControls()
   {
+    RoutingController.get().attach(this);
+    RoutingController.get().restore();
     if (RoutingController.get().isNavigating())
     {
       showNavigation(true);
@@ -1930,14 +1995,18 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
     else if (RoutingController.get().isPlanning())
     {
-      mMainMenu.show(true);
       mRoutingPlanInplaceController.show(true);
       initNavigationButtons(MapButtonsController.LayoutMode.planning, true /* force */);
     }
     else
+    {
       initNavigationButtons(MapButtonsController.LayoutMode.regular, true /* force */);
-    mMapButtonsViewModel.setButtonsHidden(false);
+      if (mMapButtonsController != null)
+        mMapButtonsController.showMapButtons(true);
+    }
     LocationState.nativeSetListener(this);
+    Logger.d(TAG, "Activate");
+    Framework.nativePlacePageActivationListener(this);
     onMyPositionModeChanged(LocationState.nativeGetMode());
     updateViewsInsets();
     if (mOnmapDownloader != null)
diff --git a/android/src/app/organicmaps/car/NavigationSession.java b/android/src/app/organicmaps/car/NavigationSession.java
index f670ea0bf2..58ade2c293 100644
--- a/android/src/app/organicmaps/car/NavigationSession.java
+++ b/android/src/app/organicmaps/car/NavigationSession.java
@@ -14,8 +14,12 @@ import androidx.car.app.SessionInfo;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
+import app.organicmaps.Framework;
 import app.organicmaps.Map;
+import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.car.screens.NavigationScreen;
+import app.organicmaps.car.screens.PlaceScreen;
+import app.organicmaps.car.screens.hacks.PopToRootHack;
 import app.organicmaps.display.DisplayChangedListener;
 import app.organicmaps.display.DisplayManager;
 import app.organicmaps.display.DisplayType;
@@ -29,10 +33,11 @@ import app.organicmaps.location.LocationListener;
 import app.organicmaps.location.LocationState;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.util.log.Logger;
+import app.organicmaps.widget.placepage.PlacePageData;
 
 import java.io.IOException;
 
-public final class NavigationSession extends Session implements DefaultLifecycleObserver, LocationListener, LocationState.ModeChangeListener, DisplayChangedListener
+public final class NavigationSession extends Session implements DefaultLifecycleObserver, LocationListener, LocationState.ModeChangeListener, DisplayChangedListener, Framework.PlacePageActivationListener
 {
   private static final String TAG = NavigationSession.class.getSimpleName();
 
@@ -81,6 +86,8 @@ public final class NavigationSession extends Session implements DefaultLifecycle
     LocationHelper.INSTANCE.addListener(this);
     LocationHelper.INSTANCE.onTransit(true);
     onMyPositionModeChanged(LocationState.nativeGetMode());
+    Logger.d(TAG, "Activate");
+    Framework.nativePlacePageActivationListener(this);
   }
 
   @Override
@@ -90,6 +97,8 @@ public final class NavigationSession extends Session implements DefaultLifecycle
     LocationHelper.INSTANCE.onTransit(false);
     LocationHelper.INSTANCE.removeListener(this);
     LocationState.nativeRemoveListener();
+    Logger.d(TAG, "Deactivate");
+    Framework.nativeRemovePlacePageActivationListener();
   }
 
   @Override
@@ -109,6 +118,12 @@ public final class NavigationSession extends Session implements DefaultLifecycle
     init();
   }
 
+  @Override
+  public void onPause(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
+
   @Override
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
@@ -153,19 +168,49 @@ public final class NavigationSession extends Session implements DefaultLifecycle
     Logger.d(TAG);
     final ScreenManager screenManager = getCarContext().getCarService(ScreenManager.class);
     final boolean isUsedOnDeviceScreenShown = screenManager.getTop() instanceof MapPlaceholderScreen;
-    if (newDisplayType == DisplayType.Car && isUsedOnDeviceScreenShown)
+    if (newDisplayType == DisplayType.Car)
     {
       LocationState.nativeSetListener(this);
       onMyPositionModeChanged(LocationState.nativeGetMode());
       screenManager.popToRoot();
+      RoutingController.get().restore();
       if (RoutingController.get().isNavigating())
         screenManager.push(new NavigationScreen(getCarContext(), mSurfaceRenderer));
+      else if (RoutingController.get().isPlanning() && RoutingController.get().getEndPoint() != null)
+        screenManager.push(new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer).setMapObject(RoutingController.get().getEndPoint()).build());
       mSurfaceRenderer.enable();
+      Framework.nativePlacePageActivationListener(this);
     }
     else if (newDisplayType == DisplayType.Device && !isUsedOnDeviceScreenShown)
     {
+      Framework.nativeRemovePlacePageActivationListener();
       mSurfaceRenderer.disable();
-      screenManager.push(new MapPlaceholderScreen(getCarContext()));
+      final PopToRootHack hack = new PopToRootHack.Builder(getCarContext()).setScreenToPush(new MapPlaceholderScreen(getCarContext())).build();
+      screenManager.push(hack);
+      RoutingController.get().onSaveState();
     }
   }
+
+  @Override
+  public void onPlacePageActivated(@NonNull PlacePageData data)
+  {
+    final ScreenManager screenManager = getCarContext().getCarService(ScreenManager.class);
+    if (screenManager.getTop() instanceof PlaceScreen)
+    {
+      final PlaceScreen screen = (PlaceScreen) screenManager.getTop();
+      if (screen.getMapObject().equals(data))
+        return;
+    }
+    final PlaceScreen placeScreen = new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer).setMapObject((MapObject) data).build();
+    final PopToRootHack hack = new PopToRootHack.Builder(getCarContext()).setScreenToPush(placeScreen).build();
+    screenManager.push(hack);
+  }
+
+  @Override
+  public void onPlacePageDeactivated(boolean switchFullScreenMode)
+  {
+    final ScreenManager screenManager = getCarContext().getCarService(ScreenManager.class);
+    if (screenManager.getTop() instanceof PlaceScreen)
+      screenManager.popToRoot();
+  }
 }
diff --git a/android/src/app/organicmaps/car/SurfaceRenderer.java b/android/src/app/organicmaps/car/SurfaceRenderer.java
index fd9493d136..3fbf5a5113 100644
--- a/android/src/app/organicmaps/car/SurfaceRenderer.java
+++ b/android/src/app/organicmaps/car/SurfaceRenderer.java
@@ -28,6 +28,8 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
 
   @NonNull
   private Rect mVisibleArea = new Rect();
+  @NonNull
+  private Rect mStableArea = new Rect();
 
   private boolean mIsRunning;
 
@@ -65,9 +67,10 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   public void onStableAreaChanged(@NonNull Rect stableArea)
   {
     Logger.d(TAG, "Stable area changed. stableArea: " + stableArea);
+    mStableArea = stableArea;
 
-    if (!stableArea.isEmpty())
-      Framework.nativeSetVisibleRect(stableArea.left, stableArea.top, stableArea.right, stableArea.bottom);
+    if (!mStableArea.isEmpty())
+      Framework.nativeSetVisibleRect(mStableArea.left, mStableArea.top, mStableArea.right, mStableArea.bottom);
     else if (!mVisibleArea.isEmpty())
       Framework.nativeSetVisibleRect(mVisibleArea.left, mVisibleArea.top, mVisibleArea.right, mVisibleArea.bottom);
   }
@@ -82,10 +85,10 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   @Override
   public void onCreate(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    Logger.d(TAG, "onCreate");
     mCarContext.getCarService(AppManager.class).setSurfaceCallback(this);
 
-    // TODO (AndrewShkrob): Properly process deep links from other apps on AA.
+    // TODO: Properly process deep links from other apps on AA.
     boolean launchByDeepLink = false;
     mMap.onCreate(launchByDeepLink);
   }
@@ -93,7 +96,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   @Override
   public void onStart(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    Logger.d(TAG, "onStart");
     mMap.onStart();
     mMap.setCallbackUnsupported(this::reportUnsupported);
   }
@@ -101,7 +104,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    Logger.d(TAG, "onStop");
     mMap.onStop();
     mMap.setCallbackUnsupported(null);
   }
@@ -109,14 +112,14 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   @Override
   public void onPause(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    Logger.d(TAG, "onPause");
     mMap.onPause(mCarContext);
   }
 
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    Logger.d(TAG, "onResume");
     mMap.onResume();
   }
 
@@ -168,8 +171,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   public void onClick(float x, float y)
   {
     Logger.d(TAG, "x: " + x + ", y: " + y);
-    // TODO (AndrewShkrob): Will be implemented together with PlaceScreen
-    // Map.onClick(x, y);
+    Map.onClick(x, y);
   }
 
   public void disable()
diff --git a/android/src/app/organicmaps/car/util/UiHelpers.java b/android/src/app/organicmaps/car/UiHelpers.java
similarity index 81%
rename from android/src/app/organicmaps/car/util/UiHelpers.java
rename to android/src/app/organicmaps/car/UiHelpers.java
index f75e1e89fb..bde27023d8 100644
--- a/android/src/app/organicmaps/car/util/UiHelpers.java
+++ b/android/src/app/organicmaps/car/UiHelpers.java
@@ -1,9 +1,8 @@
-package app.organicmaps.car.util;
+package app.organicmaps.car;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.car.app.CarContext;
-import androidx.car.app.ScreenManager;
 import androidx.car.app.model.Action;
 import androidx.car.app.model.ActionStrip;
 import androidx.car.app.model.CarColor;
@@ -12,7 +11,7 @@ import androidx.car.app.navigation.model.MapController;
 import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.settings.SettingsScreen;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationState;
@@ -20,9 +19,9 @@ import app.organicmaps.location.LocationState;
 public final class UiHelpers
 {
   @NonNull
-  public static ActionStrip createSettingsActionStrip(@NonNull CarContext context, @NonNull SurfaceRenderer surfaceRenderer)
+  public static ActionStrip createSettingsActionStrip(@NonNull BaseMapScreen mapScreen, @NonNull SurfaceRenderer surfaceRenderer)
   {
-    return new ActionStrip.Builder().addAction(createSettingsAction(context, surfaceRenderer)).build();
+    return new ActionStrip.Builder().addAction(createSettingsAction(mapScreen, surfaceRenderer)).build();
   }
 
   @NonNull
@@ -50,12 +49,19 @@ public final class UiHelpers
   }
 
   @NonNull
-  public static Action createSettingsAction(@NonNull CarContext context, @NonNull SurfaceRenderer surfaceRenderer)
+  public static Action createSettingsAction(@NonNull BaseMapScreen mapScreen, @NonNull SurfaceRenderer surfaceRenderer)
   {
+    final CarContext context = mapScreen.getCarContext();
     final CarIcon iconSettings = new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_settings)).build();
 
     return new Action.Builder().setIcon(iconSettings).setOnClickListener(
-        () -> context.getCarService(ScreenManager.class).push(new SettingsScreen(context, surfaceRenderer))
+        () -> {
+          // Action.onClickListener for the Screen A maybe called even if the Screen B is shown now.
+          // We need to check it
+          if (mapScreen.getScreenManager().getTop() != mapScreen)
+            return;
+          mapScreen.getScreenManager().push(new SettingsScreen(context, surfaceRenderer));
+        }
     ).build();
   }
 
diff --git a/android/src/app/organicmaps/car/screens/BookmarksScreen.java b/android/src/app/organicmaps/car/screens/BookmarksScreen.java
index f7ba08171d..56d9d92df7 100644
--- a/android/src/app/organicmaps/car/screens/BookmarksScreen.java
+++ b/android/src/app/organicmaps/car/screens/BookmarksScreen.java
@@ -20,7 +20,7 @@ import app.organicmaps.bookmarks.data.BookmarkCategory;
 import app.organicmaps.bookmarks.data.BookmarkInfo;
 import app.organicmaps.bookmarks.data.BookmarkManager;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.util.Graphics;
 
@@ -54,7 +54,7 @@ public class BookmarksScreen extends BaseMapScreen
     final MapTemplate.Builder builder = new MapTemplate.Builder();
     builder.setHeader(createHeader());
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
-    builder.setActionStrip(UiHelpers.createSettingsActionStrip(getCarContext(), getSurfaceRenderer()));
+    builder.setActionStrip(UiHelpers.createSettingsActionStrip(this, getSurfaceRenderer()));
     builder.setItemList(mBookmarkCategory == null ? createBookmarkCategoriesList() : createBookmarksList());
     return builder.build();
   }
@@ -114,7 +114,7 @@ public class BookmarksScreen extends BaseMapScreen
           R.dimen.bookmark_icon_size,
           getCarContext());
       itemBuilder.setImage(new CarIcon.Builder(IconCompat.createWithBitmap(Graphics.drawableToBitmap(icon))).build());
-      itemBuilder.setOnClickListener(() -> { /* TODO (AndrewShkrob): Will be implemented together with PlaceScreen */ });
+      itemBuilder.setOnClickListener(() -> BookmarkManager.INSTANCE.showBookmarkOnMap(bookmarkId));
       builder.addItem(itemBuilder.build());
     }
     return builder.build();
diff --git a/android/src/app/organicmaps/car/screens/CategoriesScreen.java b/android/src/app/organicmaps/car/screens/CategoriesScreen.java
index 3a0c240b35..c66f678641 100644
--- a/android/src/app/organicmaps/car/screens/CategoriesScreen.java
+++ b/android/src/app/organicmaps/car/screens/CategoriesScreen.java
@@ -16,9 +16,9 @@ import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.screens.search.SearchOnMapScreen;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
+import app.organicmaps.car.screens.search.SearchScreen;
 
 import java.util.Arrays;
 import java.util.List;
@@ -40,7 +40,6 @@ public class CategoriesScreen extends BaseMapScreen
     }
   }
 
-  // TODO (AndrewShkrob): discuss categories and their priority for this list
   private static final List<CategoryData> CATEGORIES = Arrays.asList(
       new CategoryData(R.string.fuel, R.drawable.ic_category_fuel),
       new CategoryData(R.string.parking, R.drawable.ic_category_parking),
@@ -67,7 +66,7 @@ public class CategoriesScreen extends BaseMapScreen
     final MapTemplate.Builder builder = new MapTemplate.Builder();
     builder.setHeader(createHeader());
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
-    builder.setActionStrip(UiHelpers.createSettingsActionStrip(getCarContext(), getSurfaceRenderer()));
+    builder.setActionStrip(UiHelpers.createSettingsActionStrip(this, getSurfaceRenderer()));
     builder.setItemList(createCategoriesList());
     return builder.build();
   }
@@ -92,7 +91,9 @@ public class CategoriesScreen extends BaseMapScreen
       final String title = getCarContext().getString(CATEGORIES.get(i).nameResId);
       itemBuilder.setTitle(title);
       itemBuilder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), CATEGORIES.get(i).iconResId)).build());
-      itemBuilder.setOnClickListener(() -> getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setCategory(title).build()));
+      // TODO: replace with this line when implementation of {@link SearchOnMapScreen} will be finished
+      // itemBuilder.setOnClickListener(() -> getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setCategory(title).build()));
+      itemBuilder.setOnClickListener(() -> getScreenManager().push(new SearchScreen.Builder(getCarContext(), getSurfaceRenderer()).setCategory(title).build()));
       builder.addItem(itemBuilder.build());
     }
     return builder.build();
diff --git a/android/src/app/organicmaps/car/screens/ErrorScreen.java b/android/src/app/organicmaps/car/screens/ErrorScreen.java
index ff2eecefa0..bcdaf8525f 100644
--- a/android/src/app/organicmaps/car/screens/ErrorScreen.java
+++ b/android/src/app/organicmaps/car/screens/ErrorScreen.java
@@ -1,15 +1,19 @@
 package app.organicmaps.car.screens;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.car.app.CarContext;
+import androidx.car.app.Screen;
 import androidx.car.app.model.LongMessageTemplate;
 import androidx.car.app.model.Template;
 
 import app.organicmaps.R;
-import app.organicmaps.car.screens.base.BaseScreen;
 
-public class ErrorScreen extends BaseScreen
+public class ErrorScreen extends Screen
 {
+  private static final String TAG = ErrorScreen.class.getSimpleName();
+
   public ErrorScreen(@NonNull CarContext carContext)
   {
     super(carContext);
@@ -19,7 +23,8 @@ public class ErrorScreen extends BaseScreen
   @Override
   public Template onGetTemplate()
   {
-    final LongMessageTemplate.Builder builder = new LongMessageTemplate.Builder(getCarContext().getString(R.string.dialog_error_storage_message));
+    Log.d(TAG, "onGetTemplate");
+    LongMessageTemplate.Builder builder = new LongMessageTemplate.Builder(getCarContext().getString(R.string.dialog_error_storage_message));
     builder.setTitle(getCarContext().getString(R.string.dialog_error_storage_title));
 
     return builder.build();
diff --git a/android/src/app/organicmaps/car/screens/MapPlaceholderScreen.java b/android/src/app/organicmaps/car/screens/MapPlaceholderScreen.java
index 827c92fbe5..30a1f00e06 100644
--- a/android/src/app/organicmaps/car/screens/MapPlaceholderScreen.java
+++ b/android/src/app/organicmaps/car/screens/MapPlaceholderScreen.java
@@ -12,9 +12,12 @@ import app.organicmaps.car.screens.base.BaseScreen;
 import app.organicmaps.display.DisplayManager;
 import app.organicmaps.display.DisplayType;
 import app.organicmaps.R;
+import app.organicmaps.util.log.Logger;
 
 public class MapPlaceholderScreen extends BaseScreen
 {
+  private static final String TAG = MapPlaceholderScreen.class.getSimpleName();
+
   public MapPlaceholderScreen(@NonNull CarContext carContext)
   {
     super(carContext);
@@ -24,6 +27,7 @@ public class MapPlaceholderScreen extends BaseScreen
   @Override
   public Template onGetTemplate()
   {
+    Logger.d(TAG, "onGetTemplate");
     final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.aa_used_on_phone_screen));
     builder.setHeaderAction(Action.APP_ICON);
     builder.setTitle(getCarContext().getString(R.string.app_name));
diff --git a/android/src/app/organicmaps/car/screens/MapScreen.java b/android/src/app/organicmaps/car/screens/MapScreen.java
index 7c9bdb155e..f4ed59b4c8 100644
--- a/android/src/app/organicmaps/car/screens/MapScreen.java
+++ b/android/src/app/organicmaps/car/screens/MapScreen.java
@@ -14,7 +14,7 @@ import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.search.SearchScreen;
 
@@ -32,7 +32,7 @@ public class MapScreen extends BaseMapScreen
     final MapTemplate.Builder builder = new MapTemplate.Builder();
     builder.setHeader(createHeader());
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
-    builder.setActionStrip(UiHelpers.createSettingsActionStrip(getCarContext(), getSurfaceRenderer()));
+    builder.setActionStrip(UiHelpers.createSettingsActionStrip(this, getSurfaceRenderer()));
     builder.setItemList(createList());
     return builder.build();
   }
@@ -91,16 +91,22 @@ public class MapScreen extends BaseMapScreen
 
   private void openSearch()
   {
+    if (getScreenManager().getTop() != this)
+      return;
     getScreenManager().push(new SearchScreen.Builder(getCarContext(), getSurfaceRenderer()).build());
   }
 
   private void openCategories()
   {
+    if (getScreenManager().getTop() != this)
+      return;
     getScreenManager().push(new CategoriesScreen(getCarContext(), getSurfaceRenderer()));
   }
 
   private void openBookmarks()
   {
+    if (getScreenManager().getTop() != this)
+      return;
     getScreenManager().push(new BookmarksScreen(getCarContext(), getSurfaceRenderer()));
   }
 }
diff --git a/android/src/app/organicmaps/car/screens/NavigationScreen.java b/android/src/app/organicmaps/car/screens/NavigationScreen.java
index 1f123c3d1d..c099bbd9d0 100644
--- a/android/src/app/organicmaps/car/screens/NavigationScreen.java
+++ b/android/src/app/organicmaps/car/screens/NavigationScreen.java
@@ -9,19 +9,19 @@ import androidx.car.app.navigation.model.NavigationTemplate;
 
 import app.organicmaps.R;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.routing.RoutingController;
 
-public class NavigationScreen extends BaseMapScreen
+public class NavigationScreen extends BaseMapScreen implements RoutingController.Container
 {
-  @NonNull
   private final RoutingController mRoutingController;
-
   public NavigationScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
     mRoutingController = RoutingController.get();
+    mRoutingController.attach(this);
+    mRoutingController.restore();
   }
 
   @NonNull
@@ -39,16 +39,13 @@ public class NavigationScreen extends BaseMapScreen
   {
     final Action.Builder stopActionBuilder = new Action.Builder();
     stopActionBuilder.setTitle(getCarContext().getString(R.string.current_location_unknown_stop_button));
-    stopActionBuilder.setOnClickListener(this::stop);
+    stopActionBuilder.setOnClickListener(() -> {
+      mRoutingController.cancel();
+      getScreenManager().popToRoot();
+    });
     final ActionStrip.Builder builder = new ActionStrip.Builder();
-    builder.addAction(UiHelpers.createSettingsAction(getCarContext(), getSurfaceRenderer()));
+    builder.addAction(UiHelpers.createSettingsAction(this, getSurfaceRenderer()));
     builder.addAction(stopActionBuilder.build());
     return builder.build();
   }
-
-  private void stop()
-  {
-    mRoutingController.cancel();
-    getScreenManager().popToRoot();
-  }
 }
diff --git a/android/src/app/organicmaps/car/screens/PlaceScreen.java b/android/src/app/organicmaps/car/screens/PlaceScreen.java
new file mode 100644
index 0000000000..b8fb5ebb83
--- /dev/null
+++ b/android/src/app/organicmaps/car/screens/PlaceScreen.java
@@ -0,0 +1,385 @@
+package app.organicmaps.car.screens;
+
+import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
+import static android.text.Spanned.SPAN_INCLUSIVE_INCLUSIVE;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.text.SpannableString;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.car.app.CarContext;
+import androidx.car.app.model.Action;
+import androidx.car.app.model.CarColor;
+import androidx.car.app.model.CarIcon;
+import androidx.car.app.model.DurationSpan;
+import androidx.car.app.model.ForegroundCarColorSpan;
+import androidx.car.app.model.Header;
+import androidx.car.app.model.Pane;
+import androidx.car.app.model.Row;
+import androidx.car.app.model.Template;
+import androidx.car.app.navigation.model.MapTemplate;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import app.organicmaps.Framework;
+import app.organicmaps.R;
+import app.organicmaps.bookmarks.data.BookmarkManager;
+import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.bookmarks.data.Metadata;
+import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.UiHelpers;
+import app.organicmaps.car.screens.base.BaseMapScreen;
+import app.organicmaps.car.screens.settings.DrivingOptionsScreen;
+import app.organicmaps.car.util.OnBackPressedCallback;
+import app.organicmaps.editor.OpeningHours;
+import app.organicmaps.editor.data.Timetable;
+import app.organicmaps.location.LocationHelper;
+import app.organicmaps.routing.RoutingController;
+import app.organicmaps.routing.RoutingInfo;
+import app.organicmaps.util.Config;
+import app.organicmaps.util.Utils;
+
+import java.util.Calendar;
+
+public class PlaceScreen extends BaseMapScreen implements RoutingController.Container, OnBackPressedCallback.Callback
+{
+  @NonNull
+  private final MapObject mMapObject;
+
+  @NonNull
+  private final RoutingController mRoutingController;
+
+  @NonNull
+  private final OnBackPressedCallback mOnBackPressedCallback;
+
+  private PlaceScreen(@NonNull Builder builder)
+  {
+    super(builder.mCarContext, builder.mSurfaceRenderer);
+
+    assert builder.mMapObject != null;
+    mMapObject = builder.mMapObject;
+
+    mRoutingController = RoutingController.get();
+    mOnBackPressedCallback = new OnBackPressedCallback(getCarContext(), this);
+  }
+
+  @NonNull
+  @Override
+  public Template onGetTemplate()
+  {
+    final MapTemplate.Builder builder = new MapTemplate.Builder();
+    builder.setHeader(createHeader());
+    builder.setActionStrip(UiHelpers.createSettingsActionStrip(this, getSurfaceRenderer()));
+    builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
+    builder.setPane(createPane());
+
+    return builder.build();
+  }
+
+  @NonNull
+  public MapObject getMapObject()
+  {
+    return mMapObject;
+  }
+
+  @NonNull
+  private Header createHeader()
+  {
+    final Header.Builder builder = new Header.Builder();
+    builder.setStartHeaderAction(Action.BACK);
+    getCarContext().getOnBackPressedDispatcher().addCallback(this, mOnBackPressedCallback);
+    if (!mRoutingController.isBuilding() && !mRoutingController.isBuilt())
+      builder.addEndHeaderAction(createBookmarkAction());
+    if (mRoutingController.isBuilt())
+    {
+      builder.addEndHeaderAction(
+          new Action.Builder()
+              .setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_settings)).build())
+              .setOnClickListener(() -> getScreenManager().push(new DrivingOptionsScreen(getCarContext(), getSurfaceRenderer())))
+              .build()
+      );
+    }
+
+    return builder.build();
+  }
+
+  @NonNull
+  private Pane createPane()
+  {
+    final Pane.Builder builder = new Pane.Builder();
+
+    if (mRoutingController.isBuilding())
+    {
+      builder.setLoading(true);
+      return builder.build();
+    }
+
+    builder.addRow(getPlaceDescription());
+    if (mRoutingController.isBuilt())
+      builder.addRow(getPlaceRouteInfo());
+
+    final Row placeOpeningHours = getPlaceOpeningHours();
+    if (placeOpeningHours != null)
+      builder.addRow(placeOpeningHours);
+
+    createPaneActions(builder);
+
+    return builder.build();
+  }
+
+  @NonNull
+  private Row getPlaceDescription()
+  {
+    final Row.Builder builder = new Row.Builder();
+    builder.setTitle(mMapObject.getTitle());
+    if (!mMapObject.getSubtitle().isEmpty())
+      builder.addText(mMapObject.getSubtitle());
+    String address = mMapObject.getAddress();
+    if (address.isEmpty())
+      address = Framework.nativeGetAddress(mMapObject.getLat(), mMapObject.getLon());
+    if (!address.isEmpty())
+      builder.addText(address);
+    return builder.build();
+  }
+
+  @NonNull
+  private Row getPlaceRouteInfo()
+  {
+    final RoutingInfo routingInfo = RoutingController.get().getCachedRoutingInfo();
+    if (routingInfo == null)
+    {
+      throw new IllegalStateException("routingInfo == null");
+    }
+
+    final Row.Builder builder = new Row.Builder();
+
+    builder.setTitle(routingInfo.distToTarget + " " + routingInfo.targetUnits);
+
+    final SpannableString time = new SpannableString(" ");
+    time.setSpan(DurationSpan.create(routingInfo.totalTimeInSeconds), 0, 1, SPAN_INCLUSIVE_INCLUSIVE);
+    time.setSpan(ForegroundCarColorSpan.create(CarColor.BLUE), 0, 1, SPAN_EXCLUSIVE_EXCLUSIVE);
+    builder.addText(time);
+
+    return builder.build();
+  }
+
+  @Nullable
+  private Row getPlaceOpeningHours()
+  {
+    if (!mMapObject.hasMetadata())
+      return null;
+
+    final String ohStr = mMapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS);
+    final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(ohStr);
+    final boolean isEmptyTT = (timetables == null || timetables.length == 0);
+
+    if (ohStr.isEmpty() && isEmptyTT)
+      return null;
+
+    final Row.Builder builder = new Row.Builder();
+    builder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_operating_hours)).build());
+    if (isEmptyTT)
+      builder.setTitle(ohStr);
+    else if (timetables[0].isFullWeek())
+    {
+      if (timetables[0].isFullday)
+        builder.setTitle(getCarContext().getString(R.string.twentyfour_seven));
+      else
+        builder.setTitle(timetables[0].workingTimespan.toWideString());
+    }
+    else
+    {
+      boolean containsCurrentWeekday = false;
+      final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
+      for (final Timetable tt : timetables)
+      {
+        if (tt.containsWeekday(currentDay))
+        {
+          containsCurrentWeekday = true;
+          String openTime;
+
+          if (tt.isFullday)
+            openTime = Utils.unCapitalize(getCarContext().getString(R.string.editor_time_allday));
+          else
+            openTime = tt.workingTimespan.toWideString();
+
+          builder.setTitle(openTime);
+
+          break;
+        }
+      }
+      // Show that place is closed today.
+      if (!containsCurrentWeekday)
+        builder.setTitle(getCarContext().getString(R.string.day_off_today));
+    }
+
+    return builder.build();
+  }
+
+  @NonNull
+  private String getPhoneNumber()
+  {
+    if (!mMapObject.hasMetadata())
+      return "";
+
+    final String phones = mMapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER);
+    return phones.split(";", 1)[0];
+  }
+
+  private void createPaneActions(@NonNull Pane.Builder builder)
+  {
+    final String phoneNumber = getPhoneNumber();
+    if (!phoneNumber.isEmpty())
+    {
+      final Action.Builder openDialBuilder = new Action.Builder();
+      openDialBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone)).build());
+      openDialBuilder.setOnClickListener(() -> getCarContext().startCarApp(new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phoneNumber))));
+      builder.addAction(openDialBuilder.build());
+    }
+
+    final Action.Builder startRouteBuilder = new Action.Builder();
+    startRouteBuilder.setBackgroundColor(CarColor.GREEN);
+
+    if (mRoutingController.isNavigating())
+    {
+      startRouteBuilder.setFlags(Action.FLAG_PRIMARY);
+      startRouteBuilder.setTitle(getCarContext().getString(R.string.placepage_add_stop));
+      startRouteBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_route_via)).build());
+      // TODO: implement with navigation screen
+      startRouteBuilder.setOnClickListener(() -> {
+      });
+    }
+    else if (mRoutingController.isBuilt())
+    {
+      startRouteBuilder.setFlags(Action.FLAG_DEFAULT);
+      startRouteBuilder.setTitle(getCarContext().getString(R.string.p2p_start));
+      startRouteBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_follow_and_rotate)).build());
+      startRouteBuilder.setOnClickListener(() -> {
+        mRoutingController.start();
+        getScreenManager().push(new NavigationScreen(getCarContext(), getSurfaceRenderer()));
+      });
+    }
+    else
+    {
+      startRouteBuilder.setFlags(Action.FLAG_PRIMARY);
+      startRouteBuilder.setTitle(getCarContext().getString(R.string.p2p_to_here));
+      startRouteBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_route_to)).build());
+      startRouteBuilder.setOnClickListener(() -> {
+        mRoutingController.setRouterType(Framework.ROUTER_TYPE_VEHICLE);
+        mRoutingController.prepare(LocationHelper.INSTANCE.getMyPosition(), mMapObject);
+        Framework.nativeDeactivatePopup();
+      });
+    }
+    builder.addAction(startRouteBuilder.build());
+  }
+
+  @NonNull
+  private Action createBookmarkAction()
+  {
+    final Action.Builder builder = new Action.Builder();
+    final CarIcon.Builder iconBuilder = new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_bookmarks));
+    if (mMapObject.getMapObjectType() == MapObject.BOOKMARK)
+      iconBuilder.setTint(CarColor.YELLOW);
+    builder.setIcon(iconBuilder.build());
+    builder.setOnClickListener(() -> {
+      if (MapObject.isOfType(MapObject.BOOKMARK, mMapObject))
+        Framework.nativeDeleteBookmarkFromMapObject();
+      else
+        BookmarkManager.INSTANCE.addNewBookmark(mMapObject.getLat(), mMapObject.getLon());
+    });
+    return builder.build();
+  }
+
+  @Override
+  public void onBuiltRoute()
+  {
+    invalidate();
+  }
+
+  @Override
+  public void onPlanningStarted()
+  {
+    invalidate();
+  }
+
+  @Override
+  public void onPlanningCancelled()
+  {
+    invalidate();
+  }
+
+  @Override
+  public void showRoutePlan(boolean show, @Nullable Runnable completionListener)
+  {
+    if (completionListener != null)
+      completionListener.run();
+  }
+
+  @Override
+  public void onShowDisclaimer()
+  {
+    // TODO: show disclaimer screen or not?
+    Config.acceptRoutingDisclaimer();
+    mRoutingController.prepare();
+  }
+
+  @Override
+  public void onCreate(@NonNull LifecycleOwner owner)
+  {
+    mRoutingController.attach(this);
+    if (mRoutingController.isPlanning() && mRoutingController.getLastRouterType() != Framework.ROUTER_TYPE_VEHICLE)
+    {
+      mRoutingController.setRouterType(Framework.ROUTER_TYPE_VEHICLE);
+      mRoutingController.rebuildLastRoute();
+    }
+  }
+
+  @Override
+  public void onDestroy(@NonNull LifecycleOwner owner)
+  {
+    mRoutingController.detach();
+  }
+
+  @Override
+  public void onBackPressed()
+  {
+    if (!mRoutingController.isNavigating())
+      mRoutingController.cancel();
+    Framework.nativeDeactivatePopup();
+  }
+
+  /**
+   * A builder of {@link PlaceScreen}.
+   */
+  public static final class Builder
+  {
+    @NonNull
+    private final CarContext mCarContext;
+    @NonNull
+    private final SurfaceRenderer mSurfaceRenderer;
+    @Nullable
+    private MapObject mMapObject;
+
+    public Builder(@NonNull final CarContext carContext, @NonNull final SurfaceRenderer surfaceRenderer)
+    {
+      mCarContext = carContext;
+      mSurfaceRenderer = surfaceRenderer;
+    }
+
+    public Builder setMapObject(@NonNull MapObject mapObject)
+    {
+      mMapObject = mapObject;
+      return this;
+    }
+
+    @NonNull
+    public PlaceScreen build()
+    {
+      if (mMapObject == null)
+        throw new IllegalStateException("MapObject must be set");
+      return new PlaceScreen(this);
+    }
+  }
+}
diff --git a/android/src/app/organicmaps/car/screens/hacks/PopToRootHack.java b/android/src/app/organicmaps/car/screens/hacks/PopToRootHack.java
new file mode 100644
index 0000000000..4c391aeb5b
--- /dev/null
+++ b/android/src/app/organicmaps/car/screens/hacks/PopToRootHack.java
@@ -0,0 +1,74 @@
+package app.organicmaps.car.screens.hacks;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.car.app.CarContext;
+import androidx.car.app.model.Template;
+import androidx.car.app.navigation.model.RoutePreviewNavigationTemplate;
+import androidx.lifecycle.LifecycleOwner;
+
+import app.organicmaps.car.screens.base.BaseScreen;
+
+public final class PopToRootHack extends BaseScreen
+{
+  private static final Handler mHandler = new Handler(Looper.getMainLooper());
+  private static final RoutePreviewNavigationTemplate mTemplate = new RoutePreviewNavigationTemplate.Builder().setLoading(true).build();
+
+  private final BaseScreen mScreenToPush;
+
+  private PopToRootHack(@NonNull Builder builder)
+  {
+    super(builder.mCarContext);
+    mScreenToPush = builder.mScreenToPush;
+  }
+
+  @NonNull
+  @Override
+  public Template onGetTemplate()
+  {
+    return mTemplate;
+  }
+
+  @Override
+  public void onStart(@NonNull LifecycleOwner owner)
+  {
+    mHandler.post(() -> {
+      getScreenManager().popToRoot();
+      mHandler.post(() -> getScreenManager().push(mScreenToPush));
+    });
+  }
+
+  /**
+   * A builder of {@link PopToRootHack}.
+   */
+  public static final class Builder
+  {
+    @NonNull
+    private final CarContext mCarContext;
+    @Nullable
+    private BaseScreen mScreenToPush;
+
+    public Builder(@NonNull final CarContext carContext)
+    {
+      mCarContext = carContext;
+    }
+
+    @NonNull
+    public Builder setScreenToPush(@NonNull BaseScreen screenToPush)
+    {
+      mScreenToPush = screenToPush;
+      return this;
+    }
+
+    @NonNull
+    public PopToRootHack build()
+    {
+      if (mScreenToPush == null)
+        throw new IllegalStateException("You must specify Screen that will be pushed to the ScreenManager after the popToRoot() action");
+      return new PopToRootHack(this);
+    }
+  }
+}
diff --git a/android/src/app/organicmaps/car/screens/search/SearchOnMapScreen.java b/android/src/app/organicmaps/car/screens/search/SearchOnMapScreen.java
index 7c205096e8..f83c1a7145 100644
--- a/android/src/app/organicmaps/car/screens/search/SearchOnMapScreen.java
+++ b/android/src/app/organicmaps/car/screens/search/SearchOnMapScreen.java
@@ -8,10 +8,10 @@ import androidx.car.app.model.Action;
 import androidx.car.app.model.CarIcon;
 import androidx.car.app.model.CarLocation;
 import androidx.car.app.model.Header;
+import androidx.car.app.model.Item;
 import androidx.car.app.model.ItemList;
 import androidx.car.app.model.Metadata;
 import androidx.car.app.model.Place;
-import androidx.car.app.model.PlaceMarker;
 import androidx.car.app.model.Row;
 import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.PlaceListNavigationTemplate;
@@ -21,21 +21,24 @@ import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
-import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.search.NativeSearchListener;
 import app.organicmaps.search.SearchEngine;
-import app.organicmaps.search.SearchRecents;
 import app.organicmaps.search.SearchResult;
+import app.organicmaps.util.log.Logger;
 
-public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchListener
+import java.util.List;
+
+// TODO: finish implementation
+public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchListener, ItemList.OnItemVisibilityChangedListener
 {
-  private final int MAX_RESULTS_SIZE;
+  private final static String TAG = SearchOnMapScreen.class.getSimpleName();
 
-  @NonNull
-  private final String mQuery;
+  private final int MAX_RESULTS_SIZE;
   private final boolean mIsCategory;
+  private final String mQuery;
 
   @Nullable
   private ItemList mResults = null;
@@ -43,11 +46,10 @@ public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchList
   private SearchOnMapScreen(@NonNull Builder builder)
   {
     super(builder.mCarContext, builder.mSurfaceRenderer);
-    final ConstraintManager constraintManager = getCarContext().getCarService(ConstraintManager.class);
-    MAX_RESULTS_SIZE = constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST);
-
-    mQuery = builder.mQuery;
     mIsCategory = builder.mIsCategory;
+    mQuery = builder.mQuery;
+    final ConstraintManager constraintManager = getCarContext().getCarService(ConstraintManager.class);
+    MAX_RESULTS_SIZE = constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST);
   }
 
   @NonNull
@@ -72,14 +74,36 @@ public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchList
 
     final ItemList.Builder builder = new ItemList.Builder();
     builder.setNoItemsMessage(getCarContext().getString(R.string.search_not_found));
+    builder.setOnItemsVisibilityChangedListener(this);
     final int resultsSize = Math.min(results.length, MAX_RESULTS_SIZE);
     for (int i = 0; i < resultsSize; i++)
       builder.addItem(createResultItem(results[i], i));
     mResults = builder.build();
-
     invalidate();
   }
 
+  @Override
+  public void onItemVisibilityChanged(int startIndex, int endIndex)
+  {
+    if (mResults == null)
+      return;
+
+    final List<Item> items = mResults.getItems().subList(startIndex, endIndex);
+    final double[] coordinates = new double[items.size() * 2];
+    for (int i = 0; i < items.size(); ++i)
+    {
+      final Metadata metadata = ((Row) items.get(i)).getMetadata();
+
+      assert metadata != null;
+      assert metadata.getPlace() != null;
+
+      final CarLocation location = metadata.getPlace().getLocation();
+      coordinates[2 * i] = location.getLatitude();
+      coordinates[2 * i + 1] = location.getLongitude();
+    }
+    // Framework.nativeShowPoints(coordinates);
+  }
+
   @NonNull
   private Row createResultItem(@NonNull SearchResult result, int resultIndex)
   {
@@ -87,14 +111,13 @@ public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchList
     builder.setBrowsable(true);
     if (result.type == SearchResult.TYPE_RESULT)
     {
-      final Metadata metadata = new Metadata.Builder().setPlace(new Place.Builder(CarLocation.create(result.lat, result.lon)).setMarker(new PlaceMarker.Builder().setLabel("" + (resultIndex + 1)).build()).build()).build();
+      final Metadata metadata = new Metadata.Builder().setPlace(new Place.Builder(CarLocation.create(result.lat, result.lon)).build()).build();
       final String title = result.getTitle(getCarContext());
       builder.setTitle(title);
       builder.addText(result.getFormattedDescription(getCarContext()));
       builder.addText(SearchUiHelpers.getOpeningHoursAndDistanceText(getCarContext(), result));
       builder.setMetadata(metadata);
       builder.setOnClickListener(() -> {
-        SearchRecents.add(title, getCarContext());
         SearchEngine.INSTANCE.cancel();
         SearchEngine.INSTANCE.showResult(resultIndex);
         getScreenManager().popToRoot();
@@ -112,26 +135,39 @@ public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchList
   @Override
   public void onStart(@NonNull LifecycleOwner owner)
   {
+    Logger.d(TAG);
     SearchEngine.INSTANCE.addListener(this);
   }
 
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
+    Logger.d(TAG);
     SearchEngine.INSTANCE.cancel();
-
     final MapObject location = LocationHelper.INSTANCE.getMyPosition();
-    final boolean hasLocation = location != null;
-    final double lat = hasLocation ? location.getLat() : 0;
-    final double lon = hasLocation ? location.getLon() : 0;
-
-    SearchEngine.INSTANCE.searchInteractive(getCarContext(), mQuery, mIsCategory, System.nanoTime(), true /* isMapAndTable */, hasLocation, lat, lon);
+    if (location != null)
+      SearchEngine.INSTANCE.searchInteractive(
+          getCarContext(), mQuery, mIsCategory,
+          System.nanoTime(), true /* isMapAndTable */, true /* hasLocation */,
+          location.getLat(), location.getLon());
+    else
+      SearchEngine.INSTANCE.searchInteractive(
+          getCarContext(), mQuery, mIsCategory,
+          System.nanoTime(), true /* isMapAndTable */);
+    SearchEngine.INSTANCE.setQuery(mQuery);
   }
 
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
+    Logger.d(TAG);
     SearchEngine.INSTANCE.removeListener(this);
+  }
+
+  @Override
+  public void onDestroy(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
     SearchEngine.INSTANCE.cancel();
   }
 
@@ -149,14 +185,11 @@ public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchList
    */
   public static final class Builder
   {
-    @NonNull
     private final CarContext mCarContext;
-    @NonNull
     private final SurfaceRenderer mSurfaceRenderer;
 
-    @NonNull
-    private String mQuery = "";
     private boolean mIsCategory;
+    private String mQuery;
 
     public Builder(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
     {
@@ -181,7 +214,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchList
     @NonNull
     public SearchOnMapScreen build()
     {
-      if (mQuery.isEmpty())
+      if (mQuery == null)
         throw new IllegalStateException("Search query is empty");
       return new SearchOnMapScreen(this);
     }
diff --git a/android/src/app/organicmaps/car/screens/search/SearchScreen.java b/android/src/app/organicmaps/car/screens/search/SearchScreen.java
index a7d7855df4..3398341d15 100644
--- a/android/src/app/organicmaps/car/screens/search/SearchScreen.java
+++ b/android/src/app/organicmaps/car/screens/search/SearchScreen.java
@@ -1,7 +1,6 @@
 package app.organicmaps.car.screens.search;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.car.app.CarContext;
 import androidx.car.app.constraints.ConstraintManager;
 import androidx.car.app.model.Action;
@@ -23,16 +22,16 @@ import app.organicmaps.search.NativeSearchListener;
 import app.organicmaps.search.SearchEngine;
 import app.organicmaps.search.SearchRecents;
 import app.organicmaps.search.SearchResult;
+import app.organicmaps.util.log.Logger;
 
 public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, NativeSearchListener
 {
+  private static final String TAG = SearchScreen.class.getSimpleName();
+
   private final int MAX_RESULTS_SIZE;
-
-  @NonNull
+  private ItemList mResults;
   private String mQuery = "";
-
-  @Nullable
-  private ItemList mResults = null;
+  private boolean mIsCategory;
 
   private SearchScreen(@NonNull Builder builder)
   {
@@ -40,6 +39,7 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
     final ConstraintManager constraintManager = getCarContext().getCarService(ConstraintManager.class);
     MAX_RESULTS_SIZE = constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST);
 
+    mIsCategory = builder.mIsCategory;
     onSearchSubmitted(builder.mQuery);
   }
 
@@ -47,7 +47,7 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
   @Override
   public Template onGetTemplate()
   {
-    final SearchTemplate.Builder builder = new SearchTemplate.Builder(this);
+    SearchTemplate.Builder builder = new SearchTemplate.Builder(this);
     builder.setHeaderAction(Action.BACK);
     builder.setShowKeyboardByDefault(false);
     if (mQuery.isEmpty() && mResults == null)
@@ -55,12 +55,13 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
       if (!loadRecents())
         builder.setShowKeyboardByDefault(true);
     }
-    if (!mQuery.isEmpty() && mResults != null && !mResults.getItems().isEmpty())
+    if (!mQuery.isEmpty() && mResults != null)
       builder.setActionStrip(createActionStrip());
     if (mResults == null)
       builder.setLoading(true);
     else
       builder.setItemList(mResults);
+    Logger.d(TAG, mQuery);
     builder.setInitialSearchText(mQuery);
     builder.setSearchHint(getCarContext().getString(R.string.search));
     return builder.build();
@@ -69,44 +70,47 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
   @Override
   public void onSearchTextChanged(@NonNull String searchText)
   {
+    Logger.d(TAG, searchText);
     if (mQuery.equals(searchText))
       return;
+    if (!mQuery.isEmpty())
+      mIsCategory = false;
     mQuery = searchText;
-    mResults = null;
 
     SearchEngine.INSTANCE.cancel();
 
-    if (mQuery.isEmpty())
-    {
-      invalidate();
-      return;
-    }
-
     final MapObject location = LocationHelper.INSTANCE.getMyPosition();
-    final boolean hasLocation = location != null;
-    final double lat = hasLocation ? location.getLat() : 0;
-    final double lon = hasLocation ? location.getLon() : 0;
+    if (location != null)
+      SearchEngine.INSTANCE.search(getCarContext(), mQuery, mIsCategory, System.nanoTime(), true, location.getLat(), location.getLon());
+    else
+      SearchEngine.INSTANCE.search(getCarContext(), mQuery, mIsCategory, System.nanoTime(), false, 0, 0);
 
-    SearchEngine.INSTANCE.search(getCarContext(), mQuery, false, System.nanoTime(), hasLocation, lat, lon);
+    mResults = null;
     invalidate();
   }
 
   @Override
   public void onSearchSubmitted(@NonNull String searchText)
   {
+    Logger.d(TAG, searchText);
     onSearchTextChanged(searchText);
   }
 
   @Override
-  public void onStart(@NonNull LifecycleOwner owner)
+  public void onResume(@NonNull LifecycleOwner owner)
   {
     SearchEngine.INSTANCE.addListener(this);
   }
 
   @Override
-  public void onStop(@NonNull LifecycleOwner owner)
+  public void onPause(@NonNull LifecycleOwner owner)
   {
     SearchEngine.INSTANCE.removeListener(this);
+  }
+
+  @Override
+  public void onDestroy(@NonNull LifecycleOwner owner)
+  {
     SearchEngine.INSTANCE.cancel();
   }
 
@@ -128,6 +132,8 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
     final Row.Builder builder = new Row.Builder();
     if (result.type == SearchResult.TYPE_RESULT)
     {
+      if (result.description != null)
+        Logger.d(TAG, result.description.featureType);
       final String title = result.getTitle(getCarContext());
       builder.setTitle(title);
       builder.addText(result.getFormattedDescription(getCarContext()));
@@ -178,8 +184,9 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
   {
     final Action.Builder builder = new Action.Builder();
     builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_show_on_map)).build());
-    builder.setOnClickListener(() ->
-        getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setQuery(mQuery).build()));
+    // TODO: uncomment when implementation of {@link SearchOnMapScreen} will be finished
+    // builder.setOnClickListener(() ->
+    //     getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setQuery(mQuery).build()));
 
     return new ActionStrip.Builder().addAction(builder.build()).build();
   }
@@ -189,12 +196,10 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
    */
   public static final class Builder
   {
-    @NonNull
     private final CarContext mCarContext;
-    @NonNull
     private final SurfaceRenderer mSurfaceRenderer;
 
-    @NonNull
+    private boolean mIsCategory;
     private String mQuery = "";
 
     public Builder(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
@@ -203,9 +208,16 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
       mSurfaceRenderer = surfaceRenderer;
     }
 
-    @NonNull
+    public Builder setCategory(@NonNull String category)
+    {
+      mIsCategory = true;
+      mQuery = category;
+      return this;
+    }
+
     public Builder setQuery(@NonNull String query)
     {
+      mIsCategory = false;
       mQuery = query;
       return this;
     }
diff --git a/android/src/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java b/android/src/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
index c0c63f767a..aad45f3e63 100644
--- a/android/src/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
+++ b/android/src/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
@@ -14,7 +14,7 @@ import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.routing.RoutingOptions;
 import app.organicmaps.settings.RoadType;
diff --git a/android/src/app/organicmaps/car/screens/settings/HelpScreen.java b/android/src/app/organicmaps/car/screens/settings/HelpScreen.java
index 68c290c721..45b030b912 100644
--- a/android/src/app/organicmaps/car/screens/settings/HelpScreen.java
+++ b/android/src/app/organicmaps/car/screens/settings/HelpScreen.java
@@ -14,7 +14,7 @@ import app.organicmaps.BuildConfig;
 import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.util.DateUtils;
 
diff --git a/android/src/app/organicmaps/car/screens/settings/SettingsScreen.java b/android/src/app/organicmaps/car/screens/settings/SettingsScreen.java
index a09320962e..8f705011e8 100644
--- a/android/src/app/organicmaps/car/screens/settings/SettingsScreen.java
+++ b/android/src/app/organicmaps/car/screens/settings/SettingsScreen.java
@@ -15,7 +15,7 @@ import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
 import app.organicmaps.car.SurfaceRenderer;
-import app.organicmaps.car.util.UiHelpers;
+import app.organicmaps.car.UiHelpers;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.util.Config;
 
diff --git a/android/src/app/organicmaps/car/util/OnBackPressedCallback.java b/android/src/app/organicmaps/car/util/OnBackPressedCallback.java
new file mode 100644
index 0000000000..bbf5a5183c
--- /dev/null
+++ b/android/src/app/organicmaps/car/util/OnBackPressedCallback.java
@@ -0,0 +1,30 @@
+package app.organicmaps.car.util;
+
+import androidx.annotation.NonNull;
+import androidx.car.app.CarContext;
+import androidx.car.app.ScreenManager;
+
+public class OnBackPressedCallback extends androidx.activity.OnBackPressedCallback
+{
+  public interface Callback
+  {
+    void onBackPressed();
+  }
+
+  private final ScreenManager mScreenManager;
+  private final Callback mCallback;
+
+  public OnBackPressedCallback(@NonNull CarContext carContext, @NonNull Callback callback)
+  {
+    super(true);
+    mScreenManager = carContext.getCarService(ScreenManager.class);
+    mCallback = callback;
+  }
+
+  @Override
+  public void handleOnBackPressed()
+  {
+    mCallback.onBackPressed();
+    mScreenManager.pop();
+  }
+}
diff --git a/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java
index 3708921150..18045e86b9 100644
--- a/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -140,14 +140,15 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
 
     mTabs = root.findViewById(R.id.tabs);
     TextView tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
-    tabView.setText(getResources().getString(R.string.editor_time_from));
+    // TODO @yunik add translations
+    tabView.setText("From");
     final ColorStateList textColor = AppCompatResources.getColorStateList(requireContext(),
         ThemeUtils.isNightTheme(requireContext()) ? R.color.accent_color_selector_night
                                                   : R.color.accent_color_selector);
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
     tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
-    tabView.setText(getResources().getString(R.string.editor_time_to));
+    tabView.setText("To");
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
     mTabs.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener()
diff --git a/android/src/app/organicmaps/location/AndroidNativeProvider.java b/android/src/app/organicmaps/location/AndroidNativeProvider.java
index e9ae5e2b56..05c9ed8470 100644
--- a/android/src/app/organicmaps/location/AndroidNativeProvider.java
+++ b/android/src/app/organicmaps/location/AndroidNativeProvider.java
@@ -14,9 +14,11 @@ import androidx.core.location.LocationManagerCompat;
 import androidx.core.location.LocationRequestCompat;
 
 import app.organicmaps.MwmApplication;
+import app.organicmaps.util.LocationUtils;
 import app.organicmaps.util.log.Logger;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 class AndroidNativeProvider extends BaseLocationProvider
@@ -86,17 +88,21 @@ class AndroidNativeProvider extends BaseLocationProvider
         .setQuality(LocationRequestCompat.QUALITY_HIGH_ACCURACY)
         .build();
 
-    // API 31+ provides `fused` provider which aggregates `gps` and `network` and potentially other sensors as well.
-    // Unfortunately, certain LineageOS ROMs have broken `fused` provider that pretends to be enabled, but in
-    // reality it does absolutely nothing and doesn't return any location updates. For this reason, we try all
-    // (`fused`, `network`, `gps`) providers here, but prefer `fused` in LocationHelper.onLocationChanged().
-    //
-    // https://developer.android.com/reference/android/location/LocationManager#FUSED_PROVIDER
-    // https://issuetracker.google.com/issues/215186921#comment3
-    // https://github.com/organicmaps/organicmaps/issues/4158
-    //
-    mProviders.addAll(mLocationManager.getProviders(true));
-    mProviders.remove(LocationManager.PASSIVE_PROVIDER); // not really useful if other providers are enabled.
+    if (mLocationManager.isProviderEnabled(LocationUtils.FUSED_PROVIDER))
+    {
+      // The FUSED provider takes into account both GPS and NETWORK and potentially other sensors as well.
+      // https://issuetracker.google.com/issues/215186921#comment3
+      mProviders.add(LocationUtils.FUSED_PROVIDER);
+    }
+    else
+    {
+      if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER))
+        mProviders.add(LocationManager.GPS_PROVIDER);
+
+      if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER))
+        mProviders.add(LocationManager.NETWORK_PROVIDER);
+    }
+
     if (mProviders.isEmpty())
     {
       // Call this callback in the next event loop to allow LocationHelper::start() to finish.
diff --git a/android/src/app/organicmaps/maplayer/MapButtonsController.java b/android/src/app/organicmaps/maplayer/MapButtonsController.java
index d7ebb2b9ad..ca948cf4c5 100644
--- a/android/src/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/src/app/organicmaps/maplayer/MapButtonsController.java
@@ -13,10 +13,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.downloader.MapManager;
 import app.organicmaps.downloader.UpdateInfo;
@@ -25,7 +21,7 @@ import app.organicmaps.util.Config;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
+import app.organicmaps.widget.placepage.PlacePageController;
 import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.badge.BadgeUtils;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -52,28 +48,20 @@ public class MapButtonsController extends Fragment
   private float mContentWidth;
 
   private MapButtonClickListener mMapButtonClickListener;
-  private PlacePageViewModel mPlacePageViewModel;
-  private MapButtonsViewModel mMapButtonsViewModel;
-
-  private final Observer<Integer> mPlacePageDistanceToTopObserver = this::move;
-  private final Observer<Boolean> mButtonHiddenObserver = this::setButtonsHidden;
-  private final Observer<Integer> mMyPositionModeObserver = this::updateNavMyPositionButton;
-  private final Observer<Mode> mMapLayerModeObserver = this::toggleMapLayer;
-  private final Observer<SearchWheel.SearchOption> mSearchOptionObserver = this::onSearchOptionChange;
+  private View.OnClickListener mOnSearchCanceledListener;
+  private PlacePageController mPlacePageController;
+  private OnBottomButtonsHeightChangedListener mOnBottomButtonsHeightChangedListener;
 
+  private LayoutMode mLayoutMode;
+  private int mMyPositionMode;
 
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
-    final FragmentActivity activity = requireActivity();
-    mMapButtonClickListener = (MwmActivity) activity;
-    mPlacePageViewModel = new ViewModelProvider(activity).get(PlacePageViewModel.class);
-    mMapButtonsViewModel = new ViewModelProvider(activity).get(MapButtonsViewModel.class);
-    final LayoutMode layoutMode = mMapButtonsViewModel.getLayoutMode().getValue();
-    if (layoutMode == LayoutMode.navigation)
+    if (mLayoutMode == LayoutMode.navigation)
       mFrame = inflater.inflate(R.layout.map_buttons_layout_navigation, container, false);
-    else if (layoutMode == LayoutMode.planning)
+    else if (mLayoutMode == LayoutMode.planning)
       mFrame = inflater.inflate(R.layout.map_buttons_layout_planning, container, false);
     else
       mFrame = inflater.inflate(R.layout.map_buttons_layout_regular, container, false);
@@ -87,51 +75,44 @@ public class MapButtonsController extends Fragment
     {
       helpButton.setImageResource(R.drawable.logo);
       // Keep this button colorful in normal theme.
-      if (!ThemeUtils.isNightTheme(requireContext()))
+      if (!ThemeUtils.isNightTheme(getContext()))
         helpButton.getDrawable().setTintList(null);
     }
 
     final View zoomFrame = mFrame.findViewById(R.id.zoom_buttons_container);
     mFrame.findViewById(R.id.nav_zoom_in)
-          .setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomIn));
+          .setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.zoomIn));
     mFrame.findViewById(R.id.nav_zoom_out)
-          .setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomOut));
+          .setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.zoomOut));
     final View bookmarksButton = mFrame.findViewById(R.id.btn_bookmarks);
-    bookmarksButton.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.bookmarks));
+    bookmarksButton.setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.bookmarks));
     final View myPosition = mFrame.findViewById(R.id.my_position);
-    mNavMyPosition = new MyPositionButton(myPosition, (v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.myPosition));
+    mNavMyPosition = new MyPositionButton(myPosition, mMyPositionMode, (v) -> mMapButtonClickListener.onClick(MapButtons.myPosition));
 
     // Some buttons do not exist in navigation mode
     final FloatingActionButton layersButton = mFrame.findViewById(R.id.layers_button);
     if (layersButton != null)
     {
-      mToggleMapLayerController = new MapLayersController(
-          layersButton,
-          () -> mMapButtonClickListener.onMapButtonClick(MapButtons.toggleMapLayer),
-          requireActivity(),
-          mMapButtonsViewModel);
+      mToggleMapLayerController = new MapLayersController(layersButton,
+                                                          () -> mMapButtonClickListener.onClick(MapButtons.toggleMapLayer), requireActivity());
     }
     final View menuButton = mFrame.findViewById(R.id.menu_button);
     if (menuButton != null)
     {
-      menuButton.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.menu));
+      menuButton.setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.menu));
       // This hack is needed to show the badge on the initial startup. For some reason, updateMenuBadge does not work from onResume() there.
       menuButton.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
         @Override
-        public void onGlobalLayout()
-        {
+        public void onGlobalLayout() {
           updateMenuBadge();
           menuButton.getViewTreeObserver().removeOnGlobalLayoutListener(this);
         }
       });
     }
     if (helpButton != null)
-      helpButton.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.help));
+      helpButton.setOnClickListener((v) -> mMapButtonClickListener.onClick(MapButtons.help));
 
-    mSearchWheel = new SearchWheel(mFrame,
-                                   (v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.search),
-                                   (v) -> mMapButtonClickListener.onSearchCanceled(),
-                                   mMapButtonsViewModel);
+    mSearchWheel = new SearchWheel(mFrame, (v) -> mMapButtonClickListener.onClick(MapButtons.search), mOnSearchCanceledListener);
     final View searchButton = mFrame.findViewById(R.id.btn_search);
 
     // Used to get the maximum height the buttons will evolve in
@@ -154,9 +135,25 @@ public class MapButtonsController extends Fragment
       UiUtils.setViewInsetsPadding(view, windowInsets);
       return windowInsets;
     });
+
     return mFrame;
   }
 
+  public LayoutMode getLayoutMode()
+  {
+    return mLayoutMode;
+  }
+
+  public void init(LayoutMode layoutMode, int myPositionMode, MapButtonClickListener mapButtonClickListener, @NonNull View.OnClickListener onSearchCanceledListener, PlacePageController placePageController, OnBottomButtonsHeightChangedListener onBottomButtonsHeightChangedListener)
+  {
+    mLayoutMode = layoutMode;
+    mMyPositionMode = myPositionMode;
+    mMapButtonClickListener = mapButtonClickListener;
+    mOnSearchCanceledListener = onSearchCanceledListener;
+    mPlacePageController = placePageController;
+    mOnBottomButtonsHeightChangedListener = onBottomButtonsHeightChangedListener;
+  }
+
   public void showButton(boolean show, MapButtonsController.MapButtons button)
   {
     // TODO(AB): Why do we need this check? Isn't it better to crash and fix the wrong logic ASAP?
@@ -212,12 +209,7 @@ public class MapButtonsController extends Fragment
 
   private boolean isBehindPlacePage(View v)
   {
-    if (mPlacePageViewModel == null)
-      return false;
-    final Integer placePageWidth = mPlacePageViewModel.getPlacePageWidth().getValue();
-    if (placePageWidth != null)
-      return !(mContentWidth / 2 > (placePageWidth.floatValue() / 2.0) + v.getWidth());
-    return true;
+    return !(mContentWidth / 2 > (mPlacePageController.getPlacePageWidth() / 2.0) + v.getWidth());
   }
 
   private boolean isMoving(View v)
@@ -267,7 +259,7 @@ public class MapButtonsController extends Fragment
     }
   }
 
-  private float getBottomButtonsHeight()
+  public float getBottomButtonsHeight()
   {
     if (mBottomButtonsFrame != null && mFrame != null && UiUtils.isVisible(mFrame))
       return mBottomButtonsFrame.getMeasuredHeight();
@@ -275,12 +267,16 @@ public class MapButtonsController extends Fragment
       return 0;
   }
 
-  public void setButtonsHidden(boolean buttonHidden)
+  public void showMapButtons(boolean show)
   {
-    UiUtils.showIf(!buttonHidden, mFrame);
-    if (!buttonHidden)
+    if (show)
+    {
+      UiUtils.show(mFrame);
       updateButtonsVisibility();
-    mMapButtonsViewModel.setBottomButtonsHeight(getBottomButtonsHeight());
+    }
+    else
+      UiUtils.hide(mFrame);
+    mOnBottomButtonsHeightChangedListener.OnBottomButtonsHeightChanged();
   }
 
   private boolean isInNavigationMode()
@@ -288,15 +284,10 @@ public class MapButtonsController extends Fragment
     return RoutingController.get().isPlanning() || RoutingController.get().isNavigating();
   }
 
-  public void toggleMapLayer(@Nullable Mode mode)
+  public void toggleMapLayer(@NonNull Mode mode)
   {
     if (mToggleMapLayerController != null)
-    {
-      if (mode == null)
-        mToggleMapLayerController.disableModes();
-      else
-        mToggleMapLayerController.enableMode(mode);
-    }
+      mToggleMapLayerController.toggleMode(mode);
   }
 
   public void updateNavMyPositionButton(int newMode)
@@ -310,18 +301,6 @@ public class MapButtonsController extends Fragment
     return (int) (translation + v.getTop());
   }
 
-  @Override
-  public void onStart()
-  {
-    super.onStart();
-    final FragmentActivity activity = requireActivity();
-    mPlacePageViewModel.getPlacePageDistanceToTop().observe(activity, mPlacePageDistanceToTopObserver);
-    mMapButtonsViewModel.getButtonsHidden().observe(activity, mButtonHiddenObserver);
-    mMapButtonsViewModel.getMyPositionMode().observe(activity, mMyPositionModeObserver);
-    mMapButtonsViewModel.getMapLayerMode().observe(activity, mMapLayerModeObserver);
-    mMapButtonsViewModel.getSearchOption().observe(activity, mSearchOptionObserver);
-  }
-
   public void onResume()
   {
     super.onResume();
@@ -329,21 +308,19 @@ public class MapButtonsController extends Fragment
     updateMenuBadge();
   }
 
-  @Override
-  public void onStop()
+  public void resetSearch()
   {
-    super.onStop();
-    mPlacePageViewModel.getPlacePageDistanceToTop().removeObserver(mPlacePageDistanceToTopObserver);
-    mMapButtonsViewModel.getButtonsHidden().removeObserver(mButtonHiddenObserver);
-    mMapButtonsViewModel.getMyPositionMode().removeObserver(mMyPositionModeObserver);
-    mMapButtonsViewModel.getMapLayerMode().removeObserver(mMapLayerModeObserver);
-    mMapButtonsViewModel.getSearchOption().removeObserver(mSearchOptionObserver);
+    mSearchWheel.reset();
   }
 
-  public void onSearchOptionChange(@Nullable SearchWheel.SearchOption searchOption)
+  public void saveNavSearchState(@NonNull Bundle outState)
   {
-    if (searchOption == null)
-      mSearchWheel.reset();
+    mSearchWheel.saveState(outState);
+  }
+
+  public void restoreNavSearchState(@NonNull Bundle savedInstanceState)
+  {
+    mSearchWheel.restoreState(savedInstanceState);
   }
 
   public enum LayoutMode
@@ -368,9 +345,12 @@ public class MapButtonsController extends Fragment
 
   public interface MapButtonClickListener
   {
-    void onMapButtonClick(MapButtons button);
+    void onClick(MapButtons button);
+  }
 
-    void onSearchCanceled();
+  public interface OnBottomButtonsHeightChangedListener
+  {
+    void OnBottomButtonsHeightChanged();
   }
 
   private class ContentViewLayoutChangeListener implements View.OnLayoutChangeListener
@@ -389,7 +369,7 @@ public class MapButtonsController extends Fragment
     {
       mContentHeight = bottom - top;
       mContentWidth = right - left;
-      mMapButtonsViewModel.setBottomButtonsHeight(getBottomButtonsHeight());
+      mOnBottomButtonsHeightChangedListener.OnBottomButtonsHeightChanged();
       mContentView.removeOnLayoutChangeListener(this);
     }
   }
diff --git a/android/src/app/organicmaps/maplayer/MapButtonsViewModel.java b/android/src/app/organicmaps/maplayer/MapButtonsViewModel.java
deleted file mode 100644
index eb50db7202..0000000000
--- a/android/src/app/organicmaps/maplayer/MapButtonsViewModel.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package app.organicmaps.maplayer;
-
-import androidx.annotation.Nullable;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class MapButtonsViewModel extends ViewModel
-{
-  private final MutableLiveData<Boolean> mButtonsHidden = new MutableLiveData<>(false);
-  private final MutableLiveData<Float> mBottomButtonsHeight = new MutableLiveData<>(0f);
-  private final MutableLiveData<MapButtonsController.LayoutMode> mLayoutMode = new MutableLiveData<>(MapButtonsController.LayoutMode.regular);
-  private final MutableLiveData<Integer> mMyPositionMode = new MutableLiveData<>();
-  private final MutableLiveData<Mode> mMapLayerMode = new MutableLiveData<>();
-  private final MutableLiveData<SearchWheel.SearchOption> mSearchOption = new MutableLiveData<>();
-
-  public MutableLiveData<Boolean> getButtonsHidden()
-  {
-    return mButtonsHidden;
-  }
-
-  public void setButtonsHidden(boolean buttonsHidden)
-  {
-    mButtonsHidden.setValue(buttonsHidden);
-  }
-
-  public MutableLiveData<Float> getBottomButtonsHeight()
-  {
-    return mBottomButtonsHeight;
-  }
-
-  public void setBottomButtonsHeight(float height)
-  {
-    mBottomButtonsHeight.setValue(height);
-  }
-
-  public MutableLiveData<MapButtonsController.LayoutMode> getLayoutMode()
-  {
-    return mLayoutMode;
-  }
-
-  public void setLayoutMode(MapButtonsController.LayoutMode layoutMode)
-  {
-    mLayoutMode.setValue(layoutMode);
-  }
-
-  public MutableLiveData<Integer> getMyPositionMode()
-  {
-    return mMyPositionMode;
-  }
-
-  public void setMyPositionMode(int mode)
-  {
-    mMyPositionMode.setValue(mode);
-  }
-
-  public MutableLiveData<Mode> getMapLayerMode()
-  {
-    return mMapLayerMode;
-  }
-
-  public void setMapLayerMode(Mode mode)
-  {
-    mMapLayerMode.setValue(mode);
-  }
-
-  public MutableLiveData<SearchWheel.SearchOption> getSearchOption()
-  {
-    return mSearchOption;
-  }
-
-  public void setSearchOption(@Nullable SearchWheel.SearchOption searchOption)
-  {
-    mSearchOption.setValue(searchOption);
-  }
-}
diff --git a/android/src/app/organicmaps/maplayer/MapLayersController.java b/android/src/app/organicmaps/maplayer/MapLayersController.java
index 4fd0a4dcb7..4b1cca8595 100644
--- a/android/src/app/organicmaps/maplayer/MapLayersController.java
+++ b/android/src/app/organicmaps/maplayer/MapLayersController.java
@@ -23,19 +23,21 @@ public class MapLayersController
   OnShowMenuListener mOnShowMenuListener;
   @NonNull
   private Mode mCurrentLayer;
-  private final MapButtonsViewModel mMapButtonsViewModel;
 
-  public MapLayersController(@NonNull ImageButton layersButton, @NonNull OnShowMenuListener onShowMenuListener, @NonNull Activity activity, MapButtonsViewModel mapButtonsViewModel)
+  public MapLayersController(@NonNull ImageButton layersButton, @NonNull OnShowMenuListener onShowMenuListener, @NonNull Activity activity)
   {
     mActivity = activity;
-    mMapButtonsViewModel = mapButtonsViewModel;
     mLayersButton = layersButton;
     mLayersButton.setOnClickListener(view -> onLayersButtonClick());
     mOnShowMenuListener = onShowMenuListener;
     mLayers = LayersUtils.getAvailableLayers();
     mCurrentLayer = getCurrentLayer();
-    // View model only expects a layer if it is active
-    mMapButtonsViewModel.setMapLayerMode(mCurrentLayer.isEnabled(activity) ? mCurrentLayer : null);
+    initMode();
+  }
+
+  private void initMode()
+  {
+    setEnabled(mCurrentLayer.isEnabled(mActivity));
     showButton(true);
   }
 
@@ -74,21 +76,16 @@ public class MapLayersController
   private void onLayersButtonClick()
   {
     if (mCurrentLayer.isEnabled(mActivity))
-      mMapButtonsViewModel.setMapLayerMode(null);
+      setEnabled(false);
     else
       mOnShowMenuListener.onShow();
   }
 
-  public void disableModes()
-  {
-    setEnabled(false);
-  }
-
-  public void enableMode(@NonNull Mode mode)
+  public void toggleMode(@NonNull Mode mode)
   {
     setCurrentLayer(mode);
     showButton(true);
-    setEnabled(true);
+    setEnabled(!mode.isEnabled(mActivity));
   }
 
   public void showButton(boolean show)
diff --git a/android/src/app/organicmaps/maplayer/SearchWheel.java b/android/src/app/organicmaps/maplayer/SearchWheel.java
index debd29e910..6e952bd5d7 100644
--- a/android/src/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/src/app/organicmaps/maplayer/SearchWheel.java
@@ -26,6 +26,7 @@ import app.organicmaps.util.concurrency.UiThread;
 
 public class SearchWheel implements View.OnClickListener
 {
+  private static final String EXTRA_CURRENT_OPTION = "extra_current_option";
   private final View mFrame;
 
   private View mSearchLayout;
@@ -34,11 +35,12 @@ public class SearchWheel implements View.OnClickListener
   private final View mTouchInterceptor;
 
   private boolean mIsExpanded;
+  @Nullable
+  private SearchOption mCurrentOption;
   @NonNull
   private final View.OnClickListener mOnSearchPressedListener;
   @NonNull
   private final View.OnClickListener mOnSearchCanceledListener;
-  private MapButtonsViewModel mMapButtonsViewModel;
 
   private static final long CLOSE_DELAY_MILLIS = 5000L;
   private final Runnable mCloseRunnable = new Runnable() {
@@ -53,7 +55,7 @@ public class SearchWheel implements View.OnClickListener
     }
   };
 
-  public enum SearchOption
+  private enum SearchOption
   {
     FUEL(R.id.search_fuel, R.drawable.ic_routing_fuel_off, R.string.fuel),
     PARKING(R.id.search_parking, R.drawable.ic_routing_parking_off, R.string.parking),
@@ -101,11 +103,9 @@ public class SearchWheel implements View.OnClickListener
     }
   }
 
-  public SearchWheel(View frame, @NonNull View.OnClickListener onSearchPressedListener,
-                     @NonNull View.OnClickListener onSearchCanceledListener, MapButtonsViewModel mapButtonsViewModel)
+  public SearchWheel(View frame, @NonNull View.OnClickListener onSearchPressedListener, @NonNull View.OnClickListener onSearchCanceledListener)
   {
     mFrame = frame;
-    mMapButtonsViewModel = mapButtonsViewModel;
     mOnSearchPressedListener = onSearchPressedListener;
     mOnSearchCanceledListener = onSearchCanceledListener;
     mTouchInterceptor = mFrame.findViewById(R.id.touch_interceptor);
@@ -151,15 +151,26 @@ public class SearchWheel implements View.OnClickListener
       UiUtils.showIf(show && mIsExpanded, mSearchLayout);
   }
 
+  public void saveState(@NonNull Bundle outState)
+  {
+    outState.putSerializable(EXTRA_CURRENT_OPTION, mCurrentOption);
+  }
+
+  public void restoreState(@NonNull Bundle savedState)
+  {
+    mCurrentOption = Utils.getSerializable(savedState, EXTRA_CURRENT_OPTION, SearchOption.class);
+  }
+
   public void reset()
   {
     mIsExpanded = false;
+    mCurrentOption = null;
     resetSearchButtonImage();
   }
 
   public void onResume()
   {
-    if (mMapButtonsViewModel.getSearchOption().getValue() != null)
+    if (mCurrentOption != null)
     {
       refreshSearchButtonImage();
       return;
@@ -172,6 +183,7 @@ public class SearchWheel implements View.OnClickListener
       return;
     }
 
+    mCurrentOption = SearchOption.fromSearchQuery(query, mFrame.getContext());
     refreshSearchButtonImage();
   }
 
@@ -232,11 +244,10 @@ public class SearchWheel implements View.OnClickListener
 
   private void refreshSearchButtonImage()
   {
-    final SearchOption searchOption = mMapButtonsViewModel.getSearchOption().getValue();
     mSearchButton.setImageDrawable(Graphics.tint(mSearchButton.getContext(),
-                                                 searchOption == null ?
+                                                 mCurrentOption == null ?
                                                  R.drawable.ic_routing_search_off :
-                                                 searchOption.mDrawableOff,
+                                                 mCurrentOption.mDrawableOff,
                                                  R.attr.colorAccent));
   }
 
@@ -267,7 +278,7 @@ public class SearchWheel implements View.OnClickListener
       return;
     }
 
-    if (mMapButtonsViewModel.getSearchOption().getValue() != null || !TextUtils.isEmpty(SearchEngine.INSTANCE.getQuery()))
+    if (mCurrentOption != null || !TextUtils.isEmpty(SearchEngine.INSTANCE.getQuery()))
     {
       mOnSearchCanceledListener.onClick(v);
       refreshSearchVisibility();
@@ -292,7 +303,7 @@ public class SearchWheel implements View.OnClickListener
 
   private void startSearch(SearchOption searchOption)
   {
-    mMapButtonsViewModel.setSearchOption(searchOption);
+    mCurrentOption = searchOption;
     final String query = mFrame.getContext().getString(searchOption.mQueryId);
     // Category request from navigation search wheel.
     SearchEngine.INSTANCE.searchInteractive(mFrame.getContext(), query, true, System.nanoTime(), false);
diff --git a/android/src/app/organicmaps/maplayer/ToggleMapLayerFragment.java b/android/src/app/organicmaps/maplayer/ToggleMapLayerFragment.java
index 82181db600..205f4c769c 100644
--- a/android/src/app/organicmaps/maplayer/ToggleMapLayerFragment.java
+++ b/android/src/app/organicmaps/maplayer/ToggleMapLayerFragment.java
@@ -9,23 +9,24 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import app.organicmaps.R;
 import app.organicmaps.maplayer.isolines.IsolinesManager;
+import app.organicmaps.widget.recycler.SpanningLinearLayoutManager;
 import app.organicmaps.util.SharedPropertiesUtils;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.recycler.SpanningLinearLayoutManager;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class ToggleMapLayerFragment extends Fragment
 {
+  @Nullable
+  private LayerItemClickListener mLayerItemClickListener;
   @Nullable
   private LayersAdapter mAdapter;
-  private MapButtonsViewModel mMapButtonsViewModel;
 
   @Nullable
   @Override
@@ -33,7 +34,8 @@ public class ToggleMapLayerFragment extends Fragment
   {
     View mRoot = inflater.inflate(R.layout.fragment_toggle_map_layer, container, false);
 
-    mMapButtonsViewModel = new ViewModelProvider(requireActivity()).get(MapButtonsViewModel.class);
+    if (requireActivity() instanceof LayerItemClickListener)
+      mLayerItemClickListener = ((LayerItemClickListener) requireActivity());
 
     initRecycler(mRoot);
     return mRoot;
@@ -70,6 +72,12 @@ public class ToggleMapLayerFragment extends Fragment
     mAdapter.notifyDataSetChanged();
     if (IsolinesManager.from(context).shouldShowNotification())
       Utils.showSnackbar(context, v.getRootView(), R.string.isolines_toast_zooms_1_10);
-    mMapButtonsViewModel.setMapLayerMode(mode);
+    if (mLayerItemClickListener != null)
+      mLayerItemClickListener.onLayerItemClick(mode);
+  }
+
+  public interface LayerItemClickListener
+  {
+    void onLayerItemClick(@NonNull Mode mode);
   }
 }
diff --git a/android/src/app/organicmaps/routing/NavigationController.java b/android/src/app/organicmaps/routing/NavigationController.java
index e7a35358f9..88b08fc09f 100644
--- a/android/src/app/organicmaps/routing/NavigationController.java
+++ b/android/src/app/organicmaps/routing/NavigationController.java
@@ -21,16 +21,17 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import app.organicmaps.Framework;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.MediaPlayerWrapper;
+import app.organicmaps.maplayer.MapButtonsController;
 import app.organicmaps.maplayer.traffic.TrafficManager;
 import app.organicmaps.sound.TtsPlayer;
+import app.organicmaps.widget.menu.NavMenu;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.menu.NavMenu;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
 import java.util.Arrays;
 
@@ -58,7 +59,10 @@ public class NavigationController implements Application.ActivityLifecycleCallba
   private final RecyclerView mLanes;
   @NonNull
   private final LanesAdapter mLanesAdapter;
-  
+
+  @NonNull
+  private final MapButtonsController mMapButtonsController;
+
   @NonNull
   private final MediaPlayer.OnCompletionListener mSpeedCamSignalCompletionListener;
 
@@ -102,12 +106,13 @@ public class NavigationController implements Application.ActivityLifecycleCallba
     mLanes.setNestedScrollingEnabled(false);
   }
 
-  public NavigationController(AppCompatActivity activity, View.OnClickListener onSettingsClickListener,
-                              NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
+  public NavigationController(AppCompatActivity activity, @NonNull MapButtonsController mapButtonsController,
+                              View.OnClickListener onSettingsClickListener, NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
   {
     mFrame = activity.findViewById(R.id.navigation_frame);
     mNavMenu = new NavMenu(activity, this, onMenuSizeChangedListener);
     mOnSettingsClickListener = onSettingsClickListener;
+    mMapButtonsController = mapButtonsController;
 
     // Top frame
     View topFrame = mFrame.findViewById(R.id.nav_top_frame);
@@ -149,6 +154,8 @@ public class NavigationController implements Application.ActivityLifecycleCallba
 
   public void stop(MwmActivity parent)
   {
+    mMapButtonsController.resetSearch();
+
     if (mBound)
     {
       parent.unbindService(mServiceConnection);
@@ -323,6 +330,7 @@ public class NavigationController implements Application.ActivityLifecycleCallba
   public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState)
   {
     outState.putBoolean(STATE_BOUND, mBound);
+    mMapButtonsController.saveNavSearchState(outState);
   }
 
   public void onRestoreState(@NonNull Bundle savedInstanceState, @NonNull MwmActivity parent)
@@ -330,6 +338,7 @@ public class NavigationController implements Application.ActivityLifecycleCallba
     mBound = savedInstanceState.getBoolean(STATE_BOUND);
     if (mBound)
       start(parent);
+    mMapButtonsController.restoreNavSearchState(savedInstanceState);
   }
 
   @Override
diff --git a/android/src/app/organicmaps/routing/RoutingController.java b/android/src/app/organicmaps/routing/RoutingController.java
index dc2af0485a..7ef16dfbd4 100644
--- a/android/src/app/organicmaps/routing/RoutingController.java
+++ b/android/src/app/organicmaps/routing/RoutingController.java
@@ -1,17 +1,23 @@
 package app.organicmaps.routing;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.DimenRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.util.Pair;
+import androidx.fragment.app.FragmentActivity;
 
 import app.organicmaps.Framework;
+import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.Initializable;
 import app.organicmaps.bookmarks.data.FeatureId;
@@ -23,6 +29,7 @@ import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.concurrency.UiThread;
 import app.organicmaps.util.log.Logger;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
@@ -67,7 +74,7 @@ public class RoutingController implements Initializable<Void>
     default boolean isSubwayEnabled() { return false; }
     default void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps) {}
     default void onDrivingOptionsBuildError() {}
-    default void onShowDisclaimer(@Nullable MapObject startPoint, @Nullable MapObject endPoint) {}
+    default void onShowDisclaimer() {}
     default void onSuggestRebuildRoute() {}
 
     /**
@@ -353,6 +360,11 @@ public class RoutingController implements Initializable<Void>
     prepare(getStartPoint(), getEndPoint(), false);
   }
 
+  public void prepare()
+  {
+    prepare(getStartPoint(), getEndPoint());
+  }
+
   public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint)
   {
     prepare(startPoint, endPoint, false);
@@ -365,12 +377,12 @@ public class RoutingController implements Initializable<Void>
     if (!Config.isRoutingDisclaimerAccepted())
     {
       if (mContainer != null)
-        mContainer.onShowDisclaimer(startPoint, endPoint);
+        mContainer.onShowDisclaimer();
       return;
     }
 
     initLastRouteType(startPoint, endPoint, fromApi);
-    prepare(startPoint, endPoint, mLastRouterType);
+    prepare(startPoint, endPoint, mLastRouterType, fromApi);
   }
 
   private void initLastRouteType(@Nullable MapObject startPoint, @Nullable MapObject endPoint,
@@ -394,6 +406,12 @@ public class RoutingController implements Initializable<Void>
 
   public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint,
                       @Framework.RouterType int routerType)
+  {
+    prepare(startPoint, endPoint, routerType, false);
+  }
+
+  public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint,
+                      @Framework.RouterType int routerType, boolean fromApi)
   {
     cancel();
     setState(State.PREPARE);
@@ -476,6 +494,11 @@ public class RoutingController implements Initializable<Void>
     return false;
   }
 
+  private void removeIntermediatePoints()
+  {
+    Framework.nativeRemoveIntermediateRoutePoints();
+  }
+
   @NonNull
   private MapObject toMapObject(@NonNull RouteMarkData point)
   {
@@ -593,12 +616,12 @@ public class RoutingController implements Initializable<Void>
     return mState == State.PREPARE;
   }
 
-  public boolean isTransitType()
+  boolean isTransitType()
   {
     return mLastRouterType == Framework.ROUTER_TYPE_TRANSIT;
   }
 
-  public boolean isVehicleRouterType()
+  boolean isVehicleRouterType()
   {
     return mLastRouterType == Framework.ROUTER_TYPE_VEHICLE;
   }
@@ -718,7 +741,7 @@ public class RoutingController implements Initializable<Void>
       mContainer.updateMenu();
   }
 
-  public void checkAndBuildRoute()
+  void checkAndBuildRoute()
   {
     if (isWaitingPoiPick())
       showRoutePlan();
diff --git a/android/src/app/organicmaps/search/NativeSearchListener.java b/android/src/app/organicmaps/search/NativeSearchListener.java
index 01ddde1c14..8eebcb9acf 100644
--- a/android/src/app/organicmaps/search/NativeSearchListener.java
+++ b/android/src/app/organicmaps/search/NativeSearchListener.java
@@ -12,7 +12,7 @@ public interface NativeSearchListener
    * @param results Search results.
    * @param timestamp Timestamp of search request.
    */
-  default void onResultsUpdate(@NonNull SearchResult[] results, long timestamp) {}
+  void onResultsUpdate(@NonNull SearchResult[] results, long timestamp);
 
   /**
    * @param timestamp Timestamp of search request.
diff --git a/android/src/app/organicmaps/search/SearchAdapter.java b/android/src/app/organicmaps/search/SearchAdapter.java
index 050e7f37d0..eb660755f5 100644
--- a/android/src/app/organicmaps/search/SearchAdapter.java
+++ b/android/src/app/organicmaps/search/SearchAdapter.java
@@ -2,11 +2,18 @@ package app.organicmaps.search;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
@@ -16,6 +23,7 @@ import app.organicmaps.R;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 
 class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHolder>
 {
@@ -113,6 +121,15 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
       return 0;
     }
 
+    @NonNull
+    private CharSequence colorizeString(@NonNull String str, @ColorInt int color)
+    {
+      final SpannableStringBuilder sb = new SpannableStringBuilder(str);
+      sb.setSpan(new ForegroundColorSpan(color),
+                 0, sb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+      return sb;
+    }
+
     ResultViewHolder(@NonNull View view)
     {
       super(view);
@@ -207,7 +224,6 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     mSearchFragment = fragment;
   }
 
-  @NonNull
   @Override
   public SearchDataViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
   {
diff --git a/android/src/app/organicmaps/search/SearchEngine.java b/android/src/app/organicmaps/search/SearchEngine.java
index acb40a1eb5..e1eabde887 100644
--- a/android/src/app/organicmaps/search/SearchEngine.java
+++ b/android/src/app/organicmaps/search/SearchEngine.java
@@ -147,14 +147,7 @@ public enum SearchEngine implements NativeSearchListener,
   public void searchInteractive(@NonNull Context context, @NonNull String query, boolean isCategory,
                                 long timestamp, boolean isMapAndTable)
   {
-    searchInteractive(query, isCategory, Language.getKeyboardLocale(context), timestamp, isMapAndTable, false, 0, 0);
-  }
-
-  @MainThread
-  public static void searchMaps(@NonNull Context context, String query, long timestamp)
-  {
-    nativeRunSearchMaps(query.getBytes(StandardCharsets.UTF_8), Language.getKeyboardLocale(context),
-                        timestamp);
+    searchInteractive(query, isCategory, Language.getKeyboardLocale(context), timestamp, isMapAndTable);
   }
 
   @MainThread
@@ -164,6 +157,13 @@ public enum SearchEngine implements NativeSearchListener,
     searchInteractive(query, isCategory, Language.getKeyboardLocale(context), timestamp, isMapAndTable, hasLocation, lat, lon);
   }
 
+  @MainThread
+  public static void searchMaps(@NonNull Context context, String query, long timestamp)
+  {
+    nativeRunSearchMaps(query.getBytes(StandardCharsets.UTF_8), Language.getKeyboardLocale(context),
+                        timestamp);
+  }
+
   @MainThread
   public boolean searchInBookmarks(@NonNull String query, long categoryId, long timestamp)
   {
diff --git a/android/src/app/organicmaps/search/SearchResult.java b/android/src/app/organicmaps/search/SearchResult.java
index 8910b78fb7..2f5a87090e 100644
--- a/android/src/app/organicmaps/search/SearchResult.java
+++ b/android/src/app/organicmaps/search/SearchResult.java
@@ -29,7 +29,7 @@ public class SearchResult implements PopularityProvider
   public static final int OPEN_NOW_NO = 2;
 
   public static final SearchResult EMPTY = new SearchResult("", "", 0, 0,
-                                                            new int[] {});
+      new int[]{});
 
   public static class Description
   {
@@ -168,19 +168,29 @@ public class SearchResult implements PopularityProvider
     final SpannableStringBuilder tail = new SpannableStringBuilder();
 
     if (!TextUtils.isEmpty(description.airportIata))
+    {
       tail.append(" • ").append(description.airportIata);
+    }
     else if (!TextUtils.isEmpty(description.roadShields))
+    {
       tail.append(" • ").append(description.roadShields);
+    }
     else
     {
       if (!TextUtils.isEmpty(description.brand))
+      {
         tail.append(" • ").append(Utils.getLocalizedBrand(context, description.brand));
+      }
       if (!TextUtils.isEmpty(description.cuisine))
+      {
         tail.append(" • ").append(description.cuisine);
+      }
     }
 
     if (isHotel && stars != 0)
+    {
       tail.append(" • ").append("★★★★★★★".substring(0, Math.min(7, stars)));
+    }
 
     res.append(tail);
 
diff --git a/android/src/app/organicmaps/sound/TtsPlayer.java b/android/src/app/organicmaps/sound/TtsPlayer.java
index 8d1bdc67c9..42cf10d218 100644
--- a/android/src/app/organicmaps/sound/TtsPlayer.java
+++ b/android/src/app/organicmaps/sound/TtsPlayer.java
@@ -43,7 +43,7 @@ public enum TtsPlayer implements Initializable<Context>
 
   private static final String TAG = TtsPlayer.class.getSimpleName();
   private static final Locale DEFAULT_LOCALE = Locale.US;
-  private static final float SPEECH_RATE = 1.0f;
+  private static final float SPEECH_RATE = 1.2f;
   private static final int TTS_SPEAK_DELAY_MILLIS = 50;
 
   private TextToSpeech mTts;
diff --git a/android/src/app/organicmaps/util/Config.java b/android/src/app/organicmaps/util/Config.java
index e46d608acf..7ed73e0007 100644
--- a/android/src/app/organicmaps/util/Config.java
+++ b/android/src/app/organicmaps/util/Config.java
@@ -10,7 +10,6 @@ import static app.organicmaps.util.Counters.KEY_MISC_FIRST_START_DIALOG_SEEN;
 import static app.organicmaps.util.Counters.KEY_MISC_NEWS_LAST_VERSION;
 
 import android.content.Context;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 
@@ -199,12 +198,7 @@ public final class Config
 
   public static boolean isShowOnLockScreenEnabled()
   {
-    // Disabled by default on Android 7.1 and earlier devices.
-    // See links below for details:
-    // https://github.com/organicmaps/organicmaps/issues/2857
-    // https://github.com/organicmaps/organicmaps/issues/3967
-    final boolean defaultValue = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    return getBool(KEY_MISC_SHOW_ON_LOCK_SCREEN, defaultValue);
+    return getBool(KEY_MISC_SHOW_ON_LOCK_SCREEN, true);
   }
 
   public static void setShowOnLockScreenEnabled(boolean enabled)
diff --git a/android/src/app/organicmaps/widget/menu/MyPositionButton.java b/android/src/app/organicmaps/widget/menu/MyPositionButton.java
index e757d071c6..894b03979a 100644
--- a/android/src/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/src/app/organicmaps/widget/menu/MyPositionButton.java
@@ -30,13 +30,13 @@ public class MyPositionButton
 
   private final int mFollowPaddingShift;
 
-  public MyPositionButton(@NonNull View button, @NonNull View.OnClickListener listener)
+  public MyPositionButton(@NonNull View button, int myPositionMode, @NonNull View.OnClickListener listener)
   {
     mButton = (FloatingActionButton) button;
     mButton.setOnClickListener(listener);
     mIcons.clear();
     mFollowPaddingShift = (int) (FOLLOW_SHIFT * button.getResources().getDisplayMetrics().density);
-    update(LocationState.nativeGetMode());
+    update(myPositionMode);
   }
 
   public void update(int mode)
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java b/android/src/app/organicmaps/widget/placepage/PlaceOpeningHoursAdapter.java
similarity index 99%
rename from android/src/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
rename to android/src/app/organicmaps/widget/placepage/PlaceOpeningHoursAdapter.java
index c08815c22e..f232f76131 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
+++ b/android/src/app/organicmaps/widget/placepage/PlaceOpeningHoursAdapter.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java
similarity index 93%
rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
rename to android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java
index db15d99893..75ec8aa81a 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -26,8 +26,6 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.placepage.EditBookmarkFragment;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
 
 public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener,
                                                                    View.OnLongClickListener,
@@ -75,16 +73,16 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
   }
 
   @Override
-  public void onStart()
+  public void onResume()
   {
-    super.onStart();
+    super.onResume();
     mViewModel.getMapObject().observe(requireActivity(), this);
   }
 
   @Override
-  public void onStop()
+  public void onPause()
   {
-    super.onStop();
+    super.onPause();
     mViewModel.getMapObject().removeObserver(this);
   }
 
@@ -143,12 +141,12 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
   }
 
   @Override
-  public void onChanged(@Nullable MapObject mapObject)
+  public void onChanged(MapObject mapObject)
   {
     // MapObject could be something else than a bookmark if the user already has the place page
     // opened and clicks on a non-bookmarked POI.
     // This callback would be called before the fragment had time to be destroyed
-    if (mapObject != null && mapObject.getMapObjectType() == MapObject.BOOKMARK)
+    if (mapObject.getMapObjectType() == MapObject.BOOKMARK)
     {
       currentBookmark = (Bookmark) mapObject;
       updateBookmarkDetails();
diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java b/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java
index 6cd35663bb..abecaa59b9 100644
--- a/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java
@@ -1,5 +1,6 @@
 package app.organicmaps.widget.placepage;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -49,24 +50,28 @@ public final class PlacePageButtons extends Fragment implements Observer<List<Pl
       return windowInsets;
     });
     mMaxButtons = getResources().getInteger(R.integer.pp_buttons_max);
-
-    Fragment parentFragment = getParentFragment();
-    mItemListener = (PlacePageButtonClickListener) parentFragment;
-
+    mViewModel.getCurrentButtons().observe(requireActivity(), this);
     createButtons(mViewModel.getCurrentButtons().getValue());
   }
 
   @Override
-  public void onStart()
+  public void onAttach(@NonNull Context context)
   {
-    super.onStart();
-    mViewModel.getCurrentButtons().observe(requireActivity(), this);
+    super.onAttach(context);
+    try
+    {
+      mItemListener = (PlacePageButtonClickListener) context;
+    }
+    catch (ClassCastException e)
+    {
+      throw new ClassCastException(context + " must implement PlacePageButtonClickListener");
+    }
   }
 
   @Override
-  public void onStop()
+  public void onDestroyView()
   {
-    super.onStop();
+    super.onDestroyView();
     mViewModel.getCurrentButtons().removeObserver(this);
   }
 
@@ -89,7 +94,7 @@ public final class PlacePageButtons extends Fragment implements Observer<List<Pl
   private void showMoreBottomSheet()
   {
     MenuBottomSheetFragment.newInstance(PLACEPAGE_MORE_MENU_ID)
-                           .show(getParentFragmentManager(), PLACEPAGE_MORE_MENU_ID);
+                           .show(requireActivity().getSupportFragmentManager(), PLACEPAGE_MORE_MENU_ID);
   }
 
   private void createButtons(@Nullable List<ButtonType> buttons)
diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageController.java b/android/src/app/organicmaps/widget/placepage/PlacePageController.java
index 531fb3041e..590929cb26 100644
--- a/android/src/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageController.java
@@ -1,87 +1,101 @@
 package app.organicmaps.widget.placepage;
 
 import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.widget.NestedScrollViewClickFixed;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.Framework;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
-import app.organicmaps.api.Const;
 import app.organicmaps.api.ParsedMwmRequest;
-import app.organicmaps.bookmarks.data.BookmarkManager;
+import app.organicmaps.base.Initializable;
+import app.organicmaps.base.Savable;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.RoadWarningMarkType;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.settings.RoadType;
-import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import app.organicmaps.util.log.Logger;
+
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
-public class PlacePageController extends Fragment implements
-                                                  PlacePageView.PlacePageViewListener,
-                                                  PlacePageButtons.PlacePageButtonClickListener,
-                                                  MenuBottomSheetFragment.MenuBottomSheetInterface,
-                                                  Observer<MapObject>
+public class PlacePageController implements Initializable<Activity>,
+                                            Savable<Bundle>,
+                                            PlacePageView.PlacePageViewListener,
+                                            PlacePageButtons.PlacePageButtonClickListener,
+                                            MenuBottomSheetFragment.MenuBottomSheetInterface,
+                                            Observer<MapObject>
 {
   private static final String TAG = PlacePageController.class.getSimpleName();
   private static final String PLACE_PAGE_BUTTONS_FRAGMENT_TAG = "PLACE_PAGE_BUTTONS";
   private static final String PLACE_PAGE_FRAGMENT_TAG = "PLACE_PAGE";
 
   private static final float PREVIEW_PLUS_RATIO = 0.45f;
-  private BottomSheetBehavior<View> mPlacePageBehavior;
-  private NestedScrollViewClickFixed mPlacePage;
-  private ViewGroup mPlacePageContainer;
-  private ViewGroup mCoordinator;
-  private int mViewportMinHeight;
-  private int mButtonsHeight;
-  private int mMaxButtons;
-  private PlacePageViewModel mViewModel;
+  @NonNull
+  private final SlideListener mSlideListener;
+  @NonNull
+  private final BottomSheetBehavior<View> mPlacePageBehavior;
+  @NonNull
+  private final NestedScrollViewClickFixed mPlacePage;
+  @NonNull
+  private final ViewGroup mPlacePageContainer;
+  private final ViewGroup mCoordinator;
+  private final int mViewportMinHeight;
+  private final AppCompatActivity mMwmActivity;
+  private final int mButtonsHeight;
+  private final int mMaxButtons;
+  private final PlacePageViewModel mViewModel;
   private int mPreviewHeight;
   private int mFrameHeight;
+  private boolean mDeactivateMapSelection = true;
   @Nullable
   private MapObject mMapObject;
-  @Nullable
-  private MapObject mPreviousMapObject;
   private WindowInsetsCompat mCurrentWindowInsets;
 
   private boolean mShouldCollapse;
   private int mDistanceToTop;
 
   private ValueAnimator mCustomPeekHeightAnimator;
-  private PlacePageRouteSettingsListener mPlacePageRouteSettingsListener;
-  private final BottomSheetBehavior.BottomSheetCallback mDefaultBottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback()
+
+  class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetCallback
   {
     @Override
     public void onStateChanged(@NonNull View bottomSheet, int newState)
     {
+      final Lifecycle.State state = mMwmActivity.getLifecycle().getCurrentState();
+      if (!state.isAtLeast(Lifecycle.State.RESUMED))
+      {
+        Logger.e(TAG, "Called in the wrong activity state=" + state);
+        return;
+      }
+
       Logger.d(TAG, "State change, new = " + PlacePageUtils.toString(newState));
       if (PlacePageUtils.isSettlingState(newState) || PlacePageUtils.isDraggingState(newState))
         return;
 
-      PlacePageUtils.updateMapViewport(mCoordinator, mDistanceToTop, mViewportMinHeight);
+      PlacePageUtils.moveViewportUp(mPlacePage, mViewportMinHeight);
 
       if (PlacePageUtils.isHiddenState(newState))
         onHiddenInternal();
@@ -90,48 +104,51 @@ public class PlacePageController extends Fragment implements
     @Override
     public void onSlide(@NonNull View bottomSheet, float slideOffset)
     {
+      final Lifecycle.State state = mMwmActivity.getLifecycle().getCurrentState();
+      if (!state.isAtLeast(Lifecycle.State.RESUMED))
+      {
+        Logger.e(TAG, "Called in the wrong activity state=" + state);
+        return;
+      }
       stopCustomPeekHeightAnimation();
       mDistanceToTop = bottomSheet.getTop();
-      mViewModel.setPlacePageDistanceToTop(mDistanceToTop);
+      mSlideListener.onPlacePageSlide(mDistanceToTop);
     }
-  };
-
-  @Nullable
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
-  {
-    return inflater.inflate(R.layout.place_page_container_fragment, container, false);
   }
 
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
+  @SuppressLint("ClickableViewAccessibility")
+  public PlacePageController(@Nullable Activity activity,
+                             @NonNull SlideListener listener)
   {
-    super.onViewCreated(view, savedInstanceState);
-    final FragmentActivity activity = requireActivity();
-    mPlacePageRouteSettingsListener = (MwmActivity) activity;
+    mSlideListener = listener;
 
-    final Resources res = activity.getResources();
+    Objects.requireNonNull(activity);
+    mMwmActivity = (AppCompatActivity) activity;
+    mCoordinator = mMwmActivity.findViewById(R.id.coordinator);
+    Resources res = activity.getResources();
     mViewportMinHeight = res.getDimensionPixelSize(R.dimen.viewport_min_height);
-    mButtonsHeight = (int) res.getDimension(R.dimen.place_page_buttons_height);
-    mMaxButtons = res.getInteger(R.integer.pp_buttons_max);
-
-    mCoordinator = activity.findViewById(R.id.coordinator);
-    mPlacePage = view.findViewById(R.id.placepage);
-    mPlacePageContainer = view.findViewById(R.id.placepage_container);
+    mPlacePage = activity.findViewById(R.id.placepage);
+    mPlacePageContainer = activity.findViewById(R.id.placepage_container);
     mPlacePageBehavior = BottomSheetBehavior.from(mPlacePage);
 
     mShouldCollapse = true;
 
+    mPlacePageBehavior.addBottomSheetCallback(new DefaultBottomSheetCallback());
     mPlacePageBehavior.setHideable(true);
     mPlacePageBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
     mPlacePageBehavior.setFitToContents(true);
     mPlacePageBehavior.setSkipCollapsed(true);
 
-    UiUtils.bringViewToFrontOf(view.findViewById(R.id.pp_buttons_fragment), mPlacePage);
+    UiUtils.bringViewToFrontOf(activity.findViewById(R.id.pp_buttons_fragment), mPlacePage);
 
-    mViewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class);
+    mPlacePage.requestApplyInsets();
 
-    ViewCompat.setOnApplyWindowInsetsListener(mPlacePage, (v, windowInsets) -> {
+    mButtonsHeight = (int) mMwmActivity.getResources()
+                                       .getDimension(R.dimen.place_page_buttons_height);
+    mMaxButtons = mMwmActivity.getResources().getInteger(R.integer.pp_buttons_max);
+    mViewModel = new ViewModelProvider(mMwmActivity).get(PlacePageViewModel.class);
+
+    ViewCompat.setOnApplyWindowInsetsListener(mPlacePage, (view, windowInsets) -> {
       mCurrentWindowInsets = windowInsets;
       return windowInsets;
     });
@@ -164,12 +181,19 @@ public class PlacePageController extends Fragment implements
 
   private void onHiddenInternal()
   {
-    Framework.nativeDeactivatePopup();
-    PlacePageUtils.updateMapViewport(mCoordinator, mDistanceToTop, mViewportMinHeight);
+    if (mDeactivateMapSelection)
+      Framework.nativeDeactivatePopup();
+    mDeactivateMapSelection = true;
+    PlacePageUtils.moveViewportUp(mPlacePage, mViewportMinHeight);
     resetPlacePageHeightBounds();
     removePlacePageFragments();
   }
 
+  public int getPlacePageWidth()
+  {
+    return mPlacePage.getWidth();
+  }
+
   @Nullable
   public ArrayList<MenuBottomSheetItem> getMenuBottomSheetItems(String id)
   {
@@ -179,27 +203,24 @@ public class PlacePageController extends Fragment implements
     ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
     for (int i = mMaxButtons - 1; i < currentItems.size(); i++)
     {
-      final PlacePageButton bsItem = PlacePageButtonFactory.createButton(currentItems.get(i), requireActivity());
+      final PlacePageButton bsItem = PlacePageButtonFactory.createButton(currentItems.get(i), mMwmActivity);
       items.add(new MenuBottomSheetItem(
           bsItem.getTitle(),
           bsItem.getIcon(),
-          () -> onPlacePageButtonClick(bsItem.getType())
+          () -> ((PlacePageButtons.PlacePageButtonClickListener) mMwmActivity).onPlacePageButtonClick(bsItem.getType())
       ));
     }
     return items;
   }
 
-  private void open()
+  public void openFor(@NonNull PlacePageData data)
   {
+    mDeactivateMapSelection = true;
+    MapObject mapObject = (MapObject) data;
+    final MapObject previousMapObject = mViewModel.getMapObject().getValue();
     // Only collapse the place page if the data is different from the one already available
-    mShouldCollapse = PlacePageUtils.isHiddenState(mPlacePageBehavior.getState()) || !MapObject.same(mPreviousMapObject, mMapObject);
-    mPreviousMapObject = mMapObject;
-    // Place page will automatically open when the bottom sheet content is loaded so we can compute the peek height
-  }
-
-  private void close()
-  {
-    mPlacePageBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+    mShouldCollapse = PlacePageUtils.isHiddenState(mPlacePageBehavior.getState()) || !MapObject.same(previousMapObject, mapObject);
+    mViewModel.setMapObject(mapObject);
   }
 
   private void resetPlacePageHeightBounds()
@@ -278,10 +299,10 @@ public class PlacePageController extends Fragment implements
       mPlacePageBehavior.setPeekHeight(value);
       // The place page is not firing the slide callbacks when using this animation, so we must call them manually
       mDistanceToTop = parentHeight - value - bottomInsets;
-      mViewModel.setPlacePageDistanceToTop(mDistanceToTop);
+      mSlideListener.onPlacePageSlide(mDistanceToTop);
       if (value == peekHeight)
       {
-        PlacePageUtils.updateMapViewport(mCoordinator, mDistanceToTop, mViewportMinHeight);
+        PlacePageUtils.moveViewportUp(mPlacePage, mViewportMinHeight);
         setPlacePageHeightBounds();
       }
     });
@@ -296,12 +317,37 @@ public class PlacePageController extends Fragment implements
     return mPreviewHeight + mButtonsHeight;
   }
 
+  public void close(boolean deactivateMapSelection)
+  {
+    mDeactivateMapSelection = deactivateMapSelection;
+    mPlacePageBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+  }
+
+  public boolean isClosed()
+  {
+    return PlacePageUtils.isHiddenState(mPlacePageBehavior.getState());
+  }
+
+  @Override
+  public void onSave(@NonNull Bundle outState)
+  {
+    // no op
+  }
+
+  @Override
+  public void onRestore(@NonNull Bundle inState)
+  {
+    if (mPlacePageBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN)
+      return;
+    if (!Framework.nativeHasPlacePageInfo())
+      close(false);
+  }
+
   @Override
   public void onPlacePageContentChanged(int previewHeight, int frameHeight)
   {
     mPreviewHeight = previewHeight;
     mFrameHeight = frameHeight;
-    mViewModel.setPlacePageWidth(mPlacePage.getWidth());
     // Make sure to update the peek height on the UI thread to prevent weird animation jumps
     mPlacePage.post(() -> {
       setPeekHeight();
@@ -311,6 +357,12 @@ public class PlacePageController extends Fragment implements
     });
   }
 
+  @Override
+  public void onPlacePageRequestClose()
+  {
+    close(true);
+  }
+
   @Override
   public void onPlacePageRequestToggleState()
   {
@@ -323,150 +375,24 @@ public class PlacePageController extends Fragment implements
       mPlacePageBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
   }
 
+  @Override
+  public void onPlacePageRequestToggleRouteSettings(@NonNull RoadType roadType)
+  {
+    // no op
+  }
+
   @Override
   public void onPlacePageButtonClick(PlacePageButtons.ButtonType item)
   {
-    switch (item)
-    {
-      case BOOKMARK_SAVE:
-      case BOOKMARK_DELETE:
-        onBookmarkBtnClicked();
-        break;
-
-      case SHARE:
-        onShareBtnClicked();
-        break;
-
-      case BACK:
-        onBackBtnClicked();
-        break;
-
-      case ROUTE_FROM:
-        onRouteFromBtnClicked();
-        break;
-
-      case ROUTE_TO:
-        onRouteToBtnClicked();
-        break;
-
-      case ROUTE_ADD:
-        onRouteAddBtnClicked();
-        break;
-
-      case ROUTE_REMOVE:
-        onRouteRemoveBtnClicked();
-        break;
-
-      case ROUTE_AVOID_TOLL:
-        onAvoidTollBtnClicked();
-        break;
-
-      case ROUTE_AVOID_UNPAVED:
-        onAvoidUnpavedBtnClicked();
-        break;
-
-      case ROUTE_AVOID_FERRY:
-        onAvoidFerryBtnClicked();
-        break;
-    }
-  }
-
-  private void onBookmarkBtnClicked()
-  {
-    // No need to call setMapObject here as the native methods will reopen the place page
-    if (MapObject.isOfType(MapObject.BOOKMARK, mMapObject))
-      Framework.nativeDeleteBookmarkFromMapObject();
-    else
-      BookmarkManager.INSTANCE.addNewBookmark(mMapObject.getLat(), mMapObject.getLon());
-  }
-
-  private void onShareBtnClicked()
-  {
-    if (mMapObject != null)
-      SharingUtils.shareMapObject(requireContext(), mMapObject);
-  }
-
-  private void onBackBtnClicked()
-  {
-    if (mMapObject == null)
-      return;
-    final ParsedMwmRequest request = ParsedMwmRequest.getCurrentRequest();
-    if (request != null && request.isPickPointMode())
-    {
-      final Intent result = new Intent();
-      result.putExtra(Const.EXTRA_POINT_LAT, mMapObject.getLat())
-            .putExtra(Const.EXTRA_POINT_LON, mMapObject.getLon())
-            .putExtra(Const.EXTRA_POINT_NAME, mMapObject.getTitle())
-            .putExtra(Const.EXTRA_POINT_ID, mMapObject.getApiId())
-            .putExtra(Const.EXTRA_ZOOM_LEVEL, Framework.nativeGetDrawScale());
-      requireActivity().setResult(Activity.RESULT_OK, result);
-      ParsedMwmRequest.setCurrentRequest(null);
-    }
-    requireActivity().finish();
-  }
-
-  private void onRouteFromBtnClicked()
-  {
-    if (mMapObject == null)
-      return;
-    RoutingController controller = RoutingController.get();
-    if (!controller.isPlanning())
-    {
-      controller.prepare(mMapObject, null);
-      close();
-    }
-    else if (controller.setStartPoint(mMapObject))
-      close();
-  }
-
-  private void onRouteToBtnClicked()
-  {
-    if (mMapObject == null)
-      return;
-    if (RoutingController.get().isPlanning())
-    {
-      RoutingController.get().setEndPoint(mMapObject);
-      close();
-    }
-    else
-      ((MwmActivity) requireActivity()).startLocationToPoint(mMapObject);
-  }
-
-  private void onRouteAddBtnClicked()
-  {
-    if (mMapObject != null)
-      RoutingController.get().addStop(mMapObject);
-  }
-
-  private void onRouteRemoveBtnClicked()
-  {
-    if (mMapObject != null)
-      RoutingController.get().removeStop(mMapObject);
-  }
-
-  private void onAvoidUnpavedBtnClicked()
-  {
-    onAvoidBtnClicked(RoadType.Dirty);
-  }
-
-  private void onAvoidFerryBtnClicked()
-  {
-    onAvoidBtnClicked(RoadType.Ferry);
-  }
-
-  private void onAvoidTollBtnClicked()
-  {
-    onAvoidBtnClicked(RoadType.Toll);
-  }
-
-  private void onAvoidBtnClicked(@NonNull RoadType roadType)
-  {
-    mPlacePageRouteSettingsListener.onPlacePageRequestToggleRouteSettings(roadType);
+    @Nullable final PlacePageView placePageFragment = (PlacePageView) mMwmActivity.getSupportFragmentManager()
+                                                                                  .findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG);
+    if (placePageFragment != null)
+      placePageFragment.onPlacePageButtonClick(item);
   }
 
   private void removePlacePageFragments()
   {
-    final FragmentManager fm = getChildFragmentManager();
+    final FragmentManager fm = mMwmActivity.getSupportFragmentManager();
     final Fragment placePageButtonsFragment = fm.findFragmentByTag(PLACE_PAGE_BUTTONS_FRAGMENT_TAG);
     final Fragment placePageFragment = fm.findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG);
 
@@ -475,21 +401,23 @@ public class PlacePageController extends Fragment implements
       fm.beginTransaction()
         .setReorderingAllowed(true)
         .remove(placePageButtonsFragment)
-        .commit();
+        .commitNow();
     }
     if (placePageFragment != null)
     {
+      // Make sure to synchronously remove the fragment so setting the map object to null
+      // won't impact the fragment
       fm.beginTransaction()
         .setReorderingAllowed(true)
         .remove(placePageFragment)
-        .commit();
+        .commitNow();
     }
     mViewModel.setMapObject(null);
   }
 
   private void createPlacePageFragments()
   {
-    final FragmentManager fm = getChildFragmentManager();
+    final FragmentManager fm = mMwmActivity.getSupportFragmentManager();
     if (fm.findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG) == null)
     {
       fm.beginTransaction()
@@ -558,42 +486,29 @@ public class PlacePageController extends Fragment implements
     mMapObject = mapObject;
     if (mapObject != null)
     {
-      open();
       createPlacePageFragments();
       updateButtons(
           mapObject,
           MapObject.isOfType(MapObject.API_POINT, mMapObject),
           !MapObject.isOfType(MapObject.MY_POSITION, mMapObject));
-    } else
-      close();
+    }
   }
 
   @Override
-  public void onStart()
+  public void initialize(@Nullable Activity activity)
   {
-    super.onStart();
-    mPlacePageBehavior.addBottomSheetCallback(mDefaultBottomSheetCallback);
-    mViewModel.getMapObject().observe(requireActivity(), this);
+    Objects.requireNonNull(activity);
+    mViewModel.getMapObject().observe((MwmActivity) activity, this);
   }
 
   @Override
-  public void onResume()
+  public void destroy()
   {
-    super.onResume();
-    if (mPlacePageBehavior.getState() != BottomSheetBehavior.STATE_HIDDEN && !Framework.nativeHasPlacePageInfo())
-      mViewModel.setMapObject(null);
-  }
-
-  @Override
-  public void onStop()
-  {
-    super.onStop();
-    mPlacePageBehavior.removeBottomSheetCallback(mDefaultBottomSheetCallback);
     mViewModel.getMapObject().removeObserver(this);
   }
 
-  public interface PlacePageRouteSettingsListener
+  public interface SlideListener
   {
-    void onPlacePageRequestToggleRouteSettings(@NonNull RoadType roadType);
+    void onPlacePageSlide(int top);
   }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java
similarity index 95%
rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
rename to android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java
index f552832bd6..618ef29b91 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageLinksFragment.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -17,8 +17,6 @@ import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.Metadata;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.placepage.PlacePageUtils;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -218,26 +216,23 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
   }
 
   @Override
-  public void onStart()
+  public void onResume()
   {
-    super.onStart();
+    super.onResume();
     mViewModel.getMapObject().observe(requireActivity(), this);
   }
 
   @Override
-  public void onStop()
+  public void onPause()
   {
-    super.onStop();
+    super.onPause();
     mViewModel.getMapObject().removeObserver(this);
   }
 
   @Override
-  public void onChanged(@Nullable  MapObject mapObject)
+  public void onChanged(MapObject mapObject)
   {
-    if (mapObject != null)
-    {
-      mMapObject = mapObject;
-      refreshLinks();
-    }
+    mMapObject = mapObject;
+    refreshLinks();
   }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePageOpeningHoursFragment.java
similarity index 91%
rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
rename to android/src/app/organicmaps/widget/placepage/PlacePageOpeningHoursFragment.java
index 5ad5cf75e2..37bcce2de0 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageOpeningHoursFragment.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -25,8 +25,6 @@ import app.organicmaps.editor.data.Timetable;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.placepage.PlacePageUtils;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
 
 import java.util.Calendar;
 import java.util.Locale;
@@ -90,9 +88,11 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
     mTodayOpenTime.setTextColor(color);
   }
 
-  private void refreshOpeningHours(MapObject mapObject)
+  private void refreshOpeningHours()
   {
-    final String ohStr = mapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS);
+    final String ohStr = mViewModel.getMapObject()
+                                  .getValue()
+                                  .getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS);
     final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(ohStr);
     mFrame.setOnLongClickListener((v) -> {
       PlacePageUtils.copyToClipboard(requireContext(), mFrame, TimeFormatUtils.formatTimetables(getResources(), ohStr, timetables));
@@ -170,7 +170,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
         // Show that place is closed today.
         if (!containsCurrentWeekday)
         {
-          refreshTodayOpeningHours(resources.getString(R.string.day_off_today), ContextCompat.getColor(requireContext(), R.color.base_red));
+          refreshTodayOpeningHours(resources.getString(R.string.day_off_today), ContextCompat.getColor(getContext(), R.color.base_red));
           UiUtils.hide(mTodayNonBusinessTime);
         }
       }
@@ -178,23 +178,22 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
   }
 
   @Override
-  public void onStart()
+  public void onResume()
   {
-    super.onStart();
+    super.onResume();
     mViewModel.getMapObject().observe(requireActivity(), this);
   }
 
   @Override
-  public void onStop()
+  public void onPause()
   {
-    super.onStop();
+    super.onPause();
     mViewModel.getMapObject().removeObserver(this);
   }
 
   @Override
-  public void onChanged(@Nullable MapObject mapObject)
+  public void onChanged(MapObject mapObject)
   {
-    if (mapObject != null)
-      refreshOpeningHours(mapObject);
+    refreshOpeningHours();
   }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePagePhoneFragment.java
similarity index 79%
rename from android/src/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java
rename to android/src/app/organicmaps/widget/placepage/PlacePagePhoneFragment.java
index fe4dacc56e..a3b5fccc7d 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePagePhoneFragment.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.Metadata;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
 
 public class PlacePagePhoneFragment extends Fragment implements Observer<MapObject>
 {
@@ -40,23 +39,22 @@ public class PlacePagePhoneFragment extends Fragment implements Observer<MapObje
   }
 
   @Override
-  public void onStart()
+  public void onResume()
   {
-    super.onStart();
+    super.onResume();
     mViewModel.getMapObject().observe(requireActivity(), this);
   }
 
   @Override
-  public void onStop()
+  public void onPause()
   {
-    super.onStop();
+    super.onPause();
     mViewModel.getMapObject().removeObserver(this);
   }
 
   @Override
-  public void onChanged(@Nullable MapObject mapObject)
+  public void onChanged(MapObject mapObject)
   {
-    if (mapObject != null)
-      mPhoneAdapter.refreshPhones(mapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER));
+    mPhoneAdapter.refreshPhones(mapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER));
   }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageUtils.java b/android/src/app/organicmaps/widget/placepage/PlacePageUtils.java
index b101dd96ef..c69b8a76a1 100644
--- a/android/src/app/organicmaps/widget/placepage/PlacePageUtils.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageUtils.java
@@ -1,8 +1,10 @@
 package app.organicmaps.widget.placepage;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.view.Menu;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.PopupMenu;
 
 import androidx.annotation.NonNull;
@@ -14,17 +16,23 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
 import java.util.List;
 
-public class PlacePageUtils
+class PlacePageUtils
 {
-  static void updateMapViewport(@NonNull View parent, int placePageDistanceToTop, int viewportMinHeight)
+  static void moveViewportUp(@NonNull View placePageView, int viewportMinHeight)
   {
-    parent.post(() -> {
+    placePageView.post(() -> {
       // Because of the post(), this lambda is called after the car.SurfaceRenderer.onStableAreaChanged() and breaks the visibleRect configuration
-      if (DisplayManager.from(parent.getContext()).isCarDisplayUsed())
+      if (DisplayManager.from(placePageView.getContext()).isCarDisplayUsed())
         return;
-      final int screenWidth = parent.getWidth();
-      if (placePageDistanceToTop >= viewportMinHeight)
-        Framework.nativeSetVisibleRect(0, 0, screenWidth, placePageDistanceToTop);
+      final View coordinatorLayout = (ViewGroup) placePageView.getParent();
+      final int viewPortWidth = coordinatorLayout.getWidth();
+      int viewPortHeight = coordinatorLayout.getHeight();
+      Rect sheetRect = new Rect();
+      placePageView.getGlobalVisibleRect(sheetRect);
+
+      viewPortHeight -= sheetRect.height();
+      if (viewPortHeight >= viewportMinHeight)
+        Framework.nativeSetVisibleRect(0, 0, viewPortWidth, viewPortHeight);
     });
   }
 
@@ -80,7 +88,7 @@ public class PlacePageUtils
     }
   }
 
-  public static void copyToClipboard(Context context, View frame, String text)
+  static void copyToClipboard(Context context, View frame, String text)
   {
     Utils.copyTextToClipboard(context, text);
     Utils.showSnackbarAbove(frame,
@@ -88,7 +96,7 @@ public class PlacePageUtils
                             context.getString(R.string.copied_to_clipboard, text));
   }
 
-  public static void showCopyPopup(Context context, View popupAnchor, View frame, List<String> items)
+  static void showCopyPopup(Context context, View popupAnchor, View frame, List<String> items)
   {
     final PopupMenu popup = new PopupMenu(context, popupAnchor);
     final Menu menu = popup.getMenu();
diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageView.java b/android/src/app/organicmaps/widget/placepage/PlacePageView.java
index 2a18f47247..072d181baf 100644
--- a/android/src/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageView.java
@@ -1,6 +1,8 @@
 package app.organicmaps.widget.placepage;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
@@ -27,6 +29,9 @@ import app.organicmaps.Framework;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.api.Const;
+import app.organicmaps.api.ParsedMwmRequest;
+import app.organicmaps.bookmarks.data.BookmarkManager;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.Metadata;
@@ -37,15 +42,12 @@ import app.organicmaps.editor.Editor;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;
 import app.organicmaps.routing.RoutingController;
+import app.organicmaps.settings.RoadType;
+import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.concurrency.UiThread;
 import app.organicmaps.widget.ArrowView;
-import app.organicmaps.widget.placepage.sections.PlacePageBookmarkFragment;
-import app.organicmaps.widget.placepage.sections.PlacePageLinksFragment;
-import app.organicmaps.widget.placepage.sections.PlacePageOpeningHoursFragment;
-import app.organicmaps.widget.placepage.sections.PlacePagePhoneFragment;
-import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,6 +58,7 @@ import static android.view.View.VISIBLE;
 
 public class PlacePageView extends Fragment implements View.OnClickListener,
                                                        View.OnLongClickListener,
+                                                       PlacePageButtons.PlacePageButtonClickListener,
                                                        LocationListener,
                                                        Observer<MapObject>
 
@@ -173,9 +176,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
         MwmApplication.prefs(requireContext()).getInt(
             PREF_COORDINATES_FORMAT, CoordinatesFormat.LatLonDecimal.getId()));
 
-    Fragment parentFragment = getParentFragment();
-    mPlacePageViewListener = (PlacePageViewListener) parentFragment;
-
     mFrame = view;
     mFrame.setOnClickListener((v) -> mPlacePageViewListener.onPlacePageRequestToggleState());
 
@@ -238,29 +238,186 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
     mDownloaderIcon = new DownloaderStatusIcon(mPreview.findViewById(R.id.downloader_status_frame));
 
     mDownloaderInfo = mPreview.findViewById(R.id.tv__downloader_details);
+
+    mMapObject = mViewModel.getMapObject().getValue();
   }
 
   @Override
-  public void onStart()
+  public void onAttach(@NonNull Context context)
   {
-    super.onStart();
+    super.onAttach(context);
+    mPlacePageViewListener = (MwmActivity) context;
+  }
+
+  @Override
+  public void onResume()
+  {
+    super.onResume();
     mViewModel.getMapObject().observe(requireActivity(), this);
     LocationHelper.INSTANCE.addListener(this);
   }
 
+  @Override
+  public void onPause()
+  {
+    super.onPause();
+    // Unsubscribe from events as soon as the fragment becomes inactive
+    // to prevent unwanted side effects
+    mViewModel.getMapObject().removeObserver(this);
+    LocationHelper.INSTANCE.removeListener(this);
+  }
+
   @Override
   public void onStop()
   {
     super.onStop();
-    mViewModel.getMapObject().removeObserver(this);
-    LocationHelper.INSTANCE.removeListener(this);
+    // Safely detach the country once the fragment is hidden from the user
+    // It is safer to call this here than in onPause as the app could go from onPause to
+    // onResume without killing the fragment.
+    // In this case we would not want to detach the country.
     detachCountry();
   }
 
+  @Override
+  public void onPlacePageButtonClick(PlacePageButtons.ButtonType item)
+  {
+    switch (item)
+    {
+      case BOOKMARK_SAVE:
+      case BOOKMARK_DELETE:
+        onBookmarkBtnClicked();
+        break;
+
+      case SHARE:
+        onShareBtnClicked();
+        break;
+
+      case BACK:
+        onBackBtnClicked();
+        break;
+
+      case ROUTE_FROM:
+        onRouteFromBtnClicked();
+        break;
+
+      case ROUTE_TO:
+        onRouteToBtnClicked();
+        break;
+
+      case ROUTE_ADD:
+        onRouteAddBtnClicked();
+        break;
+
+      case ROUTE_REMOVE:
+        onRouteRemoveBtnClicked();
+        break;
+
+      case ROUTE_AVOID_TOLL:
+        onAvoidTollBtnClicked();
+        break;
+
+      case ROUTE_AVOID_UNPAVED:
+        onAvoidUnpavedBtnClicked();
+        break;
+
+      case ROUTE_AVOID_FERRY:
+        onAvoidFerryBtnClicked();
+        break;
+    }
+  }
+
+  private void onBookmarkBtnClicked()
+  {
+    // No need to call setMapObject here as the native methods will reopen the place page
+    if (MapObject.isOfType(MapObject.BOOKMARK, mMapObject))
+      Framework.nativeDeleteBookmarkFromMapObject();
+    else
+      BookmarkManager.INSTANCE.addNewBookmark(mMapObject.getLat(), mMapObject.getLon());
+  }
+
+  private void onShareBtnClicked()
+  {
+    SharingUtils.shareMapObject(requireContext(), mMapObject);
+  }
+
+  private void onBackBtnClicked()
+  {
+    final ParsedMwmRequest request = ParsedMwmRequest.getCurrentRequest();
+    if (request != null && request.isPickPointMode())
+    {
+      final Intent result = new Intent();
+      result.putExtra(Const.EXTRA_POINT_LAT, mMapObject.getLat())
+            .putExtra(Const.EXTRA_POINT_LON, mMapObject.getLon())
+            .putExtra(Const.EXTRA_POINT_NAME, mMapObject.getTitle())
+            .putExtra(Const.EXTRA_POINT_ID, mMapObject.getApiId())
+            .putExtra(Const.EXTRA_ZOOM_LEVEL, Framework.nativeGetDrawScale());
+      requireActivity().setResult(Activity.RESULT_OK, result);
+      ParsedMwmRequest.setCurrentRequest(null);
+    }
+    requireActivity().finish();
+  }
+
+  private void onRouteFromBtnClicked()
+  {
+    RoutingController controller = RoutingController.get();
+    if (!controller.isPlanning())
+    {
+      controller.prepare(mMapObject, null);
+      mPlacePageViewListener.onPlacePageRequestClose();
+    }
+    else if (controller.setStartPoint(mMapObject))
+    {
+      mPlacePageViewListener.onPlacePageRequestClose();
+    }
+  }
+
+  private void onRouteToBtnClicked()
+  {
+    if (RoutingController.get().isPlanning())
+    {
+      RoutingController.get().setEndPoint(mMapObject);
+      mPlacePageViewListener.onPlacePageRequestClose();
+    }
+    else
+    {
+      ((MwmActivity) requireActivity()).startLocationToPoint(mMapObject);
+    }
+  }
+
+  private void onRouteAddBtnClicked()
+  {
+    RoutingController.get().addStop(mMapObject);
+  }
+
+  private void onRouteRemoveBtnClicked()
+  {
+    RoutingController.get().removeStop(mMapObject);
+  }
+
+  private void onAvoidUnpavedBtnClicked()
+  {
+    onAvoidBtnClicked(RoadType.Dirty);
+  }
+
+  private void onAvoidFerryBtnClicked()
+  {
+    onAvoidBtnClicked(RoadType.Ferry);
+  }
+
+  private void onAvoidTollBtnClicked()
+  {
+    onAvoidBtnClicked(RoadType.Toll);
+  }
+
+  private void onAvoidBtnClicked(@NonNull RoadType roadType)
+  {
+    mPlacePageViewListener.onPlacePageRequestToggleRouteSettings(roadType);
+  }
+
   private void setCurrentCountry()
   {
     if (mCurrentCountry != null)
-      return;
+      throw new AssertionError("country should be detached before!");
     String country = MapManager.nativeGetSelectedCountry();
     if (country != null && !RoutingController.get().isNavigating())
       attachCountry(country);
@@ -293,7 +450,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
       fm.beginTransaction()
         .setReorderingAllowed(true)
         .remove(fragment)
-        .commit();
+        .commitNow();
     }
   }
 
@@ -342,7 +499,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
       int end = text.lastIndexOf("★") + 1;
       if (start > -1)
       {
-        sb.setSpan(new ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.base_yellow)),
+        sb.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.base_yellow)),
                    start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
       }
       mTvSubtitle.setText(sb);
@@ -596,15 +753,13 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   }
 
   @Override
-  public void onChanged(@Nullable MapObject mapObject)
+  public void onChanged(MapObject mapObject)
   {
-    if (mapObject == null)
-      return;
-    // Starting the download will fire this callback but the object will be the same
-    // Detaching the country in that case will crash the app
     if (!mapObject.sameAs(mMapObject))
+    {
       detachCountry();
-    setCurrentCountry();
+      setCurrentCountry();
+    }
 
     mMapObject = mapObject;
 
@@ -618,8 +773,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   @Override
   public void onLocationUpdated(@NonNull Location location)
   {
-    if (mMapObject == null)
-      return;
     if (MapObject.isOfType(MapObject.MY_POSITION, mMapObject))
       refreshMyPosition(location);
     else
@@ -629,7 +782,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   @Override
   public void onCompassUpdated(double north)
   {
-    if (mMapObject == null || MapObject.isOfType(MapObject.MY_POSITION, mMapObject))
+    if (MapObject.isOfType(MapObject.MY_POSITION, mMapObject))
       return;
 
     final Location location = LocationHelper.INSTANCE.getSavedLocation();
@@ -657,6 +810,10 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
     // Called when the content has actually changed and we are ready to compute the peek height
     void onPlacePageContentChanged(int previewHeight, int frameHeight);
 
+    void onPlacePageRequestClose();
+
     void onPlacePageRequestToggleState();
+
+    void onPlacePageRequestToggleRouteSettings(@NonNull RoadType roadType);
   }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/src/app/organicmaps/widget/placepage/PlacePageViewModel.java
index fa8ed2f3d6..be0241737d 100644
--- a/android/src/app/organicmaps/widget/placepage/PlacePageViewModel.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageViewModel.java
@@ -11,8 +11,6 @@ public class PlacePageViewModel extends ViewModel
 {
   private final MutableLiveData<List<PlacePageButtons.ButtonType>> mCurrentButtons = new MutableLiveData<>();
   private final MutableLiveData<MapObject> mMapObject = new MutableLiveData<>();
-  private final MutableLiveData<Integer> mPlacePageWidth = new MutableLiveData<>();
-  private final MutableLiveData<Integer> mPlacePageDistanceToTop = new MutableLiveData<>();
 
   public LiveData<List<PlacePageButtons.ButtonType>> getCurrentButtons()
   {
@@ -33,24 +31,4 @@ public class PlacePageViewModel extends ViewModel
   {
     mMapObject.setValue(mapObject);
   }
-
-  public MutableLiveData<Integer> getPlacePageWidth()
-  {
-    return mPlacePageWidth;
-  }
-
-  public void setPlacePageWidth(int width)
-  {
-    mPlacePageWidth.setValue(width);
-  }
-
-  public MutableLiveData<Integer> getPlacePageDistanceToTop()
-  {
-    return mPlacePageDistanceToTop;
-  }
-
-  public void setPlacePageDistanceToTop(int top)
-  {
-    mPlacePageDistanceToTop.setValue(top);
-  }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/src/app/organicmaps/widget/placepage/PlacePageWikipediaFragment.java
similarity index 89%
rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
rename to android/src/app/organicmaps/widget/placepage/PlacePageWikipediaFragment.java
index 53acc16492..f1d7a1edba 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePageWikipediaFragment.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
@@ -19,9 +19,6 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.bookmarks.data.Metadata;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.UiUtils;
-import app.organicmaps.widget.placepage.PlaceDescriptionActivity;
-import app.organicmaps.widget.placepage.PlacePageUtils;
-import app.organicmaps.widget.placepage.PlacePageViewModel;
 
 public class PlacePageWikipediaFragment extends Fragment implements Observer<MapObject>
 {
@@ -112,26 +109,23 @@ public class PlacePageWikipediaFragment extends Fragment implements Observer<Map
   }
 
   @Override
-  public void onStart()
+  public void onResume()
   {
-    super.onStart();
+    super.onResume();
     mViewModel.getMapObject().observe(requireActivity(), this);
   }
 
   @Override
-  public void onStop()
+  public void onPause()
   {
-    super.onStop();
+    super.onPause();
     mViewModel.getMapObject().removeObserver(this);
   }
 
   @Override
-  public void onChanged(@Nullable MapObject mapObject)
+  public void onChanged(MapObject mapObject)
   {
-    if (mapObject != null)
-    {
-      mMapObject = mapObject;
-      updateViews();
-    }
+    mMapObject = mapObject;
+    updateViews();
   }
 }
diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java b/android/src/app/organicmaps/widget/placepage/PlacePhoneAdapter.java
similarity index 98%
rename from android/src/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
rename to android/src/app/organicmaps/widget/placepage/PlacePhoneAdapter.java
index 0d5b095ed0..c69e93ecdd 100644
--- a/android/src/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java
+++ b/android/src/app/organicmaps/widget/placepage/PlacePhoneAdapter.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import android.content.Context;
 import android.text.TextUtils;
diff --git a/android/src/fdroid/play/listings/ar/release-notes.txt b/android/src/fdroid/play/listings/ar/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ar/release-notes.txt
+++ b/android/src/fdroid/play/listings/ar/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/az-AZ/release-notes.txt b/android/src/fdroid/play/listings/az-AZ/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/az-AZ/release-notes.txt
+++ b/android/src/fdroid/play/listings/az-AZ/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/az-AZ/title-google.txt b/android/src/fdroid/play/listings/az-AZ/title-google.txt
index 2781058ae5..e88ecfea27 100644
--- a/android/src/fdroid/play/listings/az-AZ/title-google.txt
+++ b/android/src/fdroid/play/listings/az-AZ/title-google.txt
@@ -1 +1 @@
-Organic Maps: offline maps
+Offline Organic Maps Hike Bike
diff --git a/android/src/fdroid/play/listings/be/release-notes.txt b/android/src/fdroid/play/listings/be/release-notes.txt
index db8192427a..a43a33bdb7 100644
--- a/android/src/fdroid/play/listings/be/release-notes.txt
+++ b/android/src/fdroid/play/listings/be/release-notes.txt
@@ -1,13 +1,9 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• Новыя дадзеныя OpenStreetMap за 29 сакавіка
+• Навігацыя: дададзена адлюстраванне палос, выпраўлена няправільнае становішча стрэлкі месцазнаходжання і адлюстраванне хуткасці/адлегласці
+• Выпраўлены імпарт трэкаў з некаторых KML файлаў
+• Выпраўлены API для выбару кропкі на карце
+• Мноства новых тыпаў крам
+• Дададзены станцыі зарадкі ровараў, электрастанцыя, пункты пераводу грошай
+• Зроблены рознымі колеры паркаў, лясоў і кустоў
+• Палепшаны пераклады
+…падрабязней: omaps.app/news
diff --git a/android/src/fdroid/play/listings/bg/release-notes.txt b/android/src/fdroid/play/listings/bg/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/bg/release-notes.txt
+++ b/android/src/fdroid/play/listings/bg/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/bg/title-google.txt b/android/src/fdroid/play/listings/bg/title-google.txt
index fdc2daeb27..e88ecfea27 100644
--- a/android/src/fdroid/play/listings/bg/title-google.txt
+++ b/android/src/fdroid/play/listings/bg/title-google.txt
@@ -1 +1 @@
-Organic Maps: gps и навигиране
+Offline Organic Maps Hike Bike
diff --git a/android/src/fdroid/play/listings/bn-BD/release-notes.txt b/android/src/fdroid/play/listings/bn-BD/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/bn-BD/release-notes.txt
+++ b/android/src/fdroid/play/listings/bn-BD/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/bn-BD/title-google.txt b/android/src/fdroid/play/listings/bn-BD/title-google.txt
index f75ec56c76..5727d00586 100644
--- a/android/src/fdroid/play/listings/bn-BD/title-google.txt
+++ b/android/src/fdroid/play/listings/bn-BD/title-google.txt
@@ -1 +1 @@
-Organic Maps: জিপিএস নেভিগেশন
+Organic Maps অরগানিক ম্যাপ
diff --git a/android/src/fdroid/play/listings/ca/release-notes.txt b/android/src/fdroid/play/listings/ca/release-notes.txt
index db8192427a..15575d30cd 100644
--- a/android/src/fdroid/play/listings/ca/release-notes.txt
+++ b/android/src/fdroid/play/listings/ca/release-notes.txt
@@ -1,13 +1,8 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• Dades planetàries noves de l’OSM al 29 de març
+• Auxiliar de carrils experimental
+• Es corregeix la posició incorrecta de la fletxa d’ubicació durant la navegació
+• S’arregla el selector de colors de les adreces d’interès en llengües escrites de dreta a esquerra
+• Es mostra apropiadament la velocitat i la distància al mode de navegació
+• Molts tipus de botigues nous
+• Afegeix transferències de diners, estacions de càrrega de bicicletes i centrals d’energia
+…i més: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ca/title-google.txt b/android/src/fdroid/play/listings/ca/title-google.txt
index d13e0d68c9..0fa869a588 100644
--- a/android/src/fdroid/play/listings/ca/title-google.txt
+++ b/android/src/fdroid/play/listings/ca/title-google.txt
@@ -1 +1 @@
-Organic Maps: gps offline
+Organic Maps Offline Hike Bike
diff --git a/android/src/fdroid/play/listings/cs-CZ/full-description.txt b/android/src/fdroid/play/listings/cs-CZ/full-description.txt
index 31a980f019..f5446e3f57 100644
--- a/android/src/fdroid/play/listings/cs-CZ/full-description.txt
+++ b/android/src/fdroid/play/listings/cs-CZ/full-description.txt
@@ -1,14 +1,14 @@
-‣ Naše bezplatná aplikace vás nesleduje, neobsahuje reklamy a potřebuje vaši pomoc.
-‣ Neustále ji vylepšují přispěvatelé a náš malý tým ve svém volném čase.
+‣ Naše bezplatná aplikace vás nesleduje a neobsahuje reklamy.
+‣ Neustále ji vylepšuje náš malý tým, ve svém volném čase, za naše vlastní peníze.
 ‣ Pokud na mapě něco chybí nebo je špatně, opravte to prosím v <b>OpenStreetMap</b> a uvidíte své změny v budoucí aktualizaci map.
 ‣ Pokud nefunguje navigace nebo vyhledávání, napište nám prosím. Odpovídáme na <i> KAŽDÝ</i> e-mail a opravíme to co nejdříve!
 
-<b>Vaše zpětná vazba a 5hvězdičková hodnocení jsou pro nás tou nejlepší motivací!</b>
+<b>Vaše zpětná vazba a pětihvězdičková hodnocení jsou pro nás tou nejlepší motivací!</b>
 
 Klíčové funkce:
 
-• Zdarma, open-source, bez reklam, bez špehování.
-• Podrobné offline mapy s místy, která na Google mapách neexistují, díky komunitě <b>OpenStreetMap</b>.
+• Zdarma, open-source, bez reklam, bez sledování.
+• Podrobné offline mapy s místy, která na mapách Google neexistují, díky komunitě <b>OpenStreetMap</b>.
 • Cyklistické trasy, turistické stezky a pěší trasy
 • Obrysové linie, výškové profily, vrcholy a svahy
 • Pěší, cyklistická a EXPERIMENTÁLNÍ automobilová navigace turn-by-turn s hlasovým naváděním
@@ -45,9 +45,9 @@ V Organic Maps věříme, že <b>soukromí je základním lidským právem</b>:
 • Chráníme soukromí před zvědavýma očima Big Tech.
 • Zůstaňte v bezpečí, ať jste kdekoli
 
-Podle Exodus Privacy Report vyžadují pouze minimální oprávnění a nachází se zde nula sledovacích zařízení.
+Podle zprávy Exodus Privacy Report se zde nachází nula sledovacích zařízení a vyžadují pouze minimálně oprávnění.
 
-Další podrobnosti a nejčastější dotazy najdete na <b><i>organicmaps.app</i></b> webové stránce a kontaktujte nás přímo na @OrganicMapsApp na Telegramu.
+Další podrobnosti a nejčastější dotazy najdete na <b><i>organicmaps.app</i></b> webové stránce a kontaktujte nás přímo na @OrganicMapsApp v aplikaci Telegram.
 
 Odmítněte dohled - přijměte svou svobodu.
 <b>Vyzkoušejte Organic Maps!</b>
diff --git a/android/src/fdroid/play/listings/cs-CZ/release-notes.txt b/android/src/fdroid/play/listings/cs-CZ/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/cs-CZ/release-notes.txt
+++ b/android/src/fdroid/play/listings/cs-CZ/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/cs-CZ/title-google.txt b/android/src/fdroid/play/listings/cs-CZ/title-google.txt
index 9a8daa8d3e..0fa869a588 100644
--- a/android/src/fdroid/play/listings/cs-CZ/title-google.txt
+++ b/android/src/fdroid/play/listings/cs-CZ/title-google.txt
@@ -1 +1 @@
-Organic Maps: Mapy Offline
+Organic Maps Offline Hike Bike
diff --git a/android/src/fdroid/play/listings/cs-CZ/title.txt b/android/src/fdroid/play/listings/cs-CZ/title.txt
index ceb33214cb..bb31a1db54 100644
--- a/android/src/fdroid/play/listings/cs-CZ/title.txt
+++ b/android/src/fdroid/play/listings/cs-CZ/title.txt
@@ -1 +1 @@
-Organic Maps Offline Turistika, Cyklistika, GPS
+Organic Maps Offline Turistika, Kolo & GPS
diff --git a/android/src/fdroid/play/listings/da-DK/release-notes.txt b/android/src/fdroid/play/listings/da-DK/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/da-DK/release-notes.txt
+++ b/android/src/fdroid/play/listings/da-DK/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/de-DE/release-notes.txt b/android/src/fdroid/play/listings/de-DE/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/el-GR/release-notes.txt b/android/src/fdroid/play/listings/el-GR/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/el-GR/release-notes.txt
+++ b/android/src/fdroid/play/listings/el-GR/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/en-US/release-notes.txt b/android/src/fdroid/play/listings/en-US/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/es-ES/release-notes.txt b/android/src/fdroid/play/listings/es-ES/release-notes.txt
index db8192427a..dabda0a359 100644
--- a/android/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,13 +1,8 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• Datos planetarios nuevos de OSM al 29 de marzo
+• Asistente de carril experimental
+• Arreglada la posición incorrecta de la flecha de ubicación al navegar
+• Arreglado el selector de colores para marcadores en lenguas escritas de derecha a izquierda
+• Se muestran adecuadamente las velocidades y las distancias en el modo de navegación
+• Muchos tipos de tienda nuevos
+• Añade transferencias monetarias, estaciones de carga de bicicletas y centrales de energía
+…para saber más: omaps.app/news
diff --git a/android/src/fdroid/play/listings/es-ES/title-google.txt b/android/src/fdroid/play/listings/es-ES/title-google.txt
index baca3eff86..45f6f75de5 100644
--- a/android/src/fdroid/play/listings/es-ES/title-google.txt
+++ b/android/src/fdroid/play/listings/es-ES/title-google.txt
@@ -1 +1 @@
-Organic Maps: gps sin internet
+Organic Maps bici y senderismo
diff --git a/android/src/fdroid/play/listings/et/release-notes.txt b/android/src/fdroid/play/listings/et/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/et/release-notes.txt
+++ b/android/src/fdroid/play/listings/et/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/et/title-google.txt b/android/src/fdroid/play/listings/et/title-google.txt
index e4ccefb89e..e88ecfea27 100644
--- a/android/src/fdroid/play/listings/et/title-google.txt
+++ b/android/src/fdroid/play/listings/et/title-google.txt
@@ -1 +1 @@
-Organic Maps: gps kaardid
+Offline Organic Maps Hike Bike
diff --git a/android/src/fdroid/play/listings/eu-ES/release-notes.txt b/android/src/fdroid/play/listings/eu-ES/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/eu-ES/release-notes.txt
+++ b/android/src/fdroid/play/listings/eu-ES/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/fa/release-notes.txt b/android/src/fdroid/play/listings/fa/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/fa/release-notes.txt
+++ b/android/src/fdroid/play/listings/fa/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/fi-FI/release-notes.txt b/android/src/fdroid/play/listings/fi-FI/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/fi-FI/release-notes.txt
+++ b/android/src/fdroid/play/listings/fi-FI/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/fr-FR/release-notes.txt b/android/src/fdroid/play/listings/fr-FR/release-notes.txt
index 6cad44c353..fbdd72304f 100644
--- a/android/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,12 +1,9 @@
-• Nouvelles données Openstreetmap du 3 Mai
-• Recherche d'adresses améliorée
-• Rendu de la couche métro plus rapide
-• Correction des codes postaux incorrects à Paris
-• Correction des liens Wikipédia manquants
-• Amélioration du routage
-• Amélioration de la localisation GPS sur certains appareils
-• Mise à jour de l'icône des portes et l'icône du métro de Lyon
-• Correction de l'affichage des noms des routes sur la carte aux États-Unis
-• Ajout de nouveau type de boutiques
-
-…Plus: omaps.org/fr/news
+• Nouvelles données Openstreetmap du 29 Mars
+• Indication expérimentale des voies de bifurcation
+• Correction position flèche de localisation en navigation
+• Correction sélecteur de couleur des signets
+• Correction affichage vitesse et distance en navigation
+• Beaucoup de nouveaux types de magasins
+• Ajout transfert d'argent, stations de recharge de vélos et centrales électriques
+• Différenciation des couleurs des parcs, des forêts et des broussailles
+…Plus : omaps.app/new
diff --git a/android/src/fdroid/play/listings/fr-FR/title-google.txt b/android/src/fdroid/play/listings/fr-FR/title-google.txt
index d2462cd276..3893374b2a 100644
--- a/android/src/fdroid/play/listings/fr-FR/title-google.txt
+++ b/android/src/fdroid/play/listings/fr-FR/title-google.txt
@@ -1 +1 @@
-Organic Maps: navigation gps
+Organic Maps cartes hors ligne
diff --git a/android/src/fdroid/play/listings/gl-ES/release-notes.txt b/android/src/fdroid/play/listings/gl-ES/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/gl-ES/release-notes.txt
+++ b/android/src/fdroid/play/listings/gl-ES/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/gu/release-notes.txt b/android/src/fdroid/play/listings/gu/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/gu/release-notes.txt
+++ b/android/src/fdroid/play/listings/gu/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/hi-IN/release-notes.txt b/android/src/fdroid/play/listings/hi-IN/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/hi-IN/release-notes.txt
+++ b/android/src/fdroid/play/listings/hi-IN/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/hi-IN/title-google.txt b/android/src/fdroid/play/listings/hi-IN/title-google.txt
index f2045c23b8..66f295166c 100644
--- a/android/src/fdroid/play/listings/hi-IN/title-google.txt
+++ b/android/src/fdroid/play/listings/hi-IN/title-google.txt
@@ -1 +1 @@
-ऑफलाइन Organic Maps मैप ऐप
+ऑफलाइन Organic Maps हाइक बाइक
diff --git a/android/src/fdroid/play/listings/hr/release-notes.txt b/android/src/fdroid/play/listings/hr/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/hr/release-notes.txt
+++ b/android/src/fdroid/play/listings/hr/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/hu-HU/release-notes.txt b/android/src/fdroid/play/listings/hu-HU/release-notes.txt
index 722c5cf825..685d979688 100644
--- a/android/src/fdroid/play/listings/hu-HU/release-notes.txt
+++ b/android/src/fdroid/play/listings/hu-HU/release-notes.txt
@@ -1,10 +1,8 @@
-• Új OpenStreetMap adatok (május 3)
-• A keresés most váltakozó páratlan és páros címeket talál
-• A metró réteg gyorsabb lett
-• Kijavítottuk a hiányzó Wikipedia linkeket
-• Javítottuk az autók körforgalmakon keresztüli navigációját
-• Javítottuk a helymeghatározás funkciót a hálózaton keresztül egyes eszközökön
-• Megváltozott a kapuk és a lyoni metró ikonja
-• Javítottuk az amerikai autópálya jelölő ikonokat
-• Kamerabolt, belső dekor, régiségek, művészetek, sajtbolt hozzáadása
-…infó: omaps.org/news
+• Új OpenStreetMap térképadatok (március 29)
+• Kísérleti sávnavigációs funkció
+• A felhasználó helyzetét jelző nyíl pozícióját megváltoztattuk, a jobb élmény érdekében
+• Megjavítottuk a könyvjelzők színválasztóját a jobb oldalról balra haladó írásmódú nyelveknél
+• Immáron a sebesség és a távolság helyesen van megjelenítve navigáció közben
+• Sok új bolttípussal bővült alkalmazásunk
+• Hozzáadtuk a pénz átutalóhelyeket, bicikli töltőállomásokat, és erőműveket
+…további infó: omaps.app/news
diff --git a/android/src/fdroid/play/listings/hu-HU/title-google.txt b/android/src/fdroid/play/listings/hu-HU/title-google.txt
index d365f08c61..f3398e9a75 100644
--- a/android/src/fdroid/play/listings/hu-HU/title-google.txt
+++ b/android/src/fdroid/play/listings/hu-HU/title-google.txt
@@ -1 +1 @@
-Organic Maps offline navigáció
+Organic Maps: offline GPS
diff --git a/android/src/fdroid/play/listings/id/release-notes.txt b/android/src/fdroid/play/listings/id/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/id/release-notes.txt
+++ b/android/src/fdroid/play/listings/id/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/id/title-google.txt b/android/src/fdroid/play/listings/id/title-google.txt
index d13e0d68c9..ab0bdb36be 100644
--- a/android/src/fdroid/play/listings/id/title-google.txt
+++ b/android/src/fdroid/play/listings/id/title-google.txt
@@ -1 +1 @@
-Organic Maps: gps offline
+Organic Maps Navigasi Luring
diff --git a/android/src/fdroid/play/listings/it-IT/release-notes.txt b/android/src/fdroid/play/listings/it-IT/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/iw-IL/release-notes.txt b/android/src/fdroid/play/listings/iw-IL/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/iw-IL/release-notes.txt
+++ b/android/src/fdroid/play/listings/iw-IL/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ja-JP/release-notes.txt b/android/src/fdroid/play/listings/ja-JP/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ja-JP/release-notes.txt
+++ b/android/src/fdroid/play/listings/ja-JP/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ka-GE/release-notes.txt b/android/src/fdroid/play/listings/ka-GE/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ka-GE/release-notes.txt
+++ b/android/src/fdroid/play/listings/ka-GE/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ka-GE/short-description.txt b/android/src/fdroid/play/listings/ka-GE/short-description.txt
index a59f79d255..c2f1533e8e 100644
--- a/android/src/fdroid/play/listings/ka-GE/short-description.txt
+++ b/android/src/fdroid/play/listings/ka-GE/short-description.txt
@@ -1 +1 @@
-ღია კოდის მქონე რუკა მოგზაურებისთვს, ტურისტებისთვის, ველოსიპედისტებისთვის და ა.შ
+Open-source, community-driven maps for travelers, tourists, cyclists & hikers
diff --git a/android/src/fdroid/play/listings/ka-GE/title.txt b/android/src/fdroid/play/listings/ka-GE/title.txt
index c5aecbe0dd..1a8a13ec0c 100644
--- a/android/src/fdroid/play/listings/ka-GE/title.txt
+++ b/android/src/fdroid/play/listings/ka-GE/title.txt
@@ -1 +1 @@
-Organic Maps Offline Hike, მოტო, GPS ნავიგაცია
+Organic Maps Offline Hike, Bike, GPS Navigation
diff --git a/android/src/fdroid/play/listings/kk/release-notes.txt b/android/src/fdroid/play/listings/kk/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/kk/release-notes.txt
+++ b/android/src/fdroid/play/listings/kk/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/km-KH/release-notes.txt b/android/src/fdroid/play/listings/km-KH/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/km-KH/release-notes.txt
+++ b/android/src/fdroid/play/listings/km-KH/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/kn-IN/release-notes.txt b/android/src/fdroid/play/listings/kn-IN/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/kn-IN/release-notes.txt
+++ b/android/src/fdroid/play/listings/kn-IN/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ko-KR/release-notes.txt b/android/src/fdroid/play/listings/ko-KR/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ko-KR/release-notes.txt
+++ b/android/src/fdroid/play/listings/ko-KR/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/lo-LA/release-notes.txt b/android/src/fdroid/play/listings/lo-LA/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/lo-LA/release-notes.txt
+++ b/android/src/fdroid/play/listings/lo-LA/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/lt/release-notes.txt b/android/src/fdroid/play/listings/lt/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/lt/release-notes.txt
+++ b/android/src/fdroid/play/listings/lt/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/lv/release-notes.txt b/android/src/fdroid/play/listings/lv/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/lv/release-notes.txt
+++ b/android/src/fdroid/play/listings/lv/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/mk-MK/release-notes.txt b/android/src/fdroid/play/listings/mk-MK/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/mk-MK/release-notes.txt
+++ b/android/src/fdroid/play/listings/mk-MK/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ml-IN/release-notes.txt b/android/src/fdroid/play/listings/ml-IN/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ml-IN/release-notes.txt
+++ b/android/src/fdroid/play/listings/ml-IN/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/mr-IN/release-notes.txt b/android/src/fdroid/play/listings/mr-IN/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/mr-IN/release-notes.txt
+++ b/android/src/fdroid/play/listings/mr-IN/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ms/release-notes.txt b/android/src/fdroid/play/listings/ms/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ms/release-notes.txt
+++ b/android/src/fdroid/play/listings/ms/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ne-NP/release-notes.txt b/android/src/fdroid/play/listings/ne-NP/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ne-NP/release-notes.txt
+++ b/android/src/fdroid/play/listings/ne-NP/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/nl-NL/release-notes.txt b/android/src/fdroid/play/listings/nl-NL/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/nl-NL/release-notes.txt
+++ b/android/src/fdroid/play/listings/nl-NL/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/no-NO/release-notes.txt b/android/src/fdroid/play/listings/no-NO/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/no-NO/release-notes.txt
+++ b/android/src/fdroid/play/listings/no-NO/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/pl-PL/release-notes.txt b/android/src/fdroid/play/listings/pl-PL/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/pl-PL/release-notes.txt
+++ b/android/src/fdroid/play/listings/pl-PL/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/pl-PL/title-google.txt b/android/src/fdroid/play/listings/pl-PL/title-google.txt
index 53f39447ce..1630be2666 100644
--- a/android/src/fdroid/play/listings/pl-PL/title-google.txt
+++ b/android/src/fdroid/play/listings/pl-PL/title-google.txt
@@ -1 +1 @@
-Organic Maps: gps nawigacja
+Organic Maps: Wędrówki i rower
diff --git a/android/src/fdroid/play/listings/pt-BR/release-notes.txt b/android/src/fdroid/play/listings/pt-BR/release-notes.txt
index b7c1041a2f..43d74eb0d4 100644
--- a/android/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,12 +1,10 @@
-• Novos dados OSM de 03/05
-• Busca suporta endereços interpolados
-• Renderização mais rápida do metrô
-• Correção de links ausentes da Wikipédia
-• Melhor roteamento nas rotatórias
-• Ativação de TTS para ES-MX e PT-BR
-• Correção de detecção de localização via rede em alguns dispositivos
-• Alteração de ícone de portão e do metrô de Lyon
-• Correção de placas de estradas dos EUA
-• Adição de loja de antiguidades, arte, câmeras, interiores e queijos
-
-…mais: omaps.org/news
+• Novos dados OSM de 29/03
+• Assistente de faixas (beta)
+• Correção da posição de seta de localização durante navegação
+• Correção do selecionador de cores dos favoritos para escritas RTL
+• Exibição correta da velocidade e distância no modo de navegação
+• Correção da API para selecionar um ponto no mapa
+• Muitos novos tipos de lojas
+• Adição de carregamento de bicicleta, transferência de dinheiro e usinas
+• Distinção de arbustos, florestas e parques
+…mais: omaps.app/news
diff --git a/android/src/fdroid/play/listings/pt-PT/release-notes.txt b/android/src/fdroid/play/listings/pt-PT/release-notes.txt
index 8432d9d3e1..eb8a659b27 100644
--- a/android/src/fdroid/play/listings/pt-PT/release-notes.txt
+++ b/android/src/fdroid/play/listings/pt-PT/release-notes.txt
@@ -1,12 +1,10 @@
-• Novos dados OSM de 03/05
-• Busca suporta moradas interpoladas
-• Renderização mais rápida do metro
-• Correção de links ausentes da Wikipédia
-• Melhor roteamento nas rotundas
-• Ativação de TTS para ES-MX e PT-BR
-• Correção de deteção de localização via rede em alguns dispositivos
-• Alteração de ícone de portão e do metro de Lyon
-• Correção de placas de estradas dos EUA
-• Adição de loja de antiguidades, arte, câmeras, interiores e queijos
-
-…mais: omaps.org/news
+• Novos dados OSM de 29/03
+• Assistente de pistas (beta)
+• Correção da posição de seta de localização durante navegação
+• Correção do selecionador de cores dos favoritos para escritas RTL
+• Exibição correta da velocidade e distância no modo de navegação
+• Correção da API para selecionar um ponto no mapa
+• Muitos novos tipos de lojas
+• Adição de carregamento de bicicleta, transferência de dinheiro e usinas
+• Distinção de arbustos, florestas e parques
+…mais: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ro/release-notes.txt b/android/src/fdroid/play/listings/ro/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ro/release-notes.txt
+++ b/android/src/fdroid/play/listings/ro/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ru-RU/release-notes.txt b/android/src/fdroid/play/listings/ru-RU/release-notes.txt
index 3e3ebff5b7..b99106831f 100644
--- a/android/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,11 +1,9 @@
-• Новые данные OpenStreetMap за 3 мая
-• Поиск чередующихся чётных/нечётных адресов
-• Быстрая прорисовка слоя метро
-• Исправлены неверные почтовые индексы в Париже
-• Исправлены недостающие ссылки Википедии
-• Исправлена автомобильная навигация через круговые развязки
-• Исправлено определение местоположения через интернет на некоторых устройствах
-• Изменены иконки ворот и метро Лиона
-• Добавлены магазины камер, дизайнера интерьеров, антиквариата, искусства, сыра
-
-…подробнее: omaps.org/ru/news
+• Новые данные OpenStreetMap за 29 марта
+• Навигация: добавлено отображение полос, исправлено неправильное положение стрелки местоположения и отображение скорости/расстояния
+• Исправлен импорт треков из некоторых KML файлов
+• Исправлен API для выбора точки на карте
+• Множество новых типов магазинов
+• Добавлены станции зарядки велосипедов, электростанция, пункты перевода денег
+• Сделаны разными цвета парков, лесов и кустарников
+• Улучшены переводы
+…подробнее: omaps.app/news
diff --git a/android/src/fdroid/play/listings/si-LK/release-notes.txt b/android/src/fdroid/play/listings/si-LK/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/si-LK/release-notes.txt
+++ b/android/src/fdroid/play/listings/si-LK/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/sk/release-notes.txt b/android/src/fdroid/play/listings/sk/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/sk/release-notes.txt
+++ b/android/src/fdroid/play/listings/sk/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/sl/release-notes.txt b/android/src/fdroid/play/listings/sl/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/sl/release-notes.txt
+++ b/android/src/fdroid/play/listings/sl/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/sr/release-notes.txt b/android/src/fdroid/play/listings/sr/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/src/fdroid/play/listings/sr/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/sv-SE/release-notes.txt b/android/src/fdroid/play/listings/sv-SE/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/sv-SE/release-notes.txt
+++ b/android/src/fdroid/play/listings/sv-SE/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/sv-SE/title-google.txt b/android/src/fdroid/play/listings/sv-SE/title-google.txt
index 6caf7ede32..e88ecfea27 100644
--- a/android/src/fdroid/play/listings/sv-SE/title-google.txt
+++ b/android/src/fdroid/play/listings/sv-SE/title-google.txt
@@ -1 +1 @@
-Organic Maps: karta gps
+Offline Organic Maps Hike Bike
diff --git a/android/src/fdroid/play/listings/th/release-notes.txt b/android/src/fdroid/play/listings/th/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/th/release-notes.txt
+++ b/android/src/fdroid/play/listings/th/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/tr-TR/release-notes.txt b/android/src/fdroid/play/listings/tr-TR/release-notes.txt
index 587901883a..87a78a7076 100644
--- a/android/src/fdroid/play/listings/tr-TR/release-notes.txt
+++ b/android/src/fdroid/play/listings/tr-TR/release-notes.txt
@@ -1,11 +1,11 @@
-• 3 Mayıs tarihine ait yeni OpenStreetMap verileri
-• addr:interpolation adresleri artık aranabilir
-• Metro katmanı artık daha hızlı açılıyor 
-• Eksik Vikipedi bağlantıları düzeltildi 
-• Döner kavşaklardan geçen araç rotalarında bazı düzeltmeler yapıldı
-• Bazı cihazlarda ağ üzerinden konum algılama düzeltildi 
-• Geçit simgesi değiştirildi
-• Fotoğraf makinesi mağazası, iç dekorasyon, antika, sanat, peynirci kategorileri eklendi 
-
- …dahası: omaps.org/tr/news
- 
+Mutlu Ramazanlar!
+• 29 Mart tarihine ait yeni OpenStreetMap harita verileri
+• Deneysel şerit asistanı
+• Navigasyon sırasındaki konum okunun konumu düzeltildi
+• Artık navigasyon modundayken hız ve mesafe düzgün şekilde görüntüleniyor
+• API için haritadan nokta seçimi düzeltildi
+• Birçok yeni mağaza türü eklendi
+• Para transferi, bisiklet şarj istasyonu ve elektrik santrali kategorileri eklendi
+• Park, orman ve çalılık renkleri artık farklı
+• Çeviriler iyileştirildi
+…dahası: omaps.app/tr/news
diff --git a/android/src/fdroid/play/listings/tr-TR/title-google.txt b/android/src/fdroid/play/listings/tr-TR/title-google.txt
index 07dd31b017..c16af3d826 100644
--- a/android/src/fdroid/play/listings/tr-TR/title-google.txt
+++ b/android/src/fdroid/play/listings/tr-TR/title-google.txt
@@ -1 +1 @@
-Organic Maps: GPS Haritalar
+Organic Maps Çevrimdışı Harita
diff --git a/android/src/fdroid/play/listings/uk/release-notes.txt b/android/src/fdroid/play/listings/uk/release-notes.txt
index 80511d9d4b..773c41dd7f 100644
--- a/android/src/fdroid/play/listings/uk/release-notes.txt
+++ b/android/src/fdroid/play/listings/uk/release-notes.txt
@@ -1,11 +1,9 @@
-• Нові дані OpenStreetMap станом на 3 травня
-• Пошук тепер знаходить парні та непарні інтерполовані адреси
-• Пришвидшення малювання схеми метро
-• Виправлення зниклих посилань до Wikipedia
-• Виправлена навігації через кільце
-• Виправлено визначення місцеположення за допомогою мережі на деяких пристроях
-• Нові іконки воріт та станцій метро у Ліоні
-• Виправлення щитів доріг у США
-• Додані магазини фототехніки, декору, антикваріату, мистецтва та сиру
-
-…більше: omaps.org/news
+• Нові дані OSM Planet станом на 29 березня
+• Експериментальний помічник по смугам руху
+• Виправлено неправильне розташування стрілки місцезнаходження під час навігації
+• Виправлено вибір кольору закладки для мов із написанням справа наліво
+• Правильне відображення швидкості та відстані в режимі навігації
+• Багато нових типів магазинів
+• Додано переказ грошей, станції зарядки велосипедів, електростанції
+• Зроблено різними кольори парки, ліси та чагарники
+…більше: omaps.app/news
diff --git a/android/src/fdroid/play/listings/ur/release-notes.txt b/android/src/fdroid/play/listings/ur/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/ur/release-notes.txt
+++ b/android/src/fdroid/play/listings/ur/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/vi/release-notes.txt b/android/src/fdroid/play/listings/vi/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/vi/release-notes.txt
+++ b/android/src/fdroid/play/listings/vi/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/vi/title-google.txt b/android/src/fdroid/play/listings/vi/title-google.txt
index 7fd31360ca..e88ecfea27 100644
--- a/android/src/fdroid/play/listings/vi/title-google.txt
+++ b/android/src/fdroid/play/listings/vi/title-google.txt
@@ -1 +1 @@
-Organic Maps: bản đồ dẫn đường
+Offline Organic Maps Hike Bike
diff --git a/android/src/fdroid/play/listings/zh-CN/release-notes.txt b/android/src/fdroid/play/listings/zh-CN/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/zh-CN/release-notes.txt
+++ b/android/src/fdroid/play/listings/zh-CN/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/zh-CN/title-google.txt b/android/src/fdroid/play/listings/zh-CN/title-google.txt
index 6704b74cc6..dc8383a09d 100644
--- a/android/src/fdroid/play/listings/zh-CN/title-google.txt
+++ b/android/src/fdroid/play/listings/zh-CN/title-google.txt
@@ -1 +1 @@
-Organic Maps: 地图更新
+Organic Maps 离线登山与骑行
diff --git a/android/src/fdroid/play/listings/zh-HK/release-notes.txt b/android/src/fdroid/play/listings/zh-HK/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/zh-HK/release-notes.txt
+++ b/android/src/fdroid/play/listings/zh-HK/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/listings/zh-TW/release-notes.txt b/android/src/fdroid/play/listings/zh-TW/release-notes.txt
index db8192427a..fdf8ecf092 100644
--- a/android/src/fdroid/play/listings/zh-TW/release-notes.txt
+++ b/android/src/fdroid/play/listings/zh-TW/release-notes.txt
@@ -1,13 +1,11 @@
-• New OpenStreetMap data as of May 3
-• Fix search for interpolated odd/even house numbers
-• Fix zoom buttons setting
-• Faster rendering of subway layer
-• Fix wrong postcodes in Paris
-• Fix missing Wikipedia links
-• Fix car routing via roundabouts
-• Enable TTS for Portuguese/Brazil, Español/México
-• Fix location detection over a network on some devices
-• Change gates and Lyon subway icon
-• Fix US road shields
-• Add camera, interior_decoration, antiques, art, cheese shops
-…more: omaps.org/news
+• New OpenStreetMap data as of March 29
+• Experimental Lane assistant
+• Fix wrong location arrow position during navigation
+• Fix bookmark's color chooser for Right-To-Left languages
+• Properly display speed and distance in navigation mode
+• Fix API to select a point on the map
+• Many new shop types
+• Add money transfer, bicycle charging stations, power plant
+• Made park, forest, and scrub colors different
+• Improved ar, be, de, hu, tr translations
+…more: omaps.app/news
diff --git a/android/src/fdroid/play/version.yaml b/android/src/fdroid/play/version.yaml
index 316114505b..f9cdcea489 100644
--- a/android/src/fdroid/play/version.yaml
+++ b/android/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2023.05.08-7-FDroid+23050807
+version: 2023.04.02-7-FDroid+23040207
diff --git a/android/tests/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java b/android/tests/java/app/organicmaps/widget/placepage/PlaceOpeningHoursAdapterTest.java
similarity index 98%
rename from android/tests/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java
rename to android/tests/java/app/organicmaps/widget/placepage/PlaceOpeningHoursAdapterTest.java
index e427e084b0..499662aca5 100644
--- a/android/tests/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java
+++ b/android/tests/java/app/organicmaps/widget/placepage/PlaceOpeningHoursAdapterTest.java
@@ -1,10 +1,9 @@
-package app.organicmaps.widget.placepage.sections;
+package app.organicmaps.widget.placepage;
 
 import app.organicmaps.editor.data.HoursMinutes;
 import app.organicmaps.editor.data.Timespan;
 import app.organicmaps.editor.data.Timetable;
-import app.organicmaps.widget.placepage.sections.PlaceOpeningHoursAdapter;
-import app.organicmaps.widget.placepage.sections.PlaceOpeningHoursAdapter.WeekScheduleData;
+import app.organicmaps.widget.placepage.PlaceOpeningHoursAdapter.WeekScheduleData;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/base/base_tests/beam_tests.cpp b/base/base_tests/beam_tests.cpp
index 0cb4705c30..a575643d38 100644
--- a/base/base_tests/beam_tests.cpp
+++ b/base/base_tests/beam_tests.cpp
@@ -12,11 +12,11 @@
 #include <string>
 #include <vector>
 
-namespace beam_tests
-{
 using namespace base;
 using namespace std;
 
+namespace
+{
 template <template <typename, typename> class Beam>
 void Smoke()
 {
@@ -65,11 +65,12 @@ void Benchmark(string const & beamType, uint64_t const numResets, size_t const c
       beam.Add(i, dis(rng));
   }
 }
+}  // namespace
 
 UNIT_TEST(Beam_Smoke)
 {
-  Smoke<Beam>();
-  Smoke<HeapBeam>();
+  Smoke<base::Beam>();
+  Smoke<base::HeapBeam>();
 }
 
 UNIT_TEST(Beam_Benchmark)
@@ -80,8 +81,7 @@ UNIT_TEST(Beam_Benchmark)
   for (uint64_t numResets = 0; numResets < 1000; numResets += 200)
   {
     LOG(LINFO, ("Resets =", numResets, "Capacity =", kCapacity, "Total events =", kNumEvents));
-    Benchmark<Beam>("Vector-based", numResets, kCapacity, kNumEvents);
-    Benchmark<HeapBeam>("Heap-based", numResets, kCapacity, kNumEvents);
+    Benchmark<base::Beam>("Vector-based", numResets, kCapacity, kNumEvents);
+    Benchmark<base::HeapBeam>("Heap-based", numResets, kCapacity, kNumEvents);
   }
 }
-}  // namespace beam_tests
diff --git a/base/base_tests/buffer_vector_test.cpp b/base/base_tests/buffer_vector_test.cpp
index 1abf1b8849..2e279163cd 100644
--- a/base/base_tests/buffer_vector_test.cpp
+++ b/base/base_tests/buffer_vector_test.cpp
@@ -316,10 +316,10 @@ struct CopyCtorChecker
   }
 };
 
-// void swap(CopyCtorChecker & r1, CopyCtorChecker & r2)
-// {
-//   r1.m_s.swap(r2.m_s);
-// }
+void swap(CopyCtorChecker & r1, CopyCtorChecker & r2)
+{
+  r1.m_s.swap(r2.m_s);
+}
 
 typedef buffer_vector<CopyCtorChecker, 2> VectorT;
 
diff --git a/base/base_tests/cancellable_tests.cpp b/base/base_tests/cancellable_tests.cpp
index af0fc161a7..760020416a 100644
--- a/base/base_tests/cancellable_tests.cpp
+++ b/base/base_tests/cancellable_tests.cpp
@@ -55,7 +55,7 @@ UNIT_TEST(Cancellable_Deadline)
   double x = 0.123;
 
   auto const fn = [&] {
-    while (true)
+    for (size_t it = 0;; it++)
     {
       if (cancellable.IsCancelled())
         break;
diff --git a/base/base_tests/clustering_map_tests.cpp b/base/base_tests/clustering_map_tests.cpp
index e15aae41db..e1f9332492 100644
--- a/base/base_tests/clustering_map_tests.cpp
+++ b/base/base_tests/clustering_map_tests.cpp
@@ -63,7 +63,7 @@ public:
   template <typename V>
   void Append(Key const & key, V && value)
   {
-    m_m.Append(key, std::forward<V>(value));
+    m_m.Append(key, forward<V>(value));
   }
 
   void Union(Key const & u, Key const & v) { m_m.Union(u, v); }
diff --git a/base/base_tests/mem_trie_test.cpp b/base/base_tests/mem_trie_test.cpp
index fc4e01dcdc..892b242d10 100644
--- a/base/base_tests/mem_trie_test.cpp
+++ b/base/base_tests/mem_trie_test.cpp
@@ -101,7 +101,7 @@ UNIT_CLASS_TEST(MemTrieTest, Basic)
   TEST_EQUAL(GetExpectedContents(), GetActualContents(), ());
   TEST_EQUAL(GetNumNodes(), 8, ());
 
-  Trie newTrie(std::move(m_trie));
+  Trie newTrie(move(m_trie));
 
   TEST_EQUAL(m_trie.GetNumNodes(), 1, ());
   TEST(GetTrieContents(m_trie).empty(), ());
diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp
index 7d65879546..c9780231bc 100644
--- a/base/buffer_vector.hpp
+++ b/base/buffer_vector.hpp
@@ -473,8 +473,3 @@ typename buffer_vector<T, N>::const_iterator end(buffer_vector<T, N> const & v)
   return v.end();
 }
 }  // namespace std
-
-template <class Dest, class Src> void assign_range(Dest & dest, Src const & src)
-{
-  dest.assign(std::begin(src), std::end(src));
-}
diff --git a/base/logging.cpp b/base/logging.cpp
index 3ba2a10e40..9ae4e7c8c1 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -12,35 +12,37 @@
 #include <mutex>
 #include <sstream>
 
+using namespace std;
+
 namespace
 {
-std::mutex g_logMutex;
+mutex g_logMutex;
 }  // namespace
 
 namespace base
 {
-std::string ToString(LogLevel level)
+string ToString(LogLevel level)
 {
   auto const & names = GetLogLevelNames();
   CHECK_LESS(level, names.size(), ());
   return names[level];
 }
 
-bool FromString(std::string const & s, LogLevel & level)
+bool FromString(string const & s, LogLevel & level)
 {
   auto const & names = GetLogLevelNames();
   auto it = find(names.begin(), names.end(), s);
   if (it == names.end())
     return false;
-  level = static_cast<LogLevel>(std::distance(names.begin(), it));
+  level = static_cast<LogLevel>(distance(names.begin(), it));
   return true;
 }
 
-std::array<char const *, NUM_LOG_LEVELS> const & GetLogLevelNames()
+array<char const *, NUM_LOG_LEVELS> const & GetLogLevelNames()
 {
   // If you're going to modify the behavior of the function, please,
   // check validity of LogHelper ctor.
-  static std::array<char const *, NUM_LOG_LEVELS> const kNames = {
+  static array<char const *, NUM_LOG_LEVELS> const kNames = {
       {"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}};
   return kNames;
 }
@@ -70,7 +72,7 @@ int LogHelper::GetThreadID()
   return id;
 }
 
-void LogHelper::WriteProlog(std::ostream & s, LogLevel level)
+void LogHelper::WriteProlog(ostream & s, LogLevel level)
 {
   s << "LOG";
 
@@ -78,31 +80,31 @@ void LogHelper::WriteProlog(std::ostream & s, LogLevel level)
   s << " " << m_names[level];
 
   double const sec = m_timer.ElapsedSeconds();
-  s << " " << std::setfill(' ') << std::setw(static_cast<int>(16 - m_lens[level])) << sec << " ";
+  s << " " << setfill(' ') << setw(static_cast<int>(16 - m_lens[level])) << sec << " ";
 }
 
-void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, std::string const & msg)
+void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg)
 {
-  std::lock_guard lock(g_logMutex);
+  lock_guard<mutex> lock(g_logMutex);
 
   auto & logger = LogHelper::Instance();
 
-  std::ostringstream out;
+  ostringstream out;
   logger.WriteProlog(out, level);
 
-  out << DebugPrint(srcPoint) << msg << std::endl;
-  std::cerr << out.str();
+  out << DebugPrint(srcPoint) << msg << endl;
+  cerr << out.str();
 
   CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
 }
 
-void LogMessageTests(LogLevel level, SrcPoint const &, std::string const & msg)
+void LogMessageTests(LogLevel level, SrcPoint const &, string const & msg)
 {
-  std::lock_guard lock(g_logMutex);
+  lock_guard<mutex> lock(g_logMutex);
 
-  std::ostringstream out;
-  out << msg << std::endl;
-  std::cerr << out.str();
+  ostringstream out;
+  out << msg << endl;
+  cerr << out.str();
 
   CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
 }
@@ -111,7 +113,7 @@ LogMessageFn LogMessage = &LogMessageDefault;
 
 LogMessageFn SetLogMessageFn(LogMessageFn fn)
 {
-  std::swap(LogMessage, fn);
+  swap(LogMessage, fn);
   return fn;
 }
 
diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp
index 7b7c9fe55a..f70bbf9242 100644
--- a/base/mem_trie.hpp
+++ b/base/mem_trie.hpp
@@ -55,7 +55,7 @@ public:
   void AddSubtree(Char const & c, std::unique_ptr<Subtree> subtree)
   {
     ASSERT(!GetSubtree(c), ());
-    m_subtrees.emplace(c, std::move(subtree));
+    m_subtrees.emplace(c, move(subtree));
   }
 
   void EraseSubtree(Char const & c) { m_subtrees.erase(c); }
diff --git a/base/stl_helpers.hpp b/base/stl_helpers.hpp
index 173c512469..da658080e0 100644
--- a/base/stl_helpers.hpp
+++ b/base/stl_helpers.hpp
@@ -116,17 +116,11 @@ void SortUnique(Cont & c)
 
 /// @name Use std::ref to pass functors into std, since all algorithm functions here get forwarding reference.
 /// @{
-template <typename Cont, typename Equals>
-void Unique(Cont & c, Equals && equals)
-{
-  c.erase(std::unique(c.begin(), c.end(), std::ref(equals)), c.end());
-}
-
 template <typename Cont, typename Less, typename Equals>
 void SortUnique(Cont & c, Less && less, Equals && equals)
 {
   std::sort(c.begin(), c.end(), std::ref(less));
-  Unique(c, equals);
+  c.erase(std::unique(c.begin(), c.end(), std::ref(equals)), c.end());
 }
 
 template <typename Cont, typename Fn>
diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index c8de922852..db7fd9f975 100644
--- a/base/string_utils.cpp
+++ b/base/string_utils.cpp
@@ -454,7 +454,7 @@ void ParseCSVRow(std::string const & s, char const delimiter, std::vector<std::s
   {
     std::string column(*it);
     strings::Trim(column);
-    target.push_back(std::move(column));
+    target.push_back(move(column));
   }
 
   // Special case: if the string is empty, return an empty array instead of {""}.
diff --git a/base/string_utils.hpp b/base/string_utils.hpp
index 2feac30b71..1ae52e015b 100644
--- a/base/string_utils.hpp
+++ b/base/string_utils.hpp
@@ -467,6 +467,12 @@ bool ToInteger(char const * start, T & result, int base = 10)
 [[nodiscard]] bool to_double(char const * s, double & d);
 [[nodiscard]] bool is_finite(double d);
 
+[[nodiscard]] inline bool is_number(std::string const & s)
+{
+  uint64_t dummy;
+  return to_uint64(s.c_str(), dummy);
+}
+
 [[nodiscard]] inline bool to_int(std::string const & s, int & i, int base = 10)
 {
   return to_int(s.c_str(), i, base);
@@ -529,6 +535,12 @@ inline bool to_double(std::string_view sv, double & d)
   /// @todo std::from_chars still not implemented?
   return to_double(std::string(sv), d);
 }
+
+inline bool is_number(std::string_view s)
+{
+  uint64_t i;
+  return impl::from_sv(s, i);
+}
 //@}
 
 
diff --git a/base/suffix_array.cpp b/base/suffix_array.cpp
index b783364b03..16d16bd0c1 100644
--- a/base/suffix_array.cpp
+++ b/base/suffix_array.cpp
@@ -4,6 +4,8 @@
 
 #include <limits>
 
+using namespace std;
+
 namespace
 {
 bool LEQ(size_t a1, size_t a2, size_t b1, size_t b2)
@@ -26,7 +28,7 @@ template <typename Values>
 void RadixSort(size_t numKeys, size_t const * keys, size_t numValues, Values const & values,
                size_t * resultKeys)
 {
-  std::vector<size_t> count(numValues, 0);
+  vector<size_t> count(numValues, 0);
   for (size_t i = 0; i < numKeys; ++i)
   {
     auto const value = values[keys[i]];
@@ -58,7 +60,7 @@ struct SkewWrapper
     return 0;
   }
 
-  size_t MaxValue() const { return static_cast<size_t>(std::numeric_limits<uint8_t>::max()) + 1; }
+  size_t MaxValue() const { return static_cast<size_t>(numeric_limits<uint8_t>::max()) + 1; }
 
   size_t const m_n;
   uint8_t const * const m_s;
@@ -94,7 +96,7 @@ Slice<Container> MakeSlice(Container const & c, size_t offset)
 template <typename S>
 void RawSkew(size_t n, size_t maxValue, S const & s, size_t * sa)
 {
-  size_t const kInvalidId = std::numeric_limits<size_t>::max();
+  size_t const kInvalidId = numeric_limits<size_t>::max();
 
   if (n == 0)
     return;
@@ -119,8 +121,8 @@ void RawSkew(size_t n, size_t maxValue, S const & s, size_t * sa)
   ASSERT_EQUAL(fake1, static_cast<uint32_t>(n % 3 == 1), ());
 
   // Generate positions of =(1|2) (mod 3) suffixes.
-  std::vector<size_t> s12(n02 + 3);
-  std::vector<size_t> sa12(n02 + 3);
+  vector<size_t> s12(n02 + 3);
+  vector<size_t> sa12(n02 + 3);
 
   // (n0 - n1) is needed in case when n == 0 (mod 3).  We need a fake
   // =1 (mod 3) suffix for proper sorting of =0 (mod 3) suffixes.
@@ -184,8 +186,8 @@ void RawSkew(size_t n, size_t maxValue, S const & s, size_t * sa)
   // in s12 are unique.
 
   // Need to do a stable sort for all =0 (mod 3) suffixes.
-  std::vector<size_t> s0(n0);
-  std::vector<size_t> sa0(n0);
+  vector<size_t> s0(n0);
+  vector<size_t> sa0(n0);
   for (size_t i = 0, j = 0; i < n02; ++i)
   {
     if (sa12[i] < n0)
@@ -245,7 +247,7 @@ void Skew(size_t n, uint8_t const * s, size_t * sa)
   RawSkew(n, wrapper.MaxValue(), wrapper, sa);
 }
 
-void Skew(std::string const & s, std::vector<size_t> & sa)
+void Skew(string const & s, vector<size_t> & sa)
 {
   auto const n = s.size();
   sa.assign(n, 0);
diff --git a/base/thread.cpp b/base/thread.cpp
index a2c219a4b5..5cc65a2d92 100644
--- a/base/thread.cpp
+++ b/base/thread.cpp
@@ -2,8 +2,6 @@
 
 #include "base/logging.hpp"
 
-#include "std/target_os.hpp"
-
 #include <chrono>
 #include <exception>
 
@@ -64,7 +62,7 @@ bool Thread::Create(std::unique_ptr<IRoutine> && routine)
     m_routine.reset();
     return false;
   }
-  m_thread = std::move(routineThread);
+  m_thread = move(routineThread);
   return true;
 }
 
diff --git a/base/thread.hpp b/base/thread.hpp
index 3a332e2144..40a9ee0974 100644
--- a/base/thread.hpp
+++ b/base/thread.hpp
@@ -4,9 +4,13 @@
 #include "base/cancellable.hpp"
 #include "base/macros.hpp"
 
+#include "std/target_os.hpp"
+
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <thread>
+#include <utility>
 
 namespace threads
 {
@@ -84,7 +88,7 @@ public:
 
   SimpleThread() noexcept {}
   SimpleThread(SimpleThread && x) noexcept
-    : m_thread(std::move(x.m_thread))
+    : m_thread(move(x.m_thread))
   {}
 
   template <class Fn, class... Args>
@@ -94,7 +98,7 @@ public:
 
   SimpleThread & operator= (SimpleThread && x) noexcept
   {
-    m_thread = std::move(x.m_thread);
+    m_thread = move(x.m_thread);
     return *this;
   }
 
diff --git a/base/thread_pool.cpp b/base/thread_pool.cpp
index c42f3139f2..cd219b9a14 100644
--- a/base/thread_pool.cpp
+++ b/base/thread_pool.cpp
@@ -8,15 +8,18 @@
 #include <utility>
 #include <vector>
 
-namespace base::thread_pool
+namespace base
+{
+namespace thread_pool
 {
 namespace routine
 {
+using namespace threads;
 namespace
 {
 typedef std::function<threads::IRoutine *()> TPopRoutineFn;
 
-class PoolRoutine : public threads::IRoutine
+class PoolRoutine : public IRoutine
 {
 public:
   PoolRoutine(const TPopRoutineFn & popFn, const TFinishRoutineFn & finishFn)
@@ -56,7 +59,7 @@ public:
     ASSERT_GREATER(size, 0, ());
     for (auto & thread : m_threads)
     {
-      thread = std::make_unique<threads::Thread>();
+      thread.reset(new threads::Thread());
       thread->Create(std::make_unique<PoolRoutine>(std::bind(&ThreadPool::Impl::PopFront, this), m_finishFn));
     }
   }
@@ -124,7 +127,7 @@ void ThreadPool::PushBack(threads::IRoutine * routine)
   m_impl->PushBack(routine);
 }
 
-void ThreadPool::PushFront(threads::IRoutine * routine)
+void ThreadPool::PushFront(IRoutine * routine)
 {
   m_impl->PushFront(routine);
 }
@@ -141,8 +144,8 @@ ThreadPool::ThreadPool(size_t reserve) { m_pool.reserve(reserve); }
 
 void ThreadPool::Add(std::unique_ptr<threads::IRoutine> && routine)
 {
-  m_pool.emplace_back(std::make_unique<threads::Thread>());
-  m_pool.back()->Create(std::move(routine));
+  m_pool.emplace_back(new threads::Thread());
+  m_pool.back()->Create(move(routine));
 }
 
 void ThreadPool::Join()
@@ -152,6 +155,6 @@ void ThreadPool::Join()
 }
 
 threads::IRoutine * ThreadPool::GetRoutine(size_t i) const { return m_pool[i]->GetRoutine(); }
-
 }  // namespace routine_simple
-}  // namespace base::thread_pool
+}  // namespace thread_pool
+}  // namespace base
diff --git a/base/thread_pool.hpp b/base/thread_pool.hpp
index a6e912c60b..cf71ff357a 100644
--- a/base/thread_pool.hpp
+++ b/base/thread_pool.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "base/base.hpp"
 #include "base/macros.hpp"
 
 #include <functional>
@@ -11,7 +12,9 @@ class IRoutine;
 class Thread;
 }  // namespace threads
 
-namespace base::thread_pool
+namespace base
+{
+namespace thread_pool
 {
 namespace routine
 {
@@ -48,9 +51,10 @@ public:
   threads::IRoutine * GetRoutine(size_t i) const;
 
 private:
-  std::vector<std::unique_ptr<threads::Thread>> m_pool;
+    std::vector<std::unique_ptr<threads::Thread>> m_pool;
 
-  DISALLOW_COPY(ThreadPool);
+    DISALLOW_COPY(ThreadPool);
 };
 }  // namespace routine_simple
-}  // namespace base::thread_pool
+}  // namespace thread_pool
+}  // namespace base
diff --git a/base/thread_pool_delayed.cpp b/base/thread_pool_delayed.cpp
index 6bd112909b..53dca92e2e 100644
--- a/base/thread_pool_delayed.cpp
+++ b/base/thread_pool_delayed.cpp
@@ -2,7 +2,13 @@
 
 #include <array>
 
-namespace base::thread_pool::delayed
+using namespace std;
+
+namespace base
+{
+namespace thread_pool
+{
+namespace delayed
 {
 namespace
 {
@@ -31,7 +37,7 @@ ThreadPool::~ThreadPool()
 
 TaskLoop::PushResult ThreadPool::Push(Task && t)
 {
-  return AddImmediate(std::move(t));
+  return AddImmediate(move(t));
 }
 
 TaskLoop::PushResult ThreadPool::Push(Task const & t)
@@ -41,7 +47,7 @@ TaskLoop::PushResult ThreadPool::Push(Task const & t)
 
 TaskLoop::PushResult ThreadPool::PushDelayed(Duration const & delay, Task && t)
 {
-  return AddDelayed(delay, std::move(t));
+  return AddDelayed(delay, move(t));
 }
 
 TaskLoop::PushResult ThreadPool::PushDelayed(Duration const & delay, Task const & t)
@@ -54,7 +60,7 @@ TaskLoop::PushResult ThreadPool::AddImmediate(T && task)
 {
   return AddTask([&]() {
     auto const newId = MakeNextId(m_immediateLastId, kImmediateMinId, kImmediateMaxId);
-    VERIFY(m_immediate.Emplace(newId, std::forward<T>(task)), ());
+    VERIFY(m_immediate.Emplace(newId, forward<T>(task)), ());
     m_immediateLastId = newId;
     return newId;
   });
@@ -66,7 +72,7 @@ TaskLoop::PushResult ThreadPool::AddDelayed(Duration const & delay, T && task)
   auto const when = Now() + delay;
   return AddTask([&]() {
     auto const newId = MakeNextId(m_delayedLastId, kDelayedMinId, kDelayedMaxId);
-    m_delayed.Add(newId, std::make_shared<DelayedTask>(newId, when, std::forward<T>(task)));
+    m_delayed.Add(newId, make_shared<DelayedTask>(newId, when, forward<T>(task)));
     m_delayedLastId = newId;
     return newId;
   });
@@ -75,7 +81,7 @@ TaskLoop::PushResult ThreadPool::AddDelayed(Duration const & delay, T && task)
 template <typename Add>
 TaskLoop::PushResult ThreadPool::AddTask(Add && add)
 {
-  std::lock_guard lk(m_mu);
+  lock_guard<mutex> lk(m_mu);
   if (m_shutdown)
     return {};
 
@@ -91,10 +97,10 @@ void ThreadPool::ProcessTasks()
 
   while (true)
   {
-    std::array<Task, QUEUE_TYPE_COUNT> tasks;
+    array<Task, QUEUE_TYPE_COUNT> tasks;
 
     {
-      std::unique_lock lk(m_mu);
+      unique_lock<mutex> lk(m_mu);
       if (!m_delayed.IsEmpty())
       {
         // We need to wait until the moment when the earliest delayed
@@ -140,13 +146,13 @@ void ThreadPool::ProcessTasks()
 
       if (canExecImmediate)
       {
-        tasks[QUEUE_TYPE_IMMEDIATE] = std::move(m_immediate.Front());
+        tasks[QUEUE_TYPE_IMMEDIATE] = move(m_immediate.Front());
         m_immediate.PopFront();
       }
 
       if (canExecDelayed)
       {
-        tasks[QUEUE_TYPE_DELAYED] = std::move(m_delayed.GetFirstValue()->m_task);
+        tasks[QUEUE_TYPE_DELAYED] = move(m_delayed.GetFirstValue()->m_task);
         m_delayed.RemoveValue(m_delayed.GetFirstValue());
       }
     }
@@ -170,7 +176,7 @@ void ThreadPool::ProcessTasks()
       if (now >= top.m_when)
         break;
       auto const delay = top.m_when - now;
-      std::this_thread::sleep_for(delay);
+      this_thread::sleep_for(delay);
     }
     ASSERT(Now() >= top.m_when, ());
     top.m_task();
@@ -181,7 +187,7 @@ void ThreadPool::ProcessTasks()
 
 bool ThreadPool::Cancel(TaskId id)
 {
-  std::lock_guard lk(m_mu);
+  lock_guard<mutex> lk(m_mu);
 
   if (m_shutdown || id == kNoId)
     return false;
@@ -208,7 +214,7 @@ bool ThreadPool::Cancel(TaskId id)
 
 bool ThreadPool::Shutdown(Exit e)
 {
-  std::lock_guard lk(m_mu);
+  lock_guard<mutex> lk(m_mu);
   if (m_shutdown)
     return false;
   m_shutdown = true;
@@ -231,7 +237,9 @@ void ThreadPool::ShutdownAndJoin()
 
 bool ThreadPool::IsShutDown()
 {
-  std::lock_guard lk(m_mu);
+  lock_guard<mutex> lk(m_mu);
   return m_shutdown;
 }
-}  // namespace base::thread_pool::delayed
+}  // namespace delayed
+}  // namespace thread_pool
+}  // namespace base
diff --git a/coding/bwt.cpp b/coding/bwt.cpp
index aaa82e9e46..4b271a452e 100644
--- a/coding/bwt.cpp
+++ b/coding/bwt.cpp
@@ -8,6 +8,8 @@
 #include <limits>
 #include <vector>
 
+using namespace std;
+
 namespace
 {
 size_t const kNumBytes = 256;
@@ -49,10 +51,10 @@ public:
       return kEOS;
 
     --i;
-    auto it = std::upper_bound(m_starts.begin(), m_starts.end(), i);
+    auto it = upper_bound(m_starts.begin(), m_starts.end(), i);
     ASSERT(it != m_starts.begin(), ());
     --it;
-    return static_cast<uint32_t>(std::distance(m_starts.begin(), it));
+    return static_cast<uint32_t>(distance(m_starts.begin(), it));
   }
 
   // Returns the rank of the i-th symbol among symbols with the same
@@ -64,7 +66,7 @@ public:
       return 0;
 
     --i;
-    auto it = std::upper_bound(m_starts.begin(), m_starts.end(), i);
+    auto it = upper_bound(m_starts.begin(), m_starts.end(), i);
     if (it == m_starts.begin())
       return i;
     --it;
@@ -73,7 +75,7 @@ public:
 
 private:
   size_t const m_n;
-  std::array<size_t, kNumBytes> m_starts;
+  array<size_t, kNumBytes> m_starts;
 };
 
 // LastColumn represents the last column in the BWT matrix. As during
@@ -129,7 +131,7 @@ private:
   size_t const m_n;
   size_t const m_start;
   uint8_t const * const m_s;
-  std::array<std::vector<size_t>, kNumBytes> m_table;
+  array<vector<size_t>, kNumBytes> m_table;
 };
 }  // namespace
 
@@ -137,7 +139,7 @@ namespace coding
 {
 size_t BWT(size_t n, uint8_t const * s, uint8_t * r)
 {
-  std::vector<size_t> sa(n);
+  vector<size_t> sa(n);
   base::Skew(n, s, sa.data());
 
   size_t result = 0;
@@ -156,7 +158,7 @@ size_t BWT(size_t n, uint8_t const * s, uint8_t * r)
   return result;
 }
 
-size_t BWT(std::string const & s, std::string & r)
+size_t BWT(string const & s, string & r)
 {
   auto const n = s.size();
   r.assign(n, '\0');
@@ -184,7 +186,7 @@ void RevBWT(size_t n, size_t start, uint8_t const * s, uint8_t * r)
   ASSERT_EQUAL(first[curr], kEOS, ());
 }
 
-void RevBWT(size_t start, std::string const & s, std::string & r)
+void RevBWT(size_t start, string const & s, string & r)
 {
   auto const n = s.size();
   r.assign(n, '\0');
diff --git a/coding/coding_tests/map_uint32_to_val_tests.cpp b/coding/coding_tests/map_uint32_to_val_tests.cpp
index e4bff15a33..a7a42097ef 100644
--- a/coding/coding_tests/map_uint32_to_val_tests.cpp
+++ b/coding/coding_tests/map_uint32_to_val_tests.cpp
@@ -2,9 +2,9 @@
 
 #include "coding/map_uint32_to_val.hpp"
 #include "coding/reader.hpp"
-#include "coding/varint.hpp"
 #include "coding/writer.hpp"
 
+#include <cstdint>
 #include <utility>
 #include <vector>
 
diff --git a/coding/compressed_bit_vector.cpp b/coding/compressed_bit_vector.cpp
index 673f46c450..3121e6e2b9 100644
--- a/coding/compressed_bit_vector.cpp
+++ b/coding/compressed_bit_vector.cpp
@@ -7,10 +7,10 @@
 
 #include <algorithm>
 
+using namespace std;
+
 namespace coding
 {
-using std::make_unique, std::max, std::min, std::unique_ptr, std::vector;
-
 namespace
 {
 struct IntersectOp
@@ -25,7 +25,7 @@ struct IntersectOp
     vector<uint64_t> resGroups(min(sizeA, sizeB));
     for (size_t i = 0; i < resGroups.size(); ++i)
       resGroups[i] = a.GetBitGroup(i) & b.GetBitGroup(i);
-    return coding::CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
+    return coding::CompressedBitVectorBuilder::FromBitGroups(move(resGroups));
   }
 
   // The intersection of dense and sparse is always sparse.
@@ -39,7 +39,7 @@ struct IntersectOp
       if (a.GetBit(pos))
         resPos.push_back(pos);
     }
-    return make_unique<coding::SparseCBV>(std::move(resPos));
+    return make_unique<coding::SparseCBV>(move(resPos));
   }
 
   unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
@@ -53,7 +53,7 @@ struct IntersectOp
   {
     vector<uint64_t> resPos;
     set_intersection(a.Begin(), a.End(), b.Begin(), b.End(), back_inserter(resPos));
-    return make_unique<coding::SparseCBV>(std::move(resPos));
+    return make_unique<coding::SparseCBV>(move(resPos));
   }
 };
 
@@ -69,7 +69,7 @@ struct SubtractOp
     vector<uint64_t> resGroups(min(sizeA, sizeB));
     for (size_t i = 0; i < resGroups.size(); ++i)
       resGroups[i] = a.GetBitGroup(i) & ~b.GetBitGroup(i);
-    return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
+    return CompressedBitVectorBuilder::FromBitGroups(move(resGroups));
   }
 
   unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
@@ -97,7 +97,7 @@ struct SubtractOp
     for (; i < resGroups.size(); ++i)
       resGroups[i] = a.GetBitGroup(i);
 
-    return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
+    return CompressedBitVectorBuilder::FromBitGroups(move(resGroups));
   }
 
   unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
@@ -108,7 +108,7 @@ struct SubtractOp
             {
               return !b.GetBit(bit);
             });
-    return CompressedBitVectorBuilder::FromBitPositions(std::move(resPos));
+    return CompressedBitVectorBuilder::FromBitPositions(move(resPos));
   }
 
   unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
@@ -116,7 +116,7 @@ struct SubtractOp
   {
     vector<uint64_t> resPos;
     set_difference(a.Begin(), a.End(), b.Begin(), b.End(), back_inserter(resPos));
-    return CompressedBitVectorBuilder::FromBitPositions(std::move(resPos));
+    return CompressedBitVectorBuilder::FromBitPositions(move(resPos));
   }
 };
 
@@ -145,7 +145,7 @@ struct UnionOp
       for (size_t i = commonSize; i < resultSize; ++i)
         resGroups[i] = b.GetBitGroup(i);
     }
-    return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
+    return CompressedBitVectorBuilder::FromBitGroups(move(resGroups));
   }
 
   unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
@@ -173,7 +173,7 @@ struct UnionOp
       a.ForEach(merge);
       for (; j < b.End(); ++j)
         resPos.push_back(*j);
-      return CompressedBitVectorBuilder::FromBitPositions(std::move(resPos));
+      return CompressedBitVectorBuilder::FromBitPositions(move(resPos));
     }
 
     vector<uint64_t> resGroups(sizeA);
@@ -195,7 +195,7 @@ struct UnionOp
       resGroups[i] = mask;
     }
 
-    return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
+    return CompressedBitVectorBuilder::FromBitGroups(move(resGroups));
   }
 
   unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
@@ -209,7 +209,7 @@ struct UnionOp
   {
     vector<uint64_t> resPos;
     set_union(a.Begin(), a.End(), b.Begin(), b.End(), back_inserter(resPos));
-    return CompressedBitVectorBuilder::FromBitPositions(std::move(resPos));
+    return CompressedBitVectorBuilder::FromBitPositions(move(resPos));
   }
 };
 
@@ -263,13 +263,13 @@ template <typename TBitPositions>
 unique_ptr<CompressedBitVector> BuildFromBitPositions(TBitPositions && setBits)
 {
   if (setBits.empty())
-    return make_unique<SparseCBV>(std::forward<TBitPositions>(setBits));
+    return make_unique<SparseCBV>(forward<TBitPositions>(setBits));
   uint64_t const maxBit = *max_element(setBits.begin(), setBits.end());
 
   if (DenseEnough(setBits.size(), maxBit))
-    return make_unique<DenseCBV>(std::forward<TBitPositions>(setBits));
+    return make_unique<DenseCBV>(forward<TBitPositions>(setBits));
 
-  return make_unique<SparseCBV>(std::forward<TBitPositions>(setBits));
+  return make_unique<SparseCBV>(forward<TBitPositions>(setBits));
 }
 }  // namespace
 
@@ -300,7 +300,7 @@ unique_ptr<DenseCBV> DenseCBV::BuildFromBitGroups(vector<uint64_t> && bitGroups)
   cbv->m_popCount = 0;
   for (size_t i = 0; i < bitGroups.size(); ++i)
     cbv->m_popCount += bits::PopCount(bitGroups[i]);
-  cbv->m_bitGroups = std::move(bitGroups);
+  cbv->m_bitGroups = move(bitGroups);
   return cbv;
 }
 
@@ -344,7 +344,7 @@ unique_ptr<CompressedBitVector> DenseCBV::LeaveFirstSetNBits(uint64_t n) const
       groups.push_back(part);
     }
   }
-  return CompressedBitVectorBuilder::FromBitGroups(std::move(groups));
+  return CompressedBitVectorBuilder::FromBitGroups(move(groups));
 }
 
 CompressedBitVector::StorageStrategy DenseCBV::GetStorageStrategy() const
@@ -372,7 +372,7 @@ SparseCBV::SparseCBV(vector<uint64_t> const & setBits) : m_positions(setBits)
   ASSERT(is_sorted(m_positions.begin(), m_positions.end()), ());
 }
 
-SparseCBV::SparseCBV(vector<uint64_t> && setBits) : m_positions(std::move(setBits))
+SparseCBV::SparseCBV(vector<uint64_t> && setBits) : m_positions(move(setBits))
 {
   ASSERT(is_sorted(m_positions.begin(), m_positions.end()), ());
 }
@@ -395,7 +395,7 @@ unique_ptr<CompressedBitVector> SparseCBV::LeaveFirstSetNBits(uint64_t n) const
   if (PopCount() <= n)
     return Clone();
   vector<uint64_t> positions(m_positions.begin(), m_positions.begin() + static_cast<size_t>(n));
-  return CompressedBitVectorBuilder::FromBitPositions(std::move(positions));
+  return CompressedBitVectorBuilder::FromBitPositions(move(positions));
 }
 
 CompressedBitVector::StorageStrategy SparseCBV::GetStorageStrategy() const
@@ -428,7 +428,7 @@ unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitPositions(
 unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitPositions(
     vector<uint64_t> && setBits)
 {
-  return BuildFromBitPositions(std::move(setBits));
+  return BuildFromBitPositions(move(setBits));
 }
 
 // static
@@ -440,7 +440,7 @@ unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitGroups(
   while (!bitGroups.empty() && bitGroups.back() == 0)
     bitGroups.pop_back();
   if (bitGroups.empty())
-    return make_unique<SparseCBV>(std::move(bitGroups));
+    return make_unique<SparseCBV>(move(bitGroups));
 
   uint64_t const maxBit = kBlockSize * (bitGroups.size() - 1) + bits::FloorLog(bitGroups.back());
   uint64_t popCount = 0;
@@ -448,7 +448,7 @@ unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitGroups(
     popCount += bits::PopCount(bitGroups[i]);
 
   if (DenseEnough(popCount, maxBit))
-    return DenseCBV::BuildFromBitGroups(std::move(bitGroups));
+    return DenseCBV::BuildFromBitGroups(move(bitGroups));
 
   vector<uint64_t> setBits;
   for (size_t i = 0; i < bitGroups.size(); ++i)
@@ -462,7 +462,7 @@ unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitGroups(
   return make_unique<SparseCBV>(setBits);
 }
 
-std::string DebugPrint(CompressedBitVector::StorageStrategy strat)
+string DebugPrint(CompressedBitVector::StorageStrategy strat)
 {
   switch (strat)
   {
diff --git a/coding/file_writer.cpp b/coding/file_writer.cpp
index f32b22a9d2..84f8472a95 100644
--- a/coding/file_writer.cpp
+++ b/coding/file_writer.cpp
@@ -3,8 +3,10 @@
 
 #include <vector>
 
-FileWriter::FileWriter(std::string const & fileName, FileWriter::Op op)
-  : m_pFileData(std::make_unique<base::FileData>(fileName, static_cast<base::FileData::Op>(op)))
+using namespace std;
+
+FileWriter::FileWriter(string const & fileName, FileWriter::Op op)
+  : m_pFileData(make_unique<base::FileData>(fileName, static_cast<base::FileData::Op>(op)))
 {
 }
 
@@ -29,7 +31,7 @@ void FileWriter::Write(void const * p, size_t size)
   m_pFileData->Write(p, size);
 }
 
-std::string const & FileWriter::GetName() const
+string const & FileWriter::GetName() const
 {
   return m_pFileData->GetName();
 }
@@ -44,7 +46,7 @@ void FileWriter::Flush() noexcept(false)
   m_pFileData->Flush();
 }
 
-void FileWriter::DeleteFileX(std::string const & fName)
+void FileWriter::DeleteFileX(string const & fName)
 {
   UNUSED_VALUE(base::DeleteFileX(fName));
 }
diff --git a/coding/files_container.cpp b/coding/files_container.cpp
index c3e790f55c..a6685e478e 100644
--- a/coding/files_container.cpp
+++ b/coding/files_container.cpp
@@ -24,6 +24,8 @@
 
 #include <errno.h>
 
+using namespace std;
+
 template <typename Source, typename Info>
 void Read(Source & src, Info & i)
 {
@@ -42,9 +44,9 @@ void Write(Sink & sink, Info const & i)
   WriteVarUint(sink, i.m_size);
 }
 
-std::string DebugPrint(FilesContainerBase::TagInfo const & info)
+string DebugPrint(FilesContainerBase::TagInfo const & info)
 {
-  std::ostringstream ss;
+  ostringstream ss;
   ss << "{ " << info.m_tag << ", " << info.m_offset << ", " << info.m_size << " }";
   return ss.str();
 }
@@ -68,10 +70,10 @@ void FilesContainerBase::ReadInfo(Reader & reader)
 // FilesContainerR
 /////////////////////////////////////////////////////////////////////////////
 
-FilesContainerR::FilesContainerR(std::string const & filePath,
+FilesContainerR::FilesContainerR(string const & filePath,
                                  uint32_t logPageSize,
                                  uint32_t logPageCount)
-  : m_source(std::make_unique<FileReader>(filePath, logPageSize, logPageCount))
+  : m_source(make_unique<FileReader>(filePath, logPageSize, logPageCount))
 {
   ReadInfo(m_source);
 }
@@ -90,7 +92,7 @@ FilesContainerR::TReader FilesContainerR::GetReader(Tag const & tag) const
   return m_source.SubReader(p->m_offset, p->m_size);
 }
 
-std::pair<uint64_t, uint64_t> FilesContainerR::GetAbsoluteOffsetAndSize(Tag const & tag) const
+pair<uint64_t, uint64_t> FilesContainerR::GetAbsoluteOffsetAndSize(Tag const & tag) const
 {
   TagInfo const * p = GetInfo(tag);
   if (!p)
@@ -98,7 +100,7 @@ std::pair<uint64_t, uint64_t> FilesContainerR::GetAbsoluteOffsetAndSize(Tag cons
 
   auto reader = dynamic_cast<FileReader const *>(m_source.GetPtr());
   uint64_t const offset = reader ? reader->GetOffset() : 0;
-  return std::make_pair(offset + p->m_offset, p->m_size);
+  return make_pair(offset + p->m_offset, p->m_size);
 }
 
 FilesContainerBase::TagInfo const * FilesContainerBase::GetInfo(Tag const & tag) const
@@ -115,7 +117,7 @@ namespace detail
 /////////////////////////////////////////////////////////////////////////////
 // MappedFile
 /////////////////////////////////////////////////////////////////////////////
-void MappedFile::Open(std::string const & fName)
+void MappedFile::Open(string const & fName)
 {
   Close();
 
@@ -165,7 +167,7 @@ void MappedFile::Close()
 #endif
 }
 
-MappedFile::Handle MappedFile::Map(uint64_t offset, uint64_t size, std::string const & tag) const
+MappedFile::Handle MappedFile::Map(uint64_t offset, uint64_t size, string const & tag) const
 {
 #ifdef OMIM_OS_WINDOWS
   SYSTEM_INFO sysInfo;
@@ -203,7 +205,7 @@ MappedFile::Handle MappedFile::Map(uint64_t offset, uint64_t size, std::string c
 // FilesMappingContainer
 /////////////////////////////////////////////////////////////////////////////
 
-FilesMappingContainer::FilesMappingContainer(std::string const & fName)
+FilesMappingContainer::FilesMappingContainer(string const & fName)
 {
   Open(fName);
 }
@@ -213,7 +215,7 @@ FilesMappingContainer::~FilesMappingContainer()
   Close();
 }
 
-void FilesMappingContainer::Open(std::string const & fName)
+void FilesMappingContainer::Open(string const & fName)
 {
   {
     FileReader reader(fName);
@@ -294,7 +296,7 @@ void FilesMappingContainer::Handle::Reset()
 // FilesContainerW
 /////////////////////////////////////////////////////////////////////////////
 
-FilesContainerW::FilesContainerW(std::string const & fName, FileWriter::Op op)
+FilesContainerW::FilesContainerW(string const & fName, FileWriter::Op op)
   : m_name(fName), m_finished(false)
 {
   Open(op);
@@ -412,7 +414,7 @@ std::unique_ptr<FilesContainerWriter> FilesContainerW::GetWriter(Tag const & tag
     ASSERT(!m_info.empty(), ());
 
     uint64_t const curr = m_info.back().m_offset + m_info.back().m_size;
-    auto writer = std::make_unique<TruncatingFileWriter>(m_name);
+    auto writer = make_unique<TruncatingFileWriter>(m_name);
     writer->Seek(curr);
     writer->WritePaddingByPos(kSectionAlignment);
 
@@ -424,7 +426,7 @@ std::unique_ptr<FilesContainerWriter> FilesContainerW::GetWriter(Tag const & tag
   {
     SaveCurrentSize();
 
-    auto writer = std::make_unique<FilesContainerWriter>(m_name, FileWriter::OP_APPEND);
+    auto writer = make_unique<FilesContainerWriter>(m_name, FileWriter::OP_APPEND);
     writer->WritePaddingByPos(kSectionAlignment);
 
     m_info.emplace_back(tag, writer->Pos());
@@ -433,9 +435,9 @@ std::unique_ptr<FilesContainerWriter> FilesContainerW::GetWriter(Tag const & tag
   }
 }
 
-void FilesContainerW::Write(std::string const & fPath, Tag const & tag)
+void FilesContainerW::Write(string const & fPath, Tag const & tag)
 {
-  Write(ModelReaderPtr(std::make_unique<FileReader>(fPath)), tag);
+  Write(ModelReaderPtr(make_unique<FileReader>(fPath)), tag);
 }
 
 void FilesContainerW::Write(ModelReaderPtr reader, Tag const & tag)
@@ -452,12 +454,12 @@ void FilesContainerW::Write(void const * buffer, size_t size, Tag const & tag)
     GetWriter(tag)->Write(buffer, size);
 }
 
-void FilesContainerW::Write(std::vector<char> const & buffer, Tag const & tag)
+void FilesContainerW::Write(vector<char> const & buffer, Tag const & tag)
 {
   Write(buffer.data(), buffer.size(), tag);
 }
 
-void FilesContainerW::Write(std::vector<uint8_t> const & buffer, Tag const & tag)
+void FilesContainerW::Write(vector<uint8_t> const & buffer, Tag const & tag)
 {
   Write(buffer.data(), buffer.size(), tag);
 }
diff --git a/coding/geometry_coding.cpp b/coding/geometry_coding.cpp
index 74644c2687..4779c83061 100644
--- a/coding/geometry_coding.cpp
+++ b/coding/geometry_coding.cpp
@@ -9,6 +9,8 @@
 #include <complex>
 #include <stack>
 
+using namespace std;
+
 namespace
 {
 inline m2::PointU ClampPoint(m2::PointD const & maxPoint, m2::PointD const & point)
@@ -40,7 +42,7 @@ bool TestDecoding(InPointsT const & points, m2::PointU const & basePoint,
 {
   size_t const count = points.size();
 
-  std::vector<m2::PointU> decoded;
+  vector<m2::PointU> decoded;
   decoded.resize(count);
 
   OutPointsT decodedA(decoded);
@@ -76,12 +78,11 @@ m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const
 {
   CHECK_NOT_EQUAL(p2, p3, ());
 
-  using std::complex;
   complex<double> const c1(p1.x, p1.y);
   complex<double> const c2(p2.x, p2.y);
   complex<double> const c3(p3.x, p3.y);
   complex<double> const d = (c1 - c2) / (c2 - c3);
-  complex<double> const c0 = c1 + (c1 - c2) * std::polar(0.5, 0.5 * arg(d));
+  complex<double> const c0 = c1 + (c1 - c2) * polar(0.5, 0.5 * arg(d));
 
   /*
   complex<double> const c1(p1.x, p1.y);
@@ -336,7 +337,7 @@ m2::PointU GetMaxPoint(GeometryCodingParams const & params)
 m2::PointU GetBasePoint(GeometryCodingParams const & params) { return params.GetBasePoint(); }
 }  // namespace pts
 
-void Encode(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodingParams const & params,
+void Encode(EncodeFunT fn, vector<m2::PointD> const & points, GeometryCodingParams const & params,
             DeltasT & deltas)
 {
   size_t const count = points.size();
@@ -344,8 +345,8 @@ void Encode(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodin
   pts::PointsU upoints;
   upoints.reserve(count);
 
-  transform(points.begin(), points.end(), std::back_inserter(upoints),
-            std::bind(&pts::D2U, std::placeholders::_1, params.GetCoordBits()));
+  transform(points.begin(), points.end(), back_inserter(upoints),
+            bind(&pts::D2U, placeholders::_1, params.GetCoordBits()));
 
   ASSERT(deltas.empty(), ());
   deltas.resize(count);
@@ -361,7 +362,7 @@ void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const &
 }
 
 void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const & params,
-            std::vector<m2::PointD> & points, size_t reserveF)
+            vector<m2::PointD> & points, size_t reserveF)
 {
   DecodeImpl(fn, deltas, params, points, reserveF);
 }
@@ -384,7 +385,7 @@ TrianglesChainSaver::TrianglesChainSaver(GeometryCodingParams const & params)
   m_max = pts::GetMaxPoint(params);
 }
 
-void TrianglesChainSaver::operator()(TPoint arr[3], std::vector<TEdge> edges)
+void TrianglesChainSaver::operator()(TPoint arr[3], vector<TEdge> edges)
 {
   m_buffers.push_back(TBuffer());
   MemWriter<TBuffer> writer(m_buffers.back());
@@ -397,7 +398,7 @@ void TrianglesChainSaver::operator()(TPoint arr[3], std::vector<TEdge> edges)
 
   sort(edges.begin(), edges.end(), edge_less_p0());
 
-  std::stack<TEdge> st;
+  stack<TEdge> st;
   while (true)
   {
     CHECK_EQUAL(curr.m_delta >> 62, 0, ());
@@ -417,7 +418,7 @@ void TrianglesChainSaver::operator()(TPoint arr[3], std::vector<TEdge> edges)
       // first child
       delta |= (one << i->m_side);
 
-      std::vector<TEdge>::iterator j = i + 1;
+      vector<TEdge>::iterator j = i + 1;
       if (j != edges.end() && j->m_p[0] == nextNode)
       {
         // second child
@@ -462,7 +463,7 @@ void DecodeTriangles(coding::InDeltasT const & deltas, m2::PointU const & basePo
   points.push_back(coding::DecodePointDeltaFromUint(deltas[1], points.back()));
   points.push_back(coding::DecodePointDeltaFromUint(deltas[2] >> 2, points.back()));
 
-  std::stack<size_t> st;
+  stack<size_t> st;
 
   size_t ind = 2;
   uint8_t treeBits = deltas[2] & 3;
diff --git a/coding/huffman.cpp b/coding/huffman.cpp
index c5f3c6e274..0e6f2af9ed 100644
--- a/coding/huffman.cpp
+++ b/coding/huffman.cpp
@@ -5,6 +5,8 @@
 #include <queue>
 #include <utility>
 
+using namespace std;
+
 namespace coding
 {
 HuffmanCoder::~HuffmanCoder()
@@ -64,7 +66,7 @@ void HuffmanCoder::DeleteHuffmanTree(Node * root)
 
 void HuffmanCoder::BuildHuffmanTree(Freqs const & freqs)
 {
-  std::priority_queue<Node *, std::vector<Node *>, NodeComparator> pq;
+  priority_queue<Node *, vector<Node *>, NodeComparator> pq;
   for (auto const & e : freqs.GetTable())
     pq.push(new Node(e.first, e.second, true /* isLeaf */));
 
@@ -81,7 +83,7 @@ void HuffmanCoder::BuildHuffmanTree(Freqs const & freqs)
     auto b = pq.top();
     pq.pop();
     if (a->symbol > b->symbol)
-      std::swap(a, b);
+      swap(a, b);
     // Give it the smaller symbol to make the resulting encoding more predictable.
     auto ab = new Node(a->symbol, a->freq + b->freq, false /* isLeaf */);
     ab->l = a;
diff --git a/coding/map_uint32_to_val.hpp b/coding/map_uint32_to_val.hpp
index c6eea21ab2..a2d4d1ecd8 100644
--- a/coding/map_uint32_to_val.hpp
+++ b/coding/map_uint32_to_val.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
+#include "coding/endianness.hpp"
 #include "coding/files_container.hpp"
 #include "coding/memory_region.hpp"
 #include "coding/reader.hpp"
 #include "coding/succinct_mapper.hpp"
+#include "coding/varint.hpp"
 #include "coding/write_to_sink.hpp"
 #include "coding/writer.hpp"
 
@@ -197,7 +199,7 @@ private:
       uint32_t const idsSize = m_header.m_positionsOffset - sizeof(m_header);
       std::vector<uint8_t> data(idsSize);
       m_reader.Read(sizeof(m_header), data.data(), data.size());
-      m_idsRegion = std::make_unique<CopiedMemoryRegion>(std::move(data));
+      m_idsRegion = std::make_unique<CopiedMemoryRegion>(move(data));
 
       coding::MapVisitor visitor(m_idsRegion->ImmutableData());
       m_ids.map(visitor);
@@ -207,7 +209,7 @@ private:
       uint32_t const offsetsSize = m_header.m_variablesOffset - m_header.m_positionsOffset;
       std::vector<uint8_t> data(offsetsSize);
       m_reader.Read(m_header.m_positionsOffset, data.data(), data.size());
-      m_offsetsRegion = std::make_unique<CopiedMemoryRegion>(std::move(data));
+      m_offsetsRegion = std::make_unique<CopiedMemoryRegion>(move(data));
 
       coding::MapVisitor visitor(m_offsetsRegion->ImmutableData());
       m_offsets.map(visitor);
diff --git a/coding/mmap_reader.cpp b/coding/mmap_reader.cpp
index 5f60795c99..a157d7387b 100644
--- a/coding/mmap_reader.cpp
+++ b/coding/mmap_reader.cpp
@@ -16,10 +16,12 @@
   #endif
 #endif
 
+using namespace std;
+
 class MmapReader::MmapData
 {
 public:
-  explicit MmapData(std::string const & fileName, Advice advice)
+  explicit MmapData(string const & fileName, Advice advice)
   {
     // @TODO add windows support
 #ifndef OMIM_OS_WINDOWS
@@ -69,7 +71,7 @@ private:
   int m_fd = 0;
 };
 
-MmapReader::MmapReader(std::string const & fileName, Advice advice)
+MmapReader::MmapReader(string const & fileName, Advice advice)
   : base_type(fileName)
   , m_data(std::make_shared<MmapData>(fileName, advice))
   , m_offset(0)
@@ -94,11 +96,11 @@ void MmapReader::Read(uint64_t pos, void * p, size_t size) const
   memcpy(p, m_data->m_memory + m_offset + pos, size);
 }
 
-std::unique_ptr<Reader> MmapReader::CreateSubReader(uint64_t pos, uint64_t size) const
+unique_ptr<Reader> MmapReader::CreateSubReader(uint64_t pos, uint64_t size) const
 {
   ASSERT_LESS_OR_EQUAL(pos + size, Size(), (pos, size));
   // Can't use make_unique with private constructor.
-  return std::unique_ptr<Reader>(new MmapReader(*this, m_offset + pos, size));
+  return unique_ptr<Reader>(new MmapReader(*this, m_offset + pos, size));
 }
 
 uint8_t * MmapReader::Data() const
diff --git a/coding/move_to_front.cpp b/coding/move_to_front.cpp
index 54c8be1f64..ae79c9d9cd 100644
--- a/coding/move_to_front.cpp
+++ b/coding/move_to_front.cpp
@@ -6,22 +6,27 @@
 #include <cstring>
 #include <numeric>
 
+using namespace std;
+
 namespace coding
 {
+// static
+size_t constexpr MoveToFront::kNumBytes;
+
 MoveToFront::MoveToFront()
 {
-  std::iota(m_order.begin(), m_order.end(), 0);
+  iota(m_order.begin(), m_order.end(), 0);
 }
 
 uint8_t MoveToFront::Transform(uint8_t b)
 {
-  auto const it = std::find(m_order.begin(), m_order.end(), b);
+  auto const it = find(m_order.begin(), m_order.end(), b);
   ASSERT(it != m_order.end(), ());
 
-  size_t const result = std::distance(m_order.begin(), it);
+  size_t const result = distance(m_order.begin(), it);
   ASSERT_LESS(result, kNumBytes, ());
 
-  std::rotate(m_order.begin(), it, it + 1);
+  rotate(m_order.begin(), it, it + 1);
   ASSERT_EQUAL(m_order[0], b, ());
   return static_cast<uint8_t>(result);
 }
diff --git a/coding/reader_streambuf.cpp b/coding/reader_streambuf.cpp
index fd49f28360..8ffa4dd85c 100644
--- a/coding/reader_streambuf.cpp
+++ b/coding/reader_streambuf.cpp
@@ -4,17 +4,19 @@
 
 #include <algorithm>
 
-ReaderStreamBuf::ReaderStreamBuf(std::unique_ptr<Reader> && p)
-  : m_p(std::move(p)), m_pos(0), m_size(m_p->Size())
+using namespace std;
+
+ReaderStreamBuf::ReaderStreamBuf(unique_ptr<Reader> && p)
+  : m_p(move(p)), m_pos(0), m_size(m_p->Size())
 {
 }
 
 // Define destructor in .cpp due to using unique_ptr with incomplete type.
 ReaderStreamBuf::~ReaderStreamBuf() = default;
 
-std::streamsize ReaderStreamBuf::xsgetn(char_type * s, std::streamsize n)
+streamsize ReaderStreamBuf::xsgetn(char_type * s, streamsize n)
 {
-  std::streamsize const count = std::min(n, static_cast<std::streamsize>(m_size - m_pos));
+  streamsize const count = min(n, static_cast<streamsize>(m_size - m_pos));
   if (count > 0)
   {
     m_p->Read(m_pos, s, count);
@@ -25,7 +27,7 @@ std::streamsize ReaderStreamBuf::xsgetn(char_type * s, std::streamsize n)
 
 ReaderStreamBuf::int_type ReaderStreamBuf::underflow()
 {
-  std::streamsize s = xsgetn(m_buf, sizeof(m_buf));
+  streamsize s = xsgetn(m_buf, sizeof(m_buf));
   if (s > 0)
   {
     setg(m_buf, m_buf, m_buf + s);
@@ -38,7 +40,7 @@ ReaderStreamBuf::int_type ReaderStreamBuf::underflow()
 }
 
 
-std::streamsize WriterStreamBuf::xsputn(char_type const * s, std::streamsize n)
+streamsize WriterStreamBuf::xsputn(char_type const * s, streamsize n)
 {
   m_writer.Write(s, n);
   return n;
diff --git a/coding/string_utf8_multilang.cpp b/coding/string_utf8_multilang.cpp
index cf16fd7ee0..db5bd485a8 100644
--- a/coding/string_utf8_multilang.cpp
+++ b/coding/string_utf8_multilang.cpp
@@ -3,6 +3,8 @@
 #include <algorithm>
 #include <array>
 
+using namespace std;
+
 namespace
 {
 // Order is important. Any reordering breaks backward compatibility.
@@ -10,7 +12,7 @@ namespace
 // several data releases.
 // Note that it's not feasible to increase languages number here due to current encoding (6 bit to
 // store language code).
-std::array<StringUtf8Multilang::Lang, StringUtf8Multilang::kMaxSupportedLanguages> const kLanguages = {{
+array<StringUtf8Multilang::Lang, StringUtf8Multilang::kMaxSupportedLanguages> const kLanguages = {{
      {"default", "Native for each country", {"Any-Latin"}},
      {"en", "English", {}},
      {"ja", "日本語", {}},
@@ -82,7 +84,7 @@ static_assert(
     "With current encoding we are limited to 64 languages max. And we need kLanguages.size()"
     " to be exactly 64 for backward compatibility.");
 
-constexpr bool IsSupportedLangCode(int8_t langCode)
+bool IsSupportedLangCode(int8_t langCode)
 {
   return langCode >= 0 && langCode < static_cast<int8_t>(kLanguages.size()) &&
          kLanguages[langCode].m_code != StringUtf8Multilang::kReservedLang;
@@ -93,15 +95,15 @@ constexpr bool IsSupportedLangCode(int8_t langCode)
 StringUtf8Multilang::Languages const & StringUtf8Multilang::GetSupportedLanguages()
 {
   // Asserts for generic class constants.
-  ASSERT_EQUAL(kLanguages[kDefaultCode].m_code, std::string_view{"default"}, ());
-  ASSERT_EQUAL(kLanguages[kInternationalCode].m_code, std::string_view{"int_name"}, ());
-  ASSERT_EQUAL(kLanguages[kAltNameCode].m_code, std::string_view{"alt_name"}, ());
-  ASSERT_EQUAL(kLanguages[kOldNameCode].m_code, std::string_view{"old_name"}, ());
-  ASSERT_EQUAL(kLanguages[kEnglishCode].m_code, std::string_view{"en"}, ());
+  ASSERT_EQUAL(kLanguages[kDefaultCode].m_code, string("default"), ());
+  ASSERT_EQUAL(kLanguages[kInternationalCode].m_code, string("int_name"), ());
+  ASSERT_EQUAL(kLanguages[kAltNameCode].m_code, string("alt_name"), ());
+  ASSERT_EQUAL(kLanguages[kOldNameCode].m_code, string("old_name"), ());
+  ASSERT_EQUAL(kLanguages[kEnglishCode].m_code, string("en"), ());
   static StringUtf8Multilang::Languages languages;
   if (languages.empty())
   {
-    std::copy_if(kLanguages.cbegin(), kLanguages.cend(), std::back_inserter(languages),
+    copy_if(kLanguages.cbegin(), kLanguages.cend(), back_inserter(languages),
             [](Lang const & lang) { return lang.m_code != kReservedLang; });
   }
 
@@ -109,7 +111,7 @@ StringUtf8Multilang::Languages const & StringUtf8Multilang::GetSupportedLanguage
 }
 
 // static
-int8_t StringUtf8Multilang::GetLangIndex(std::string_view const lang)
+int8_t StringUtf8Multilang::GetLangIndex(string_view const lang)
 {
   if (lang == kReservedLang)
     return kUnsupportedLanguageCode;
@@ -123,30 +125,31 @@ int8_t StringUtf8Multilang::GetLangIndex(std::string_view const lang)
 }
 
 // static
-std::string_view StringUtf8Multilang::GetLangByCode(int8_t langCode)
+char const * StringUtf8Multilang::GetLangByCode(int8_t langCode)
 {
   if (!IsSupportedLangCode(langCode))
-    return {};
+    return "";
 
-  return kLanguages[langCode].m_code;
+  return kLanguages[langCode].m_code.c_str();
 }
 
 // static
-std::string_view StringUtf8Multilang::GetLangNameByCode(int8_t langCode)
+char const * StringUtf8Multilang::GetLangNameByCode(int8_t langCode)
 {
   if (!IsSupportedLangCode(langCode))
-    return {};
+    return "";
 
-  return kLanguages[langCode].m_name;
+  return kLanguages[langCode].m_name.c_str();
 }
 
 // static
-std::vector<std::string_view> const * StringUtf8Multilang::GetTransliteratorsIdsByCode(int8_t langCode)
+vector<string> const & StringUtf8Multilang::GetTransliteratorsIdsByCode(int8_t langCode)
 {
+  static const vector<string> empty;
   if (!IsSupportedLangCode(langCode))
-    return nullptr;
+    return empty;
 
-  return &kLanguages[langCode].m_transliteratorsIds;
+  return kLanguages[langCode].m_transliteratorsIds;
 }
 
 size_t StringUtf8Multilang::GetNextIndex(size_t i) const
@@ -175,7 +178,7 @@ size_t StringUtf8Multilang::GetNextIndex(size_t i) const
   return i;
 }
 
-void StringUtf8Multilang::AddString(int8_t lang, std::string_view utf8s)
+void StringUtf8Multilang::AddString(int8_t lang, string_view utf8s)
 {
   size_t i = 0;
   size_t const sz = m_s.size();
@@ -217,7 +220,7 @@ void StringUtf8Multilang::RemoveString(int8_t lang)
   }
 }
 
-bool StringUtf8Multilang::GetString(int8_t lang, std::string_view & utf8s) const
+bool StringUtf8Multilang::GetString(int8_t lang, string_view & utf8s) const
 {
   if (!IsSupportedLangCode(lang))
     return false;
@@ -256,11 +259,11 @@ bool StringUtf8Multilang::HasString(int8_t lang) const
   return false;
 }
 
-int8_t StringUtf8Multilang::FindString(std::string const & utf8s) const
+int8_t StringUtf8Multilang::FindString(string const & utf8s) const
 {
   int8_t result = kUnsupportedLanguageCode;
 
-  ForEach([&utf8s, &result](int8_t code, std::string_view name)
+  ForEach([&utf8s, &result](int8_t code, string_view name)
   {
     if (name == utf8s)
     {
@@ -282,12 +285,12 @@ size_t StringUtf8Multilang::CountLangs() const
   return count;
 }
 
-std::string DebugPrint(StringUtf8Multilang const & s)
+string DebugPrint(StringUtf8Multilang const & s)
 {
-  std::string result;
+  string result;
 
   bool isFirst = true;
-  s.ForEach([&result, &isFirst](int8_t code, std::string_view name)
+  s.ForEach([&result, &isFirst](int8_t code, string_view name)
   {
     if (isFirst)
       isFirst = false;
diff --git a/coding/string_utf8_multilang.hpp b/coding/string_utf8_multilang.hpp
index 4bed32a526..f5a3cd36fd 100644
--- a/coding/string_utf8_multilang.hpp
+++ b/coding/string_utf8_multilang.hpp
@@ -66,11 +66,11 @@ public:
   struct Lang
   {
     /// OSM language code (e.g. for name:en it's "en" part).
-    std::string_view m_code;
+    std::string m_code;
     /// Native language name.
-    std::string_view m_name;
+    std::string m_name;
     /// Transliterators to latin ids.
-    std::vector<std::string_view> m_transliteratorsIds;
+    std::vector<std::string> m_transliteratorsIds;
   };
 
   static int8_t constexpr kUnsupportedLanguageCode = -1;
@@ -86,26 +86,20 @@ public:
   // "10".
   static int8_t constexpr kLangCodeMask = 0x3F;
   static_assert(kMaxSupportedLanguages == kLangCodeMask + 1);
-  static std::string_view constexpr kReservedLang = "reserved";
+  static char constexpr kReservedLang[] = "reserved";
 
   using Languages = buffer_vector<Lang, kMaxSupportedLanguages>;
 
   static Languages const & GetSupportedLanguages();
 
-  // These names require separate search/street processing.
-  static bool IsAltOrOldName(int8_t langCode)
-  {
-    return langCode == kAltNameCode || langCode == kOldNameCode;
-  }
-
   /// @returns kUnsupportedLanguageCode if language is not recognized.
   static int8_t GetLangIndex(std::string_view lang);
   /// @returns empty string if langCode is invalid.
-  static std::string_view GetLangByCode(int8_t langCode);
+  static char const * GetLangByCode(int8_t langCode);
   /// @returns empty string if langCode is invalid.
-  static std::string_view GetLangNameByCode(int8_t langCode);
-  /// @returns nullptr if langCode is invalid.
-  static std::vector<std::string_view> const * GetTransliteratorsIdsByCode(int8_t langCode);
+  static char const * GetLangNameByCode(int8_t langCode);
+  /// @returns empty vector if langCode is invalid.
+  static std::vector<std::string> const & GetTransliteratorsIdsByCode(int8_t langCode);
 
   inline bool operator==(StringUtf8Multilang const & rhs) const { return m_s == rhs.m_s; }
   inline bool operator!=(StringUtf8Multilang const & rhs) const { return !(*this == rhs); }
diff --git a/coding/transliteration.cpp b/coding/transliteration.cpp
index ad35f3f9b9..ad4f607ce2 100644
--- a/coding/transliteration.cpp
+++ b/coding/transliteration.cpp
@@ -81,7 +81,7 @@ void Transliteration::SetMode(Transliteration::Mode mode)
   m_mode = mode;
 }
 
-bool Transliteration::Transliterate(std::string_view transID, icu::UnicodeString & ustr) const
+bool Transliteration::Transliterate(std::string const & transID, icu::UnicodeString & ustr) const
 {
   CHECK(m_inited, ());
   ASSERT(!transID.empty(), ());
@@ -100,8 +100,8 @@ bool Transliteration::Transliterate(std::string_view transID, icu::UnicodeString
     {
       UErrorCode status = U_ZERO_ERROR;
       // Append remove diacritic rule.
-      auto const withDiacritic = std::string{transID}.append(";NFD;[\u02B9-\u02D3\u0301-\u0358\u00B7\u0027]Remove;NFC");
-      icu::UnicodeString const uTransID(withDiacritic.c_str());
+      auto const withDiacritic = transID + ";NFD;[\u02B9-\u02D3\u0301-\u0358\u00B7\u0027]Remove;NFC";
+      icu::UnicodeString uTransID(withDiacritic.c_str());
 
       it->second->m_transliterator.reset(
           icu::Transliterator::createInstance(uTransID, UTRANS_FORWARD, status));
@@ -142,12 +142,12 @@ bool Transliteration::Transliterate(std::string_view sv, int8_t langCode,
   if (sv.empty() || strings::IsASCIIString(sv))
     return false;
 
-  auto const * transliteratorsIds = StringUtf8Multilang::GetTransliteratorsIdsByCode(langCode);
-  if (transliteratorsIds == nullptr || transliteratorsIds->empty())
+  auto const & transliteratorsIds = StringUtf8Multilang::GetTransliteratorsIdsByCode(langCode);
+  if (transliteratorsIds.empty())
     return false;
 
   icu::UnicodeString ustr(sv.data(), static_cast<int32_t>(sv.size()));
-  for (auto const & id : *transliteratorsIds)
+  for (auto const & id : transliteratorsIds)
     Transliterate(id, ustr);
 
   if (ustr.isEmpty())
diff --git a/coding/transliteration.hpp b/coding/transliteration.hpp
index b825f8b6fb..d9c6c8604a 100644
--- a/coding/transliteration.hpp
+++ b/coding/transliteration.hpp
@@ -43,10 +43,10 @@ private:
 
   Transliteration();
 
-  bool Transliterate(std::string_view transID, icu::UnicodeString & ustr) const;
+  bool Transliterate(std::string const & transID, icu::UnicodeString & ustr) const;
 
   std::mutex m_initializationMutex;
   std::atomic<bool> m_inited;
   std::atomic<Mode> m_mode;
-  std::map<std::string_view, std::unique_ptr<TransliteratorInfo>> m_transliterators;
+  std::map<std::string, std::unique_ptr<TransliteratorInfo>> m_transliterators;
 };
diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp
index 2de9ac007f..c3d26cee3b 100644
--- a/coding/zip_reader.cpp
+++ b/coding/zip_reader.cpp
@@ -9,13 +9,15 @@
 
 #include "3party/minizip/minizip.hpp"
 
+using namespace std;
+
 namespace
 {
 class UnzipFileDelegate : public ZipFileReader::Delegate
 {
 public:
-  explicit UnzipFileDelegate(std::string const & path)
-    : m_file(std::make_unique<FileWriter>(path)), m_path(path), m_completed(false)
+  explicit UnzipFileDelegate(string const & path)
+    : m_file(make_unique<FileWriter>(path)), m_path(path), m_completed(false)
   {
   }
 
@@ -34,13 +36,13 @@ public:
   void OnCompleted() override { m_completed = true; }
 
 private:
-  std::unique_ptr<FileWriter> m_file;
-  std::string const m_path;
+  unique_ptr<FileWriter> m_file;
+  string const m_path;
   bool m_completed;
 };
 }  // namespace
 
-ZipFileReader::ZipFileReader(std::string const & container, std::string const & file, uint32_t logPageSize,
+ZipFileReader::ZipFileReader(string const & container, string const & file, uint32_t logPageSize,
                              uint32_t logPageCount)
   : FileReader(container, logPageSize, logPageCount), m_uncompressedFileSize(0)
 {
@@ -48,7 +50,7 @@ ZipFileReader::ZipFileReader(std::string const & container, std::string const &
   if (!zip)
     MYTHROW(OpenZipException, ("Can't get zip file handle", container));
 
-  SCOPE_GUARD(zipGuard, std::bind(&unzClose, zip));
+  SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
 
   if (unzip::Code::Ok != unzip::GoToFile(zip, file.c_str()))
     MYTHROW(LocateZipException, ("Can't locate file inside zip", file));
@@ -70,13 +72,13 @@ ZipFileReader::ZipFileReader(std::string const & container, std::string const &
   m_uncompressedFileSize = fileInfo.m_info.uncompressed_size;
 }
 
-void ZipFileReader::FilesList(std::string const & zipContainer, FileList & filesList)
+void ZipFileReader::FilesList(string const & zipContainer, FileList & filesList)
 {
   auto const zip = unzip::Open(zipContainer.c_str());
   if (!zip)
     MYTHROW(OpenZipException, ("Can't get zip file handle", zipContainer));
 
-  SCOPE_GUARD(zipGuard, std::bind(&unzip::Close, zip));
+  SCOPE_GUARD(zipGuard, bind(&unzip::Close, zip));
 
   if (unzip::Code::Ok != unzip::GoToFirstFile(zip))
     MYTHROW(LocateZipException, ("Can't find first file inside zip", zipContainer));
@@ -92,7 +94,7 @@ void ZipFileReader::FilesList(std::string const & zipContainer, FileList & files
   } while (unzip::Code::Ok == unzip::GoToNextFile(zip));
 }
 
-bool ZipFileReader::IsZip(std::string const & zipContainer)
+bool ZipFileReader::IsZip(string const & zipContainer)
 {
   auto zip = unzip::Open(zipContainer);
   if (!zip)
@@ -102,20 +104,20 @@ bool ZipFileReader::IsZip(std::string const & zipContainer)
 }
 
 // static
-void ZipFileReader::UnzipFile(std::string const & zipContainer, std::string const & fileInZip,
+void ZipFileReader::UnzipFile(string const & zipContainer, string const & fileInZip,
                               Delegate & delegate)
 {
   auto zip = unzip::Open(zipContainer);
   if (!zip)
     MYTHROW(OpenZipException, ("Can't get zip file handle", zipContainer));
-  SCOPE_GUARD(zipGuard, std::bind(&unzip::Close, zip));
+  SCOPE_GUARD(zipGuard, bind(&unzip::Close, zip));
 
   if (unzip::Code::Ok != unzip::GoToFile(zip, fileInZip))
     MYTHROW(LocateZipException, ("Can't locate file inside zip", fileInZip));
 
   if (unzip::Code::Ok != unzip::OpenCurrentFile(zip))
     MYTHROW(LocateZipException, ("Can't open file inside zip", fileInZip));
-  SCOPE_GUARD(currentFileGuard, std::bind(&unzip::CloseCurrentFile, zip));
+  SCOPE_GUARD(currentFileGuard, bind(&unzip::CloseCurrentFile, zip));
 
   unzip::FileInfo fileInfo;
   if (unzip::Code::Ok != unzip::GetCurrentFileInfo(zip, fileInfo))
@@ -140,8 +142,8 @@ void ZipFileReader::UnzipFile(std::string const & zipContainer, std::string cons
 }
 
 // static
-void ZipFileReader::UnzipFile(std::string const & zipContainer, std::string const & fileInZip,
-                              std::string const & outPath)
+void ZipFileReader::UnzipFile(string const & zipContainer, string const & fileInZip,
+                              string const & outPath)
 {
   UnzipFileDelegate delegate(outPath);
   UnzipFile(zipContainer, fileInZip, delegate);
diff --git a/data/World.mwm b/data/World.mwm
index 067ca2e47f..68c7386ab0 100644
Binary files a/data/World.mwm and b/data/World.mwm differ
diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm
index 46ab5bc67d..873ee10f7c 100644
Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ
diff --git a/data/categories.txt b/data/categories.txt
index 16180a7118..e62ae4ebd3 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -5988,7 +5988,7 @@ fa:پناهگاه
 mr:निवारा
 
 amenity-telephone
-en:2Phone|U+260E|U+1F4DE|5Telephone
+en:2Phone|U+260E|U+1F4DE
 ru:3Телефон|4таксофон
 bg:3Телефон|мобифон|обаждане
 ar:هاتف
@@ -10489,46 +10489,6 @@ el:Φωτογραφείο|πλαίσια|κατάστημα
 sk:4Fotografické služby|Rámovanie
 mr:फोटो शॉप|फोटो स्टुडिओ
 
-shop-camera
-en:3Camera Shop
-ar:متجر الكاميرا
-be:Крама фотаапаратаў
-bg:Магазин за фотоапарати
-ca:Botiga de càmeres
-cs:Obchod s fotoaparáty
-da:Kamera butik
-de:Kamerageschäft
-el:Κατάστημα φωτογραφικών μηχανών
-es:Tienda de cámaras
-et:Kaamerapood
-eu:Kamera Denda
-fa:فروشگاه دوربین
-fi:Kamerakauppa
-fr:Boutique d'appareils photo
-he:חנות מצלמות
-hu:Fényképezőgép bolt
-id:Toko Kamera
-it:Negozio di macchine fotografiche
-ja:カメラショップ
-ko:카메라 샵
-mr:कॅमेरा शॉप
-nb:Kamerabutikk
-nl:Camerawinkel
-pl:Sklep z aparatami
-pt:Loja de câmeras
-pt-BR:Loja de câmeras
-ro:Magazin de aparate foto
-ru:Магазин фотоаппаратов
-sk:Obchod s fotoaparátmi
-sv:Kameraaffär
-sw:Duka la Kamera
-th:ร้านกล้อง
-tr:Kamera Dükkanı
-uk:Магазин фотоапаратів
-vi:Cửa hàng máy ảnh
-zh-Hans:相机店
-zh-Hant:相機店
-
 shop-travel_agency
 en:4Travel Agency|tours|4tour agency|trips|journeys|travel bureau|holidays|travel agent|tourist office|last minute tour
 ru:3Турагентство|путешествия|туристическое агентство|турфирма|5путевки|пакетные туры|горящие туры|горящие путевки|туроператор|купить тур|купить путевку|бронирование туров|туристическая компания|туристическая фирма
diff --git a/data/classificator.txt b/data/classificator.txt
index 94f1ce1174..77d57270bd 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -1,8 +1,4 @@
 world  +
-    addr:interpolation  +
-        even  -
-        odd  -
-        {}
     aerialway  +
         cable_car  -
         chair_lift  -
@@ -1132,7 +1128,6 @@ world  +
         books  -
         boutique  -
         butcher  -
-        camera  -
         cannabis  -
         car  -
         car_parts  -
diff --git a/data/colors.txt b/data/colors.txt
index 3900f57260..b952df9b39 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -420,15 +420,11 @@
 3432785840
 3942645760
 4043309055
-4278401920
-4278542285
 4279308544
 4281545523
 4287137928
 4287393810
-4288423856
 4288578070
 4294761984
-4294921100
 4294960384
 4294967295
diff --git a/data/countries.txt b/data/countries.txt
index 7303dae20b..cb38841cdd 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -1,16 +1,16 @@
 {
- "v": 230503,
+ "v": 230329,
  "id": "Countries",
  "g": [
   {
    "id": "World",
-   "s": 44392477,
-   "sha1_base64": "wX4lAUvU9gDBN9BXl5zn5NmMKq0="
+   "s": 44096065,
+   "sha1_base64": "yNu/Bl3bI10LuPeADIt7PH7Kpng="
   },
   {
    "id": "WorldCoasts",
-   "s": 8754642,
-   "sha1_base64": "ZFaRpRHF03xP2PIjrlBhzCLjtXI="
+   "s": 8754035,
+   "sha1_base64": "55znVRRVH12zWgPlcN2CyI0AJR8="
   },
   {
    "id": "Abkhazia",
@@ -22,8 +22,8 @@
     "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430",
     "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"
    ],
-   "s": 11856757,
-   "sha1_base64": "0lvc1562x8s85YovbaA+HJFrr3I="
+   "s": 12145157,
+   "sha1_base64": "rwrIReP1HH4OeviNsNyI/RlEgJw="
   },
   {
    "id": "Afghanistan",
@@ -67,8 +67,8 @@
     "\u0648\u0644\u0627\u06cc\u062a \u063a\u0648\u0631",
     "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646"
    ],
-   "s": 107405471,
-   "sha1_base64": "XbXS8mZMCOiJaahWntEM/TVvcJE="
+   "s": 107585774,
+   "sha1_base64": "tMRZuUv5alzax0inObN4oEPZ6Bs="
   },
   {
    "id": "Albania",
@@ -78,8 +78,8 @@
    "affiliations": [
     "Shqip\u00ebria"
    ],
-   "s": 46932206,
-   "sha1_base64": "tXCdjIrdUqjFT8yXob1IFUnbaWw="
+   "s": 46835134,
+   "sha1_base64": "YfiYixlZsXgMsRQqQNWQBRnXlM4="
   },
   {
    "id": "Algeria",
@@ -109,8 +109,8 @@
       "Tindouf \u2d5c\u2d49\u2d4f\u2d37\u2d53\u2d3c \u062a\u0646\u062f\u0648\u0641",
       "T\u00e9bessa - \u062a\u0628\u0633\u0629"
      ],
-     "s": 41985109,
-     "sha1_base64": "Ws807QaZPfDNifyeJW7mZCQaqT4="
+     "s": 41999949,
+     "sha1_base64": "k2X9sTN2CY1peS+nIjss3eCYIi8="
     },
     {
      "id": "Algeria_Coast",
@@ -151,8 +151,8 @@
       "Tizi Ouzou - \u2d5c\u2d49\u2d63\u2d49 \u2d53\u2d63\u2d63\u2d53 - \u062a\u064a\u0632\u064a \u0648\u0632\u0648",
       "Tlemcen - \u062a\u0644\u0645\u0633\u0627\u0646"
      ],
-     "s": 95033082,
-     "sha1_base64": "Bs5uJQvu/EXIa8zWb89ZWZTL4HM="
+     "s": 95371954,
+     "sha1_base64": "bWq4shBP1aceoiyxnmCv2Uwa8aU="
     }
    ]
   },
@@ -164,8 +164,8 @@
    "affiliations": [
     "Andorra"
    ],
-   "s": 3726321,
-   "sha1_base64": "e1xh1hyL8azWHWuL2EykYWG/sn0="
+   "s": 3714921,
+   "sha1_base64": "TcChkVCHkWhoXqETuxeLMBXYT+Q="
   },
   {
    "id": "Angola",
@@ -193,8 +193,8 @@
     "Namibe",
     "Zaire"
    ],
-   "s": 57847461,
-   "sha1_base64": "vXmnUCqRX5kSIq1sByqs+6ohghY="
+   "s": 57180325,
+   "sha1_base64": "MvP1DsAO412z+4I7yuT6TB1/K0Y="
   },
   {
    "id": "Anguilla",
@@ -204,8 +204,8 @@
    "affiliations": [
     "Anguilla"
    ],
-   "s": 718300,
-   "sha1_base64": "xALIIafwXHJ16uDwSilz83/1s8U="
+   "s": 737476,
+   "sha1_base64": "WvWreKEaZsO8UjaiNeYlJ5q59jU="
   },
   {
    "id": "Antigua and Barbuda",
@@ -216,8 +216,8 @@
     "Antigua and Barbuda",
     "Montserrat"
    ],
-   "s": 2452140,
-   "sha1_base64": "n5wII3wmDL9xuv9w6Lq68Ww3BGE="
+   "s": 2505756,
+   "sha1_base64": "ANSeR8GEbElkQDntb6YBMiob078="
   },
   {
    "id": "Barbados",
@@ -227,8 +227,8 @@
    "affiliations": [
     "Barbados"
    ],
-   "s": 6159472,
-   "sha1_base64": "RMS5LHZs8QGcuTpcF2jd2C4IjaU="
+   "s": 6148880,
+   "sha1_base64": "Jr6zejl+lnk5OmKIM/q+3HTN7Po="
   },
   {
    "id": "British Virgin Islands",
@@ -238,8 +238,8 @@
    "affiliations": [
     "British Virgin Islands"
    ],
-   "s": 1116982,
-   "sha1_base64": "Alp+brhMTa3XQ1Dxr1rU/61Fuyw="
+   "s": 1259726,
+   "sha1_base64": "tsEn/ajzrv4ZuW5KPfrLTke3gEQ="
   },
   {
    "id": "Caribisch Nederland",
@@ -257,8 +257,8 @@
     "Aruba",
     "Curacao"
    ],
-   "s": 7698434,
-   "sha1_base64": "Ct7M9VNtPPji/MAI9GoAEH9ImCo="
+   "s": 7838474,
+   "sha1_base64": "8xRMrVg7uHO+dJZYICulrZCvEcA="
   },
   {
    "id": "Dominica",
@@ -278,8 +278,8 @@
     "Saint Joseph Parish",
     "Saint Peter Parish"
    ],
-   "s": 3560150,
-   "sha1_base64": "ZZAazzBo/y0IH78hmzD6tEymivc="
+   "s": 3762518,
+   "sha1_base64": "A0ZN+UQpJssB1NPodj73wXLZxy8="
   },
   {
    "id": "Grenada",
@@ -289,8 +289,8 @@
    "affiliations": [
     "Grenada"
    ],
-   "s": 2526966,
-   "sha1_base64": "sbv0TNGPOQKsM1PqiUSijXJ/4Nc="
+   "s": 2514893,
+   "sha1_base64": "I4u7duARUvMLxQcA3Arczct6bYI="
   },
   {
    "id": "Guadeloupe",
@@ -302,8 +302,8 @@
     "Guadeloupe",
     "Montserrat"
    ],
-   "s": 16346180,
-   "sha1_base64": "W2c/d4PfsJqtd+I2OM2aBUO0vPQ="
+   "s": 16357364,
+   "sha1_base64": "ASeDTw5BrW+LXCpXZdpPL4PIWPU="
   },
   {
    "id": "Martinique",
@@ -315,8 +315,8 @@
     "Martinique",
     "Saint Lucia"
    ],
-   "s": 13167228,
-   "sha1_base64": "LsfJkfYzfaJISALDy+4qQ7c0S7I="
+   "s": 13200932,
+   "sha1_base64": "1gTEOAlwyR+tdC+OlJEYQGCMNgY="
   },
   {
    "id": "Montserrat",
@@ -326,8 +326,8 @@
    "affiliations": [
     "Montserrat"
    ],
-   "s": 535564,
-   "sha1_base64": "c9DIJycNUDmickLooJmgibnkEng="
+   "s": 576620,
+   "sha1_base64": "Zq+/cCxA6WGifmGWXyq8ZdwwwFM="
   },
   {
    "id": "Saint Barthelemy",
@@ -337,8 +337,8 @@
    "affiliations": [
     "France"
    ],
-   "s": 576588,
-   "sha1_base64": "19GL20a6559UvC+v7IRRyUe7piw="
+   "s": 617483,
+   "sha1_base64": "FvAabTpt9s+oSWsgjjTCiluNghw="
   },
   {
    "id": "Saint Kitts and Nevis",
@@ -348,8 +348,8 @@
    "affiliations": [
     "Saint Kitts and Nevis"
    ],
-   "s": 1512681,
-   "sha1_base64": "/IokGe+S7cSIvsoEKuy0eBxx/fY="
+   "s": 1669025,
+   "sha1_base64": "jfMECxULLe5G4fHPqLcOYSvSsLQ="
   },
   {
    "id": "Saint Lucia",
@@ -360,8 +360,8 @@
     "Saint Lucia",
     "Saint Vincent and the Grenadines"
    ],
-   "s": 3703215,
-   "sha1_base64": "iPRDyOdX4f4p7LWwjAbXRcyQHuw="
+   "s": 3809431,
+   "sha1_base64": "T6mUET7YyJGEu4LdRUo5kxMeWB4="
   },
   {
    "id": "Saint Martin",
@@ -378,8 +378,8 @@
     "Saint Martin (Dutch part)",
     "Sint Maarten (Netherlands)"
    ],
-   "s": 2173296,
-   "sha1_base64": "t+dJwFlOtaxDqZQsq5DA8VPY3+Y="
+   "s": 2369544,
+   "sha1_base64": "096ETL4XS7DlwjlCZVPHSYvW6Dw="
   },
   {
    "id": "Saint Vincent and the Grenadines",
@@ -389,8 +389,8 @@
    "affiliations": [
     "Saint Vincent and the Grenadines"
    ],
-   "s": 2601664,
-   "sha1_base64": "0t0r+7zNDf+oJvQUWotMSDd2ihs="
+   "s": 2626864,
+   "sha1_base64": "vAtNJEZHb2xN8z1YYukK8u4zrf8="
   },
   {
    "id": "Trinidad and Tobago",
@@ -400,8 +400,8 @@
    "affiliations": [
     "Trinidad and Tobago"
    ],
-   "s": 16894429,
-   "sha1_base64": "awJhsAxHWz+q/yAyma3qkTsdBug="
+   "s": 16876613,
+   "sha1_base64": "KKb5Fbxxxr8ElpFeNXa3/psXKNU="
   },
   {
    "id": "United States Virgin Islands",
@@ -416,8 +416,8 @@
     "VI",
     "United States of America"
    ],
-   "s": 3063981,
-   "sha1_base64": "5yHaYROLz7459/b8MCLFwXhQeDc="
+   "s": 3391605,
+   "sha1_base64": "FrLZApvW2UDkc1/YFrMj9s/f7M8="
   },
   {
    "id": "Argentina",
@@ -427,8 +427,8 @@
      "affiliations": [
       "Acuerdo de Campos de Hielo"
      ],
-     "s": 7364560,
-     "sha1_base64": "7X3h7yGYp6hJxLGJtaNNdmDgljE="
+     "s": 7568832,
+     "sha1_base64": "10J4Y7Buz+Cdt7ymD8xj7rXk1A8="
     },
     {
      "id": "Argentina_Buenos Aires_Buenos Aires",
@@ -440,8 +440,8 @@
       "Ciudad Aut\u00f3noma de Buenos Aires",
       "Buenos Aires"
      ],
-     "s": 57516277,
-     "sha1_base64": "57bRdkEMvBEjte08xX0pU5b5kG0="
+     "s": 50171557,
+     "sha1_base64": "LAyLeHlHc3o0/GFzVGBELeZvtK4="
     },
     {
      "id": "Argentina_Buenos Aires_North",
@@ -452,8 +452,8 @@
       "Argentina",
       "Buenos Aires"
      ],
-     "s": 33581293,
-     "sha1_base64": "PREy9Klp6TmbE6pYj53ZUjA5DMM="
+     "s": 31631253,
+     "sha1_base64": "Ta4eA8mroQDMx1GP5quTfgmmoZ0="
     },
     {
      "id": "Argentina_Buenos Aires_South",
@@ -464,8 +464,8 @@
       "Argentina",
       "Buenos Aires"
      ],
-     "s": 50716992,
-     "sha1_base64": "ZSOJepCDXnTSD1WEugVB6EtbLgc="
+     "s": 47424832,
+     "sha1_base64": "2ze8rxNnwYS9USvn5cgpzwuYdkk="
     },
     {
      "id": "Argentina_Patagonia",
@@ -480,8 +480,8 @@
       "Santa Cruz",
       "Tierra del Fuego"
      ],
-     "s": 76276707,
-     "sha1_base64": "Uy2dstOAEseBH5eiaRwT231PxQQ="
+     "s": 74501547,
+     "sha1_base64": "Q0LyG1UY/zRQxjvriyzeyPzhN0w="
     },
     {
      "id": "Argentina_Cuyo",
@@ -495,8 +495,8 @@
       "San Juan",
       "San Luis"
      ],
-     "s": 40015781,
-     "sha1_base64": "TG2YiSZ3d5yANWhVpEMKukV8XNY="
+     "s": 39252901,
+     "sha1_base64": "RJ8hj2thHcLhh/JauZU9G6iCs9E="
     },
     {
      "id": "Argentina_Mesopotamia",
@@ -517,8 +517,8 @@
       "Itap\u00faa",
       "Misiones"
      ],
-     "s": 72965264,
-     "sha1_base64": "dqKG9Iakf4Oa3iS7EnDGW9/dmK4="
+     "s": 71353409,
+     "sha1_base64": "4PR0xzqTgXaT5c5gMfoSUCeZ71g="
     },
     {
      "id": "Argentina_Northwest",
@@ -535,8 +535,8 @@
       "Santiago del Estero",
       "Tucum\u00e1n"
      ],
-     "s": 57613305,
-     "sha1_base64": "b/4PBJxMJR5WCOl1W8tAy9qanW8="
+     "s": 55669160,
+     "sha1_base64": "H45rF7FrOqIyLtJy5VoVqXPQaYg="
     },
     {
      "id": "Argentina_Pampas",
@@ -548,8 +548,8 @@
       "C\u00f3rdoba",
       "La Pampa"
      ],
-     "s": 60496882,
-     "sha1_base64": "YYIKb0FbzSTOr3JMwfAYg88EIIM="
+     "s": 55557202,
+     "sha1_base64": "KB5GHroDWuOX6s0Qn1IXNsJ8m5E="
     },
     {
      "id": "Argentina_Santa Fe",
@@ -560,8 +560,8 @@
       "Argentina",
       "Santa Fe"
      ],
-     "s": 35445774,
-     "sha1_base64": "j1nDTuC5p5V6y6Rvl9Ab0YiV/tU="
+     "s": 32761638,
+     "sha1_base64": "IyBTsWDoj41d+lG9SjSHvsgyFAM="
     }
    ]
   },
@@ -586,8 +586,8 @@
     "\u0531\u0580\u0561\u0563\u0561\u056e\u0578\u057f\u0576\u056b \u0574\u0561\u0580\u0566",
     "\u0533\u0565\u0572\u0561\u0580\u0584\u0578\u0582\u0576\u056b\u0584"
    ],
-   "s": 49710956,
-   "sha1_base64": "6VDycHVrXuFl4Vqlh6Y5S+rqpaI="
+   "s": 49390148,
+   "sha1_base64": "oP7RovKyQ8CpLYoXMypfdU6Gy6k="
   },
   {
    "id": "Austria",
@@ -601,8 +601,8 @@
       "Burgenland",
       "\u00d6sterreich"
      ],
-     "s": 37873059,
-     "sha1_base64": "2oYSlIdamblEp4WxBPXrUgeAoQs="
+     "s": 38213987,
+     "sha1_base64": "BZpwwbTSt4l3c3/ddDqa2mpo8bM="
     },
     {
      "id": "Austria_Carinthia",
@@ -613,8 +613,8 @@
       "K\u00e4rnten",
       "\u00d6sterreich"
      ],
-     "s": 61284271,
-     "sha1_base64": "VvOsxCtPnWq26hm8S/JpHGPaY5U="
+     "s": 61320056,
+     "sha1_base64": "6EGehkArv/JvhnCnG3yEJ2Lccxo="
     },
     {
      "id": "Austria_Lower Austria_Wien",
@@ -626,8 +626,8 @@
       "Nieder\u00f6sterreich",
       "Wien"
      ],
-     "s": 121269592,
-     "sha1_base64": "YGDSp4LSThC1yE2h5k0htW5Isgg="
+     "s": 120896922,
+     "sha1_base64": "lUOGlIdmaM5O9v6WGEFAhvWng0Y="
     },
     {
      "id": "Austria_Styria_Graz",
@@ -638,8 +638,8 @@
       "\u00d6sterreich",
       "Steiermark"
      ],
-     "s": 84184091,
-     "sha1_base64": "tpxBoxdF/Xn+E1mGuoD5tD961n0="
+     "s": 84064051,
+     "sha1_base64": "9oo8MdrjVtF1hpInIzcxyyOsdos="
     },
     {
      "id": "Austria_Styria_Leoben",
@@ -650,8 +650,8 @@
       "\u00d6sterreich",
       "Steiermark"
      ],
-     "s": 52124375,
-     "sha1_base64": "8z/sb6+WKY3S6UEGB1saZ0p597o="
+     "s": 52115951,
+     "sha1_base64": "zYiNbLFho/1AAOB4bFxBENcBc/c="
     },
     {
      "id": "Austria_Upper Austria_Linz",
@@ -662,8 +662,8 @@
       "\u00d6sterreich",
       "Ober\u00f6sterreich"
      ],
-     "s": 50877991,
-     "sha1_base64": "XcNhHB6QPfdgh636vsdJA6H3fnQ="
+     "s": 50274127,
+     "sha1_base64": "v4p3FUCsv42XGDk8IWHcxZYQCvk="
     },
     {
      "id": "Austria_Upper Austria_Wels",
@@ -674,8 +674,8 @@
       "\u00d6sterreich",
       "Ober\u00f6sterreich"
      ],
-     "s": 62294456,
-     "sha1_base64": "+u6yuQotNRqsDYp3ugfUdW1oQS8="
+     "s": 62181696,
+     "sha1_base64": "3kb4d5IEyK2iSKEBdc2NwzAodQI="
     },
     {
      "id": "Austria_Lower Austria_West",
@@ -686,8 +686,8 @@
       "\u00d6sterreich",
       "Nieder\u00f6sterreich"
      ],
-     "s": 113394217,
-     "sha1_base64": "4dodw0pV6W7fufJodYHUqM/ntrw="
+     "s": 113187898,
+     "sha1_base64": "SnAdx1BUagBkiVqP6zccA272Mhw="
     },
     {
      "id": "Austria_Tyrol",
@@ -698,8 +698,8 @@
       "\u00d6sterreich",
       "Tirol"
      ],
-     "s": 76892323,
-     "sha1_base64": "iXBzhrwiMEpBfd+YbWV8322KsXY="
+     "s": 76709427,
+     "sha1_base64": "mhTG3NLZKFeNcA4jniO8a9Bvies="
     },
     {
      "id": "Austria_Salzburg",
@@ -710,8 +710,8 @@
       "\u00d6sterreich",
       "Salzburg"
      ],
-     "s": 57613502,
-     "sha1_base64": "llpI7Pmc8KtvmKcOy9xhX0rBGbA="
+     "s": 57667055,
+     "sha1_base64": "Gp9BfjNDDtQUQNPXgGXEWt1sn1Y="
     },
     {
      "id": "Austria_Vorarlberg",
@@ -722,8 +722,8 @@
       "\u00d6sterreich",
       "Vorarlberg"
      ],
-     "s": 33492637,
-     "sha1_base64": "2hSODeuAFKpHmv6yxw4TsSYwI6U="
+     "s": 33891797,
+     "sha1_base64": "Mpvi0zffBA7UTGdFr1ZU46ODG4E="
     }
    ]
   },
@@ -737,8 +737,8 @@
       "Coral Sea Islands Territory",
       "Willis Island"
      ],
-     "s": 178947,
-     "sha1_base64": "vJtJ7JMyRsdCkmwE5lWMaemo0u8="
+     "s": 348164,
+     "sha1_base64": "CrrAsRZQvhDrfKpBwheIftFwvyY="
     },
     {
      "id": "Australia_Melbourne",
@@ -749,8 +749,8 @@
       "Australia",
       "Victoria"
      ],
-     "s": 80381468,
-     "sha1_base64": "6uqwgeR8meg5FWOiXyPiiZ/Sk6A="
+     "s": 79388876,
+     "sha1_base64": "D4hCfJ/yg3x1q9+PZuMCPZ/sW28="
     },
     {
      "id": "Australia_New South Wales",
@@ -764,8 +764,8 @@
       "New South Wales",
       "Norfolk Island"
      ],
-     "s": 76624747,
-     "sha1_base64": "2gZf67AM0YgRa6qcrTXSKf90smw="
+     "s": 75457986,
+     "sha1_base64": "qo8nkWqXeFzsWL4FJ3jdbnRL6IQ="
     },
     {
      "id": "Australia_Northern Territory",
@@ -776,8 +776,8 @@
       "Australia",
       "Northern Territory"
      ],
-     "s": 14914500,
-     "sha1_base64": "Hfu+XA22yDkVcXtp30kc35iC1VY="
+     "s": 15000612,
+     "sha1_base64": "klFm7L9TDIz8wUvAwv5Dm3cLJAA="
     },
     {
      "id": "Australia_Queensland",
@@ -789,8 +789,8 @@
       "Coral Sea Islands Territory",
       "Queensland"
      ],
-     "s": 38997925,
-     "sha1_base64": "QnzzNFg9Q+cPnjE0pc0vcr7Ucic="
+     "s": 39175101,
+     "sha1_base64": "Bna4hCxZNQJcdUAkWHLX0ps6N8o="
     },
     {
      "id": "Australia_South Australia",
@@ -801,8 +801,8 @@
       "Australia",
       "South Australia"
      ],
-     "s": 58864723,
-     "sha1_base64": "QobC67rJcL44P2dGH2N89owqFuY="
+     "s": 58957715,
+     "sha1_base64": "lM3dcpzGLJadXatPhdRFn5CVxus="
     },
     {
      "id": "Australia_Tasmania",
@@ -813,8 +813,8 @@
       "Australia",
       "Tasmania"
      ],
-     "s": 49309932,
-     "sha1_base64": "cPsPFUILlNsONu3orrObSYg0MRE="
+     "s": 48931508,
+     "sha1_base64": "tg0dtvEAXAiYJs+aAYG+1qRwyo0="
     },
     {
      "id": "Australia_Victoria",
@@ -825,8 +825,8 @@
       "Australia",
       "Victoria"
      ],
-     "s": 85044940,
-     "sha1_base64": "jwr3TEG0Pu4YXcpQclJZp3Tb8ds="
+     "s": 84848940,
+     "sha1_base64": "CWGQDHupx5tzLfOfT7sC8NblcKc="
     },
     {
      "id": "Australia_Western Australia",
@@ -842,8 +842,8 @@
       "Cocos (Keeling) Islands",
       "Western Australia"
      ],
-     "s": 81362000,
-     "sha1_base64": "T7P2uIu9JHVPjF63GpZjAwcq97o="
+     "s": 81079912,
+     "sha1_base64": "+j3GQGZhzRtyTbIG+fpgYMl+vCQ="
     },
     {
      "id": "Australia_Brisbane",
@@ -856,8 +856,8 @@
       "France, Nouvelle-Cal\u00e9donie, R\u00e9cifs de Bellone (eaux territoriales)",
       "Queensland"
      ],
-     "s": 95077948,
-     "sha1_base64": "R6bw3LGDvcpoH4L/K3xt4r2kn/I="
+     "s": 94850628,
+     "sha1_base64": "upZnn/UpDRdsNu97AYR7vUTw9yI="
     },
     {
      "id": "Australia_Sydney",
@@ -870,8 +870,8 @@
       "Jervis Bay Territory",
       "New South Wales"
      ],
-     "s": 134303630,
-     "sha1_base64": "DTTJnsld2vqBBuFgSF0zE5MlppM="
+     "s": 133586134,
+     "sha1_base64": "DWGL137tjm1zKYrwIEP7rtubOFI="
     }
    ]
   },
@@ -894,8 +894,8 @@
       "\u0544\u0561\u0580\u057f\u0578\u0582\u0576\u0578\u0582 \u0577\u0580\u057b\u0561\u0576 (Martuni Province)",
       "\u054d\u057f\u0565\u0583\u0561\u0576\u0561\u056f\u0565\u0580\u057f (Stepanakert - Khankendi)"
      ],
-     "s": 9742862,
-     "sha1_base64": "oPVN/nlEJs+X1bxKwP2PbU8U3xE="
+     "s": 10004774,
+     "sha1_base64": "dLXv1S/qD0+N07d5fpPl3Jqh4gI="
     },
     {
      "id": "Azerbaijan",
@@ -975,8 +975,8 @@
       "\u015e\u0259mkir rayonu",
       "\u015e\u0259rur rayonu"
      ],
-     "s": 43127644,
-     "sha1_base64": "PQtkSMDZgTVkv2rPZRa4DTJI+s8="
+     "s": 43464525,
+     "sha1_base64": "a1ZVD/9tElWim8biTFgt8nsckyA="
     }
    ]
   },
@@ -993,8 +993,8 @@
     "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u062c\u0646\u0648\u0628\u064a\u0629",
     "\u0627\u0644\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0634\u0645\u0627\u0644\u064a\u0629"
    ],
-   "s": 7260095,
-   "sha1_base64": "Og/14XVRwR2Bq1IO6N9/M1SvRcE="
+   "s": 7472495,
+   "sha1_base64": "QM+PLimdQm8ntXbnqTvAaAePdg0="
   },
   {
    "id": "Bangladesh",
@@ -1012,8 +1012,8 @@
     "\u09ac\u09be\u0982\u09b2\u09be\u09a6\u09c7\u09b6",
     "\u099a\u099f\u09cd\u099f\u0997\u09cd\u09b0\u09be\u09ae \u09ac\u09bf\u09ad\u09be\u0997"
    ],
-   "s": 306708014,
-   "sha1_base64": "PYSTQtC68I0CGZ1kuK5odQiBBtk="
+   "s": 306425078,
+   "sha1_base64": "ayaW7d+H3tq1gFV8qk8O9S6EmWg="
   },
   {
    "id": "Belarus",
@@ -1030,8 +1030,8 @@
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c",
       "\u0412\u0438\u0442\u0435\u0431\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 63401713,
-     "sha1_base64": "0lJJpidyq4qypCFV7+naBTLW26s="
+     "s": 62725481,
+     "sha1_base64": "hBp5wxPE1p72fUFarNoixQiIA8g="
     },
     {
      "id": "Belarus_Hrodna Region",
@@ -1042,8 +1042,8 @@
       "\u0413\u0440\u043e\u0434\u043d\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c"
      ],
-     "s": 51026673,
-     "sha1_base64": "aOyZQY/LUMr2jhWfAfZV9NpXjnY="
+     "s": 50350289,
+     "sha1_base64": "WYPrWS0WlxGXu9b0joQ+oAyOhUc="
     },
     {
      "id": "Belarus_Brest Region",
@@ -1054,8 +1054,8 @@
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c",
       "\u0411\u0440\u0435\u0441\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 52453633,
-     "sha1_base64": "D4L5CN8aseQJkpyvEsNB8/4bjEI="
+     "s": 50678785,
+     "sha1_base64": "TCufCxV31/nL1Hlb80yjRv9qLU0="
     },
     {
      "id": "Belarus_Homiel Region",
@@ -1066,8 +1066,8 @@
       "\u0413\u043e\u043c\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c"
      ],
-     "s": 47539792,
-     "sha1_base64": "DA+CoQEcSkdzDlxeonasn80MxHA="
+     "s": 45614863,
+     "sha1_base64": "Zl7QQPQZ2qgRbrFxKELRED8W3B0="
     },
     {
      "id": "Belarus_Maglieu Region",
@@ -1078,8 +1078,8 @@
       "\u041c\u043e\u0433\u0438\u043b\u0451\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c"
      ],
-     "s": 37323444,
-     "sha1_base64": "Dej1nluIileWPwmts5JkvOL+Seo="
+     "s": 36601796,
+     "sha1_base64": "xP56vSNd8SFTTtFIXS8Uzcq+gK0="
     },
     {
      "id": "Belarus_Minsk Region",
@@ -1094,8 +1094,8 @@
       "\u041a\u043e\u043b\u043e\u0434\u0438\u0449\u0438",
       "\u041d\u0430\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0430\u044d\u0440\u043e\u043f\u043e\u0440\u0442 \"\u041c\u0438\u043d\u0441\u043a\""
      ],
-     "s": 83844786,
-     "sha1_base64": "P8pExPsggQRU8nTq+OLTOzz2D9w="
+     "s": 81410025,
+     "sha1_base64": "mtl5iM25w9XYXdtO0GYJDgDTr9I="
     }
    ]
   },
@@ -1112,8 +1112,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Vlaanderen"
      ],
-     "s": 63489128,
-     "sha1_base64": "yLqmnMad8U7G26hWfVtc/WBbHIA="
+     "s": 63048336,
+     "sha1_base64": "gsOFw+DOxTB3u6KrAXmfC621afE="
     },
     {
      "id": "Belgium_Antwerp",
@@ -1125,8 +1125,8 @@
       "Nederland - Belgique / Belgi\u00eb / Belgien",
       "Vlaanderen"
      ],
-     "s": 68489608,
-     "sha1_base64": "m4gpV+gbbBnYzeptQ8BOynqDmiM="
+     "s": 68375336,
+     "sha1_base64": "mXlNjwef+nVq2j2Gr5gOARDza48="
     },
     {
      "id": "Belgium_East Flanders",
@@ -1137,8 +1137,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Vlaanderen"
      ],
-     "s": 63635129,
-     "sha1_base64": "Pi4K76RNCDp2BbIMUnBcXU7zsSo="
+     "s": 63345673,
+     "sha1_base64": "LVhc/3q24NZYEuNExAu6XFH8KB4="
     },
     {
      "id": "Belgium_Hainaut",
@@ -1149,8 +1149,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 50789312,
-     "sha1_base64": "uwTf6sGajdk1TicJ6VFC8cSzTSc="
+     "s": 50543720,
+     "sha1_base64": "gG3s4cbZZmpBqme7RdiTc6gpNr4="
     },
     {
      "id": "Belgium_Walloon Brabant",
@@ -1161,8 +1161,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 15885689,
-     "sha1_base64": "RFI+/E4sDLdonFCgLYYHwj9hX48="
+     "s": 15802529,
+     "sha1_base64": "b3gmNwJExqAH/+1G1x56hAP6FgU="
     },
     {
      "id": "Belgium_Namur",
@@ -1173,8 +1173,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 27386324,
-     "sha1_base64": "FFp/SDEeqjlO9bBGRo68oK3lBFw="
+     "s": 27153268,
+     "sha1_base64": "eOIGjviyDJudiJaknINBQwanpFk="
     },
     {
      "id": "Belgium_Limburg",
@@ -1185,8 +1185,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Vlaanderen"
      ],
-     "s": 48642894,
-     "sha1_base64": "NigmmyOoA2asB8o12Znfkp98ZKI="
+     "s": 48577918,
+     "sha1_base64": "WTK5iQCkjOT8Rro0GOHO/tyzsE4="
     },
     {
      "id": "Belgium_Luxembourg",
@@ -1197,8 +1197,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 33303742,
-     "sha1_base64": "Q+/UMHirt9nnfDuSOHR46dmStK4="
+     "s": 33163190,
+     "sha1_base64": "u/hRKnjabpxStTvm70KHTDjxo8w="
     },
     {
      "id": "Belgium_Flemish Brabant",
@@ -1210,8 +1210,8 @@
       "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest",
       "Vlaanderen"
      ],
-     "s": 72678736,
-     "sha1_base64": "poubARE+Bk318+E5Mn6XDwexgqE="
+     "s": 72250208,
+     "sha1_base64": "h/dhBksFcUtvQfxRMrZDWEMATN8="
     },
     {
      "id": "Belgium_Liege",
@@ -1222,8 +1222,8 @@
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 56757099,
-     "sha1_base64": "+pYIzMMRDTB6CfsWeXX00vdreu8="
+     "s": 56542115,
+     "sha1_base64": "t/Kc4+RC/UMW9nupCz+RMJbD7TY="
     }
    ]
   },
@@ -1243,8 +1243,8 @@
     "Stann Creek",
     "Toledo"
    ],
-   "s": 23264622,
-   "sha1_base64": "eR84QhW65Nigct49HvPFN4R/gts="
+   "s": 23379902,
+   "sha1_base64": "8KQW8qzANbqm6w2gqW5AcloCM/o="
   },
   {
    "id": "Benin",
@@ -1266,8 +1266,8 @@
     "Plateau",
     "Zou"
    ],
-   "s": 46488130,
-   "sha1_base64": "7MAZzuEn1rB0PTUumtYYCgQamKk="
+   "s": 46451762,
+   "sha1_base64": "5RJjNHGBROFc6b4WZV9BMkAk7MA="
   },
   {
    "id": "Bermuda",
@@ -1277,8 +1277,8 @@
    "affiliations": [
     "Bermuda"
    ],
-   "s": 1879440,
-   "sha1_base64": "8IEmT5rqJ/MeafLeCvr7ET+L5J0="
+   "s": 1850904,
+   "sha1_base64": "ojegFggpImlPDYCuzPzx+KPFeY0="
   },
   {
    "id": "Bhutan",
@@ -1308,8 +1308,8 @@
     "\u0f51\u0f56\u0f44\u0f0b\u0f60\u0f51\u0f74\u0f66\u0f0b\u0f55\u0f7c\u0f0b\u0f56\u0fb2\u0f44\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b",
     "\u0f56\u0f66\u0f58\u0f0b\u0f42\u0fb2\u0f74\u0f56\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b\u0f58\u0f41\u0f62\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b"
    ],
-   "s": 32636905,
-   "sha1_base64": "wtu+Bk7cR2BK3CBP0SBXFLqI6q4="
+   "s": 32801993,
+   "sha1_base64": "jm3slqhB2ietBzWhzNCOatq8z4Y="
   },
   {
    "id": "Bolivia",
@@ -1326,8 +1326,8 @@
       "Pando",
       "Santa Cruz"
      ],
-     "s": 63572507,
-     "sha1_base64": "mi9+emYdbAj2I4jE9eeXoXhD0jk="
+     "s": 63897923,
+     "sha1_base64": "0lOzmiqeCX/Yq+BYPb0tYcXYemU="
     },
     {
      "id": "Bolivia_South",
@@ -1342,8 +1342,8 @@
       "Potos\u00ed",
       "Tarija"
      ],
-     "s": 72972489,
-     "sha1_base64": "KY0pHecYXmBT0V8xLInmIyfHr6s="
+     "s": 72995249,
+     "sha1_base64": "r84VyqlGtJy7IdLJqFvYG4vhRzw="
     }
    ]
   },
@@ -1359,8 +1359,8 @@
       "Bosna i Hercegovina",
       "Federacija Bosne i Hercegovine"
      ],
-     "s": 66911664,
-     "sha1_base64": "nuIy5Fp4I/BpWJhcx/xQaeet//M="
+     "s": 66488567,
+     "sha1_base64": "AM+45bxKfLj1Z7whtDH5BPYQ53I="
     },
     {
      "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina",
@@ -1372,8 +1372,8 @@
       "Bosna i Hercegovina",
       "Republika Srpska"
      ],
-     "s": 2298863,
-     "sha1_base64": "DONMy7YnaXWXGrc5P6pd+nbTVr8="
+     "s": 2451343,
+     "sha1_base64": "R9p94/ZSMg/mlKoW5w/dPIcJGCU="
     },
     {
      "id": "Bosnia and Herzegovina_Republic of Srpska",
@@ -1384,8 +1384,8 @@
       "Bosna i Hercegovina",
       "Republika Srpska"
      ],
-     "s": 73164584,
-     "sha1_base64": "QyJZF6qaT+fbaTPqxLGlpBW18gI="
+     "s": 72293096,
+     "sha1_base64": "hwv1AG1ElDl9v2AqyxUdD2EdsdI="
     }
    ]
   },
@@ -1406,8 +1406,8 @@
     "South-East District",
     "Southern District"
    ],
-   "s": 80294812,
-   "sha1_base64": "Fk3eJbl7NI7rGE7gufGdnOw+GD4="
+   "s": 80587372,
+   "sha1_base64": "7YQYETzFwmz5a77CFAmSv2G2xDQ="
   },
   {
    "id": "Brazil",
@@ -1421,8 +1421,8 @@
       "Bahia",
       "Brasil"
      ],
-     "s": 89365636,
-     "sha1_base64": "5LfQ2aK6wG0xhbXeCe0rfapJIB4="
+     "s": 88784323,
+     "sha1_base64": "DPmz/SiQGFu9cHFOOlSXLMiEaao="
     },
     {
      "id": "Brazil_Goias_North",
@@ -1433,8 +1433,8 @@
       "Brasil",
       "Goi\u00e1s"
      ],
-     "s": 30307980,
-     "sha1_base64": "fcWLKyfKb/vSaP8D649wYLEyO9g="
+     "s": 30177260,
+     "sha1_base64": "T3lJ/+pne6g4COHghlrEMGI2+qU="
     },
     {
      "id": "Brazil_Goias_Brasilia",
@@ -1446,8 +1446,8 @@
       "Distrito Federal",
       "Goi\u00e1s"
      ],
-     "s": 51724134,
-     "sha1_base64": "df6phjoBVes5kC6zqopT2h4tSDk="
+     "s": 51527494,
+     "sha1_base64": "GRuy5HwBDlf41vOSH6kmMKlAgl4="
     },
     {
      "id": "Brazil_Mato Grosso Do Sul",
@@ -1458,8 +1458,8 @@
       "Brasil",
       "Mato Grosso do Sul"
      ],
-     "s": 26814411,
-     "sha1_base64": "0rijaR0mHIFAaQmz/m2eevwLEBM="
+     "s": 26848003,
+     "sha1_base64": "TPGw1WgfSK4y2A+YkOo8UzKkx78="
     },
     {
      "id": "Brazil_Mato Grosso",
@@ -1470,8 +1470,8 @@
       "Brasil",
       "Mato Grosso"
      ],
-     "s": 36148603,
-     "sha1_base64": "Xbnr+3jjLjo8fh4z1rXoIvWp6g4="
+     "s": 35992395,
+     "sha1_base64": "r+Q089puHcgqhdBSO431Wt/T9dM="
     },
     {
      "id": "Brazil_North Region_East",
@@ -1484,8 +1484,8 @@
       "Par\u00e1",
       "Tocantins"
      ],
-     "s": 59240654,
-     "sha1_base64": "y8nzMyI/8xUUryi1P3UrgLctdNA="
+     "s": 59040558,
+     "sha1_base64": "gERlPN2b9E6KSscp4jzZ2bzovyc="
     },
     {
      "id": "Brazil_North Region_West",
@@ -1499,8 +1499,8 @@
       "Rond\u00f4nia",
       "Roraima"
      ],
-     "s": 60889701,
-     "sha1_base64": "qh7do44Kqv+e4KKfH/juuf/bpHA="
+     "s": 60658997,
+     "sha1_base64": "YsYCb6J4GHAdgNN6CDPiE4JwHIk="
     },
     {
      "id": "Brazil_Northeast Region_East",
@@ -1513,8 +1513,8 @@
       "Pernambuco",
       "Sergipe"
      ],
-     "s": 78203201,
-     "sha1_base64": "h3QueJ6EgYS55pCEVFp+tq6B6Zk="
+     "s": 78310849,
+     "sha1_base64": "+vZFC9IrIbqLVpItf9y6JsHL9Mw="
     },
     {
      "id": "Brazil_Northeast Region_West",
@@ -1528,8 +1528,8 @@
       "Pernambuco",
       "Piau\u00ed"
      ],
-     "s": 156471704,
-     "sha1_base64": "LVgRIFh3puT48jdcr3DoV2FeoIM="
+     "s": 146512007,
+     "sha1_base64": "uPYfEW4UFt81OUcp3/nm/5nHias="
     },
     {
      "id": "Brazil_Paraiba",
@@ -1540,8 +1540,8 @@
       "Brasil",
       "Para\u00edba"
      ],
-     "s": 43016471,
-     "sha1_base64": "SKy7K7aRr7fDkC0ae8utIdX1Uhc="
+     "s": 43144759,
+     "sha1_base64": "zPkny0fYYl1aEdzyj6qnmSCsKD0="
     },
     {
      "id": "Brazil_Parana_East",
@@ -1552,8 +1552,8 @@
       "Brasil",
       "Paran\u00e1"
      ],
-     "s": 59921361,
-     "sha1_base64": "Linn6be8xzqK7WfFU4gLOu7c22o="
+     "s": 60017665,
+     "sha1_base64": "Rs7j8Ddm8UxcrFbky0Blgnzvm7Q="
     },
     {
      "id": "Brazil_Parana_West",
@@ -1564,8 +1564,8 @@
       "Brasil",
       "Paran\u00e1"
      ],
-     "s": 81839819,
-     "sha1_base64": "bHPagOg0PCIHfPPN6wxpKlM37pI="
+     "s": 81263419,
+     "sha1_base64": "feQpA3GV/YypqBe50aRkNeuvRv8="
     },
     {
      "id": "Brazil_Rio Grande do Norte",
@@ -1577,8 +1577,8 @@
       "Pernambuco",
       "Rio Grande do Norte"
      ],
-     "s": 25674583,
-     "sha1_base64": "NmDliJoBe9bwaP8/d5Kj9hS4fDA="
+     "s": 25766703,
+     "sha1_base64": "9qxdBD1E0zNQxOg4OFiTogAB56k="
     },
     {
      "id": "Brazil_Santa Catarina",
@@ -1589,8 +1589,8 @@
       "Brasil",
       "Santa Catarina"
      ],
-     "s": 120741980,
-     "sha1_base64": "R5L00XOjr2tV0TytETBw0NqXH2s="
+     "s": 118977988,
+     "sha1_base64": "pNGG7quuwka0qkcDOUnqqg5AOjs="
     },
     {
      "id": "Brazil_South Region_East",
@@ -1601,8 +1601,8 @@
       "Brasil",
       "Rio Grande do Sul"
      ],
-     "s": 78958505,
-     "sha1_base64": "zuqsD/ZeUYM6LdGw1cKFEeiN/3I="
+     "s": 79001201,
+     "sha1_base64": "au4jyp/v3yi3IpfD+SJPkTKhy9U="
     },
     {
      "id": "Brazil_South Region_West",
@@ -1613,8 +1613,8 @@
       "Brasil",
       "Rio Grande do Sul"
      ],
-     "s": 69766194,
-     "sha1_base64": "uVTqrXz/h2vFJ+11iiFX+XZFQX0="
+     "s": 69168794,
+     "sha1_base64": "KChx2FtV4vrukzD2XIAFDOomiRU="
     },
     {
      "id": "Brazil_Southeast Region_Espirito Santo",
@@ -1625,8 +1625,8 @@
       "Brasil",
       "Esp\u00edrito Santo"
      ],
-     "s": 206815988,
-     "sha1_base64": "vu9jd0tBhcgIA9BWfwebEz7RSKA="
+     "s": 206986204,
+     "sha1_base64": "ahyuBFo3XkHa+eRWirUaTZ7Wx0E="
     },
     {
      "id": "Brazil_Southeast Region_Minas Gerais_Contagem",
@@ -1637,8 +1637,8 @@
       "Brasil",
       "Minas Gerais"
      ],
-     "s": 139866100,
-     "sha1_base64": "vsbFrigzxsGVKmKBxRCY54SDvsE="
+     "s": 139517636,
+     "sha1_base64": "BpOfA/vUJNoYW+keRvnb2ku2LA8="
     },
     {
      "id": "Brazil_Southeast Region_Minas Gerais_North",
@@ -1649,8 +1649,8 @@
       "Brasil",
       "Minas Gerais"
      ],
-     "s": 98695883,
-     "sha1_base64": "E01NKT5SsKi6nuLZdsLplC64xS8="
+     "s": 98235651,
+     "sha1_base64": "1Lu6usc8sFJiYkD0j8doMhbgRn0="
     },
     {
      "id": "Brazil_Southeast Region_Rio de Janeiro",
@@ -1661,8 +1661,8 @@
       "Brasil",
       "Rio de Janeiro"
      ],
-     "s": 74300155,
-     "sha1_base64": "h5f4T/KRr6ifND6KjgxK53MxFDM="
+     "s": 74082923,
+     "sha1_base64": "Yew9BuInHZQO3m1fCIHkR8nSLQg="
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_Campinas",
@@ -1673,8 +1673,8 @@
       "Brasil",
       "S\u00e3o Paulo"
      ],
-     "s": 92731530,
-     "sha1_base64": "cXzCWEsR9gxBiwonwc0DyNAYIl8="
+     "s": 92324410,
+     "sha1_base64": "OITNa2ooPGI4ASLbjILajIxskL0="
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_City",
@@ -1685,8 +1685,8 @@
       "Brasil",
       "S\u00e3o Paulo"
      ],
-     "s": 155067770,
-     "sha1_base64": "2Swer3R/8IG7Z55dJ2mTXR89C4Q="
+     "s": 154765746,
+     "sha1_base64": "fCoZrlcmtPl5JBt7ozN4n2ozkrY="
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_West",
@@ -1697,8 +1697,8 @@
       "Brasil",
       "S\u00e3o Paulo"
      ],
-     "s": 63293267,
-     "sha1_base64": "zWAMeH4yy5echCCqOdV8W+EcBIc="
+     "s": 62803563,
+     "sha1_base64": "tRZy6lYozMrsi3/ZLRm9jSDiyJY="
     }
    ]
   },
@@ -1710,8 +1710,8 @@
    "affiliations": [
     "Brunei Darussalam"
    ],
-   "s": 9764877,
-   "sha1_base64": "iEr9NabWnZoJZADgIuzcQsqTAB4="
+   "s": 9855325,
+   "sha1_base64": "v6dC/B6DM8bCnD9Lz0q5onOigqA="
   },
   {
    "id": "Bulgaria",
@@ -1724,8 +1724,8 @@
      "affiliations": [
       "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f"
      ],
-     "s": 52954585,
-     "sha1_base64": "muwEOS+krwhLXLbjdHm/BqIdiCQ="
+     "s": 52756897,
+     "sha1_base64": "98/xYgVavmVMtgVMWrfXI3jlMdc="
     },
     {
      "id": "Bulgaria_West",
@@ -1735,8 +1735,8 @@
      "affiliations": [
       "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f"
      ],
-     "s": 98640699,
-     "sha1_base64": "yCyWjTDgLAmADXUtDTZ5r/gnh4o="
+     "s": 97795227,
+     "sha1_base64": "MKNc7EY7IHS2wuHMUSE9woCs2Ik="
     }
    ]
   },
@@ -1761,8 +1761,8 @@
     "Sahel",
     "Sud-Ouest"
    ],
-   "s": 73807116,
-   "sha1_base64": "JJ6hhNfIZ/XzAm9o3XRZnxTc+Ao="
+   "s": 73878540,
+   "sha1_base64": "o0SHHtFc04sl1/mrhQjJ4lFrthg="
   },
   {
    "id": "Burundi",
@@ -1789,8 +1789,8 @@
     "Rutana",
     "Ruyigi"
    ],
-   "s": 43088828,
-   "sha1_base64": "oir+ngL+LH0Y1ReueU6iOT+aWhA="
+   "s": 43259996,
+   "sha1_base64": "Wa3zNHB2D9Sh0MVqqk/7LvDEgw4="
   },
   {
    "id": "Cambodia",
@@ -1825,8 +1825,8 @@
     "Tbong Khmum",
     "\u1796\u17d2\u179a\u17c7\u179a\u17b6\u1787\u17b6\u178e\u17b6\u1785\u1780\u17d2\u179a\u1780\u1798\u17d2\u1796\u17bb\u1787\u17b6 (Cambodia)"
    ],
-   "s": 46878420,
-   "sha1_base64": "eAOzsm0mPOTLRW8jKT+OTcPmsWA="
+   "s": 46408051,
+   "sha1_base64": "4emQi73IPyt7SwSKhBTQ8ELlZT8="
   },
   {
    "id": "Cameroon",
@@ -1845,8 +1845,8 @@
       "Nord",
       "Sud"
      ],
-     "s": 141006691,
-     "sha1_base64": "G1YexR8IrB3Dn3u7IP0AN0QWfjs="
+     "s": 141142059,
+     "sha1_base64": "Ht9GBNTqtSb5eP5zZM3oVkgJYoY="
     },
     {
      "id": "Cameroon_West",
@@ -1860,8 +1860,8 @@
       "Ouest",
       "Sud-Ouest"
      ],
-     "s": 90937764,
-     "sha1_base64": "lEuKg7uQNNS/T+I0YbC9Mlzn/Mc="
+     "s": 90815252,
+     "sha1_base64": "wTbFUMLaBHFSJeTStGxiAHhgfBc="
     }
    ]
   },
@@ -1880,8 +1880,8 @@
         "Alberta",
         "Canada"
        ],
-       "s": 91687769,
-       "sha1_base64": "99uO0VfGR3sFkA85F0Pr37sxSnI="
+       "s": 89512777,
+       "sha1_base64": "BtGjZQJEWi+RsH6k72KUZDzfQU8="
       },
       {
        "id": "Canada_Alberta_North",
@@ -1892,8 +1892,8 @@
         "Alberta",
         "Canada"
        ],
-       "s": 48137435,
-       "sha1_base64": "1HYsfMP+szmE7tBxDJMMTLvSKVw="
+       "s": 47980915,
+       "sha1_base64": "PT2oALc8Z0XuIK+TtD3l2KWwxMU="
       },
       {
        "id": "Canada_Alberta_South",
@@ -1904,8 +1904,8 @@
         "Alberta",
         "Canada"
        ],
-       "s": 66076010,
-       "sha1_base64": "VH5Rdx9uuN6uDibvN2GgNFAavls="
+       "s": 66151050,
+       "sha1_base64": "K6iuVejYacfPA7EipWJiE+f5FRY="
       }
      ]
     },
@@ -1921,8 +1921,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 83747174,
-       "sha1_base64": "mMn47KdxwqjapyjzaJxfP7Tz5pE="
+       "s": 83647766,
+       "sha1_base64": "BuMdoXH8xiJk8bAf2mh+c/RQD8g="
       },
       {
        "id": "Canada_British Columbia_Far_North",
@@ -1933,8 +1933,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 36059416,
-       "sha1_base64": "IPCrzutpCcaeDt8tb3h1Wz2kjNI="
+       "s": 36146240,
+       "sha1_base64": "kxu2xy0alOZfFJ85/hxxVVjLmeQ="
       },
       {
        "id": "Canada_British Columbia_Islands",
@@ -1945,8 +1945,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 69351999,
-       "sha1_base64": "mhcEtFkOsKgc1dUd6f945P52FmY="
+       "s": 69314327,
+       "sha1_base64": "WOIEkDXUPEp6uA7K0ThK5tvVW7M="
       },
       {
        "id": "Canada_British Columbia_North",
@@ -1957,8 +1957,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 73143524,
-       "sha1_base64": "g2HRy+DjZd0PoeQonSrcEpimQz0="
+       "s": 65871268,
+       "sha1_base64": "Xq2NSlYrL+pHyvFPCRPvO2OUY5Y="
       },
       {
        "id": "Canada_British Columbia_Northeast",
@@ -1969,8 +1969,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 81392874,
-       "sha1_base64": "kHSmCQfn+A7n+REDWHAboMZHC3g="
+       "s": 56027393,
+       "sha1_base64": "O0+Aax0NfUnd35I02qfUp8SnISo="
       },
       {
        "id": "Canada_British Columbia_Southeast",
@@ -1981,8 +1981,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 87702168,
-       "sha1_base64": "lJMsxVclGop2YCQglSoPVI1qQpE="
+       "s": 87207328,
+       "sha1_base64": "ZWAuWkEbbj2NmD7IAbciA18l17Q="
       },
       {
        "id": "Canada_British Columbia_Vancouver",
@@ -1993,8 +1993,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 96722809,
-       "sha1_base64": "zutC3bAMvyts02OR7iYVOjyw/EM="
+       "s": 96390305,
+       "sha1_base64": "R8XGgHi78QRDW1fLeqPH8TFlIIk="
       }
      ]
     },
@@ -2011,8 +2011,8 @@
         "Newfoundland and Labrador",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 62120045,
-       "sha1_base64": "bDRVbzQtkPM/aIubnReHzJ/eheI="
+       "s": 62492645,
+       "sha1_base64": "dsy2wdGdfpeLC0QG/RTi0RrNpfc="
       },
       {
        "id": "Canada_Labrador_South",
@@ -2023,8 +2023,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 49164451,
-       "sha1_base64": "rUT6g9Xfm3UgCrdX9P6oSiJb5p0="
+       "s": 49214275,
+       "sha1_base64": "tu6m27h7lFcZ9m87fnka4azNKvc="
       },
       {
        "id": "Canada_Labrador_West",
@@ -2035,8 +2035,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 57595343,
-       "sha1_base64": "ZwsKaB3M03PGQUn9/zgPZp8BZik="
+       "s": 57740399,
+       "sha1_base64": "ksuqobFg+nOTfjC5mdn6gao4PI8="
       }
      ]
     },
@@ -2054,8 +2054,8 @@
         "Manitoba",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 62271861,
-       "sha1_base64": "71sfeYcQ9AK1vlW/o2NwooQoTB4="
+       "s": 62397757,
+       "sha1_base64": "RwpdY9TS6VwOAV1vz1r00qu3T7o="
       },
       {
        "id": "Canada_Manitoba_Northwest",
@@ -2066,8 +2066,8 @@
         "Canada",
         "Manitoba"
        ],
-       "s": 52091513,
-       "sha1_base64": "zfJ2u88GxDGcAQ+KdUNefF0Qtbo="
+       "s": 52065873,
+       "sha1_base64": "COlXQxARGlxfG216mQaJZYA056U="
       },
       {
        "id": "Canada_Manitoba_South",
@@ -2078,8 +2078,8 @@
         "Canada",
         "Manitoba"
        ],
-       "s": 49407092,
-       "sha1_base64": "ElPL91nXrwpuBhqUYghJcovi4V4="
+       "s": 49665740,
+       "sha1_base64": "DtGcf6GL9hRhcF/undNjkEPhwD4="
       },
       {
        "id": "Canada_Manitoba_Winnipeg",
@@ -2090,8 +2090,8 @@
         "Canada",
         "Manitoba"
        ],
-       "s": 44894261,
-       "sha1_base64": "Z54cBqqObioSflY1W91utdaUVhs="
+       "s": 45111645,
+       "sha1_base64": "kt/hfU5rP90CnVbc+o0Y0NPgehY="
       }
      ]
     },
@@ -2106,8 +2106,8 @@
       "New Brunswick",
       "Oromocto Indian Reserve NO. 26"
      ],
-     "s": 63692110,
-     "sha1_base64": "JUYeJHdrgg/0YsW/Fv79JGYD7qo="
+     "s": 63702798,
+     "sha1_base64": "VRNlBzTGdXb/ZjBQqBJZUQEia5U="
     },
     {
      "id": "Canada_Newfoundland",
@@ -2121,8 +2121,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 26684633,
-       "sha1_base64": "p4P43BPa2eJBYsGoOLu+wAWG4ZI="
+       "s": 26661449,
+       "sha1_base64": "31R126ZjELEqJMlinNbeEseX9U0="
       },
       {
        "id": "Canada_Newfoundland_North",
@@ -2133,8 +2133,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 32737399,
-       "sha1_base64": "enBzvJh2NgYsBrLuNO0oI2K2Z28="
+       "s": 32938319,
+       "sha1_base64": "EoZwU+MeR5TDhGG5i7v82xNxhF8="
       },
       {
        "id": "Canada_Newfoundland_South",
@@ -2148,8 +2148,8 @@
         "Newfoundland and Labrador",
         "\u00cele Verte"
        ],
-       "s": 25901695,
-       "sha1_base64": "8BFtaXZ7PEYovEa2EUIirJafGmo="
+       "s": 26096263,
+       "sha1_base64": "/KYyNZ4JQN3VXlxZXqj9L3x2FD0="
       },
       {
        "id": "Canada_Newfoundland_West",
@@ -2160,8 +2160,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 25451581,
-       "sha1_base64": "Q+3a+7tUdyUjtQWar3EFA/Mdp0U="
+       "s": 25759118,
+       "sha1_base64": "eYruYx2WQ33yUaCHKKCabktx/Qc="
       }
      ]
     },
@@ -2177,8 +2177,8 @@
         "Canada",
         "Northwest Territories"
        ],
-       "s": 20844807,
-       "sha1_base64": "NpdgwveGGpF3uWJ0W5pKIW618DY="
+       "s": 21096207,
+       "sha1_base64": "X/2Vrq6mwlldy/OurASZlMIgoGY="
       },
       {
        "id": "Canada_Northwest Territories_North",
@@ -2189,8 +2189,8 @@
         "Canada",
         "Northwest Territories"
        ],
-       "s": 40675632,
-       "sha1_base64": "86wITJne5jxlWNXCOmtfLvqjIuQ="
+       "s": 40359584,
+       "sha1_base64": "nvGCikBiaWyGataSRpQukRTqn4I="
       },
       {
        "id": "Canada_Northwest Territories_Yellowknife",
@@ -2201,8 +2201,8 @@
         "Canada",
         "Northwest Territories"
        ],
-       "s": 63389138,
-       "sha1_base64": "Ab1gjvLURzhFlRtbCFD33dO9drU="
+       "s": 63629874,
+       "sha1_base64": "J5FApTfrIdElCr+UK/LW4uX5Sfg="
       }
      ]
     },
@@ -2218,8 +2218,8 @@
         "Canada",
         "Nova Scotia"
        ],
-       "s": 66217293,
-       "sha1_base64": "dtdCdFtDhc7dpjvUwuWXrwWHvNs="
+       "s": 63014467,
+       "sha1_base64": "S8JKiTsPpXU1HwbFOTzZyrWrYyI="
       },
       {
        "id": "Canada_Nova Scotia_Sydney",
@@ -2231,8 +2231,8 @@
         "Nova Scotia",
         "Prince Edward Island"
        ],
-       "s": 30870672,
-       "sha1_base64": "xfDBZUUsi22A+CC1TouLo84L8RY="
+       "s": 28879512,
+       "sha1_base64": "RWvpiixql7/IfWXs0qkhJfFw3P4="
       }
      ]
     },
@@ -2248,8 +2248,8 @@
         "Canada",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 39211161,
-       "sha1_base64": "98fJYfA2EJJ9rhFNPwxZ5G+LuJ0="
+       "s": 38982185,
+       "sha1_base64": "SPXEm1c0LwZ+p7Y8oGWfaYa+T48="
       },
       {
        "id": "Canada_Nunavut_South",
@@ -2260,8 +2260,8 @@
         "Canada",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 85765883,
-       "sha1_base64": "RbAomeMwn9gCiWKFlApxrxWN57U="
+       "s": 85472419,
+       "sha1_base64": "frwaHbKn2k8cfmBkJd03Wt9JKTw="
       }
      ]
     },
@@ -2277,8 +2277,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 67591805,
-       "sha1_base64": "Rq24KGHcEqcqzHlGbt0moBuZnk4="
+       "s": 65008420,
+       "sha1_base64": "bRAFAyFhEJgVzh4uKAaRFlFF5ps="
       },
       {
        "id": "Canada_Ontario_Kingston",
@@ -2289,8 +2289,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 114360921,
-       "sha1_base64": "x0IbW9PEfh1uyuRrqjlXsbHYQf8="
+       "s": 109998025,
+       "sha1_base64": "YPQHnvMfEOwO04EN40/ktMSekr4="
       },
       {
        "id": "Canada_Ontario_London",
@@ -2301,8 +2301,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 87276687,
-       "sha1_base64": "Gp3d7/m6Bu0E+rmssgK7caOKhak="
+       "s": 81729055,
+       "sha1_base64": "hJoX4i2rVWP9acdTyOcPZmbqDDo="
       },
       {
        "id": "Canada_Ontario_Northeastern_Central",
@@ -2313,8 +2313,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 36900201,
-       "sha1_base64": "J9ObfidBIDJ85Q7zqUou+28HSVY="
+       "s": 36908049,
+       "sha1_base64": "6A8gksiXt7qYpjQ/jxz/fjjLqG4="
       },
       {
        "id": "Canada_Ontario_Northeastern_North",
@@ -2327,8 +2327,8 @@
         "Ontario",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 47200613,
-       "sha1_base64": "fe+9yQQ5YJ3GuuGfgm56e8jtF6M="
+       "s": 47423181,
+       "sha1_base64": "VZM6044MKVEvyeR5XtFNxDzvmSc="
       },
       {
        "id": "Canada_Ontario_Northeastern_S",
@@ -2339,8 +2339,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 44053464,
-       "sha1_base64": "DkEW2MwDXJ5BABM16oXTcqcmuP8="
+       "s": 43777112,
+       "sha1_base64": "8MqDW0U3ntJxGx/sL0mdJNwp+MU="
       },
       {
        "id": "Canada_Ontario_Northeastern_SE",
@@ -2351,8 +2351,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 29759856,
-       "sha1_base64": "1ImIrljlZSu6rl5itOSdbFn8qug="
+       "s": 29816312,
+       "sha1_base64": "XTA+vmMMww4RvG5jMmhsrI2W6FI="
       },
       {
        "id": "Canada_Ontario_Northeastern_SW",
@@ -2363,8 +2363,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 49196912,
-       "sha1_base64": "fJTom9BIurfmFzC6OzFlLOzlfPU="
+       "s": 48957320,
+       "sha1_base64": "HO6uCHRiN8bxWZ1qnTvtRWIcMWM="
       },
       {
        "id": "Canada_Ontario_Northeastern_Wawa",
@@ -2375,8 +2375,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 33034414,
-       "sha1_base64": "MVYpb2r8iRc4knYYOjtz6TavGhc="
+       "s": 33095502,
+       "sha1_base64": "OhbaRU15gL/0zYgqroGn5U80Nt0="
       },
       {
        "id": "Canada_Ontario_Northern",
@@ -2387,8 +2387,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 49665233,
-       "sha1_base64": "ixgc3k7rs89LdesFqLOUxdBYsms="
+       "s": 49457513,
+       "sha1_base64": "ccrsa/Z8eA+ClfpjQBn/b5VdbqA="
       },
       {
        "id": "Canada_Ontario_Northwestern",
@@ -2402,8 +2402,8 @@
         "Ontario",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 129870485,
-       "sha1_base64": "5GgECjQjfw+jnQa64OexFNhsXVI="
+       "s": 130052589,
+       "sha1_base64": "h1bHfm3dEanzxt2d4YnPw0S+PwI="
       },
       {
        "id": "Canada_Ontario_Toronto",
@@ -2414,8 +2414,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 117007546,
-       "sha1_base64": "WF1sYVgipcnwrU9HTOHR65IjFjg="
+       "s": 108924026,
+       "sha1_base64": "NyTup7/I2PuvLDeMwqKWeIzZVKY="
       }
      ]
     },
@@ -2428,8 +2428,8 @@
       "Canada",
       "Prince Edward Island"
      ],
-     "s": 11551262,
-     "sha1_base64": "kDIh+vEX81h3p5WaxAENiSZcLB4="
+     "s": 10704134,
+     "sha1_base64": "BgC+ADe4gBa3VMppjrfp+GxRCDs="
     },
     {
      "id": "Canada_Quebec",
@@ -2443,8 +2443,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 77039436,
-       "sha1_base64": "JGCpF0Z2BoCWq/P2gAy4ry/c8Aw="
+       "s": 73277396,
+       "sha1_base64": "nL6JiajfvkLqmOTrAckUgvi3pOc="
       },
       {
        "id": "Canada_Quebek_Far North",
@@ -2458,8 +2458,8 @@
         "Qu\u00e9bec",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
        ],
-       "s": 70894858,
-       "sha1_base64": "exKjK/URokyfgGhle+P/S+yWOII="
+       "s": 71021122,
+       "sha1_base64": "V/I3Xs9i93bCE78+BFT36i3C+xY="
       },
       {
        "id": "Canada_Quebek_Montreal",
@@ -2470,8 +2470,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 79133596,
-       "sha1_base64": "bsELSPts28QQ17w5ysUPujHWnh0="
+       "s": 72866612,
+       "sha1_base64": "XyiJjbrtXHc+YwEagDF1gCF6xbg="
       },
       {
        "id": "Canada_Quebek_Lachute",
@@ -2482,8 +2482,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 55445814,
-       "sha1_base64": "6lz9ok51/t592sflfcxZnCxbnMs="
+       "s": 52968158,
+       "sha1_base64": "d3idmZjzd9Qyx430cYm6sXQm9IY="
       },
       {
        "id": "Canada_Quebek_North",
@@ -2494,8 +2494,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 87292163,
-       "sha1_base64": "F2agFBk8zEm6FkXz3dP+1LnZEbY="
+       "s": 87419035,
+       "sha1_base64": "Ol0mq5mg2LXw9gN0lHVNJUOAwa0="
       },
       {
        "id": "Canada_Quebek_Southeast_Rimouski",
@@ -2506,8 +2506,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 32893482,
-       "sha1_base64": "fjmIYtI5UFTpq5gfsjGWVsBr3Cg="
+       "s": 32241890,
+       "sha1_base64": "86YGdKV42F8RqGXBbirL4Hi6O2c="
       },
       {
        "id": "Canada_Quebek_Southeast_Saguenay",
@@ -2518,8 +2518,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 65996187,
-       "sha1_base64": "x9OWCPql+i0BWSu/hSMtNph3gos="
+       "s": 65073515,
+       "sha1_base64": "0nEIbv431S9sXUBHikq7iUQiPQc="
       },
       {
        "id": "Canada_Quebek_West_Chibougamau",
@@ -2530,8 +2530,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 63513137,
-       "sha1_base64": "W/0gSuaLBadEFXTnghOvnubQkq4="
+       "s": 63573337,
+       "sha1_base64": "U+aDQ5qW3ZQzt4kE9+95SLdV+2c="
       },
       {
        "id": "Canada_Quebek_West_Rouyn-Noranda",
@@ -2542,8 +2542,8 @@
         "Canada",
         "Qu\u00e9bec"
        ],
-       "s": 57734211,
-       "sha1_base64": "eDNoae2pimZ85SsP16zYj5rZSII="
+       "s": 57613211,
+       "sha1_base64": "NRk9BdGi1o9qutwfEeo5FMdFXxg="
       }
      ]
     },
@@ -2559,8 +2559,8 @@
         "Canada",
         "Saskatchewan"
        ],
-       "s": 65918484,
-       "sha1_base64": "qzZazKgZM2XERZsG1jbxspnsmxs="
+       "s": 65978428,
+       "sha1_base64": "+RQhSjo7u5z3BYP82p/Sx7LSvrE="
       },
       {
        "id": "Canada_Saskatchewan_Saskatoon",
@@ -2571,8 +2571,8 @@
         "Canada",
         "Saskatchewan"
        ],
-       "s": 41506901,
-       "sha1_base64": "6sbh6L57OFhGyJJhxqMxytSJ25Q="
+       "s": 41533213,
+       "sha1_base64": "B0eMtGxFwQP46jwTuxqdz4nUSVw="
       },
       {
        "id": "Canada_Saskatchewan_Regina",
@@ -2583,8 +2583,8 @@
         "Canada",
         "Saskatchewan"
        ],
-       "s": 53281807,
-       "sha1_base64": "kzYTdntk872BbXAo7u0/zrKq28A="
+       "s": 53550583,
+       "sha1_base64": "tgWD+s5rlm2YVNttP0PjltVXRXQ="
       }
      ]
     },
@@ -2600,8 +2600,8 @@
         "Canada",
         "Yukon"
        ],
-       "s": 49247534,
-       "sha1_base64": "SyXoHPMg2n5reHIUXjgHwSmq8fQ="
+       "s": 49525286,
+       "sha1_base64": "C0XTvodvAQTSE/+Ygl9rd/q/mQU="
       },
       {
        "id": "Canada_Yukon_Whitehorse",
@@ -2612,8 +2612,8 @@
         "Canada",
         "Yukon"
        ],
-       "s": 53934857,
-       "sha1_base64": "3ryy9TdrORdR5qlJ4uE7Tbk/IHY="
+       "s": 54154465,
+       "sha1_base64": "UQpsAEwszRQHiuiUR2iIwVIATDc="
       }
      ]
     }
@@ -2630,8 +2630,8 @@
    "country_name_synonyms": [
     "Cabo Verde"
    ],
-   "s": 13985507,
-   "sha1_base64": "WVV2PourVrjlZjXg/VZiwnmPgaE="
+   "s": 14021987,
+   "sha1_base64": "NtwYtrJ5AMrGciFLj37MI0MlGjo="
   },
   {
    "id": "Cayman Islands",
@@ -2641,8 +2641,8 @@
    "affiliations": [
     "Cayman Islands"
    ],
-   "s": 1122896,
-   "sha1_base64": "BkjRGXa6+Wj5HgXo5sjgLByks60="
+   "s": 1114816,
+   "sha1_base64": "IieyqVibFMwcvJ7KV4Ht2jgYM8I="
   },
   {
    "id": "Central African Republic",
@@ -2668,8 +2668,8 @@
     "Sangha-Mba\u00e9r\u00e9",
     "Vakaga"
    ],
-   "s": 116574386,
-   "sha1_base64": "dMhV06mgVXqUSlrayC8v5Afg72s="
+   "s": 116201362,
+   "sha1_base64": "OS/imlxlo+TZoub8EcMaYnSaT/c="
   },
   {
    "id": "Chad",
@@ -2701,8 +2701,8 @@
     "Tibesti Region",
     "Wadi Fira Region"
    ],
-   "s": 71117059,
-   "sha1_base64": "Z/fejatQZT/2hFvXWaUibm9Gy9U="
+   "s": 71505139,
+   "sha1_base64": "QKwBfg3p/yff3P560xBRoeO1KG0="
   },
   {
    "id": "Colombia",
@@ -2727,8 +2727,8 @@
       "Santander",
       "Sucre"
      ],
-     "s": 104485538,
-     "sha1_base64": "ebKVApOrwwbPyG2FS0yQVeVYaMI="
+     "s": 104753266,
+     "sha1_base64": "iyLwp0MxnGiJOmPJxcBTRca0u04="
     },
     {
      "id": "Colombia_West",
@@ -2751,8 +2751,8 @@
       "Tolima",
       "Valle del Cauca"
      ],
-     "s": 111861957,
-     "sha1_base64": "v6QIYKaTkQdcgrU2tJALh4LqPnI="
+     "s": 111536253,
+     "sha1_base64": "IPLefHADNzolD0k3OlhbcZ/4WYI="
     },
     {
      "id": "Colombia_East",
@@ -2772,8 +2772,8 @@
       "Vaup\u00e9s",
       "Vichada"
      ],
-     "s": 35070135,
-     "sha1_base64": "E8gNIME3iuG2SxbhvF8G8BPEDhE="
+     "s": 35655391,
+     "sha1_base64": "x6PLv2uq6qUZuHTx2jrmgmwiKSU="
     }
    ]
   },
@@ -2788,8 +2788,8 @@
     "Mwali",
     "Nzwani / \u0623\u0646\u062c\u0648\u0627\u0646"
    ],
-   "s": 5224079,
-   "sha1_base64": "95LEyY3GmIOFK+PixNEtjwoc9fw="
+   "s": 5200975,
+   "sha1_base64": "gM6lm20tJLcxHbSU6dNAGB+dyBw="
   },
   {
    "id": "Congo-Brazzaville",
@@ -2814,8 +2814,8 @@
    "country_name_synonyms": [
     "Republic of the Congo"
    ],
-   "s": 29056656,
-   "sha1_base64": "fnQqgdElKYgFs3WPCj7IeAGAFhM="
+   "s": 28888552,
+   "sha1_base64": "c/vN5T3Op/rP4uKqc7EefQwXIQU="
   },
   {
    "id": "Congo-Kinshasa",
@@ -2855,8 +2855,8 @@
       "Tshuapa",
       "\u00c9quateur"
      ],
-     "s": 211411103,
-     "sha1_base64": "bjX3wNVE43A32uE+Ha9Vr6uVl8g="
+     "s": 211226439,
+     "sha1_base64": "a+S20Vhu9LdvozN5p84q0goDUXA="
     },
     {
      "id": "Congo-Kinshasa_Kivu",
@@ -2868,8 +2868,8 @@
       "Nord-Kivu",
       "Sud-Kivu"
      ],
-     "s": 165747676,
-     "sha1_base64": "Zix2aeRTPv8xgsO5sQpdCk1cy4g="
+     "s": 164002236,
+     "sha1_base64": "jNgbxMDzbHQHYHyv2L5WRqXZ+0I="
     }
    ]
   },
@@ -2881,8 +2881,8 @@
    "affiliations": [
     "Cook Islands"
    ],
-   "s": 1470749,
-   "sha1_base64": "vRSbgq80tZWQ5V6PZFfgmYRwph0="
+   "s": 1475061,
+   "sha1_base64": "AsemAce2vrqPmZWmq47C/WKf61c="
   },
   {
    "id": "Costa Rica",
@@ -2901,8 +2901,8 @@
     "Puntarenas",
     "San Jos\u00e9"
    ],
-   "s": 46001430,
-   "sha1_base64": "7fENnZKYaM+Tu7qT+uKfIKgg5Uw="
+   "s": 46185655,
+   "sha1_base64": "PmZFzCWl/8kT27O+/LI+O0Cy8Po="
   },
   {
    "id": "Croatia",
@@ -2915,8 +2915,8 @@
      "affiliations": [
       "Hrvatska"
      ],
-     "s": 81244970,
-     "sha1_base64": "nriuL6kNLrwviKauXe0p5CjiQmM="
+     "s": 80515434,
+     "sha1_base64": "jSPfLOvTEyDtKfqSKyPZRLvIhjs="
     },
     {
      "id": "Croatia_West",
@@ -2927,8 +2927,8 @@
       "Hrvatska",
       "Italia"
      ],
-     "s": 81110068,
-     "sha1_base64": "sO4TkjKBKpC6/wZui8I9Ox68t68="
+     "s": 81203724,
+     "sha1_base64": "rr1MLAG/qng/0wsnaR4kq5R2pN0="
     }
    ]
   },
@@ -2954,8 +2954,8 @@
     "Santiago de Cuba",
     "Villa Clara"
    ],
-   "s": 65499952,
-   "sha1_base64": "z7GdhVjKxTddlee9oYeUOp/S27Y="
+   "s": 65152448,
+   "sha1_base64": "cQxbXVtcRBTyE9FvfEq39TQyAdA="
   },
   {
    "id": "Cyprus",
@@ -2966,8 +2966,8 @@
     "British Sovereign Base Areas",
     "\u039a\u03cd\u03c0\u03c1\u03bf\u03c2 - K\u0131br\u0131s"
    ],
-   "s": 33554306,
-   "sha1_base64": "CXkpjVg1wDjr75Kg0HcUcJZlE6M="
+   "s": 33241066,
+   "sha1_base64": "FIfW5xb9sVrrELcpGvJOIHjK2ME="
   },
   {
    "id": "Czech Republic",
@@ -2984,8 +2984,8 @@
       "Praha",
       "\u010cesko"
      ],
-     "s": 31030346,
-     "sha1_base64": "nQ4FQncYUgc+MWhgZT747xg7fck="
+     "s": 30939570,
+     "sha1_base64": "98kEc+91mJIPpQihrTXh4wAoBiI="
     },
     {
      "id": "Czech_Severovychod_Pardubicky kraj",
@@ -2996,8 +2996,8 @@
       "Severov\u00fdchod",
       "\u010cesko"
      ],
-     "s": 41682261,
-     "sha1_base64": "aNFdpHVzhS/xoIVf0fbqxsK87O8="
+     "s": 41693381,
+     "sha1_base64": "grorAjEH/v3rGxQhwv7lqWo+MTw="
     },
     {
      "id": "Czech_Karlovasky kraj",
@@ -3008,8 +3008,8 @@
       "Severoz\u00e1pad",
       "\u010cesko"
      ],
-     "s": 23389625,
-     "sha1_base64": "nY8JfNmUJk9Y8J5xnNSYjPYgW+o="
+     "s": 23541841,
+     "sha1_base64": "rqphfKIXueNCsszo44bf+QYoWew="
     },
     {
      "id": "Czech_Ustecky kraj",
@@ -3020,8 +3020,8 @@
       "Severoz\u00e1pad",
       "\u010cesko"
      ],
-     "s": 52574496,
-     "sha1_base64": "IZjow5TdYwyArtf1FTwis6SYgS4="
+     "s": 52704632,
+     "sha1_base64": "z2lyNJt2KdahW8lER+GgFlyLIeg="
     },
     {
      "id": "Czech_Jihozapad_Plzensky kraj",
@@ -3032,8 +3032,8 @@
       "Jihoz\u00e1pad",
       "\u010cesko"
      ],
-     "s": 55683215,
-     "sha1_base64": "yU5CRAV3MNk30jJNsqg3MUmMmDY="
+     "s": 55502223,
+     "sha1_base64": "RVZvXociGEMNRmahnxOKRGIU4A8="
     },
     {
      "id": "Czech_Severovychod_Kralovehradecky kraj",
@@ -3044,8 +3044,8 @@
       "Severov\u00fdchod",
       "\u010cesko"
      ],
-     "s": 44597174,
-     "sha1_base64": "PhQiQUkNQaLdoV1tURV44YBerrE="
+     "s": 44673470,
+     "sha1_base64": "kEgsHGBdpCkl/Ww4bzxS9Qa9DnA="
     },
     {
      "id": "Czech_Olomoucky kraj",
@@ -3056,8 +3056,8 @@
       "St\u0159edn\u00ed Morava",
       "\u010cesko"
      ],
-     "s": 48161685,
-     "sha1_base64": "iT69W9IGTIpuaKZz8aBw0Z+bXUQ="
+     "s": 48196685,
+     "sha1_base64": "7cpx862NJ1N0xVybAOLLLNeA2Tc="
     },
     {
      "id": "Czech_Zlinsky Kraj",
@@ -3068,8 +3068,8 @@
       "St\u0159edn\u00ed Morava",
       "\u010cesko"
      ],
-     "s": 41145869,
-     "sha1_base64": "0UtaXUNVIHHbUFfm9UstzAGpPOo="
+     "s": 41219917,
+     "sha1_base64": "0xMzLhl99CpJb9toLtA2ByQ7HOo="
     },
     {
      "id": "Czech_Stredni Cechy_East",
@@ -3080,8 +3080,8 @@
       "St\u0159edn\u00ed \u010cechy",
       "\u010cesko"
      ],
-     "s": 59193305,
-     "sha1_base64": "zLSq8PH8cDmO/JiTi7ad01517f8="
+     "s": 59234473,
+     "sha1_base64": "YtuBA7/EG3DJNPrCP2omaBmAsb8="
     },
     {
      "id": "Czech_Jihozapad_Jihocesky kraj",
@@ -3092,8 +3092,8 @@
       "Jihoz\u00e1pad",
       "\u010cesko"
      ],
-     "s": 75310081,
-     "sha1_base64": "Z934zljhHGMfco+KVF0tbDC9GkQ="
+     "s": 75281905,
+     "sha1_base64": "dEco96RAmwjiWe9Ziai6VQ4/Kf0="
     },
     {
      "id": "Czech_Jihovychod_Kraj Vysocina",
@@ -3104,8 +3104,8 @@
       "Jihov\u00fdchod",
       "\u010cesko"
      ],
-     "s": 55769662,
-     "sha1_base64": "UO32fKc7NO3TXiSszcEJD8bFByg="
+     "s": 55643158,
+     "sha1_base64": "V4wSBWD6/Ityl70PwOxFUtSLxts="
     },
     {
      "id": "Czech_Severovychod_Liberecky kraj",
@@ -3116,8 +3116,8 @@
       "Severov\u00fdchod",
       "\u010cesko"
      ],
-     "s": 35559157,
-     "sha1_base64": "Qw20+/ei+Y45SI9VvIekGSylJUo="
+     "s": 35948005,
+     "sha1_base64": "mt03Cn1bx+tSYPpPOM4wlzgK0kE="
     },
     {
      "id": "Czech_Stredni Cechy_West",
@@ -3128,8 +3128,8 @@
       "St\u0159edn\u00ed \u010cechy",
       "\u010cesko"
      ],
-     "s": 52471646,
-     "sha1_base64": "FsyENIKZjSvG5YrwVbRcaRTXjE8="
+     "s": 52516414,
+     "sha1_base64": "A9er8TzIWbB71BDpDSnBlMYHos4="
     },
     {
      "id": "Czech_Moravskoslezsko",
@@ -3140,8 +3140,8 @@
       "Moravskoslezsko",
       "\u010cesko"
      ],
-     "s": 61974354,
-     "sha1_base64": "3q4qka4a8WFdMS2DU3SaVJjlPcg="
+     "s": 62222122,
+     "sha1_base64": "CuNUC65yozXzslCYdsn5n9q8egw="
     },
     {
      "id": "Czech_Jihovychod_Jihomoravsky kraj",
@@ -3152,8 +3152,8 @@
       "Jihov\u00fdchod",
       "\u010cesko"
      ],
-     "s": 76956842,
-     "sha1_base64": "bIoHVz3y1BwQ9B9aKCjMm+bEz0g="
+     "s": 76914714,
+     "sha1_base64": "ClTSnCPtDf82zBTk28/xga0EKFo="
     }
    ]
   },
@@ -3183,8 +3183,8 @@
     "C\u00f4te d'Ivoire",
     "Ivory Coast"
    ],
-   "s": 49765317,
-   "sha1_base64": "W9PXldG2k9x9wt98cbyDAp5DYYk="
+   "s": 50029229,
+   "sha1_base64": "jTGNybJpI+Qcn/+3RAqbk+Uwblc="
   },
   {
    "id": "Denmark",
@@ -3198,8 +3198,8 @@
       "Danmark",
       "Region Nordjylland"
      ],
-     "s": 51753574,
-     "sha1_base64": "THCFZ1QWioZylEFOSVI6EoIsl9M="
+     "s": 52055374,
+     "sha1_base64": "77hdqot13Vzhgy5kQ/jXQImJYUI="
     },
     {
      "id": "Denmark_Central Denmark Region",
@@ -3210,8 +3210,8 @@
       "Danmark",
       "Region Midtjylland"
      ],
-     "s": 97382801,
-     "sha1_base64": "c9MrL+xXRab2hMTSEuV7CNlLRMw="
+     "s": 97159977,
+     "sha1_base64": "wqepA7QxxpaWQeNU3Jpf6EYQG/s="
     },
     {
      "id": "Denmark_Capital Region of Denmark",
@@ -3223,8 +3223,8 @@
       "Region Hovedstaden",
       "Territorial waters of Bornholm"
      ],
-     "s": 65691566,
-     "sha1_base64": "uzsC0zzkks/3yhz+N7ZfA017+I4="
+     "s": 65729164,
+     "sha1_base64": "UoFos3Y7gA5uWvjgm1H4XiKGCSo="
     },
     {
      "id": "Denmark_Region Zealand",
@@ -3235,8 +3235,8 @@
       "Danmark",
       "Region Sj\u00e6lland"
      ],
-     "s": 67159362,
-     "sha1_base64": "5gjAy20b+trxkRCCDbCq0EwvQBI="
+     "s": 66596000,
+     "sha1_base64": "8FjplAHn20aDcDOzcXkdM53oaNQ="
     },
     {
      "id": "Denmark_Region of Southern Denmark",
@@ -3247,8 +3247,8 @@
       "Danmark",
       "Region Syddanmark"
      ],
-     "s": 97220977,
-     "sha1_base64": "3ibWY1InLBftb23stQa13fgqFbg="
+     "s": 97110201,
+     "sha1_base64": "NVhtrEC41InB3VGy5J0F05jXkKQ="
     }
    ]
   },
@@ -3266,8 +3266,8 @@
     "Obock",
     "Tadjourah"
    ],
-   "s": 11876627,
-   "sha1_base64": "uzvfvbL7PtPHtBnqc/vDnRTwK0s="
+   "s": 12090219,
+   "sha1_base64": "1ISiAslYmnj7O4uyZcl5yEf5z8c="
   },
   {
    "id": "Dominican Republic",
@@ -3309,8 +3309,8 @@
     "S\u00e1nchez Ram\u00edrez",
     "Valverde"
    ],
-   "s": 33889337,
-   "sha1_base64": "Ocn0hOqEMffJGg+css6Xnw6voIg="
+   "s": 33811289,
+   "sha1_base64": "H20FFtouqbnu8Ck8PaAUclhwlS0="
   },
   {
    "id": "East Timor",
@@ -3336,8 +3336,8 @@
     "Tim\u00f3r Loro Sa'e",
     "Viqueque"
    ],
-   "s": 15668652,
-   "sha1_base64": "mA9UhbuCyCzTNiG8orNCjSJK/V4="
+   "s": 15626620,
+   "sha1_base64": "r9uBHjFu79u1sxe67vz5kmVf8IQ="
   },
   {
    "id": "Chile",
@@ -3347,8 +3347,8 @@
      "affiliations": [
       "Acuerdo de Campos de Hielo"
      ],
-     "s": 7364560,
-     "sha1_base64": "7X3h7yGYp6hJxLGJtaNNdmDgljE="
+     "s": 7568832,
+     "sha1_base64": "10J4Y7Buz+Cdt7ymD8xj7rXk1A8="
     },
     {
      "id": "Chile_Central",
@@ -3365,8 +3365,8 @@
       "VI Regi\u00f3n del Libertador General Bernardo O'Higgins",
       "VII Regi\u00f3n del Maule"
      ],
-     "s": 98203802,
-     "sha1_base64": "VVXnCstRdVI40ZQY9zfoekN6dhc="
+     "s": 94568674,
+     "sha1_base64": "XTw6FDvJCR1nIVqkdkXiIeLCs4g="
     },
     {
      "id": "Chile_North",
@@ -3382,8 +3382,8 @@
       "V Regi\u00f3n de Valpara\u00edso",
       "XV Regi\u00f3n de Arica y Parinacota"
      ],
-     "s": 42163159,
-     "sha1_base64": "AH7ngKAh8eyWF3Nvo4reTy5pRFQ="
+     "s": 42015343,
+     "sha1_base64": "Xoe+lLzJSeZf2DsixgpvVP1DUak="
     },
     {
      "id": "Chile_South",
@@ -3399,8 +3399,8 @@
       "XII Regi\u00f3n de Magallanes y de la Ant\u00e1rtica Chilena",
       "XIV Regi\u00f3n de Los R\u00edos"
      ],
-     "s": 158272761,
-     "sha1_base64": "x7q7krXttyKAnJenZA9w9hhriL4="
+     "s": 157356913,
+     "sha1_base64": "URkvGltF5CEvqsGpMOEQ9DEohb4="
     }
    ]
   },
@@ -3430,8 +3430,8 @@
       "Tungurahua",
       "Zamora Chinchipe"
      ],
-     "s": 48582150,
-     "sha1_base64": "qCPyBCzH/XQEfN7o+P8j0PGy2FQ="
+     "s": 49121073,
+     "sha1_base64": "GNMMn18BnqhX/WoPPiYrHpRswF8="
     },
     {
      "id": "Ecuador_West",
@@ -3458,8 +3458,8 @@
       "Santa Elena",
       "Santo Domingo de los Ts\u00e1chilas"
      ],
-     "s": 65805656,
-     "sha1_base64": "THUHptsPw8WcXm6w1eBzQ4e8lms="
+     "s": 65875008,
+     "sha1_base64": "14HJjAz6YAm4GAcsM++tHCsxtvA="
     }
    ]
   },
@@ -3497,8 +3497,8 @@
     "\u200f\u0627\u0644\u0628\u062d\u064a\u0631\u0629\u200e",
     "\u0627\u0644\u0625\u0633\u0643\u0646\u062f\u0631\u064a\u0629"
    ],
-   "s": 224823010,
-   "sha1_base64": "m6bBumsADIeO45XroLfbSFnRWJc="
+   "s": 224865378,
+   "sha1_base64": "tSZS54SyH38Z2NZrlM2ss3V0FD0="
   },
   {
    "id": "El Salvador",
@@ -3522,8 +3522,8 @@
     "Departemento de Chalatenango",
     "El Salvador"
    ],
-   "s": 33851739,
-   "sha1_base64": "/Mi3w/r7cyPtQTHDE095up0908o="
+   "s": 32605554,
+   "sha1_base64": "FE/tdBeh4e2AKAtE4E/uZD6mWiw="
   },
   {
    "id": "Equatorial Guinea",
@@ -3540,8 +3540,8 @@
     "Litoral",
     "Wele-Nzas"
    ],
-   "s": 11950532,
-   "sha1_base64": "Q036k9Lehu7bBuFurb5lopJ0vjk="
+   "s": 10396644,
+   "sha1_base64": "U1XuwfsX5MV134+D+UTuMxAZALM="
   },
   {
    "id": "Eritrea",
@@ -3557,8 +3557,8 @@
     "\u12de\u1263 \u12d3\u1295\u1230\u1263",
     "\u130b\u123d-\u1263\u122d\u12ab"
    ],
-   "s": 25940960,
-   "sha1_base64": "nEGjdKFMNQna+mWx8yB7vu1GWmY="
+   "s": 26031200,
+   "sha1_base64": "sFKz+/8WbFgaSYQkQX5xHLCUS3I="
   },
   {
    "id": "Estonia",
@@ -3571,8 +3571,8 @@
      "affiliations": [
       "Eesti"
      ],
-     "s": 51098561,
-     "sha1_base64": "rYDL3M+vYLwsRKOnlBMhE8bwfrs="
+     "s": 54101185,
+     "sha1_base64": "0DESyqdkCOUQ4uIlOSL0sip4rkE="
     },
     {
      "id": "Estonia_East",
@@ -3582,8 +3582,8 @@
      "affiliations": [
       "Eesti"
      ],
-     "s": 59656072,
-     "sha1_base64": "4Whcg2aWwuo1JpyI95YFjSlTaHI="
+     "s": 63837248,
+     "sha1_base64": "18xuwAOcBDnMjtNbowkEWcMm/yw="
     }
    ]
   },
@@ -3608,8 +3608,8 @@
     "Tigray",
     "\u12a2\u1275\u12ee\u1335\u12eb Ethiopia"
    ],
-   "s": 99039902,
-   "sha1_base64": "xJClypnoqQHPmKu6bX+VgblRzOg="
+   "s": 98315782,
+   "sha1_base64": "b8rzv4YDVJp8Wt4pa/utf6Kir6I="
   },
   {
    "id": "Faroe Islands",
@@ -3626,8 +3626,8 @@
     "Territorial waters of Faroe Islands",
     "V\u00e1ga s\u00fdsla"
    ],
-   "s": 9708677,
-   "sha1_base64": "jy2qyQF+oj+fFXaEzk+tioi6kA4="
+   "s": 9692085,
+   "sha1_base64": "7kAPQRYvNo/Xel2yCcfCSRTQq94="
   },
   {
    "id": "Federated States of Micronesia",
@@ -3642,8 +3642,8 @@
     "Pohnpei",
     "Yap"
    ],
-   "s": 2270580,
-   "sha1_base64": "nh2ynDvl6Oexe8msr8Kqu0+8JyY="
+   "s": 2268948,
+   "sha1_base64": "juXU04iSH+8A2guXkiXPeOmWsY0="
   },
   {
    "id": "Fiji",
@@ -3656,8 +3656,8 @@
     "Northern",
     "Viti"
    ],
-   "s": 19833092,
-   "sha1_base64": "KYFBbv8WC4V5iWtHVEFZ/948HBk="
+   "s": 19771140,
+   "sha1_base64": "sC6t/4g6VnF4IcmsVJQIP5B+qcA="
   },
   {
    "id": "Finland",
@@ -3671,8 +3671,8 @@
       "L\u00e4nsi-Suomi",
       "Suomi"
      ],
-     "s": 48332292,
-     "sha1_base64": "V9a+zA4TZtRcPCTIYhmtcWDQkpw="
+     "s": 47766660,
+     "sha1_base64": "b9/luRyRa6C8GElgo5rG+O+Qlz0="
     },
     {
      "id": "Finland_Western Finland_Tampere",
@@ -3683,8 +3683,8 @@
       "L\u00e4nsi-Suomi",
       "Suomi"
      ],
-     "s": 80782699,
-     "sha1_base64": "axzzBUq9CeJxz7kUdoHx30grXcg="
+     "s": 80718019,
+     "sha1_base64": "276z5mICW0BgnHPPyE0Chpo3wss="
     },
     {
      "id": "Finland_Northern Finland",
@@ -3695,8 +3695,8 @@
       "Pohjois-Suomi",
       "Suomi"
      ],
-     "s": 108077092,
-     "sha1_base64": "gRLfuZeCsoCRak5cJRUyufNJqKE="
+     "s": 107655500,
+     "sha1_base64": "mdTbslnmI+jkls2/6VKCYI0/cDw="
     },
     {
      "id": "Finland_Eastern Finland_North",
@@ -3707,8 +3707,8 @@
       "It\u00e4-Suomi",
       "Suomi"
      ],
-     "s": 117052064,
-     "sha1_base64": "1sdA9PMEN67389lZPb3SL5v0kdk="
+     "s": 116264696,
+     "sha1_base64": "0xOtVkL5+/Uw3I1hIeMWbdfw75U="
     },
     {
      "id": "Finland_Eastern Finland_South",
@@ -3719,8 +3719,8 @@
       "It\u00e4-Suomi",
       "Suomi"
      ],
-     "s": 80558393,
-     "sha1_base64": "nU26p7TcfZ690FCbAc5NQDYpp+s="
+     "s": 80316753,
+     "sha1_base64": "RASvAq+FaZtpMrwmHZ8+0ayOibA="
     },
     {
      "id": "Finland_Southern Finland_West",
@@ -3732,8 +3732,8 @@
       "Suomi",
       "\u00c5land"
      ],
-     "s": 82063788,
-     "sha1_base64": "jFx80WFkB4EakNpOYuO0Rvu1vw8="
+     "s": 82144196,
+     "sha1_base64": "D4ugDZD3rrRCMTFh0rBsIXkTFH8="
     },
     {
      "id": "Finland_Southern Finland_Helsinki",
@@ -3744,8 +3744,8 @@
       "Etel\u00e4-Suomi",
       "Suomi"
      ],
-     "s": 110196952,
-     "sha1_base64": "XHMnIx5VrURO5yXZpW2Zh6Frgs4="
+     "s": 109766352,
+     "sha1_base64": "8xjDV53F4nN++f7N3bDlOBO18yE="
     },
     {
      "id": "Finland_Southern Finland_Lappeenranta",
@@ -3756,8 +3756,8 @@
       "Etel\u00e4-Suomi",
       "Suomi"
      ],
-     "s": 59115359,
-     "sha1_base64": "TfrPcAmFepdzHVlxQTtmUd5lCgs="
+     "s": 59394015,
+     "sha1_base64": "Kn8/86Ue/c/VBzJ6fSoQHwBOJEU="
     }
    ]
   },
@@ -3776,8 +3776,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 61363161,
-       "sha1_base64": "alxsVpYpDjVs0hOHqDpI2tb81Eo="
+       "s": 61976345,
+       "sha1_base64": "qed60w3Fx+2r/ItEmwdCZGk8wms="
       },
       {
        "id": "France_Alsace_Haut-Rhin",
@@ -3788,8 +3788,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 44376662,
-       "sha1_base64": "LZLEqrm/pBcMugFDAGH7kS10cUo="
+       "s": 44492974,
+       "sha1_base64": "Ymje7JPWGJI0uWvrFWjFPNwHrJc="
       }
      ]
     },
@@ -3805,8 +3805,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 48911760,
-       "sha1_base64": "+2ZhkkITWXGLYE7VxJ1V9jDC1yY="
+       "s": 48418879,
+       "sha1_base64": "YZxIp8y+2n3cKd2C0cN3nbf2UJ0="
       },
       {
        "id": "France_Aquitaine_Gironde",
@@ -3817,8 +3817,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 73279920,
-       "sha1_base64": "7eQV4QICz+VXa+msOiGB6WaL5HY="
+       "s": 72987432,
+       "sha1_base64": "tJgZoVwo3a9cL2Zlbu0GcDlSRa4="
       },
       {
        "id": "France_Aquitaine_Landes",
@@ -3829,8 +3829,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 39876109,
-       "sha1_base64": "gAQ7jr/9BrlxbSo0cPMHBliNiUQ="
+       "s": 39503965,
+       "sha1_base64": "+yVN4G29pzHTDBSRgkrjtByMRMM="
       },
       {
        "id": "France_Aquitaine_Lot-et-Garonne",
@@ -3841,8 +3841,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 34182932,
-       "sha1_base64": "hzRyLcSbo4RMecUuicEyXR5E/KU="
+       "s": 33950812,
+       "sha1_base64": "TkoOhQn4vWxIQIQF8FDXV8esOEQ="
       },
       {
        "id": "France_Aquitaine_Pyrenees-Atlantiques",
@@ -3853,8 +3853,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 60659728,
-       "sha1_base64": "Rae0xgoAnRLU6wt4YdZ1lAFqtyo="
+       "s": 60360176,
+       "sha1_base64": "/dYbjiPMi6hKNd/O0EcMYE4Lz2U="
       }
      ]
     },
@@ -3870,8 +3870,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 37879364,
-       "sha1_base64": "VMqt76FKN/hleQowZLcL0ecXfCA="
+       "s": 37657148,
+       "sha1_base64": "vM5MRV+e/hjsfBQshdGl/IEZvHw="
       },
       {
        "id": "France_Auvergne_Cantal",
@@ -3882,8 +3882,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 24229202,
-       "sha1_base64": "Y5ntO3FwoxF6063hg0GfOiwZfRo="
+       "s": 24166090,
+       "sha1_base64": "vv4bquy47ejsV8V/zof/b8GrNVs="
       },
       {
        "id": "France_Auvergne_Haute-Loire",
@@ -3894,8 +3894,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 32483115,
-       "sha1_base64": "Ywe4Byrzf/2EEh+sGr78AF4wTVY="
+       "s": 32441683,
+       "sha1_base64": "+S08PIVk2kvHZVuUpXF4z5v2xu4="
       },
       {
        "id": "France_Auvergne_Puy-de-Dome",
@@ -3906,8 +3906,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 52786359,
-       "sha1_base64": "BnFEq/3tQyhbCvTtFr7f8Gtz2Ew="
+       "s": 52489991,
+       "sha1_base64": "Vn8OqyxqZItOFU7P1MzNw3zEu6I="
       }
      ]
     },
@@ -3925,8 +3925,8 @@
         "Guernsey",
         "Jersey"
        ],
-       "s": 51341271,
-       "sha1_base64": "8/7gHp2hcz8gcPat8AHTcI3mFzM="
+       "s": 50539975,
+       "sha1_base64": "Kk+70tzho3oahGpxmdjrtXdwMRk="
       },
       {
        "id": "France_Brittany_Finistere",
@@ -3937,8 +3937,8 @@
         "Bretagne",
         "France"
        ],
-       "s": 68834849,
-       "sha1_base64": "pzXLWSmBcDlYJTqovfaLCRUcAao="
+       "s": 67608297,
+       "sha1_base64": "hfJRsPyNY9Q89MoA2A1ElKplO5Y="
       },
       {
        "id": "France_Brittany_Ille-et-Vilaine",
@@ -3950,8 +3950,8 @@
         "France",
         "Jersey"
        ],
-       "s": 61990224,
-       "sha1_base64": "jarbzFq2/uwUc61AAF9+0NsxyrA="
+       "s": 62344920,
+       "sha1_base64": "xhiwMs6m9W10jyRL13TkZu4Th5A="
       },
       {
        "id": "France_Brittany_Morbihan",
@@ -3962,8 +3962,8 @@
         "Bretagne",
         "France"
        ],
-       "s": 54303073,
-       "sha1_base64": "NqjETjDCYgo7l+W4mlXKP5S84fM="
+       "s": 53862929,
+       "sha1_base64": "TkoGV2/cghtXmxmgXYTMF30aY80="
       }
      ]
     },
@@ -3979,8 +3979,8 @@
         "Bourgogne-Franche-Comt\u00e9",
         "France"
        ],
-       "s": 42595421,
-       "sha1_base64": "LWA9s49+tjmp1/pBdBMYv1qGvyg="
+       "s": 42007693,
+       "sha1_base64": "ElcB0KWnQyO/Jg7zbmdL52jKXOk="
       },
       {
        "id": "France_Burgundy_Nievre",
@@ -3991,8 +3991,8 @@
         "Bourgogne-Franche-Comt\u00e9",
         "France"
        ],
-       "s": 26810922,
-       "sha1_base64": "Zkiv8GwCBHBv/WNfFZzNT7bqVgc="
+       "s": 26665298,
+       "sha1_base64": "CT1rM/zrCVQDApyBlZNsA3rzBqc="
       },
       {
        "id": "France_Burgundy_Saone-et-Loire",
@@ -4003,8 +4003,8 @@
         "Bourgogne-Franche-Comt\u00e9",
         "France"
        ],
-       "s": 91878554,
-       "sha1_base64": "RgM4Yil8stUAVc2elNSrf4BL+M0="
+       "s": 90917433,
+       "sha1_base64": "UPaZW0FKngvwpL4aY4xRKMG9gnU="
       },
       {
        "id": "France_Burgundy_Yonne",
@@ -4015,8 +4015,8 @@
         "Bourgogne-Franche-Comt\u00e9",
         "France"
        ],
-       "s": 42195982,
-       "sha1_base64": "YfFl6d/FnFgSYQ0tVT/AAQ/9SoQ="
+       "s": 41693006,
+       "sha1_base64": "fcReiEenK/H2kazkzxd/JdDC4go="
       }
      ]
     },
@@ -4032,8 +4032,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 28188139,
-       "sha1_base64": "RZ9J6G8fLL3tUiGG312neeLzEd8="
+       "s": 27747979,
+       "sha1_base64": "YweOoL5/b6cMdrlE1KgM7f8aNOc="
       },
       {
        "id": "France_Centre-Val de Loire_Eure-et-Loir",
@@ -4044,8 +4044,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 29292098,
-       "sha1_base64": "kygabNSZUTE/6KCsPY8Y9PCLDMg="
+       "s": 29160450,
+       "sha1_base64": "KAeFE2cqHXuv/Sye1L0lbubSxNc="
       },
       {
        "id": "France_Centre-Val de Loire_Indre",
@@ -4056,8 +4056,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 40002669,
-       "sha1_base64": "0AecN8KWBA7recMDBMiBwk6E7C8="
+       "s": 39759053,
+       "sha1_base64": "9Z1xwK+kZ4C3KG9biKWGSFIHWkY="
       },
       {
        "id": "France_Centre-Val de Loire_Indre-et-Loire",
@@ -4068,8 +4068,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 53486135,
-       "sha1_base64": "6AuoZFlL/yV72W3h9eRNmIUs6lE="
+       "s": 53520823,
+       "sha1_base64": "HEg1DdVixQSnXjOkeOuiy2fUioc="
       },
       {
        "id": "France_Centre-Val de Loire_Loir-et-Cher",
@@ -4080,8 +4080,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 34930452,
-       "sha1_base64": "0nDjcOXXSjfaYuVJrbaCv3S4ulw="
+       "s": 34611324,
+       "sha1_base64": "Wi9FjZ0evY6calNoCsQdSgWQRH4="
       },
       {
        "id": "France_Centre-Val de Loire_Loiret",
@@ -4092,8 +4092,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 50207982,
-       "sha1_base64": "/gwqtzJmPEi/FSYq0A3riiWUC20="
+       "s": 49923646,
+       "sha1_base64": "kCxaWooY7hlIsxpRKJbKw3lP59w="
       }
      ]
     },
@@ -4106,8 +4106,8 @@
       "Alsace-Champagne-Ardenne-Lorraine",
       "France"
      ],
-     "s": 114355635,
-     "sha1_base64": "2P2QhmfbG1/e0VzL90FjI49cdQ4="
+     "s": 113622523,
+     "sha1_base64": "GPdMklBwxaRzvEN6h+wZ4G10efA="
     },
     {
      "id": "France_Corsica",
@@ -4121,8 +4121,8 @@
       "Italia",
       "Monaco"
      ],
-     "s": 29353668,
-     "sha1_base64": "0s6IodOVVQEEDV29y6yryDfAam4="
+     "s": 29042219,
+     "sha1_base64": "aJdgfxvtBoRCGASyCu7DvgAP9aE="
     },
     {
      "id": "France_Free County_North",
@@ -4133,8 +4133,8 @@
       "Bourgogne-Franche-Comt\u00e9",
       "France"
      ],
-     "s": 63213650,
-     "sha1_base64": "gW6RCwE7VjCpdYnpmw2mrVgtXX4="
+     "s": 62801617,
+     "sha1_base64": "3VDcfPHDkbEA1GLivmhrzSSRdXs="
     },
     {
      "id": "France_Free County_South",
@@ -4145,8 +4145,8 @@
       "Bourgogne-Franche-Comt\u00e9",
       "France"
      ],
-     "s": 53016992,
-     "sha1_base64": "ICF5m75YParxwp0NFTXkqsQGTbs="
+     "s": 52776032,
+     "sha1_base64": "Gio1GPG8AYk0Ip23Y2VXFmE2RTo="
     },
     {
      "id": "France_French Guiana",
@@ -4157,8 +4157,8 @@
       "France",
       "Guyane"
      ],
-     "s": 28180712,
-     "sha1_base64": "FmMLQks67s/tp2FU3dscN4xWo7A="
+     "s": 28340440,
+     "sha1_base64": "KhPXyQI0wyuExHrEqpFAG0UOpLw="
     },
     {
      "id": "France_Ile-de-France",
@@ -4172,8 +4172,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 39959020,
-       "sha1_base64": "DzHbkp5dpgPF8Q+nc7dvoeHHvBA="
+       "s": 39465556,
+       "sha1_base64": "YbyXM2f862yf23kapXTSHnIFhF8="
       },
       {
        "id": "France_Ile-de-France_Hauts-de-Seine",
@@ -4184,8 +4184,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 21414202,
-       "sha1_base64": "oErmfLs0x36Q49gkPHjyWVDvsd0="
+       "s": 21250026,
+       "sha1_base64": "C+TRU+TdneJ0dau9XQGWojDtsN8="
       },
       {
        "id": "France_Ile-de-France_Paris",
@@ -4196,8 +4196,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 45130910,
-       "sha1_base64": "MYnbX+sLzqiB6VmzQpoUUjYvNaY="
+       "s": 43968875,
+       "sha1_base64": "aUe3wjKz5dOycHuuPp+B5PuLBMo="
       },
       {
        "id": "France_Ile-de-France_Seine-Saint-Denis",
@@ -4208,8 +4208,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 24127541,
-       "sha1_base64": "g7doXxn+LNruuaJR3CRa9MLMR/c="
+       "s": 24000308,
+       "sha1_base64": "NYI2JCm7iU92Cq4KCgBhZDgd5cw="
       },
       {
        "id": "France_Ile-de-France_Seine-et-Marne",
@@ -4220,8 +4220,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 56419151,
-       "sha1_base64": "ooL31KOHckja8O0aq3RGNoBXG2o="
+       "s": 55770823,
+       "sha1_base64": "pAcz1K555oTnmPA3w4RyLlxaXps="
       },
       {
        "id": "France_Ile-de-France_Val-dOise",
@@ -4232,8 +4232,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 29495277,
-       "sha1_base64": "b31m4ykffG+WTar0QxImJuej3+0="
+       "s": 29382333,
+       "sha1_base64": "XtvH1YEdP2SOHb8/DnWHLOtVRzM="
       },
       {
        "id": "France_Ile-de-France_Val-de-Marne",
@@ -4244,8 +4244,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 23038620,
-       "sha1_base64": "iWbUpIXU5gQMl3vU76tSUoFdMDo="
+       "s": 22947153,
+       "sha1_base64": "aEDvXIin2ougAiwulimTiQnplyI="
       },
       {
        "id": "France_Ile-de-France_Yvelines",
@@ -4256,8 +4256,8 @@
         "France",
         "\u00cele-de-France"
        ],
-       "s": 44692626,
-       "sha1_base64": "x/DujV8IfODmNtz33NMZnUJuoeY="
+       "s": 44275178,
+       "sha1_base64": "HarAt817f8Ix7QVQf7/qlekV4Wo="
       }
      ]
     },
@@ -4273,8 +4273,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 44003653,
-       "sha1_base64": "iZK5BuWLDzYccYYuvLkbvJMhnOk="
+       "s": 43190509,
+       "sha1_base64": "CKLR1ywNWN7bb+YWHoRZIWBL6qQ="
       },
       {
        "id": "France_Languedoc-Roussillon_Gard",
@@ -4285,8 +4285,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 49737830,
-       "sha1_base64": "WT9uJVtMTOqvyMz7Q7QPf0kZZos="
+       "s": 49671462,
+       "sha1_base64": "zLuunKjD4+PjLdXdYrwtelWl6bM="
       },
       {
        "id": "France_Languedoc-Roussillon_Herault",
@@ -4297,8 +4297,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 71176129,
-       "sha1_base64": "JC0y2lSiU/H5F+b+/9GUwpjbFPk="
+       "s": 72366081,
+       "sha1_base64": "01MXME8X3ON8hnglR6DJZseyEcs="
       },
       {
        "id": "France_Languedoc-Roussillon_Lozere",
@@ -4309,8 +4309,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 21805296,
-       "sha1_base64": "DAvoC/jjCUMWi1eoy/vJasXdBuM="
+       "s": 21722400,
+       "sha1_base64": "kpT04sQu9gn8fliMKlVOkyAyGZk="
       },
       {
        "id": "France_Languedoc-Roussillon_Pyrenees-Orientales",
@@ -4321,8 +4321,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 38881053,
-       "sha1_base64": "VYmzDCi4KIvtXtcHGTZDDj9qeug="
+       "s": 39025844,
+       "sha1_base64": "WRbikOqWocyZvtdBd/1NYhBCxe8="
       }
      ]
     },
@@ -4335,8 +4335,8 @@
       "Aquitaine-Limousin-Poitou-Charentes",
       "France"
      ],
-     "s": 92838868,
-     "sha1_base64": "CjLDZM8y2McR/FoAl4dLWdfU7s0="
+     "s": 91786740,
+     "sha1_base64": "JS3+l5Gn2ArnVleCHi9jpGLW4qA="
     },
     {
      "id": "France_Lorraine",
@@ -4350,8 +4350,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 45212967,
-       "sha1_base64": "dVfFeucNFCnq6nALT401ARKLNNU="
+       "s": 44921751,
+       "sha1_base64": "F2KzzUJTY/JWmTJlbIW7hUZTo9g="
       },
       {
        "id": "France_Lorraine_Meuse",
@@ -4362,8 +4362,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 23087195,
-       "sha1_base64": "ZbGOVDT3rUB4EPKRrUrw3gP4vWQ="
+       "s": 22903179,
+       "sha1_base64": "MaJYB/5o4rY7S6097lZsRheAOss="
       },
       {
        "id": "France_Lorraine_Moselle",
@@ -4374,8 +4374,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 60908729,
-       "sha1_base64": "6QdkQYSi/k9OwbBcbq6hgT1qQqY="
+       "s": 61205696,
+       "sha1_base64": "CUbV6o7ZaY6XhhQzKaCvkBBl6nI="
       },
       {
        "id": "France_Lorraine_Vosges",
@@ -4386,8 +4386,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 40108870,
-       "sha1_base64": "y50LSjA52QHYR6OPwyvXGox+nKM="
+       "s": 39890070,
+       "sha1_base64": "opIUi/pcSGW5EMfbus4OzK96uM8="
       }
      ]
     },
@@ -4403,8 +4403,8 @@
         "France",
         "Normandie"
        ],
-       "s": 48961737,
-       "sha1_base64": "R3sSvzUWqjhEJKwmIFwPdYNJlLI="
+       "s": 48159313,
+       "sha1_base64": "t1wUdKODi7brbYfuk1A/AWBHCnE="
       },
       {
        "id": "France_Lower Normandy_Manche",
@@ -4416,8 +4416,8 @@
         "Jersey",
         "Normandie"
        ],
-       "s": 38621542,
-       "sha1_base64": "UGfONLgvJj0tX7rtn8fV8swgvXg="
+       "s": 38417198,
+       "sha1_base64": "jQYK+wSjd+3jAgSP7vDeOQFwY5E="
       },
       {
        "id": "France_Lower Normandy_Orne",
@@ -4428,8 +4428,8 @@
         "France",
         "Normandie"
        ],
-       "s": 30008499,
-       "sha1_base64": "ejzad9/D8VMMfQFiyba2uTqHJXY="
+       "s": 29746307,
+       "sha1_base64": "5ArB1ZLQGgs5uUdyLI8BhWCiPlg="
       }
      ]
     },
@@ -4445,8 +4445,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 27716241,
-       "sha1_base64": "ZUOR4dF/9zWem7+4EqClWXGeD/4="
+       "s": 27716561,
+       "sha1_base64": "iin7pgpxy9shAYs/rIZ1Ez+fb0I="
       },
       {
        "id": "France_Midi-Pyrenees_Aveyron",
@@ -4457,8 +4457,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 52454663,
-       "sha1_base64": "RrC07GIMeEpoabS0sw7WDQh6q0I="
+       "s": 51898270,
+       "sha1_base64": "KmVWJSm9VrYCq6y61odj+/Lo0co="
       },
       {
        "id": "France_Midi-Pyrenees_Gers",
@@ -4469,8 +4469,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 32688291,
-       "sha1_base64": "hW9qcXBmEDCFyTbDuF4lEN2KdXI="
+       "s": 31973323,
+       "sha1_base64": "URWew5B1yHWfHf9Atkfc3xu/LI0="
       },
       {
        "id": "France_Midi-Pyrenees_Haute-Garonne",
@@ -4481,8 +4481,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 73468048,
-       "sha1_base64": "FKTjE6pXtbFpIooQMIeUG0XDyr0="
+       "s": 75602080,
+       "sha1_base64": "FgYXosD8KXFuaQDlfGVWpA1UHh4="
       },
       {
        "id": "France_Midi-Pyrenees_Hautes-Pyrenees",
@@ -4493,8 +4493,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 45960717,
-       "sha1_base64": "z6SyavVJsI7zKRDCsUt7kwEAylI="
+       "s": 45797797,
+       "sha1_base64": "ZQnbfbjydzEFJ+88woz+bwn4QFo="
       },
       {
        "id": "France_Midi-Pyrenees_Lot",
@@ -4505,8 +4505,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 31013804,
-       "sha1_base64": "N/TYO8usXJXv2GVqRs5EGFkixBM="
+       "s": 30414716,
+       "sha1_base64": "NyGBg8NerCnNooDl2MaOzNYBHAs="
       },
       {
        "id": "France_Midi-Pyrenees_Tarn",
@@ -4517,8 +4517,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 34257556,
-       "sha1_base64": "wQdDIV+yWubDio1yu3p1hnxZg2E="
+       "s": 33830740,
+       "sha1_base64": "+De7MM224HlL+9imWnpAGlTE86M="
       },
       {
        "id": "France_Midi-Pyrenees_Tarn-et-Garonne",
@@ -4529,8 +4529,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
        ],
-       "s": 26224500,
-       "sha1_base64": "6qarp3b/DlnlVOOV9AHZHtg3yKg="
+       "s": 25779988,
+       "sha1_base64": "+fVTgEgCnIjO325WPmxZpMzZ4lE="
       }
      ]
     },
@@ -4551,8 +4551,8 @@
       "France, Nouvelle-Cal\u00e9donie, \u00cele de Walpole (eaux territoriales)",
       "France, Nouvelle-Cal\u00e9donie, \u00celes Loyaut\u00e9 (eaux territoriales)"
      ],
-     "s": 16847941,
-     "sha1_base64": "PisNw7TXFaujZdjjeFQfV6TpRrA="
+     "s": 16995741,
+     "sha1_base64": "k88jmwCS0F5D3DFuIDiJWvcPR74="
     },
     {
      "id": "France_Nord-Pas-de-Calais",
@@ -4566,8 +4566,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 43603029,
-       "sha1_base64": "4j5U56ihQEHV3X0bmTmo0N8bxK8="
+       "s": 43032589,
+       "sha1_base64": "q+U4nEECouFtRL3Uq3AtOyJ+jdU="
       },
       {
        "id": "France_Nord-Pas-de-Calais_Lille",
@@ -4578,8 +4578,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 54577079,
-       "sha1_base64": "2SxKUNCAQOcYGrsR0MgnF7KrMzA="
+       "s": 55425279,
+       "sha1_base64": "mXhsOm9SxjPZmSUqzM0Y7a8U/GM="
       },
       {
        "id": "France_Nord-Pas-de-Calais_Pas-de-Calais",
@@ -4592,8 +4592,8 @@
         "Nord-Pas-de-Calais-Picardie",
         "United Kingdom"
        ],
-       "s": 70584082,
-       "sha1_base64": "6KzcG8QDHNP5mrI9Z4K7FW0BOCU="
+       "s": 69815065,
+       "sha1_base64": "nYt0jNYY+iUZX+f+MN1K5bVk50E="
       }
      ]
     },
@@ -4609,8 +4609,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 49286895,
-       "sha1_base64": "l3zDdjRuUW33lFcEvX21najVp0k="
+       "s": 49459950,
+       "sha1_base64": "Djuf0wS1m0g3dFB7SYSn1nIZ8hU="
       },
       {
        "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire",
@@ -4621,8 +4621,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 27867218,
-       "sha1_base64": "p1vICoJWFcuk2kCuuxpnlTOtVHI="
+       "s": 27760314,
+       "sha1_base64": "nUzYkQPkAZ8n8LotRROb81sJmAQ="
       },
       {
        "id": "France_Pays de la Loire_Maine-et-Loire",
@@ -4633,8 +4633,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 56491320,
-       "sha1_base64": "iokzNTUvM93upIzWJOUEXe5jo4A="
+       "s": 56823576,
+       "sha1_base64": "3Jvho1aU1wQPakoJu37Bmx2wb0s="
       },
       {
        "id": "France_Pays de la Loire_Mayenne",
@@ -4645,8 +4645,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 26786634,
-       "sha1_base64": "G1voLMuLfZ46shhGeQJ4aSfWNSU="
+       "s": 26512194,
+       "sha1_base64": "Y3z4BVb0Nqfk9JGQzELjpPGG8yA="
       },
       {
        "id": "France_Pays de la Loire_Sarthe",
@@ -4657,8 +4657,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 44050904,
-       "sha1_base64": "+LYlvMArs6sgb9oBP36NxJo8IFM="
+       "s": 44034392,
+       "sha1_base64": "wVbwyW8uv0/NvsHNsmgmhKUev5s="
       },
       {
        "id": "France_Pays de la Loire_Vendee",
@@ -4669,8 +4669,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 68174857,
-       "sha1_base64": "IeOzmwNx30S1KjKmd2vGCVFc5Vw="
+       "s": 67806569,
+       "sha1_base64": "MQpEyKbO/TwIDkCWmNEkC8Mp9Zs="
       }
      ]
     },
@@ -4686,8 +4686,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 44428309,
-       "sha1_base64": "2OMArlXEweTe0IgfaZIpTGua2Gc="
+       "s": 44142781,
+       "sha1_base64": "JDx/7g2PBMX3WcZEmBfVdISbEa0="
       },
       {
        "id": "France_Picardy_Oise",
@@ -4698,8 +4698,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 55314687,
-       "sha1_base64": "hGFJpQ99rxgberASuHAs82+rZCM="
+       "s": 54296711,
+       "sha1_base64": "rW1r2D5mLX5yzVXIlLk7uWAFfWI="
       },
       {
        "id": "France_Picardy_Somme",
@@ -4710,8 +4710,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 41474541,
-       "sha1_base64": "6oaZ+91EmOUwbeL7lLh9tCmI1Y8="
+       "s": 41100165,
+       "sha1_base64": "7/mE8FJUHNSJTmZ3H+4J19jcyW4="
       }
      ]
     },
@@ -4727,8 +4727,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 39055308,
-       "sha1_base64": "/R+PodFOR6+D7WR3kfFYYBKIP70="
+       "s": 38770140,
+       "sha1_base64": "qvLqwCqwMWXJ05JdTexsV/q9JpM="
       },
       {
        "id": "France_Poitou-Charentes_Charente-Maritime",
@@ -4739,8 +4739,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 63765080,
-       "sha1_base64": "PSyg8UJ8v0WV9HEyElqhgm8KoV0="
+       "s": 63343248,
+       "sha1_base64": "GiFBME0jlSy5wYupNWHcPBBxWXE="
       },
       {
        "id": "France_Poitou-Charentes_Deux-Sevres",
@@ -4751,8 +4751,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 51804046,
-       "sha1_base64": "muKb34Nj0LiRkoeaoNpRISZEsf8="
+       "s": 50820101,
+       "sha1_base64": "2nSeGN8L5SrthXVQe822SGhWil4="
       },
       {
        "id": "France_Poitou-Charentes_Vienne",
@@ -4763,8 +4763,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 47276198,
-       "sha1_base64": "dFEV3b2nh8jxIM1tASod6bZYrYI="
+       "s": 46954654,
+       "sha1_base64": "9sUynApF7+hlZGVXbJHXvCKSCD8="
       }
      ]
     },
@@ -4780,8 +4780,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 25445844,
-       "sha1_base64": "E632HxcghTGxjU5yJMqbbh//41s="
+       "s": 25283132,
+       "sha1_base64": "WY+jUbKcLpvsYuhS1uhpoJJP/2U="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone",
@@ -4792,8 +4792,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 68843023,
-       "sha1_base64": "uBJpz2gMRQDKPKj/cLJMUqXU6WQ="
+       "s": 68692255,
+       "sha1_base64": "F3xiEIl3F7zA0S9utYEOiOfYOv4="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes",
@@ -4804,8 +4804,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 22925315,
-       "sha1_base64": "Sra/bYz6cr9bA5rTPlnaTX845eQ="
+       "s": 22734155,
+       "sha1_base64": "sbRSUuqrPQhSU8Tq9UkTojxI388="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps",
@@ -4817,8 +4817,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 47366271,
-       "sha1_base64": "VaQs186XtodqkcnapBe7K32S2d0="
+       "s": 48042327,
+       "sha1_base64": "0dC7qfyst0IYOew8/CKGMc/1V8s="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Var",
@@ -4829,8 +4829,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 55873647,
-       "sha1_base64": "q90QAQBV+ZLHopg6J7bI/IKDUao="
+       "s": 55711575,
+       "sha1_base64": "b42XqhKPFNPxDFb/eCr3SWXHlOU="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Vaucluse",
@@ -4841,8 +4841,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 41813134,
-       "sha1_base64": "ZzrAxEvlCNCYmca5dkQEG2+qv0c="
+       "s": 41330110,
+       "sha1_base64": "uKRmYUPy6+Vamt/EqFQoAHPCtWk="
       }
      ]
     },
@@ -4858,8 +4858,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 51545582,
-       "sha1_base64": "nDWDDSCGNyD0u75KZ1bobxFQI0g="
+       "s": 51234270,
+       "sha1_base64": "dVQPmuyaIFjOlbuoZjDQGJKMTBM="
       },
       {
        "id": "France_Rhone-Alpes_Ardeche",
@@ -4870,8 +4870,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 43853621,
-       "sha1_base64": "a5SXti5deaym2ucYa4hB4JvDKKA="
+       "s": 43335773,
+       "sha1_base64": "zoBy20cM0ssrCbLDORnnhb2hyAo="
       },
       {
        "id": "France_Rhone-Alpes_Drome",
@@ -4883,8 +4883,8 @@
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
        ],
-       "s": 49082037,
-       "sha1_base64": "+N7k3bNQGV9EHujPjtNHM0e9yhg="
+       "s": 48293653,
+       "sha1_base64": "pos9e2z10WBXnpxHfrxegoViknQ="
       },
       {
        "id": "France_Rhone-Alpes_Haute-Savoie",
@@ -4895,8 +4895,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 58709839,
-       "sha1_base64": "NkyYgrP3OxhGX0/hEV0l95BBwlk="
+       "s": 58156487,
+       "sha1_base64": "hLw8fzgL1fqb/A5oSI7L7k8Le7s="
       },
       {
        "id": "France_Rhone-Alpes_Isere",
@@ -4907,8 +4907,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 74120137,
-       "sha1_base64": "Q4Ht8uQJCzBl7VyrVCGKYNJXmIw="
+       "s": 73388785,
+       "sha1_base64": "i2Gf01xFhOwu6oUHdvBmPAjTcfg="
       },
       {
        "id": "France_Rhone-Alpes_Loire",
@@ -4919,8 +4919,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 56804494,
-       "sha1_base64": "u8dKuD/I/NvbF1n2RH0SORhMKss="
+       "s": 55632174,
+       "sha1_base64": "0CwX0I3RrloSPBHRPa5fewRs/4o="
       },
       {
        "id": "France_Rhone-Alpes_Rhone",
@@ -4931,8 +4931,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 70731897,
-       "sha1_base64": "X/goEimFzhn5yOZ2/F9EvsMSKyQ="
+       "s": 70030545,
+       "sha1_base64": "hBlbyFKNUxNGaVOzEtolkqD38DE="
       },
       {
        "id": "France_Rhone-Alpes_Savoie",
@@ -4943,8 +4943,8 @@
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
        ],
-       "s": 44300084,
-       "sha1_base64": "2JSed9XgbCvh84XsLoAAPLUVf3g="
+       "s": 43691732,
+       "sha1_base64": "mBag0E/9k13YHJyGo1y2worRNeE="
       }
      ]
     },
@@ -4968,8 +4968,8 @@
       "La R\u00e9union",
       "Mayotte"
      ],
-     "s": 38356602,
-     "sha1_base64": "xHMjaucfK4w9bwhbvGoGwIFyFHU="
+     "s": 38642458,
+     "sha1_base64": "ZajZ0oQHYwlwbuiZiPVSKEZ7p9g="
     },
     {
      "id": "France_Upper Normandy",
@@ -4980,8 +4980,8 @@
       "France",
       "Normandie"
      ],
-     "s": 85806315,
-     "sha1_base64": "5Lgh5yvYo9W6IAEsn5pIiQwM/ro="
+     "s": 85311843,
+     "sha1_base64": "i0NlXoegrFA7BBlQKqTzfr1F5pI="
     },
     {
      "id": "French Polynesia",
@@ -4999,8 +4999,8 @@
       "France, Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)",
       "Polyn\u00e9sie fran\u00e7aise, \u00celes du Vent (eaux territoriales)"
      ],
-     "s": 17442244,
-     "sha1_base64": "PSaWw8HE/2A9BPYt0uYydlpUdSk="
+     "s": 17405212,
+     "sha1_base64": "s7DEJHH7eNKbTz2HYWoMLcU+yRc="
     },
     {
      "id": "Wallis and Futuna",
@@ -5011,8 +5011,8 @@
       "France",
       "France, Wallis-et-Futuna (eaux territoriales)"
      ],
-     "s": 739155,
-     "sha1_base64": "xA52ICYMWKqkaX9pw5UDGStj+sE="
+     "s": 984475,
+     "sha1_base64": "9FkdIGKPvgXQBqnO4vlByaB9K7c="
     }
    ]
   },
@@ -5033,8 +5033,8 @@
     "Ogoou\u00e9-Lolo",
     "Woleu-Ntem"
    ],
-   "s": 21349912,
-   "sha1_base64": "wkvHXKxaqk/zAN98L68atovxU/c="
+   "s": 20656336,
+   "sha1_base64": "+J8Q0F3IcYSKV3XY1eN2PlKb5JY="
   },
   {
    "id": "Georgia Region",
@@ -5058,8 +5058,8 @@
       "\u10d0\u10ed\u10d0\u10e0\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0",
       "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"
      ],
-     "s": 75759240,
-     "sha1_base64": "L2ljxy2FLTsJ9J8b0zLstGfHp2I="
+     "s": 75206816,
+     "sha1_base64": "IxsMiDNvfmRzcxuAtmV/1G16SyQ="
     },
     {
      "id": "Abkhazia",
@@ -5071,8 +5071,8 @@
       "\u10d0\u10e4\u10ee\u10d0\u10d6\u10d4\u10d7\u10d8\u10e1 \u10d0\u10d5\u10e2\u10dd\u10dc\u10dd\u10db\u10d8\u10e3\u10e0\u10d8 \u10e0\u10d4\u10e1\u10de\u10e3\u10d1\u10da\u10d8\u10d9\u10d0 - \u0410\u04a7\u0441\u043d\u044b \u0410\u0432\u0442\u043e\u043d\u043e\u043c\u0442\u04d9 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430",
       "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"
      ],
-     "s": 11856757,
-     "sha1_base64": "0lvc1562x8s85YovbaA+HJFrr3I="
+     "s": 12145157,
+     "sha1_base64": "rwrIReP1HH4OeviNsNyI/RlEgJw="
     },
     {
      "id": "South Ossetia",
@@ -5084,8 +5084,8 @@
       "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f",
       "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"
      ],
-     "s": 12238432,
-     "sha1_base64": "H67Z3xWgHJvGcsbkIsF5IdYJKmc="
+     "s": 12222416,
+     "sha1_base64": "tT0Zhhp+AGfNNGTDTYFYEwgp2q0="
     }
    ]
   },
@@ -5106,8 +5106,8 @@
         "Schaffhausen",
         "Z\u00fcrich"
        ],
-       "s": 130357963,
-       "sha1_base64": "BQ4ugLAFycrs1RpJ+2IkLPObCPQ="
+       "s": 130134739,
+       "sha1_base64": "+QIxypGmkZLfcWl3/zT9gK/0Uq8="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe",
@@ -5118,8 +5118,8 @@
         "Baden-W\u00fcrttemberg",
         "Deutschland"
        ],
-       "s": 119947892,
-       "sha1_base64": "FuU4jV/8lAabs4jJr9G3Sstc0pE="
+       "s": 119336212,
+       "sha1_base64": "6rMpEak8qK2qmF5ffnga8G0aWY8="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn",
@@ -5130,8 +5130,8 @@
         "Baden-W\u00fcrttemberg",
         "Deutschland"
        ],
-       "s": 54377538,
-       "sha1_base64": "NIUVxZgTLlYgodOlaJQcKLmI42M="
+       "s": 54244258,
+       "sha1_base64": "fIpBxPaIsv80z8edEupMpNe7BoQ="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart",
@@ -5142,8 +5142,8 @@
         "Baden-W\u00fcrttemberg",
         "Deutschland"
        ],
-       "s": 117344372,
-       "sha1_base64": "OBT7+QCdYo5p5WO7jSMZLjF7JAM="
+       "s": 116773612,
+       "sha1_base64": "xwa3+HiFWOx2AYBljJfBXQjt9v0="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen",
@@ -5154,8 +5154,8 @@
         "Baden-W\u00fcrttemberg",
         "Deutschland"
        ],
-       "s": 95500108,
-       "sha1_base64": "J1H1ryQypL39WiLPZLwvVmKDBsg="
+       "s": 95541532,
+       "sha1_base64": "hpKB3d9c1WKmM24GW45Dstqwm8E="
       }
      ]
     },
@@ -5168,8 +5168,8 @@
       "Berlin",
       "Deutschland"
      ],
-     "s": 73688539,
-     "sha1_base64": "C9M7npTwkZNsdtbnBZfUTpoR4+A="
+     "s": 72955139,
+     "sha1_base64": "lIFbAlFmOIJii3Kgn3NFQP0SOnI="
     },
     {
      "id": "Germany_Brandenburg_North",
@@ -5180,8 +5180,8 @@
       "Brandenburg",
       "Deutschland"
      ],
-     "s": 86049137,
-     "sha1_base64": "tVrULokz3AAlJDXK5bvPYF9O8HM="
+     "s": 86084761,
+     "sha1_base64": "riTFR2h2PM2U6tgn2irn0Lg+TgY="
     },
     {
      "id": "Germany_Brandenburg_South",
@@ -5192,8 +5192,8 @@
       "Brandenburg",
       "Deutschland"
      ],
-     "s": 82265366,
-     "sha1_base64": "i8ZCoKO5TRe2mnaS+RC6NrWVJuM="
+     "s": 81920782,
+     "sha1_base64": "1Qa1ZBpZA+q+wdp5566pRYyZ3Es="
     },
     {
      "id": "Germany_Free State of Bavaria",
@@ -5207,8 +5207,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 73541352,
-       "sha1_base64": "MLP8AuOWBpeuyVdQqoiIIA/Ka34="
+       "s": 73331848,
+       "sha1_base64": "HRx8KMkwtTWzHqx5/vsbvFy9x/8="
       },
       {
        "id": "Germany_Free State of Bavaria_Lower Franconia",
@@ -5219,8 +5219,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 82598691,
-       "sha1_base64": "4s1m9VRmUGUk9a/CTUiILNTWzHA="
+       "s": 81953803,
+       "sha1_base64": "efj3MPymuCZ9VVziVTJKsAkT+C0="
       },
       {
        "id": "Germany_Free State of Bavaria_Middle Franconia",
@@ -5231,8 +5231,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 74274133,
-       "sha1_base64": "MD272tN5Ufh+hZeB3PmGni+aZm8="
+       "s": 73918541,
+       "sha1_base64": "0QEq5CGpOcpmqg1wNpbxfH5n+vE="
       },
       {
        "id": "Germany_Free State of Bavaria_Swabia",
@@ -5243,8 +5243,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 103763596,
-       "sha1_base64": "aw64w1wHiYpnHCyjc70dboXwVdg="
+       "s": 103500988,
+       "sha1_base64": "SGt+hSP/D1ZFIFi7QushOz2TY0E="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_East",
@@ -5255,8 +5255,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 73475229,
-       "sha1_base64": "JCBqTPodf9DkJ/jck/7TZCckeDc="
+       "s": 73455205,
+       "sha1_base64": "H8SjZWagOU6E+N2pA+ZrC3fHmBg="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt",
@@ -5267,8 +5267,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 34661202,
-       "sha1_base64": "WIPXTfNlLtOzuJwaYFRXdFkZcOU="
+       "s": 34410266,
+       "sha1_base64": "/a01JYJFNic0B0G5S1p07L1p5mo="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen",
@@ -5279,8 +5279,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 59207781,
-       "sha1_base64": "GGZwjcje0VeXtS4+A1RI1fhkP/w="
+       "s": 58847741,
+       "sha1_base64": "8zFTMHBNwtoBNf7Na6J6QnBOXjE="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_South",
@@ -5291,8 +5291,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 31492278,
-       "sha1_base64": "R1Y0iE5JHxczX+PCPL14diF/drI="
+       "s": 31566982,
+       "sha1_base64": "9SBBOgyJdvegou3MkH1wRcBGGv0="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Franconia",
@@ -5303,8 +5303,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 71448692,
-       "sha1_base64": "bNbDJmQ7t5a5un8eHGcfLt/u9oQ="
+       "s": 71127924,
+       "sha1_base64": "n0nsEKATG6HvDZm4T9zh+A1F/MQ="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Palatinate",
@@ -5315,8 +5315,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 67998103,
-       "sha1_base64": "CrvaClONXj+2uGAgx8CTvGMQGDw="
+       "s": 67744143,
+       "sha1_base64": "LuhWX/VtmWeN72S6ZofqESbeCPg="
       }
      ]
     },
@@ -5329,8 +5329,8 @@
       "Deutschland",
       "Hamburg"
      ],
-     "s": 36125392,
-     "sha1_base64": "ZyTL+wp2bMga9Zmb1YqMIsbhYwE="
+     "s": 35887000,
+     "sha1_base64": "1RhhQ4ybB3DOpYoAS6xRQ/blDGc="
     },
     {
      "id": "Germany_Hesse",
@@ -5344,8 +5344,8 @@
         "Deutschland",
         "Hessen"
        ],
-       "s": 129468270,
-       "sha1_base64": "HCEhRryUXEolWEwieVOUbDB4xpg="
+       "s": 127845566,
+       "sha1_base64": "djFlXbiIOT5xNgKTUdwZvbJ1t/I="
       },
       {
        "id": "Germany_Hesse_Regierungsbezirk Giessen",
@@ -5356,8 +5356,8 @@
         "Deutschland",
         "Hessen"
        ],
-       "s": 55871513,
-       "sha1_base64": "XsjdVmfgB78SQmPw0CJi4/C0KSY="
+       "s": 55395041,
+       "sha1_base64": "KfQjObe7LIWMWEJ+B7+yqdS8/4g="
       },
       {
        "id": "Germany_Hesse_Regierungsbezirk Kassel",
@@ -5368,8 +5368,8 @@
         "Deutschland",
         "Hessen"
        ],
-       "s": 83113540,
-       "sha1_base64": "crHVE/p5CgIFRpnt2lirLUsSetc="
+       "s": 82677900,
+       "sha1_base64": "PIl/N/B8lveHInNj7nv28oxoiLk="
       }
      ]
     },
@@ -5388,8 +5388,8 @@
         "Hamburg",
         "Niedersachsen"
        ],
-       "s": 64609272,
-       "sha1_base64": "Sogy/v/MH0AVsohbpEr51W4sprI="
+       "s": 64100032,
+       "sha1_base64": "QahSilODUnPbMPBQ0UQ8WCDv50s="
       },
       {
        "id": "Germany_Lower Saxony_Bremen_Munster",
@@ -5400,8 +5400,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 71405582,
-       "sha1_base64": "n20gi1Rkhl1Hqdn4xB7T2zSthds="
+       "s": 71452254,
+       "sha1_base64": "j1Qa6LhCN+m99OgOWpXEvZ1FbXY="
       },
       {
        "id": "Germany_Lower Saxony_Hannover",
@@ -5412,8 +5412,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 67638750,
-       "sha1_base64": "cQ42iZVZxU2j4Guc2z3Ot/LQRC4="
+       "s": 66827038,
+       "sha1_base64": "uR116zkhMne+MURsVeHKq48hALo="
       },
       {
        "id": "Germany_Lower Saxony_Braunschweig",
@@ -5424,8 +5424,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 75415602,
-       "sha1_base64": "iwjEas1wS+5fDOXjD1yKk0nEzDc="
+       "s": 75163314,
+       "sha1_base64": "AaH0aBzv/tJRWijW9qQJot/Q/x8="
       },
       {
        "id": "Germany_Lower Saxony_Oldenburg",
@@ -5437,8 +5437,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 120666312,
-       "sha1_base64": "5EtLY4NOPT/inDIrJmBPPOhIjfk="
+       "s": 120832664,
+       "sha1_base64": "BMfcjhWLu/iqTkQdMD67f+rW+OM="
       }
      ]
     },
@@ -5451,8 +5451,8 @@
       "Deutschland",
       "Mecklenburg-Vorpommern"
      ],
-     "s": 113828202,
-     "sha1_base64": "pBN4SrnVfLXU3fKYMN9pt8vijUw="
+     "s": 113748178,
+     "sha1_base64": "NO2gw0NkbImShACrHQm+Q8jXoTg="
     },
     {
      "id": "Germany_North Rhine-Westphalia",
@@ -5466,8 +5466,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 59861417,
-       "sha1_base64": "cSO7z5eAu7aGQLPEaqNUQB8wOzE="
+       "s": 59596585,
+       "sha1_base64": "eYDbyaOjkSkG1omLlXh66xyb3UI="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund",
@@ -5478,8 +5478,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 87336935,
-       "sha1_base64": "0I40GhiEPKoOK/FYyqL6OxoD5iw="
+       "s": 87070543,
+       "sha1_base64": "8p/LKRuYmuogp2gsyxTuUrOYybo="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold",
@@ -5490,8 +5490,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 101757353,
-       "sha1_base64": "J5fuV0XJMlW+pm/4CPqxwx025t4="
+       "s": 101021569,
+       "sha1_base64": "xkpav9/g/452pQ/RixW0QPt/qM0="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf",
@@ -5502,8 +5502,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 75993742,
-       "sha1_base64": "XBFEMj0+JnlFwNVfz9ODPVYMk4w="
+       "s": 75831918,
+       "sha1_base64": "HmB/l6d4cPkIduelr6kScf0KM7I="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim",
@@ -5514,8 +5514,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 62755504,
-       "sha1_base64": "pqogWKDf+EddtxYwh7clJbp8xdk="
+       "s": 62548520,
+       "sha1_base64": "UK3Lw5DPD/7aMs3VGr6XcdfOA8s="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel",
@@ -5526,8 +5526,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 22499403,
-       "sha1_base64": "jEp8rW2u0BWEBbIvpIc3RFKLXw4="
+       "s": 22452659,
+       "sha1_base64": "WUGwp5U0p+NpbyQUkQkc3/ikdnk="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
@@ -5539,8 +5539,8 @@
         "Deutschland - Belgique / Belgi\u00eb / Belgien",
         "Nordrhein-Westfalen"
        ],
-       "s": 79994858,
-       "sha1_base64": "WN2DJ8wWHJT61mx9N+50GgGTqpM="
+       "s": 79916330,
+       "sha1_base64": "uo9lWM7heXXRSOBSEdYH6oQzikE="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln",
@@ -5551,8 +5551,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 96986321,
-       "sha1_base64": "gBhUu2+CLYulMd1JI8gkFU9aItQ="
+       "s": 96756729,
+       "sha1_base64": "nxJWSCLXD2gW7F6r7cjWT+4s9m0="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster",
@@ -5563,8 +5563,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 53289104,
-       "sha1_base64": "stZjdp0NjHxHO30u17nQ+HEeQRU="
+       "s": 53098343,
+       "sha1_base64": "Upn03Ik2mqQQ7EJCR8B+LICY220="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen",
@@ -5575,8 +5575,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 58751696,
-       "sha1_base64": "ymVWi35LtUZ7LZnrO0qA1NTzT0o="
+       "s": 58361944,
+       "sha1_base64": "Ten0FqIVTf44nwYTVvLmEXsJwCc="
       }
      ]
     },
@@ -5589,8 +5589,8 @@
       "Deutschland",
       "Rheinland-Pfalz"
      ],
-     "s": 117292845,
-     "sha1_base64": "QN6Z25ms8CUh0/00ouR5JHs13TQ="
+     "s": 116253149,
+     "sha1_base64": "h81Qykmxfvuk70nmrDmFb/0lst8="
     },
     {
      "id": "Germany_Rhineland-Palatinate_South",
@@ -5601,8 +5601,8 @@
       "Deutschland",
       "Rheinland-Pfalz"
      ],
-     "s": 94619986,
-     "sha1_base64": "bZV+lcQshjYJVGD8fdKVXdwwPis="
+     "s": 93642226,
+     "sha1_base64": "8EzS9/+n3ngwqfK8YYaS9k7aJPg="
     },
     {
      "id": "Germany_Saarland",
@@ -5613,8 +5613,8 @@
       "Deutschland",
       "Saarland"
      ],
-     "s": 43120360,
-     "sha1_base64": "Pch3wRT9QaF03vUSJL7oBGIaZps="
+     "s": 43137480,
+     "sha1_base64": "gqX1qBvTcpZVKXwy4J5r6zQ9ALw="
     },
     {
      "id": "Germany_Saxony-Anhalt_Magdeburg",
@@ -5625,8 +5625,8 @@
       "Deutschland",
       "Sachsen-Anhalt"
      ],
-     "s": 65861011,
-     "sha1_base64": "c1B6xv67F4v41CBgOekfXKHMX+s="
+     "s": 65125811,
+     "sha1_base64": "AkJ603B7rTsmQQ74w2Dk8b9RELc="
     },
     {
      "id": "Germany_Saxony-Anhalt_Halle",
@@ -5637,8 +5637,8 @@
       "Deutschland",
       "Sachsen-Anhalt"
      ],
-     "s": 60089090,
-     "sha1_base64": "xGq2jp9KwcSjTXcFienvFg6qShw="
+     "s": 59804722,
+     "sha1_base64": "6tdrWIPvnW4xAEw+l7FjJNTJ8OY="
     },
     {
      "id": "Germany_Saxony_Dresden",
@@ -5649,8 +5649,8 @@
       "Deutschland",
       "Sachsen"
      ],
-     "s": 78761102,
-     "sha1_base64": "AVUvW9gtvBtvXyDyBa07ka25DXs="
+     "s": 78924334,
+     "sha1_base64": "b2vZGWPVJDhyexo97gBl1HtrAgE="
     },
     {
      "id": "Germany_Saxony_Leipzig",
@@ -5661,8 +5661,8 @@
       "Deutschland",
       "Sachsen"
      ],
-     "s": 128952182,
-     "sha1_base64": "M2Y2mbezKUj7MIx/pN6XJYBvoW0="
+     "s": 128509782,
+     "sha1_base64": "YIqFso1AKie6FVpFAqrf2fuECPo="
     },
     {
      "id": "Germany_Schleswig-Holstein_Kiel",
@@ -5674,8 +5674,8 @@
       "Deutschland",
       "Schleswig-Holstein"
      ],
-     "s": 65263811,
-     "sha1_base64": "V1EiVUwzbXJaL5+F+uYuzV5wilc="
+     "s": 65177235,
+     "sha1_base64": "r9PNDuLcn11UKQMdLzrJWr1AjRY="
     },
     {
      "id": "Germany_Schleswig-Holstein_Flensburg",
@@ -5686,8 +5686,8 @@
       "Deutschland",
       "Schleswig-Holstein"
      ],
-     "s": 62847769,
-     "sha1_base64": "5haJ33w5mtZ/JtNzF9fcz1XfaZE="
+     "s": 62630329,
+     "sha1_base64": "XP3OilH8F7K9Tn2WU6U7mGaOxqs="
     },
     {
      "id": "Germany_Thuringia",
@@ -5698,8 +5698,8 @@
       "Deutschland",
       "Th\u00fcringen"
      ],
-     "s": 134780705,
-     "sha1_base64": "7Z4Km8pe4OfVxcC3v6yJPfcrZhM="
+     "s": 133905345,
+     "sha1_base64": "rB1dG/yJ6iYLzkuiBJfesY9a4hw="
     }
    ]
   },
@@ -5721,8 +5721,8 @@
     "Volta Region",
     "Western Region"
    ],
-   "s": 82790750,
-   "sha1_base64": "X0kjpMtUHT42Nm0ceKfPzRuVUKg="
+   "s": 82480582,
+   "sha1_base64": "VFL/wiNVCqoqf0G6I0xD4rVh/wk="
   },
   {
    "id": "Gibraltar",
@@ -5734,8 +5734,8 @@
     "Espa\u00f1a",
     "Gibraltar"
    ],
-   "s": 1191413,
-   "sha1_base64": "M8UIpdLAgUwSP7RHLjPdONV/mTQ="
+   "s": 1033932,
+   "sha1_base64": "DhHQnFygHZShfdq5pLDJs2lt8lw="
   },
   {
    "id": "Greece",
@@ -5750,8 +5750,8 @@
       "Territorial waters of Greece - Gavdos and Gavdopoula",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039a\u03c1\u03ae\u03c4\u03b7\u03c2"
      ],
-     "s": 20509880,
-     "sha1_base64": "v49+thXfSMUgCaBW4n+jaFc3KB4="
+     "s": 20719368,
+     "sha1_base64": "DyJ3WKyMdh7VUPgweMouwVUmesI="
     },
     {
      "id": "Greece_Decentralized Administration of West Greece",
@@ -5764,8 +5764,8 @@
       "Shqip\u00ebria",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u03a0\u03b5\u03bb\u03bf\u03c0\u03bf\u03bd\u03bd\u03ae\u03c3\u03bf\u03c5, \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u0395\u03bb\u03bb\u03ac\u03b4\u03b1\u03c2 \u03ba\u03b1\u03b9 \u0399\u03bf\u03bd\u03af\u03bf\u03c5"
      ],
-     "s": 60186529,
-     "sha1_base64": "w1P+sHKzuLjRRbgLsxm7FkZ36GM="
+     "s": 60498689,
+     "sha1_base64": "WE3zSdIKxblpvtPzvqTCQOgP94w="
     },
     {
      "id": "Greece_Decentralized Administration of Aegean",
@@ -5776,8 +5776,8 @@
       "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03b9\u03b3\u03b1\u03af\u03bf\u03c5"
      ],
-     "s": 28361274,
-     "sha1_base64": "ex1Zt8cE2gD6ZrpZEppBU3bl6sM="
+     "s": 28538546,
+     "sha1_base64": "x6u0c+kVJ8eOohr6OPfGPRPYhHs="
     },
     {
      "id": "Greece_Decentralized Administration of Epirus - Western Macedonia",
@@ -5788,8 +5788,8 @@
       "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0397\u03c0\u03b5\u03af\u03c1\u03bf\u03c5 - \u0394\u03c5\u03c4\u03b9\u03ba\u03ae\u03c2 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2"
      ],
-     "s": 30080645,
-     "sha1_base64": "pCAUb288wUUW90puD3h2rqQLmdU="
+     "s": 30170277,
+     "sha1_base64": "RxAl8Aj3tPmsWE8554CWWJU6+1M="
     },
     {
      "id": "Greece_Decentralized Administration of Macedonia and Thrace",
@@ -5800,8 +5800,8 @@
       "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2 - \u0398\u03c1\u03ac\u03ba\u03b7\u03c2"
      ],
-     "s": 58559907,
-     "sha1_base64": "SbFW20dFGAMLb6nmKOgGO7qOeLU="
+     "s": 58894740,
+     "sha1_base64": "n3WbUF/Nma5/vYJoOb/cRgnr334="
     },
     {
      "id": "Greece_Decentralized Administration of Thessaly - Central Greece",
@@ -5813,8 +5813,8 @@
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0398\u03b5\u03c3\u03c3\u03b1\u03bb\u03af\u03b1\u03c2 - \u03a3\u03c4\u03b5\u03c1\u03b5\u03ac\u03c2 \u0395\u03bb\u03bb\u03ac\u03b4\u03b1\u03c2"
      ],
-     "s": 51887920,
-     "sha1_base64": "l+HG6FJeQ6ZPyN/PLGROP7ekcjA="
+     "s": 51690104,
+     "sha1_base64": "2JF4UxkvweLDSWkl1gRCa61rAm8="
     },
     {
      "id": "Greece_Decentralized Administration of Attica",
@@ -5825,8 +5825,8 @@
       "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1",
       "\u0391\u03c0\u03bf\u03ba\u03b5\u03bd\u03c4\u03c1\u03c9\u03bc\u03ad\u03bd\u03b7 \u0394\u03b9\u03bf\u03af\u03ba\u03b7\u03c3\u03b7 \u0391\u03c4\u03c4\u03b9\u03ba\u03ae\u03c2"
      ],
-     "s": 42202630,
-     "sha1_base64": "HBhpMeYVlHtm5LCBw2uCi7S8LR8="
+     "s": 42054950,
+     "sha1_base64": "TBm28mvrH9TJpOkVq5dNJOo6JgA="
     }
    ]
   },
@@ -5838,8 +5838,8 @@
    "affiliations": [
     "Kalaallit Nunaat"
    ],
-   "s": 50460234,
-   "sha1_base64": "Ep63WH3+C+3wtOF17KCWe/iohhU="
+   "s": 50375122,
+   "sha1_base64": "SN3V9tAz8VzRGqs0yh9x1HK7kEA="
   },
   {
    "id": "Guatemala",
@@ -5871,8 +5871,8 @@
     "Totonicap\u00e1n",
     "Zacapa"
    ],
-   "s": 117960619,
-   "sha1_base64": "u4SbQT+MaouIsFBcFyyvs5FLPk4="
+   "s": 118664851,
+   "sha1_base64": "0iJSqKHDsdXB+nj74+4JANu4w7M="
   },
   {
    "id": "Guernsey",
@@ -5905,8 +5905,8 @@
     "Selle Rocque",
     "Sark"
    ],
-   "s": 1934995,
-   "sha1_base64": "BZ8hfZkAw4IGUcTNXNdTdLjHrRE="
+   "s": 1953083,
+   "sha1_base64": "YfsbtzwD9W1Rc6fKVWrIlbtKisY="
   },
   {
    "id": "Guinea",
@@ -5924,8 +5924,8 @@
     "R\u00e9gion de Mamou",
     "R\u00e9gion de Nz\u00e9r\u00e9kor\u00e9"
    ],
-   "s": 99061348,
-   "sha1_base64": "i2XrhOVyuLqJUIHK1RgT/bbd9sY="
+   "s": 99316284,
+   "sha1_base64": "2G5q1rxf1Y8mpPIpWVpPJCfgWUM="
   },
   {
    "id": "Guinea-Bissau",
@@ -5943,8 +5943,8 @@
     "Regi\u00e3o de Quinara",
     "Regi\u00e3o de Tombali"
    ],
-   "s": 17585910,
-   "sha1_base64": "QItyx4FXsUercPr0y+bBGUZ2V8A="
+   "s": 17740590,
+   "sha1_base64": "oSssHkq3PrmyBxKdEZkLXGPWvyg="
   },
   {
    "id": "Guyana",
@@ -5954,8 +5954,8 @@
    "affiliations": [
     "Guyana"
    ],
-   "s": 28464870,
-   "sha1_base64": "PqGUO/YtFBnC2uA3NN12+QL/eHc="
+   "s": 28654294,
+   "sha1_base64": "Jau8DtAZoQ9Exrm7IoRPfHdag4I="
   },
   {
    "id": "Haiti",
@@ -5975,8 +5975,8 @@
     "D\u00e9partement du Sud",
     "D\u00e9partement du Sud-Est"
    ],
-   "s": 54165715,
-   "sha1_base64": "7GMIK5QaLixwjFB4y8zkR32hrg0="
+   "s": 54148123,
+   "sha1_base64": "kt6YK/YofFiIykVpeuyxpa0w/20="
   },
   {
    "id": "Honduras",
@@ -6005,8 +6005,8 @@
     "Valle",
     "Yoro"
    ],
-   "s": 53900925,
-   "sha1_base64": "jhzA2PBlaLHpUFjv496a8LS2rZI="
+   "s": 53057245,
+   "sha1_base64": "FqbWxgrBkNHCe9tre3tmXXfGNwI="
   },
   {
    "id": "Hungary",
@@ -6020,8 +6020,8 @@
       "Alf\u00f6ld \u00e9s \u00c9szak",
       "Magyarorsz\u00e1g"
      ],
-     "s": 101298222,
-     "sha1_base64": "Y3vFam6LQnyzCWnao0/kMlkiARQ="
+     "s": 101049678,
+     "sha1_base64": "rKvkXLmcf01xLqdVzIUgmd3UYdo="
     },
     {
      "id": "Hungary_Transdanubia",
@@ -6032,8 +6032,8 @@
       "Dun\u00e1nt\u00fal",
       "Magyarorsz\u00e1g"
      ],
-     "s": 102772429,
-     "sha1_base64": "PFL2wUMrHVytgOg54myoWUkIpd8="
+     "s": 102049085,
+     "sha1_base64": "Dyu87QZC5CqRGvqMSJmTiuNBFbM="
     },
     {
      "id": "Hungary_Kozep-Magyarorszag",
@@ -6044,8 +6044,8 @@
       "K\u00f6z\u00e9p-Magyarorsz\u00e1g",
       "Magyarorsz\u00e1g"
      ],
-     "s": 59264440,
-     "sha1_base64": "BoEr2yEZQAGcBRZX3OdS0Xhuswk="
+     "s": 58577280,
+     "sha1_base64": "6nEOPFppALaAHKuyMp/IjMcPxHY="
     }
    ]
   },
@@ -6057,8 +6057,8 @@
    "affiliations": [
     "\u00cdsland"
    ],
-   "s": 94155618,
-   "sha1_base64": "dL8fqJSgnQRrUlk9NN5XL2x4GdY="
+   "s": 93667009,
+   "sha1_base64": "SOVOik/dXQi2ucjedYWsLAQBBfo="
   },
   {
    "id": "India",
@@ -6072,8 +6072,8 @@
       "Andaman and Nicobar Islands",
       "India"
      ],
-     "s": 9437631,
-     "sha1_base64": "iLnqtXVYFy6zJlNltpx2cCxbi3g="
+     "s": 9699663,
+     "sha1_base64": "aW1KgAjHIG1gENIycgrbZ693y7o="
     },
     {
      "id": "India_Lakshadweep",
@@ -6084,8 +6084,8 @@
       "India",
       "Lakshadweep"
      ],
-     "s": 343000,
-     "sha1_base64": "cPOpzr67Xanm7Yy4zoIRH8rHVmc="
+     "s": 525680,
+     "sha1_base64": "bIECImzCm2cMogdeQE887waVfrM="
     },
     {
      "id": "India_Andhra Pradesh",
@@ -6097,8 +6097,8 @@
       "India",
       "Puducherry"
      ],
-     "s": 68378438,
-     "sha1_base64": "jRfilQSc81ExxTnUweHat+pemZo="
+     "s": 68078094,
+     "sha1_base64": "IOdJbhW95gR2fOesx7cb/IHhSy8="
     },
     {
      "id": "India_Gujarat",
@@ -6111,8 +6111,8 @@
       "Union Territory of Dadra & Nagar Haveli",
       "Union Territory of Damman & Diu"
      ],
-     "s": 73018700,
-     "sha1_base64": "vjaDiBgxim+SKebMW1Xm39GiSgA="
+     "s": 72840412,
+     "sha1_base64": "xts9dUBHLZo0RXVvvhTDQ/Lmg0M="
     },
     {
      "id": "India_Kerala",
@@ -6123,8 +6123,8 @@
       "India",
       "Kerala"
      ],
-     "s": 119973649,
-     "sha1_base64": "BjmJTizV3PiSDqd8sV7JZdlXyAI="
+     "s": 118362345,
+     "sha1_base64": "KdgFhZuI8oPy9FxXoDnNoKXbJ7I="
     },
     {
      "id": "India_Madhya Pradesh",
@@ -6135,8 +6135,8 @@
       "India",
       "Madhya Pradesh"
      ],
-     "s": 98679648,
-     "sha1_base64": "BVi/8UBkRP8gMxaYBFIgJbiw/Es="
+     "s": 98148936,
+     "sha1_base64": "5nU5M/hEpbjoRB1WP7Ej1sMHolw="
     },
     {
      "id": "India_Rajasthan",
@@ -6147,8 +6147,8 @@
       "India",
       "Rajasthan"
      ],
-     "s": 66142327,
-     "sha1_base64": "DFCDhdmkuiFKMWWoQqn9BmYAyfk="
+     "s": 66313799,
+     "sha1_base64": "3Yo+0KPiYttwqRre82EyA+2ncgA="
     },
     {
      "id": "India_Tamil Nadu",
@@ -6165,8 +6165,8 @@
       "Sorapattu",
       "Tamil Nadu"
      ],
-     "s": 93254249,
-     "sha1_base64": "FMB+tDOEPp3gld4t5SNfURRffjc="
+     "s": 92857385,
+     "sha1_base64": "AvDq36yUOf5WJF1/ruQBsmX24BI="
     },
     {
      "id": "India_Haryana",
@@ -6177,8 +6177,8 @@
       "Haryana",
       "India"
      ],
-     "s": 47482698,
-     "sha1_base64": "i9vBrRuWoRwcxLACXXiqxKTx7z0="
+     "s": 47910810,
+     "sha1_base64": "ugx0QJeUQm0MbfXPbiM2YJNEC0A="
     },
     {
      "id": "India_Goa",
@@ -6189,8 +6189,8 @@
       "Goa",
       "India"
      ],
-     "s": 6913386,
-     "sha1_base64": "tZPZsmtvhQ8j5Tldy+1yO/10MGo="
+     "s": 7231482,
+     "sha1_base64": "Bh4YY/UJ+K/eG/Gq/z5LLvEntvE="
     },
     {
      "id": "India_Karnataka_North",
@@ -6201,8 +6201,8 @@
       "India",
       "Karnataka"
      ],
-     "s": 48299252,
-     "sha1_base64": "3x+O7iyxIJf3wev2Nacrsg0tlVE="
+     "s": 48545428,
+     "sha1_base64": "MJJFocVpMEuU0y8MN+mdOTeEoTY="
     },
     {
      "id": "India_Karnataka_South",
@@ -6213,8 +6213,8 @@
       "India",
       "Karnataka"
      ],
-     "s": 52556942,
-     "sha1_base64": "OpVRfn8PqD0kwWCpNV5+RBQu4YM="
+     "s": 52447518,
+     "sha1_base64": "HlbQSlSpjh4Y9c8/t7pLN91juaA="
     },
     {
      "id": "India_Maharashtra",
@@ -6230,8 +6230,8 @@
       "Maharashtra",
       "Rangadhampetha"
      ],
-     "s": 116778322,
-     "sha1_base64": "hrlhyqrRgjTj1yvBPyS8Jy5CmX4="
+     "s": 116338386,
+     "sha1_base64": "6ByvV7aBijeBc+VE5XINHNdrbeo="
     },
     {
      "id": "India_Telangana",
@@ -6242,8 +6242,8 @@
       "India",
       "Telangana"
      ],
-     "s": 84503526,
-     "sha1_base64": "yhpRCowkcIO4AML5eJa5fRv0t1s="
+     "s": 84310430,
+     "sha1_base64": "Xx4t+EYN0mMFakFZT5K5OZ9yKfc="
     },
     {
      "id": "India_Delhi",
@@ -6254,8 +6254,8 @@
       "Delhi",
       "India"
      ],
-     "s": 17080399,
-     "sha1_base64": "6LtuCdsGQbjHL8u7eROtda6aYEU="
+     "s": 16993271,
+     "sha1_base64": "gV3q9dR6YilDq9GCnS434BzpK8A="
     },
     {
      "id": "India_Uttar Pradesh",
@@ -6266,8 +6266,8 @@
       "Uttar Pradesh",
       "India"
      ],
-     "s": 162388917,
-     "sha1_base64": "CUt08WWqrEwnbresCRYGuSJa70I="
+     "s": 162169125,
+     "sha1_base64": "eBqo0O9Eu4cjZ/nYx0IkHtaw1g8="
     },
     {
      "id": "India_Odisha",
@@ -6278,8 +6278,8 @@
       "India",
       "Odisha"
      ],
-     "s": 36160953,
-     "sha1_base64": "8hJapreleo7suNm5rzr1ie7uvmk="
+     "s": 36220113,
+     "sha1_base64": "AVWOFxpFNjDdoLU7P1HrItM+9YU="
     },
     {
      "id": "India_Chhattisgarh",
@@ -6290,8 +6290,8 @@
       "Chhattisgarh",
       "India"
      ],
-     "s": 38173073,
-     "sha1_base64": "iWdBy+Z/YLuB2XWwmzZ8PkZMEMw="
+     "s": 38086505,
+     "sha1_base64": "ecsDvEJwvNnwNr12tRjJCu44NFk="
     },
     {
      "id": "India_Jharkhand",
@@ -6302,8 +6302,8 @@
       "Jharkhand",
       "India"
      ],
-     "s": 34783305,
-     "sha1_base64": "wskIhutGwcAu0vZYmfYhRbG+oyg="
+     "s": 34891809,
+     "sha1_base64": "pkJ1VpwR3gm4v2TssyzdX3s7wbI="
     },
     {
      "id": "India_Bihar",
@@ -6314,8 +6314,8 @@
       "Bihar",
       "India"
      ],
-     "s": 72664725,
-     "sha1_base64": "KlZzgRfQuz2jzGuTHC5TBMFrio4="
+     "s": 72757805,
+     "sha1_base64": "hQGSI3aq8y9ODFZ9GLhS7X6gO5s="
     },
     {
      "id": "India_Tripura",
@@ -6326,8 +6326,8 @@
       "India",
       "Tripura"
      ],
-     "s": 13008644,
-     "sha1_base64": "XnEq6u8yLCPki3EcJDNdA3/4I3g="
+     "s": 13193444,
+     "sha1_base64": "NT6I5K7Dx4axeoTh3BQ1zlkbGhI="
     },
     {
      "id": "India_West Bengal",
@@ -6340,8 +6340,8 @@
       "India",
       "West Bengal"
      ],
-     "s": 96917559,
-     "sha1_base64": "pVdBXuhubRWVDvCdACkBUjnAp2I="
+     "s": 96673863,
+     "sha1_base64": "PXj7dkrFp9NBC19GKJUHbetb+Qs="
     },
     {
      "id": "India_Sikkim",
@@ -6352,8 +6352,8 @@
       "India",
       "Sikkim"
      ],
-     "s": 6479012,
-     "sha1_base64": "bx/jA/QjUDpaUUguiqCWAUSPg/U="
+     "s": 6844916,
+     "sha1_base64": "dfXqasy+DtlSiDOJ/1oX1+iUO9g="
     },
     {
      "id": "India_Uttarakhand",
@@ -6364,8 +6364,8 @@
       "Uttarakhand",
       "India"
      ],
-     "s": 39036138,
-     "sha1_base64": "6Z2S1/TTj75RrJZdNtfRQyNsh/E="
+     "s": 37748945,
+     "sha1_base64": "tdySql2wGCQTBQSz9EPW6B3QD38="
     },
     {
      "id": "India_Mizoram",
@@ -6376,8 +6376,8 @@
       "India",
       "Mizoram"
      ],
-     "s": 14211016,
-     "sha1_base64": "A/PtRVst+xddd/wryhYhgQVG5ys="
+     "s": 14554232,
+     "sha1_base64": "cF3n7+L5VKJ0415dzmR36tg2iFo="
     },
     {
      "id": "India_Meghalaya",
@@ -6388,8 +6388,8 @@
       "India",
       "Meghalaya"
      ],
-     "s": 11830861,
-     "sha1_base64": "B3y3M5D5UnwVfrBCINs8rAKepi4="
+     "s": 11959973,
+     "sha1_base64": "bZpdE8qFk89mkFP7glHz4YcBoOg="
     },
     {
      "id": "India_Manipur",
@@ -6400,8 +6400,8 @@
       "India",
       "Manipur"
      ],
-     "s": 12842717,
-     "sha1_base64": "FDX178EEJKX0RLtHPcgdCI2TRpA="
+     "s": 13000821,
+     "sha1_base64": "t/53seXYVGNqiNNo9L8bbQzV4t4="
     },
     {
      "id": "India_Nagaland",
@@ -6412,8 +6412,8 @@
       "India",
       "Nagaland"
      ],
-     "s": 10864608,
-     "sha1_base64": "GLjf9ZCXUITQJivE539/BpeWGMg="
+     "s": 11050304,
+     "sha1_base64": "xhy6rw3YY4bz9u3XBFfGajqCk5E="
     },
     {
      "id": "India_Assam",
@@ -6424,8 +6424,8 @@
       "Assam",
       "India"
      ],
-     "s": 33608281,
-     "sha1_base64": "raIsOcqSRqWwvUBa0AyBtN8NA+M="
+     "s": 33820609,
+     "sha1_base64": "/iZzC868Lfhv1gWvM+UGkglDD5s="
     },
     {
      "id": "India_Arunachal Pradesh",
@@ -6436,8 +6436,8 @@
       "Arunachal Pradesh",
       "India"
      ],
-     "s": 10092395,
-     "sha1_base64": "bEdwf9EGjD6V6aizLTrHi0LbO4A="
+     "s": 10167099,
+     "sha1_base64": "6/asa+DzvY/btF1e94WWtBCU4LM="
     },
     {
      "id": "India_Himachal Pradesh",
@@ -6448,8 +6448,8 @@
       "Himachal Pradesh",
       "India"
      ],
-     "s": 34548880,
-     "sha1_base64": "b+a7F+HW8uNtJRSphutXu+iy1Is="
+     "s": 34440824,
+     "sha1_base64": "UrJeRWNRD9Yr8SGwr1the9n2aJ8="
     },
     {
      "id": "India_Jammu and Kashmir",
@@ -6460,8 +6460,8 @@
       "India",
       "Jammu and Kashmir"
      ],
-     "s": 27281545,
-     "sha1_base64": "cOa3TQn5d7GT8XQHuB/W6AXiKro="
+     "s": 27488297,
+     "sha1_base64": "Foo+AjtLf0oB0ZF4R64hixyB/yI="
     },
     {
      "id": "India_Chandigarh",
@@ -6472,8 +6472,8 @@
       "India",
       "Union Territory of Chand\u012bgarh"
      ],
-     "s": 1201585,
-     "sha1_base64": "XpIyfEu+wsnsIoOtWpAl01/7Pgs="
+     "s": 1180833,
+     "sha1_base64": "avpu4ciR3+AenAZs/0UVFJs4Xfg="
     },
     {
      "id": "India_Punjab",
@@ -6484,8 +6484,8 @@
       "India",
       "Punjab"
      ],
-     "s": 44925628,
-     "sha1_base64": "f5eHXtcKhqGQ7GbtmLKJ5mIrU6U="
+     "s": 45095396,
+     "sha1_base64": "ddWfW4HuXSj1Nas/mNjb8rnk26E="
     }
    ]
   },
@@ -6511,8 +6511,8 @@
       "Sulawesi Tengah",
       "Sulawesi Utara"
      ],
-     "s": 248583072,
-     "sha1_base64": "PWUIGYdBbE6GrQwuVORMudiYctE="
+     "s": 248566144,
+     "sha1_base64": "s1iqEQkrklDnoBIrTpUkOxkNOhA="
     },
     {
      "id": "Indonesia_West",
@@ -6534,8 +6534,8 @@
       "Sumatera Selatan",
       "Sumatera Utara"
      ],
-     "s": 215724197,
-     "sha1_base64": "ixi/Drhu5a8yZ6rtyNrw3zEQVv0="
+     "s": 215892885,
+     "sha1_base64": "0ntRPwYTbg+zxy4pBFvdmOkupzw="
     },
     {
      "id": "Indonesia_Jawa Tengah",
@@ -6547,8 +6547,8 @@
       "Indonesia",
       "Jawa Tengah"
      ],
-     "s": 215963106,
-     "sha1_base64": "hyiaMrphfYdZJ10lDJC4gCyU4Ds="
+     "s": 213990570,
+     "sha1_base64": "Rrz5VfJWRlMKz5RYciNOFLriqGc="
     },
     {
      "id": "Indonesia_Jawa Barat",
@@ -6561,8 +6561,8 @@
       "Indonesia",
       "Jawa Barat"
      ],
-     "s": 337156948,
-     "sha1_base64": "jKMQsRd0cjKW4Xag6Rj8tfrXIrI="
+     "s": 336865468,
+     "sha1_base64": "20k2A1HlgWlq8Cf0AV54iFLh5qU="
     },
     {
      "id": "Indonesia_Nusa Tenggara",
@@ -6577,8 +6577,8 @@
       "Nusa Tenggara Barat",
       "Nusa Tenggara Timur"
      ],
-     "s": 150867352,
-     "sha1_base64": "23eRBPIudmVzOgrgxkqlDjA9fqM="
+     "s": 150607528,
+     "sha1_base64": "qYxCEARcqiO9W4QoXv2EE+uF/WM="
     },
     {
      "id": "Indonesia_Jawa Timur",
@@ -6589,8 +6589,8 @@
       "Indonesia",
       "Jawa Timur"
      ],
-     "s": 198290226,
-     "sha1_base64": "dMhg+sotzjM0kx2UqvuifazHlIc="
+     "s": 195494866,
+     "sha1_base64": "HU+pbJopaHYSedk/ZQZF/frTvpw="
     },
     {
      "id": "Indonesia_East",
@@ -6604,8 +6604,8 @@
       "Papua Barat",
       "Papua"
      ],
-     "s": 54984643,
-     "sha1_base64": "Lme36aZJ2ut3pRNeRV6PCcXGEww="
+     "s": 54884299,
+     "sha1_base64": "JOjK6baIyZwyF3L7dfaVdSpd3bs="
     }
    ]
   },
@@ -6626,8 +6626,8 @@
       "\u062e\u0631\u0627\u0633\u0627\u0646 \u0634\u0645\u0627\u0644\u06cc\u200e",
       "\u062c\u0645\u0647\u0648\u0631\u06cc \u0627\u0633\u0644\u0627\u0645\u06cc\u200f\u0627\u064a\u0631\u0627\u0646\u200e"
      ],
-     "s": 46373874,
-     "sha1_base64": "gD19c1UlD2T0L5QIkkKuJqPQ/fg="
+     "s": 46009266,
+     "sha1_base64": "rdg5bASNB77fEAooC8eBSlBuL9g="
     },
     {
      "id": "Iran_South",
@@ -6650,8 +6650,8 @@
       "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e",
       "\u200f\u0647\u0631\u0645\u0632\u06af\u0627\u0646\u200e"
      ],
-     "s": 100421299,
-     "sha1_base64": "n2I8mCmtA6GC6TEgILE66izsmCc="
+     "s": 100169316,
+     "sha1_base64": "q95UTmVWe+8dWcfszWu0ou1h2ds="
     },
     {
      "id": "Iran_North",
@@ -6675,8 +6675,8 @@
       "\u06a9\u0631\u0645\u0627\u0646\u0634\u0627\u0647\u200e",
       "\u0622\u0630\u0631\u0628\u0627\u06cc\u062c\u0627\u0646 \u0634\u0631\u0642\u06cc"
      ],
-     "s": 101803579,
-     "sha1_base64": "bhler1LcidkdRFKZvLZouVsdii4="
+     "s": 100890923,
+     "sha1_base64": "4+EwArqIVWDs2Hg68DibsDyMNOs="
     }
    ]
   },
@@ -6701,8 +6701,8 @@
       "\u0627\u0644\u0623\u0646\u0628\u0627\u0631",
       "\u0627\u0644\u0633\u0644\u064a\u0645\u0627\u0646\u064a\u0629"
      ],
-     "s": 69192184,
-     "sha1_base64": "vA9yT9/Exkq92rf8TQEsCGTkIjs="
+     "s": 69108408,
+     "sha1_base64": "h8CYxTS3wQ2bf4484YZCwDlE1GM="
     },
     {
      "id": "Iraq_South",
@@ -6725,8 +6725,8 @@
       "\u0627\u0644\u0623\u0646\u0628\u0627\u0631",
       "\u0627\u0644\u0642\u0627\u062f\u0633\u064a\u0629"
      ],
-     "s": 55877092,
-     "sha1_base64": "x8+MROOyck+UOtO21ImG+TWym+U="
+     "s": 55042012,
+     "sha1_base64": "yb8TY1SyzBJ8AY1ajBsIEz6dk8w="
     }
    ]
   },
@@ -6740,8 +6740,8 @@
     "Scotland",
     "United Kingdom"
    ],
-   "s": 5214985,
-   "sha1_base64": "sW/nUpLUxdsIpbFNwYNhG6Dftk8="
+   "s": 5350664,
+   "sha1_base64": "a0Vji3aF+WjUe+/QB3m+qzsjO5o="
   },
   {
    "id": "Israel Region",
@@ -6756,8 +6756,8 @@
       "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd",
       "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc"
      ],
-     "s": 8222555,
-     "sha1_base64": "dxhV3HcgoWoS7W+1MbOqzd0cjmY="
+     "s": 8458899,
+     "sha1_base64": "4Sg9Qf7duW4hsOVYIY/U+68Aczk="
     },
     {
      "id": "Israel",
@@ -6774,8 +6774,8 @@
       "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd",
       "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc"
      ],
-     "s": 89581436,
-     "sha1_base64": "4zRFiirXGys8FEaj9Cy4I+uy0TA="
+     "s": 89514628,
+     "sha1_base64": "mFupckrJ43199Vk1G0qpxZZqz08="
     }
    ]
   },
@@ -6791,8 +6791,8 @@
       "Abruzzo",
       "Italia"
      ],
-     "s": 52735223,
-     "sha1_base64": "YnWFCVRtnZQ0f77Rzcqzep4VW5s="
+     "s": 51156271,
+     "sha1_base64": "8xabquYHWOn2wufkiPclgm+4iDQ="
     },
     {
      "id": "Italy_Aosta Valley",
@@ -6803,8 +6803,8 @@
       "Italia",
       "Valle d'Aosta/Vall\u00e9e d'Aoste"
      ],
-     "s": 20016705,
-     "sha1_base64": "v4bgCCkUBNBi4IA10elghoeqTp4="
+     "s": 20049233,
+     "sha1_base64": "poOzdvgzkczhPOPXop3A+iP6ZU8="
     },
     {
      "id": "Italy_Apulia",
@@ -6820,8 +6820,8 @@
       "Italia",
       "Puglia"
      ],
-     "s": 96813073,
-     "sha1_base64": "oNf8KFRwcW7gSiitWMU5EWe5W6k="
+     "s": 96908281,
+     "sha1_base64": "Ii4EA3Re2td42qQehbdnWKVkaXU="
     },
     {
      "id": "Italy_Basilicata",
@@ -6832,8 +6832,8 @@
       "Basilicata",
       "Italia"
      ],
-     "s": 35442433,
-     "sha1_base64": "aZj+hPFUo8ubiYIiLBzseKfFV1A="
+     "s": 35151713,
+     "sha1_base64": "NKb4QQUFMd9AdMD+KUAM02LQumM="
     },
     {
      "id": "Italy_Calabria",
@@ -6846,8 +6846,8 @@
       "Isola di Dino",
       "Italia"
      ],
-     "s": 35497803,
-     "sha1_base64": "BkwxcEBCfu0Ej0bUaar7J5AL8fo="
+     "s": 35344483,
+     "sha1_base64": "+iSowfQxFSfZrf0W1u58PI9wKmM="
     },
     {
      "id": "Italy_Campania",
@@ -6864,8 +6864,8 @@
       "La Castelluccia",
       "Scoglio Rovigliano"
      ],
-     "s": 73538281,
-     "sha1_base64": "5mikye8LlGgqNS55eqIBh7g8w44="
+     "s": 73402697,
+     "sha1_base64": "Qibe0HgngbITmW3qA/dXDPLGjyU="
     },
     {
      "id": "Italy_Emilia",
@@ -6879,8 +6879,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 32620396,
-       "sha1_base64": "4mmANcapViV5cdvrIM4wgUGHgQ4="
+       "s": 32537244,
+       "sha1_base64": "rKuWxprXxlJRF0fGhojgRw+ACkU="
       },
       {
        "id": "Italy_Emilia-Romagna_Ferrara",
@@ -6891,8 +6891,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 13345984,
-       "sha1_base64": "Z/y6D81suc5nA7ajRMDKrumHdqQ="
+       "s": 13360296,
+       "sha1_base64": "2TULffoHnxw5+pU7fN052HTcaos="
       },
       {
        "id": "Italy_Emilia-Romagna_Forli-Cesena",
@@ -6903,8 +6903,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 17839504,
-       "sha1_base64": "ekqrL3VoIz8AbbTgepfIeWM9SjU="
+       "s": 18093784,
+       "sha1_base64": "EfN5sUy0tjUlH9C4aLhjF+nuRBI="
       },
       {
        "id": "Italy_Emilia-Romagna_Modena",
@@ -6915,8 +6915,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 26569555,
-       "sha1_base64": "9ghz1xvbP6INZGKqwfDuVbrjkRc="
+       "s": 26435403,
+       "sha1_base64": "EK6vrDgh2BAjDLf2ihaO4h6aVSw="
       },
       {
        "id": "Italy_Emilia-Romagna_Parma",
@@ -6927,8 +6927,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 21769626,
-       "sha1_base64": "BEVbsf+dltAteq9VYhRtzda3DX4="
+       "s": 21729826,
+       "sha1_base64": "Fncrz393BisXBvVcFMfYs0dVEK4="
       },
       {
        "id": "Italy_Emilia-Romagna_Piacenza",
@@ -6939,8 +6939,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 14448520,
-       "sha1_base64": "YuXYF0R7rdZDxSjo7RUa6yk7/1I="
+       "s": 14469960,
+       "sha1_base64": "rmCGkoxzvlpzklardR5QqvUikn8="
       },
       {
        "id": "Italy_Emilia-Romagna_Ravenna",
@@ -6951,8 +6951,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 15011167,
-       "sha1_base64": "hJpLQUtqADHfWXKCJj9ssmHkKVE="
+       "s": 15225767,
+       "sha1_base64": "m8MGNftoje16SMqRoyfeNMw/pxY="
       },
       {
        "id": "Italy_Emilia-Romagna_Reggio Emilia",
@@ -6963,8 +6963,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 19286722,
-       "sha1_base64": "tvHZ5DHRg5PMb4pfGl2tBzj7HgM="
+       "s": 19353426,
+       "sha1_base64": "0RAAuyQwuR3xKFiHFr5rWl5hwkA="
       },
       {
        "id": "Italy_Emilia-Romagna_Rimini",
@@ -6975,8 +6975,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 10401270,
-       "sha1_base64": "/iW/n/WiwIcJp8hs/6te6YA95wE="
+       "s": 10429590,
+       "sha1_base64": "Zrt+q4qSJKLEjFRis3as/MBGAgo="
       }
      ]
     },
@@ -6992,8 +6992,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 7199332,
-       "sha1_base64": "vVRPN5XdwJxHr/1KGBI99XCXncU="
+       "s": 7219156,
+       "sha1_base64": "Ava8MvuGp+nHhDRZb/bUWuex9YI="
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Pordenone",
@@ -7004,8 +7004,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 22213760,
-       "sha1_base64": "fQLG+aBG68QnCMj/UWfh3rwS0Nk="
+       "s": 22206320,
+       "sha1_base64": "rxRDZg2CPMX6udu0QzPj7G1/4F8="
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Trieste",
@@ -7016,8 +7016,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 7442805,
-       "sha1_base64": "SR0PWldi2T3HhEZlnZzHwtX+Wls="
+       "s": 7540229,
+       "sha1_base64": "eztLjLKvBfOgTZGBmVVXAj5IEig="
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Udine",
@@ -7028,8 +7028,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 47752406,
-       "sha1_base64": "qz+71mAJlsJsVawuT4hpefBpV2g="
+       "s": 47911230,
+       "sha1_base64": "/bi32xI1T55WBPiiazAZZZpcH2A="
       }
      ]
     },
@@ -7051,8 +7051,8 @@
      "country_name_synonyms": [
       "Vatican City"
      ],
-     "s": 98435818,
-     "sha1_base64": "xV4C2IQfmjYoz1fvfaWdvgor5Tw="
+     "s": 97848658,
+     "sha1_base64": "feHBdB5gc4jZTOMGmOCRSJVudc8="
     },
     {
      "id": "Italy_Liguria",
@@ -7063,8 +7063,8 @@
       "Italia",
       "Liguria"
      ],
-     "s": 64227518,
-     "sha1_base64": "091ibAo+hUXOHWXTTbMpYbXNSlo="
+     "s": 64317302,
+     "sha1_base64": "bsNnGmTSvqI+aFLNBYwWLjFP4K0="
     },
     {
      "id": "Italy_Lombardy",
@@ -7078,8 +7078,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 27723060,
-       "sha1_base64": "bQgCuKcJ+ds9q/iD5AWDwfW1qwk="
+       "s": 27603139,
+       "sha1_base64": "i2NLbmMvIQwD5aT+tp1ufdEhPX8="
       },
       {
        "id": "Italy_Lombardy_Brescia",
@@ -7090,8 +7090,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 39238827,
-       "sha1_base64": "MyOepo2GVfcpi/TchpIQPjuPSxw="
+       "s": 38981299,
+       "sha1_base64": "58ZiZcOQZKwMmhBUUPMW/zS9ThU="
       },
       {
        "id": "Italy_Lombardy_Como",
@@ -7102,8 +7102,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 16195619,
-       "sha1_base64": "uFnZB7tn2gDDCI0EwOiAeDIiEZk="
+       "s": 16194379,
+       "sha1_base64": "Zin++qiUmcblV9NF5SWQMa84JlU="
       },
       {
        "id": "Italy_Lombardy_Cremona",
@@ -7114,8 +7114,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 7901870,
-       "sha1_base64": "7dSq8HHBKUaS2w6lWMaCf9c7NxE="
+       "s": 7898502,
+       "sha1_base64": "l/+BLa1BySW6e0x+e+1gU2150AI="
       },
       {
        "id": "Italy_Lombardy_Lecco",
@@ -7126,8 +7126,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 11832713,
-       "sha1_base64": "rxp39R0PB9pI29RZHFY9sFSvA4o="
+       "s": 11774945,
+       "sha1_base64": "zQCl59OM7DyjBuEdx9cKWc2fy5A="
       },
       {
        "id": "Italy_Lombardy_Lodi",
@@ -7138,8 +7138,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 7219843,
-       "sha1_base64": "7mJkg46lztaqRO2aHkgJl+O/9h4="
+       "s": 7225419,
+       "sha1_base64": "Ysecw6cFjZoSGyzHfxaiFef0tEQ="
       },
       {
        "id": "Italy_Lombardy_Mantua",
@@ -7150,8 +7150,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 9071654,
-       "sha1_base64": "PW4UR4SMYc3da+xj+/wsYBfv16Y="
+       "s": 9044334,
+       "sha1_base64": "xJEV4aeokpEaNMro7b3XCnIspdo="
       },
       {
        "id": "Italy_Lombardy_Milan",
@@ -7162,8 +7162,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 38235284,
-       "sha1_base64": "BnxOQ2ML6B/BH839+SavpC4GIuw="
+       "s": 38127196,
+       "sha1_base64": "BjHLWLG2gQd0hq9MKXD2WyFzAow="
       },
       {
        "id": "Italy_Lombardy_Monza and Brianza",
@@ -7174,8 +7174,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 11924703,
-       "sha1_base64": "nP4ckNDH0OkqqlHA1fT3zX/KtBU="
+       "s": 11880711,
+       "sha1_base64": "DeAVrRQo4zDeyRvYPy1jgzcOxYg="
       },
       {
        "id": "Italy_Lombardy_Pavia",
@@ -7186,8 +7186,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 30557348,
-       "sha1_base64": "+npM/ZwTx1jibG3T6U2+hS/WXJ0="
+       "s": 30635452,
+       "sha1_base64": "Mr2fL77yJZO3rntH/KnrFSiAolI="
       },
       {
        "id": "Italy_Lombardy_Sondrio",
@@ -7198,8 +7198,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 18405617,
-       "sha1_base64": "feEihrC9XLOCzMypgtQ6uDuDQyg="
+       "s": 18433801,
+       "sha1_base64": "gjLG8LOVefNc4K0ny7FuM7AHB6I="
       },
       {
        "id": "Italy_Lombardy_Varese",
@@ -7210,8 +7210,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 17294169,
-       "sha1_base64": "G8eOIW+sukqG73J8DNGhnKwYGAE="
+       "s": 17300713,
+       "sha1_base64": "+P3GZF11Etf9ZWYoNwUucY9pHno="
       }
      ]
     },
@@ -7224,8 +7224,8 @@
       "Italia",
       "Marche"
      ],
-     "s": 43248061,
-     "sha1_base64": "AsdcQ57cd34FiQtFzar5obw4wSc="
+     "s": 43093365,
+     "sha1_base64": "QIZDe/G25bdikAjb7Qw0SHEBFCM="
     },
     {
      "id": "Italy_Molise",
@@ -7236,8 +7236,8 @@
       "Italia",
       "Molise"
      ],
-     "s": 13707094,
-     "sha1_base64": "sDdu7Y45FpcjNdKzaQR4WGri2HY="
+     "s": 13959814,
+     "sha1_base64": "R+nLIYycrKmicdlMTqm1bcnNUVc="
     },
     {
      "id": "Italy_Piemont",
@@ -7251,8 +7251,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 24800283,
-       "sha1_base64": "uopOY8ZiqRZmFJRA0nTMNUM6t3A="
+       "s": 24785707,
+       "sha1_base64": "WemyLPw0rzXyKWpGD2fYs6cgpZs="
       },
       {
        "id": "Italy_Piemont_Asti",
@@ -7263,8 +7263,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 13339038,
-       "sha1_base64": "P+LlOrGWsTxy2B3uZFvACJpw4kY="
+       "s": 13296158,
+       "sha1_base64": "Or0KPybDFzQe9Jp+3kEuAefI8fY="
       },
       {
        "id": "Italy_Piemont_Biella",
@@ -7275,8 +7275,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 12782252,
-       "sha1_base64": "1hORgvWcySduoOzb1BUVbkW2BD8="
+       "s": 12812212,
+       "sha1_base64": "ab7nxjYkn1ejSozG3CKk5bADXHw="
       },
       {
        "id": "Italy_Piemont_Cuneo",
@@ -7287,8 +7287,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 52166372,
-       "sha1_base64": "wWuGMTLWk8VVxvVmoZGrngMk+vc="
+       "s": 51954276,
+       "sha1_base64": "3Wx50Pv2KRlhQW+7Phl+9hkCur4="
       },
       {
        "id": "Italy_Piemont_Novara",
@@ -7299,8 +7299,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 12477665,
-       "sha1_base64": "j3H2tSRf/bDz/udWnZPQZdoRxbo="
+       "s": 12439049,
+       "sha1_base64": "QzZtPLE08hktz4sB3h4O5RUTZtc="
       },
       {
        "id": "Italy_Piemont_Torino",
@@ -7311,8 +7311,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 59694198,
-       "sha1_base64": "y76S/UkgliaE0A0oijIwLktq5fc="
+       "s": 59487734,
+       "sha1_base64": "mbHB8n0WRVYXwFp9fgDdaT1DYA8="
       },
       {
        "id": "Italy_Piemont_Verbano-Cusio-Ossola",
@@ -7323,8 +7323,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 17836473,
-       "sha1_base64": "uIPZeKEMUmhgQaCRpokl0HMDDoE="
+       "s": 17889249,
+       "sha1_base64": "UcvMUfPsmxhA03E1aYYwJsKl7M4="
       },
       {
        "id": "Italy_Piemont_Vercelli",
@@ -7335,8 +7335,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 15262968,
-       "sha1_base64": "7d8xxsMDsoVkfMwdG4zFcjVn7xc="
+       "s": 15263536,
+       "sha1_base64": "VGs72fPG7JXfJOQZixzO2+8hq8k="
       }
      ]
     },
@@ -7359,8 +7359,8 @@
       "Sardigna/Sardegna",
       "Scoglio Il Catalano"
      ],
-     "s": 79476851,
-     "sha1_base64": "L8+6YB4Xh8w9gGWpYuJzXcHy3A8="
+     "s": 80468907,
+     "sha1_base64": "z5kCLCbGPt3WJXJ8Cmpznj4KaG4="
     },
     {
      "id": "Italy_Sicily",
@@ -7408,8 +7408,8 @@
       "Scoglio Palumbo",
       "Sicilia"
      ],
-     "s": 91814232,
-     "sha1_base64": "VJYpDDILPa6PZWd5PdakWAfxD7U="
+     "s": 91986136,
+     "sha1_base64": "qSDfqoGyWZg37D+C1IxWXeUW8ec="
     },
     {
      "id": "Italy_Trentino-Alto Adige Sudtirol",
@@ -7420,8 +7420,8 @@
       "Italia",
       "Trentino-Alto Adige/S\u00fcdtirol"
      ],
-     "s": 89567932,
-     "sha1_base64": "6GKLIfc7B4Pj6zH+Yzh3rBlBkAQ="
+     "s": 89361140,
+     "sha1_base64": "GHCq7RN7jqR+GWo+oukZvCKrAuI="
     },
     {
      "id": "Italy_Tuscany_Grosseto",
@@ -7438,8 +7438,8 @@
       "Le Scole",
       "Toscana"
      ],
-     "s": 57426302,
-     "sha1_base64": "mZ6Fu1oKOQG/93I+P8DR2abgYaw="
+     "s": 57193710,
+     "sha1_base64": "+iT3n573vJpNM6srF3GVr/ehd38="
     },
     {
      "id": "Italy_Tuscany_Massa e Carrara",
@@ -7457,8 +7457,8 @@
       "Scoglio d'Africa",
       "Toscana"
      ],
-     "s": 107377293,
-     "sha1_base64": "GYJJSR4QJP0PVzvfgTlt53MtZD4="
+     "s": 107056237,
+     "sha1_base64": "SH07+JVqhSH4WkSO6cezTf+z3Wo="
     },
     {
      "id": "Italy_Umbria",
@@ -7469,8 +7469,8 @@
       "Italia",
       "Umbria"
      ],
-     "s": 34276412,
-     "sha1_base64": "wjHXzOrA8+Eg+lWag/cSxfPKw+0="
+     "s": 34184012,
+     "sha1_base64": "5yK5hO5wpas9EE7iXtBRbg7OP54="
     },
     {
      "id": "Italy_Veneto",
@@ -7484,8 +7484,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 24948482,
-       "sha1_base64": "FEe6/dSM7NmDPneSE5xxA+c9stg="
+       "s": 25132554,
+       "sha1_base64": "qcBfKhfuTuHbboD4fipf2MfFGuc="
       },
       {
        "id": "Italy_Veneto_Padova",
@@ -7496,8 +7496,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 27160065,
-       "sha1_base64": "AGlMM5SiveXdkCgG7aWX1bi9au0="
+       "s": 27058873,
+       "sha1_base64": "qJQmnfkuHBdV9wTSZnPr5PwyjG4="
       },
       {
        "id": "Italy_Veneto_Rovigo",
@@ -7508,8 +7508,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 9549886,
-       "sha1_base64": "WlAdRQHozXhZVlk5c/Fk72n7w3Q="
+       "s": 9607014,
+       "sha1_base64": "Vu5BeK8b+33ST08sYeMB4mJ6Jgo="
       },
       {
        "id": "Italy_Veneto_Treviso",
@@ -7520,8 +7520,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 34909468,
-       "sha1_base64": "xbBe+QvbTDSRfa+EsFaGyu63AIU="
+       "s": 34857372,
+       "sha1_base64": "PoF7uNiyFdY46kbZu4r4HuGC+pg="
       },
       {
        "id": "Italy_Veneto_Venezia",
@@ -7532,8 +7532,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 26800851,
-       "sha1_base64": "7LUaY9Sj/c4KYp8izYgp9MU/AGY="
+       "s": 26701803,
+       "sha1_base64": "1fBNrj+UtChrfAtEuB3gr2CVpqw="
       },
       {
        "id": "Italy_Veneto_Verona",
@@ -7544,8 +7544,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 32466860,
-       "sha1_base64": "w1Dr1zatQU63BpKXR/ieE9XvNDM="
+       "s": 32414420,
+       "sha1_base64": "YWWZ2Y9j5V0b/f00el5UII9zrfA="
       },
       {
        "id": "Italy_Veneto_Vicenza",
@@ -7556,8 +7556,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 34925420,
-       "sha1_base64": "KxRnXvRf0XpOfG0S3U+uj6AdCLw="
+       "s": 34910436,
+       "sha1_base64": "d+4Mtcfx+8nUrU1DkLInV/L/VHY="
       }
      ]
     }
@@ -7571,8 +7571,8 @@
    "affiliations": [
     "Jamaica"
    ],
-   "s": 34372055,
-   "sha1_base64": "ZLZl6w4rH8HghDhVoTCSkVLOPbI="
+   "s": 34433639,
+   "sha1_base64": "XBYdqgDULi739M0fzw41fakWhJE="
   },
   {
    "id": "Japan",
@@ -7590,8 +7590,8 @@
         "\u4e09\u91cd\u770c",
         "\u611b\u77e5\u770c"
        ],
-       "s": 50170483,
-       "sha1_base64": "u424LCZDGxUBJZWnc9NGdN/AqKs="
+       "s": 49816034,
+       "sha1_base64": "Qks6XOfJ48qtBYaRkjJPoANNens="
       },
       {
        "id": "Japan_Chubu Region_Aichi_Toyohashi",
@@ -7602,8 +7602,8 @@
         "\u65e5\u672c",
         "\u611b\u77e5\u770c"
        ],
-       "s": 19914488,
-       "sha1_base64": "Yyb/Oj7PuwFbGF0looDLma3CSW8="
+       "s": 19813216,
+       "sha1_base64": "4H1Kro0fXoTV/k787ZhtBHWr9CM="
       },
       {
        "id": "Japan_Chubu Region_Fukui",
@@ -7614,8 +7614,8 @@
         "\u65e5\u672c",
         "\u798f\u4e95\u770c"
        ],
-       "s": 23318497,
-       "sha1_base64": "e8IAOq8ajv7KPQLZuO9uFh10f2s="
+       "s": 23421553,
+       "sha1_base64": "BlrZ+uOaEFvNOWY3R7x0DSOKh4I="
       },
       {
        "id": "Japan_Chubu Region_Gifu",
@@ -7626,8 +7626,8 @@
         "\u65e5\u672c",
         "\u5c90\u961c\u770c"
        ],
-       "s": 28762273,
-       "sha1_base64": "7KUg3IQaZXYnd0uWXnqClLn6bew="
+       "s": 28078001,
+       "sha1_base64": "h0/nsIpu2zjUxej6lQaeeTsPJSY="
       },
       {
        "id": "Japan_Chubu Region_Ishikawa",
@@ -7638,8 +7638,8 @@
         "\u65e5\u672c",
         "\u77f3\u5ddd\u770c"
        ],
-       "s": 19647647,
-       "sha1_base64": "skI678VTsgpSip4CephiEYUbyI0="
+       "s": 19811415,
+       "sha1_base64": "9N0h6nIvCsrqiNDhIkT0dklQxi4="
       },
       {
        "id": "Japan_Chubu Region_Nagano",
@@ -7650,8 +7650,8 @@
         "\u9577\u91ce\u770c",
         "\u65e5\u672c"
        ],
-       "s": 42384276,
-       "sha1_base64": "hjn7sxEsDqKloO40hoQuVmuZMxg="
+       "s": 42249180,
+       "sha1_base64": "Az+Dnj9ewQNDKKsJtOAhbCVIoAw="
       },
       {
        "id": "Japan_Chubu Region_Niigata",
@@ -7663,8 +7663,8 @@
         "\u65b0\u6f5f\u770c",
         "\u77f3\u5ddd\u770c"
        ],
-       "s": 36913602,
-       "sha1_base64": "ea3Bfg+J+cGUBOPaNRjiXghYeHA="
+       "s": 36331402,
+       "sha1_base64": "JetxqraZl//40dMHXHJLG4Xcsb4="
       },
       {
        "id": "Japan_Chubu Region_Shizuoka",
@@ -7675,8 +7675,8 @@
         "\u9759\u5ca1\u770c",
         "\u65e5\u672c"
        ],
-       "s": 90126022,
-       "sha1_base64": "6kiI0/LtbdeBkR7NoTAiCUdnMl4="
+       "s": 90174310,
+       "sha1_base64": "zDDH46RJiftO/RL6vAz9XXsZPV0="
       },
       {
        "id": "Japan_Chubu Region_Toyama",
@@ -7688,8 +7688,8 @@
         "\u5bcc\u5c71\u770c",
         "\u77f3\u5ddd\u770c"
        ],
-       "s": 22439151,
-       "sha1_base64": "DEqSKwUqZPQmk5Pdr3N4YSgnAXc="
+       "s": 22429287,
+       "sha1_base64": "YGhWiTcXSgoO7Gg3pIHbWqyC9NQ="
       },
       {
        "id": "Japan_Chubu Region_Yamanashi",
@@ -7700,8 +7700,8 @@
         "\u65e5\u672c",
         "\u5c71\u68a8\u770c"
        ],
-       "s": 22708200,
-       "sha1_base64": "iuYjuXLzdE4JapjW3bym4sECwtw="
+       "s": 22790128,
+       "sha1_base64": "yG2p+HU/5jnHhLTYTEMSS5TfOoQ="
       }
      ]
     },
@@ -7717,8 +7717,8 @@
         "\u65e5\u672c",
         "\u5e83\u5cf6\u770c"
        ],
-       "s": 51733786,
-       "sha1_base64": "FC9wwvi8BMaPN7rqMnG6ie1MWgg="
+       "s": 51562698,
+       "sha1_base64": "sMaR6MdG+oEw9xs4iyjwxy4Hid0="
       },
       {
        "id": "Japan_Chugoku Region_Okayama",
@@ -7729,8 +7729,8 @@
         "\u65e5\u672c",
         "\u5ca1\u5c71\u770c"
        ],
-       "s": 35334514,
-       "sha1_base64": "xyVN4DAejInoupxqg+MCPrNrniQ="
+       "s": 35317986,
+       "sha1_base64": "mJvHpxV+DGMl0Bjvc9ula79grY0="
       },
       {
        "id": "Japan_Chugoku Region_Shimane",
@@ -7741,8 +7741,8 @@
         "\u65e5\u672c",
         "\u5cf6\u6839\u770c"
        ],
-       "s": 23921225,
-       "sha1_base64": "+NjedqLD7Jk9xselYNgI80CMjVQ="
+       "s": 24069929,
+       "sha1_base64": "of7U233F5g+lOFn6CKBmTGnTNjk="
       },
       {
        "id": "Japan_Chugoku Region_Tottori",
@@ -7753,8 +7753,8 @@
         "\u9ce5\u53d6\u770c",
         "\u65e5\u672c"
        ],
-       "s": 24420008,
-       "sha1_base64": "kov3AEDPMQQR8lxhWx/I5PXmXk0="
+       "s": 24607952,
+       "sha1_base64": "ayRkKGQTQRfuI3BR0fadFNAiQcc="
       },
       {
        "id": "Japan_Chugoku Region_Yamaguchi",
@@ -7765,8 +7765,8 @@
         "\u65e5\u672c",
         "\u5c71\u53e3\u770c"
        ],
-       "s": 28444962,
-       "sha1_base64": "9q3PGOXfT4uYAGpDlwiwJlXpavM="
+       "s": 28538914,
+       "sha1_base64": "2z1S7Y4WtqWyyq/OztGykN0FJvM="
       }
      ]
     },
@@ -7782,8 +7782,8 @@
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
        ],
-       "s": 34303817,
-       "sha1_base64": "7EXbGcWlPpGNmAJxY/20+2sBCEw="
+       "s": 34556409,
+       "sha1_base64": "sY4BEd5Y/xqYlva90GS3QjabE/I="
       },
       {
        "id": "Japan_Hokkaido Region_North",
@@ -7794,8 +7794,8 @@
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
        ],
-       "s": 46517662,
-       "sha1_base64": "vEerFbX+83YG5Ta3Uz41JvBXiA0="
+       "s": 46846038,
+       "sha1_base64": "T7+zp/iyJ8Sk5TPezJ6qN4C8nx4="
       },
       {
        "id": "Japan_Hokkaido Region_West",
@@ -7806,8 +7806,8 @@
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
        ],
-       "s": 31855448,
-       "sha1_base64": "Om87KvH86SKa2wWHKnUzPMHbFSQ="
+       "s": 31985936,
+       "sha1_base64": "HrtrbErmVcFkBvAnd2+oY4kZ+KE="
       },
       {
        "id": "Japan_Hokkaido Region_Sapporo",
@@ -7818,8 +7818,8 @@
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
        ],
-       "s": 61832445,
-       "sha1_base64": "ep5VPbTrDRKPBrSGyPkJIZ6cCjA="
+       "s": 61748213,
+       "sha1_base64": "l9UW13x2kH37Kr/fdbKbLYpbEkk="
       }
      ]
     },
@@ -7837,8 +7837,8 @@
         "\u6771\u4eac\u90fd",
         "\u795e\u5948\u5ddd\u770c"
        ],
-       "s": 51160791,
-       "sha1_base64": "s3SZKXT+PY1zziNm3a1z4L0q6pc="
+       "s": 51089287,
+       "sha1_base64": "OD2EVTMzV6NkLFUXiJraXrhAU5I="
       },
       {
        "id": "Japan_Kanto_Gunma",
@@ -7849,8 +7849,8 @@
         "\u65e5\u672c",
         "\u7fa4\u99ac\u770c"
        ],
-       "s": 28215009,
-       "sha1_base64": "zlEm43GUJlsarLa6AZgNCyQK/n4="
+       "s": 28188281,
+       "sha1_base64": "iaDNc+uNyg5CALuwnqES6Ve9fiE="
       },
       {
        "id": "Japan_Kanto_Ibaraki",
@@ -7863,8 +7863,8 @@
         "\u5343\u8449\u770c",
         "\u798f\u5cf6\u770c"
        ],
-       "s": 30822375,
-       "sha1_base64": "0m7VyPl2Mxz4zGt923YOU7VgOnw="
+       "s": 31020495,
+       "sha1_base64": "6O/srGFnnfWPrarJ/1JUrwG4DJU="
       },
       {
        "id": "Japan_Kanto_Kanagawa",
@@ -7878,8 +7878,8 @@
         "\u6771\u4eac\u90fd",
         "\u795e\u5948\u5ddd\u770c"
        ],
-       "s": 75215579,
-       "sha1_base64": "41iS1ogIe/rNNPGKjMnyUM0oPzY="
+       "s": 74881755,
+       "sha1_base64": "VgurrT18GvhJl1A6Wnt2HKonrf0="
       },
       {
        "id": "Japan_Kanto_Saitama",
@@ -7890,8 +7890,8 @@
         "\u65e5\u672c",
         "\u57fc\u7389\u770c"
        ],
-       "s": 53568451,
-       "sha1_base64": "nfO2P4TP8SQGC3BhHsBGrcdK5xY="
+       "s": 52795315,
+       "sha1_base64": "Kfz2ZYMQZp8sLjNHeb0hozc/USI="
       },
       {
        "id": "Japan_Kanto_Tochigi",
@@ -7902,8 +7902,8 @@
         "\u65e5\u672c",
         "\u6803\u6728\u770c"
        ],
-       "s": 33660906,
-       "sha1_base64": "uSwBc9WEvga9EDUxXt+hq3sYd40="
+       "s": 33648058,
+       "sha1_base64": "b20KNRfh27LCG1b/oGaCZ6MIuOo="
       },
       {
        "id": "Japan_Kanto_Tokyo",
@@ -7915,8 +7915,8 @@
         "\u65e5\u672c",
         "\u6771\u4eac\u90fd"
        ],
-       "s": 98230109,
-       "sha1_base64": "YpHF1zAnJAOWBGVcN1Sry1VsQig="
+       "s": 98061973,
+       "sha1_base64": "qwSpkWjBh1CLZVaYhU9fmGYKHgQ="
       }
      ]
     },
@@ -7933,8 +7933,8 @@
         "\u4eac\u90fd\u5e9c",
         "\u6ecb\u8cc0\u770c"
        ],
-       "s": 67917854,
-       "sha1_base64": "II93SU0Cg+9FE+t0ZsQ718kC6vc="
+       "s": 67596350,
+       "sha1_base64": "Kw1KRl40H3xjo1mqni2V6RJJE9w="
       },
       {
        "id": "Japan_Kinki Region_Mie",
@@ -7946,8 +7946,8 @@
         "\u4e09\u91cd\u770c",
         "\u611b\u77e5\u770c"
        ],
-       "s": 29366754,
-       "sha1_base64": "z7LezlOUPkUwlra25H1jUkHIqcU="
+       "s": 29430434,
+       "sha1_base64": "DNe4PoYQV2Qft3ZZyrLf5SOg4Oo="
       },
       {
        "id": "Japan_Kinki Region_Nara",
@@ -7959,8 +7959,8 @@
         "\u5948\u826f\u770c",
         "\u548c\u6b4c\u5c71\u770c"
        ],
-       "s": 24697256,
-       "sha1_base64": "uJXcMinPXmTQKsLmw2d8TuFp4+4="
+       "s": 24685560,
+       "sha1_base64": "v7KcSeendim7rtmH7YFL5+dwpYc="
       },
       {
        "id": "Japan_Kinki Region_Osaka_Osaka",
@@ -7972,8 +7972,8 @@
         "\u5175\u5eab\u770c",
         "\u5927\u962a\u5e9c"
        ],
-       "s": 67992274,
-       "sha1_base64": "EmZYzBYo7oYssSeiFKwLfkio06U="
+       "s": 67574794,
+       "sha1_base64": "qqD4yPVi6AbU7DB8tZ1rOqUnE4c="
       },
       {
        "id": "Japan_Kinki Region_Osaka_West",
@@ -7984,8 +7984,8 @@
         "\u65e5\u672c",
         "\u5175\u5eab\u770c"
        ],
-       "s": 53326765,
-       "sha1_base64": "x7g3BeuQPnwO9iMgb+idrU/gX18="
+       "s": 53076085,
+       "sha1_base64": "fl63koZcl4Mrd7XYNB13D1mJt0U="
       },
       {
        "id": "Japan_Kinki Region_Wakayama",
@@ -7996,8 +7996,8 @@
         "\u65e5\u672c",
         "\u548c\u6b4c\u5c71\u770c"
        ],
-       "s": 18882032,
-       "sha1_base64": "g7+MEPHlsdclHyXKP6nshKE99aA="
+       "s": 19073664,
+       "sha1_base64": "IlKTy2YrAS4TIxlAdwUHQv0KgyU="
       }
      ]
     },
@@ -8013,8 +8013,8 @@
         "\u65e5\u672c",
         "\u798f\u5ca1\u770c"
        ],
-       "s": 44679699,
-       "sha1_base64": "AlK/1XS/3sOmsvcKORactqpJL+8="
+       "s": 44767587,
+       "sha1_base64": "B4h9uh8JNzrdvBF9CPIzp6tLFr8="
       },
       {
        "id": "Japan_Kyushu Region_Kagoshima",
@@ -8025,8 +8025,8 @@
         "\u65e5\u672c",
         "\u9e7f\u5150\u5cf6\u770c"
        ],
-       "s": 28037514,
-       "sha1_base64": "r2MlmmvDmRq20mXGRyTvPPkmltE="
+       "s": 28111578,
+       "sha1_base64": "9ANviKJObSDrPXOe4UrcFiSCti4="
       },
       {
        "id": "Japan_Kyushu Region_Kumamoto",
@@ -8037,8 +8037,8 @@
         "\u65e5\u672c",
         "\u718a\u672c\u770c"
        ],
-       "s": 35673266,
-       "sha1_base64": "Bwaf3+C05v3SESpXOg/fHlhs0Y0="
+       "s": 35678162,
+       "sha1_base64": "YEmztvqSnsw7i49pWKkaNx5SNGg="
       },
       {
        "id": "Japan_Kyushu Region_Miyazaki",
@@ -8049,8 +8049,8 @@
         "\u65e5\u672c",
         "\u5bae\u5d0e\u770c"
        ],
-       "s": 18286961,
-       "sha1_base64": "cGcNKTs/qArstFn6M4C7ung77Hc="
+       "s": 18460569,
+       "sha1_base64": "sdducAXneedceFO8dvd8hu9f7B0="
       },
       {
        "id": "Japan_Kyushu Region_Nagasaki",
@@ -8061,8 +8061,8 @@
         "\u9577\u5d0e\u770c",
         "\u65e5\u672c"
        ],
-       "s": 27869489,
-       "sha1_base64": "z1hEX76ufV7Jk4n8ddfW00F3Dms="
+       "s": 28177257,
+       "sha1_base64": "5qmnoj2x1JMPfmNAWrV/0AFfuNE="
       },
       {
        "id": "Japan_Kyushu Region_Oita",
@@ -8073,8 +8073,8 @@
         "\u65e5\u672c",
         "\u5927\u5206\u770c"
        ],
-       "s": 25410602,
-       "sha1_base64": "VOBgKe1TMHt9Ndb1ydIybDAYcPQ="
+       "s": 25582754,
+       "sha1_base64": "vNk9JDz2S2sRcA5AVUnz63ZRgzA="
       },
       {
        "id": "Japan_Kyushu Region_Okinawa",
@@ -8085,8 +8085,8 @@
         "\u65e5\u672c",
         "\u6c96\u7e04\u770c"
        ],
-       "s": 18387932,
-       "sha1_base64": "S0kr3TgV40899zL3JS/Q2FMKUz4="
+       "s": 18652388,
+       "sha1_base64": "hvV6Ymrf2GTv1jJYhcPrzZ4LLjw="
       },
       {
        "id": "Japan_Kyushu Region_Saga",
@@ -8097,8 +8097,8 @@
         "\u65e5\u672c",
         "\u4f50\u8cc0\u770c"
        ],
-       "s": 24891080,
-       "sha1_base64": "pNo1tS8Ow9YJaD+bzVsO+M8gpew="
+       "s": 24202008,
+       "sha1_base64": "+3z9ooFtVpk3UIiHAKiCrPCVrSQ="
       }
      ]
     },
@@ -8114,8 +8114,8 @@
         "\u65e5\u672c",
         "\u611b\u5a9b\u770c"
        ],
-       "s": 31537136,
-       "sha1_base64": "BsKVLYTEtsBUh9jazk4goJdOyAQ="
+       "s": 31509656,
+       "sha1_base64": "HYThyeYclsXb1x+UBXvjcQNy/yA="
       },
       {
        "id": "Japan_Shikoku Region_Kagawa",
@@ -8126,8 +8126,8 @@
         "\u9999\u5ddd\u770c",
         "\u65e5\u672c"
        ],
-       "s": 13507519,
-       "sha1_base64": "KCe9RI7Gnar67Okl0Elh7W7dNqE="
+       "s": 13384503,
+       "sha1_base64": "BdsshBytNk0FpjYpD9lCZ5nfH8g="
       },
       {
        "id": "Japan_Shikoku Region_Kochi",
@@ -8138,8 +8138,8 @@
         "\u9ad8\u77e5\u770c",
         "\u65e5\u672c"
        ],
-       "s": 19482090,
-       "sha1_base64": "j1y1fJEXZPimSDIQlHP0HJt/6pI="
+       "s": 19613866,
+       "sha1_base64": "ASPH+C0wMV9GKRlreRTQgoZGddY="
       },
       {
        "id": "Japan_Shikoku Region_Tokushima",
@@ -8150,8 +8150,8 @@
         "\u65e5\u672c",
         "\u5fb3\u5cf6\u770c"
        ],
-       "s": 21099416,
-       "sha1_base64": "Icm0kLCFEZlfRe+aEqARcKEnbJQ="
+       "s": 21271400,
+       "sha1_base64": "IZGetgApU23PLs+1HO3deNhur3U="
       }
      ]
     },
@@ -8167,8 +8167,8 @@
         "\u65e5\u672c",
         "\u79cb\u7530\u770c"
        ],
-       "s": 41042515,
-       "sha1_base64": "NzZN7Ueq8Vbhu2YDYYKeAAQBqYo="
+       "s": 41089699,
+       "sha1_base64": "qoZAMX5TRbqLEz16wLBAYJo5luc="
       },
       {
        "id": "Japan_Tohoku_Aomori",
@@ -8179,8 +8179,8 @@
         "\u9752\u68ee\u770c",
         "\u65e5\u672c"
        ],
-       "s": 25305690,
-       "sha1_base64": "/NgYqlhAPgcgD2VNVRgpveIOWDA="
+       "s": 25298650,
+       "sha1_base64": "OfUmydXdRPxiCHGzn2VNa1I/Hs8="
       },
       {
        "id": "Japan_Tohoku_Fukushima",
@@ -8191,8 +8191,8 @@
         "\u65e5\u672c",
         "\u798f\u5cf6\u770c"
        ],
-       "s": 51236700,
-       "sha1_base64": "6bwEkujFV0ByCBMNxxVjWYwveTY="
+       "s": 51131228,
+       "sha1_base64": "9kf9uRGLP89Xml3DvbzMldZKfTs="
       },
       {
        "id": "Japan_Tohoku_Iwate",
@@ -8203,8 +8203,8 @@
         "\u65e5\u672c",
         "\u5ca9\u624b\u770c"
        ],
-       "s": 32704899,
-       "sha1_base64": "vkJjr82Fpay10G2FPoKBssTTkOw="
+       "s": 32794651,
+       "sha1_base64": "ur83bFYPnU5CRZJEUeULrqWjQ2k="
       },
       {
        "id": "Japan_Tohoku_Miyagi",
@@ -8216,8 +8216,8 @@
         "\u5bae\u57ce\u770c",
         "\u798f\u5cf6\u770c"
        ],
-       "s": 60161787,
-       "sha1_base64": "4fPGDbCvt3XCL5bARPrzcgg1whA="
+       "s": 59904475,
+       "sha1_base64": "9dat9XHpGJmTpe9opidz0YTnJqo="
       },
       {
        "id": "Japan_Tohoku_Yamagata",
@@ -8228,8 +8228,8 @@
         "\u65e5\u672c",
         "\u5c71\u5f62\u770c"
        ],
-       "s": 21172361,
-       "sha1_base64": "feFs3TtxIQxk5MrsYvZwzpZnv2s="
+       "s": 21218769,
+       "sha1_base64": "iaa7v6fjftcOB6Cpgh5LUfB1fN4="
       }
      ]
     }
@@ -8252,8 +8252,8 @@
     "Queen's Rock",
     "The Islet"
    ],
-   "s": 2026042,
-   "sha1_base64": "yDn6YpmAAMdc7xT9G/oYF4JlK2M="
+   "s": 2041898,
+   "sha1_base64": "VPa+z2CbdZvxnKFK0U41a1gkBmY="
   },
   {
    "id": "Jordan",
@@ -8275,8 +8275,8 @@
     "Zarqa",
     "\u0627\u0644\u0623\u0631\u062f\u0646"
    ],
-   "s": 39801700,
-   "sha1_base64": "1xpCpliCcTVoL8dEtubAenYaF+E="
+   "s": 40011100,
+   "sha1_base64": "0O4t5QF1RZoUEug+b5dJbx392+Q="
   },
   {
    "id": "Kazakhstan",
@@ -8295,8 +8295,8 @@
       "\u041f\u0430\u0432\u043b\u043e\u0434\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u041a\u0430\u0440\u0430\u0433\u0430\u043d\u0434\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 61710913,
-     "sha1_base64": "9/HNHQBYusaBsQ/YbPuwY2qdPDU="
+     "s": 61352856,
+     "sha1_base64": "+saHAoEbPvZ+SJ+DCub3pJU2eug="
     },
     {
      "id": "Kazakhstan_South",
@@ -8316,8 +8316,8 @@
       "\u041c\u0430\u043d\u0433\u0438\u0441\u0442\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u041a\u044b\u0437\u044b\u043b\u043e\u0440\u0434\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 105577886,
-     "sha1_base64": "GdGcueh7BcHrTKhMQVnk3DIuEPI="
+     "s": 102073957,
+     "sha1_base64": "mExSHYq7OG7BzDG54T/iy/X3Q5g="
     }
    ]
   },
@@ -8376,8 +8376,8 @@
     "Wajir",
     "West Pokot"
    ],
-   "s": 217737720,
-   "sha1_base64": "FsKdthcs40t1u5dZLximgN40Lt4="
+   "s": 215702696,
+   "sha1_base64": "lB1FdMrBdzQ3EomeFMX4fPzs4Ng="
   },
   {
    "id": "Kingdom of Lesotho",
@@ -8390,8 +8390,8 @@
    "country_name_synonyms": [
     "Lesotho"
    ],
-   "s": 87397805,
-   "sha1_base64": "ZdOog2u/hpk1OSbJAnFmT2UDROQ="
+   "s": 87167885,
+   "sha1_base64": "5Qel9iUaAIZuYPAorVGxAuipobw="
   },
   {
    "id": "Kiribati",
@@ -8401,8 +8401,8 @@
    "affiliations": [
     "Kiribati"
    ],
-   "s": 2906353,
-   "sha1_base64": "BlSAJJz9dmAEqbaCGEYbYDnXej4="
+   "s": 2912929,
+   "sha1_base64": "10CR0xA0Uh98wHXQSyayZnjqI1I="
   },
   {
    "id": "Kuwait",
@@ -8418,8 +8418,8 @@
     "\u0627\u0644\u0641\u0631\u0648\u0627\u0646\u064a\u0629",
     "\u200f\u0627\u0644\u0643\u0648\u064a\u062a\u200e"
    ],
-   "s": 19685838,
-   "sha1_base64": "rqzRcPclmjsUL405IrXYnnCeu1E="
+   "s": 19842062,
+   "sha1_base64": "xir32DxiV086nmbAlWJvsp+RRG4="
   },
   {
    "id": "Kyrgyzstan",
@@ -8440,8 +8440,8 @@
     "\u0427\u0443\u0439\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
     "\u041a\u044b\u0440\u0433\u044b\u0437\u0441\u0442\u0430\u043d"
    ],
-   "s": 45337214,
-   "sha1_base64": "UZUNcwr0axmHMlSlW6jjAz7pfeA="
+   "s": 44542878,
+   "sha1_base64": "yLKpl9Q7mk+hQ2OCp+IpTz1D8ko="
   },
   {
    "id": "Laos",
@@ -8468,8 +8468,8 @@
     "\u0eaa\u0eb0\u0eab\u0ea7\u0eb1\u0e99\u0e99\u0eb0\u0ec0\u0e82\u0e94",
     "\u0e99\u0eb0\u0e84\u0ead\u0e99\u0eab\u0ebc\u0ea7\u0e87\u0ea7\u0ebd\u0e87\u0e88\u0eb1\u0e99"
    ],
-   "s": 44083306,
-   "sha1_base64": "2WrHPprBmtrxE4NFVGdHhZAQ4/k="
+   "s": 44265258,
+   "sha1_base64": "2IEzNZ+hX9dAn5NHeXuO+NbI3wA="
   },
   {
    "id": "Latvia",
@@ -8483,8 +8483,8 @@
     "Vidzeme",
     "Zemgale"
    ],
-   "s": 112853374,
-   "sha1_base64": "58xjvPXhv/6NT26tkQsrBCXIBlw="
+   "s": 111846446,
+   "sha1_base64": "RtHaajdOvS5c9GWe+CONsUy/Q7s="
   },
   {
    "id": "Lebanon",
@@ -8519,8 +8519,8 @@
     "\u0642\u0636\u0627\u0621 \u0627\u0644\u0628\u062a\u0631\u0648\u0646",
     "\u0642\u0636\u0627\u0621 \u0627\u0644\u0646\u0628\u0637\u064a\u0629"
    ],
-   "s": 36441795,
-   "sha1_base64": "UgTF8FLcylbMC+r/xFMFUOvKlkQ="
+   "s": 36368315,
+   "sha1_base64": "/yWhqUiU173EwRKmcVBZW+XqL5Q="
   },
   {
    "id": "Liberia",
@@ -8545,8 +8545,8 @@
     "River Gee County",
     "Sinoe County"
    ],
-   "s": 42227690,
-   "sha1_base64": "qpz1nRwSpyoc9rXfhaSK2/MRnjU="
+   "s": 42466314,
+   "sha1_base64": "/PcGuinc1Kq89FD4dXrQoxRcq/I="
   },
   {
    "id": "Libya",
@@ -8578,8 +8578,8 @@
     "\u0627\u0644\u0648\u0627\u062d\u0627\u062a",
     "\u0627\u0644\u0632\u0627\u0648\u064a\u0629"
    ],
-   "s": 52759137,
-   "sha1_base64": "uvZAFF9/3+FJIhOFtbZLomZOzMY="
+   "s": 52863017,
+   "sha1_base64": "ObLBXsVStyEWGg4CLqc2TYSiws0="
   },
   {
    "id": "Liechtenstein",
@@ -8589,8 +8589,8 @@
    "affiliations": [
     "Liechtenstein"
    ],
-   "s": 2781467,
-   "sha1_base64": "E8Sua41TY3CfdgociTdeOjNj80A="
+   "s": 3131979,
+   "sha1_base64": "0S3pk5l4xTo88v95ajJEX/D4D/0="
   },
   {
    "id": "Lithuania",
@@ -8607,8 +8607,8 @@
       "Utenos apskritis",
       "Vilniaus apskritis"
      ],
-     "s": 99452131,
-     "sha1_base64": "0ABA0F6Cn0Pf8owtkaH1dtanLcs="
+     "s": 99243459,
+     "sha1_base64": "uHB/aW9ODsCKSg1YTuRtssZLgKQ="
     },
     {
      "id": "Lithuania_West",
@@ -8624,8 +8624,8 @@
       "Taurag\u0117s apskritis",
       "\u0160iauli\u0173 apskritis"
      ],
-     "s": 87995666,
-     "sha1_base64": "67s5JC38rxXS2ah4NiW4113Xmh4="
+     "s": 88454306,
+     "sha1_base64": "L/xnIN3ugyfbDiPJo8a9QMBTJDA="
     }
    ]
   },
@@ -8637,8 +8637,8 @@
    "affiliations": [
     "L\u00ebtzebuerg"
    ],
-   "s": 38418143,
-   "sha1_base64": "fLK7p+0ho99ZxrpZDXtULcmU+JI="
+   "s": 38625543,
+   "sha1_base64": "S9HEzWrI3Mml0E/x4eMjor8TwZQ="
   },
   {
    "id": "Macedonia",
@@ -8659,8 +8659,8 @@
    "country_name_synonyms": [
     "North Macedonia"
    ],
-   "s": 29378628,
-   "sha1_base64": "1Tg6kIGnevXj383/20ibitcK+Ts="
+   "s": 29493316,
+   "sha1_base64": "iUP/N8F/X44dtUOA5CR5wkMuCV8="
   },
   {
    "id": "Madagascar",
@@ -8674,8 +8674,8 @@
     "R\u00e9gion de Sava",
     "Pr\u00e9fecture de police de Nosy Be"
    ],
-   "s": 305789280,
-   "sha1_base64": "JpPlquPWxQYPoFnUtE6ALZQY8sM="
+   "s": 304605032,
+   "sha1_base64": "WFsI4IRhB/4npdKIzuZNZeik3xg="
   },
   {
    "id": "Malawi",
@@ -8691,8 +8691,8 @@
     "Northern",
     "Southern"
    ],
-   "s": 132435294,
-   "sha1_base64": "dG3vfOWnhVgP3C9nAZCNygJmPfc="
+   "s": 126284910,
+   "sha1_base64": "0ydn48wh8GC++m9g0GTWu/wal48="
   },
   {
    "id": "Malaysia",
@@ -8738,8 +8738,8 @@
     "Sarawak",
     "Singapura"
    ],
-   "s": 158609707,
-   "sha1_base64": "P3W260ZDJTJGdBuMZVVHdJmpRQ0="
+   "s": 157373955,
+   "sha1_base64": "UfcgiSxi3y7CuxKsDwZJJ/uc218="
   },
   {
    "id": "Maldives",
@@ -8758,8 +8758,8 @@
     "Medhu-Uthuru Province",
     "\u078b\u07a8\u0788\u07ac\u0780\u07a8\u0783\u07a7\u0787\u07b0\u0796\u07ad\u078e\u07ac \u0796\u07aa\u0789\u07aa\u0780\u07ab\u0783\u07a8\u0787\u07b0\u0794\u07a7"
    ],
-   "s": 3211964,
-   "sha1_base64": "eiQS1V18WLgw0Kk0kl9/bt19ONg="
+   "s": 3128684,
+   "sha1_base64": "do94eBNRTZZ1iJJ4OUowJ3ibULk="
   },
   {
    "id": "Mali",
@@ -8778,8 +8778,8 @@
     "S\u00e9gou",
     "Tombouctou"
    ],
-   "s": 148524230,
-   "sha1_base64": "hnxYDRpNqin8LuA3KKadpyYecy4="
+   "s": 146275366,
+   "sha1_base64": "Ht3SwKtSLGp1SMAGgYwZvV7gOIg="
   },
   {
    "id": "Malta",
@@ -8796,8 +8796,8 @@
     "Malta",
     "Malta"
    ],
-   "s": 6369836,
-   "sha1_base64": "THm2L6iXlPHgIeRUBGBXzuwfTAA="
+   "s": 6536932,
+   "sha1_base64": "cTWSFXE/zrEBIBvMVgFjbGRCwOI="
   },
   {
    "id": "Marshall Islands",
@@ -8808,8 +8808,8 @@
     "Aolep\u0101n Aor\u014dkin M\u0327aje\u013c",
     "MH"
    ],
-   "s": 1357828,
-   "sha1_base64": "Yu4vx1g4JGFqgTVmSedLfj1z0GM="
+   "s": 1398412,
+   "sha1_base64": "CCZEbYzgGnzhIzuvzTLf+R5R6r0="
   },
   {
    "id": "Mauritania",
@@ -8831,8 +8831,8 @@
     "\u0625\u064a\u0646\u0634\u064a\u0631\u064a",
     "\u063a\u064a\u062f\u064a\u0645\u0627\u063a\u0627"
    ],
-   "s": 28080775,
-   "sha1_base64": "uNl28Ywe7qhDr0v0qFvL2V/3DAA="
+   "s": 28312895,
+   "sha1_base64": "LSUn+V5wVtqHubtpAOxCEIZlTdA="
   },
   {
    "id": "Mauritius",
@@ -8867,8 +8867,8 @@
     "\u00cele Deux Fr\u00e8res",
     "\u00cele Fr\u00e9gate"
    ],
-   "s": 9142459,
-   "sha1_base64": "BbJKUBv906IfrQ2VXLsNevsXzew="
+   "s": 9024731,
+   "sha1_base64": "L5O7pLRRBdDBr6UwuJuCbyp5aSg="
   },
   {
    "id": "Mexico",
@@ -8887,8 +8887,8 @@
       "Colima",
       "Estados Unidos Mexicanos"
      ],
-     "s": 77015048,
-     "sha1_base64": "CygVYrzud0b6Xhp5SXr1FKoF3YA="
+     "s": 77610920,
+     "sha1_base64": "Juknp3pcuZ4WIbaa9qivkImNcKU="
     },
     {
      "id": "Mexico_Central_East",
@@ -8902,8 +8902,8 @@
       "San Luis Potos\u00ed",
       "Tamaulipas"
      ],
-     "s": 58087272,
-     "sha1_base64": "HIufd9gjkRbZ9KrI3+EBfKvtVp4="
+     "s": 58667120,
+     "sha1_base64": "Y7Pw4XCyROrRTIuWxx4c0T3gL1g="
     },
     {
      "id": "Mexico_Central_West",
@@ -8920,8 +8920,8 @@
       "Sinaloa",
       "Zacatecas"
      ],
-     "s": 74829770,
-     "sha1_base64": "o6CzMf2DDSBt4eUMKC1rrGgczTs="
+     "s": 74702657,
+     "sha1_base64": "nj4pTsnAVgyBZi4Bt+wdaXmx3gk="
     },
     {
      "id": "Mexico_East",
@@ -8939,8 +8939,8 @@
       "Veracruz de Ignacio de la Llave",
       "Yucat\u00e1n"
      ],
-     "s": 66526081,
-     "sha1_base64": "TAtnzOGTMXeJMLowj+/pv1MUDO8="
+     "s": 66827025,
+     "sha1_base64": "rQpZ3SWcDWD5Q0La6FA+Q3DNejY="
     },
     {
      "id": "Mexico_Mexico",
@@ -8957,8 +8957,8 @@
       "Tlaxcala",
       "Veracruz de Ignacio de la Llave"
      ],
-     "s": 160818365,
-     "sha1_base64": "L6FIOzkgikUZWa9HPOoZJtevCl8="
+     "s": 160954973,
+     "sha1_base64": "RMI8/hC18L/ohQAkVi/Ksaj6CYs="
     },
     {
      "id": "Mexico_Chihuahua",
@@ -8973,8 +8973,8 @@
       "Nuevo Le\u00f3n",
       "Sinaloa"
      ],
-     "s": 47681949,
-     "sha1_base64": "l4fFeBAxQjIEqJeRxQWjoQ8VTyM="
+     "s": 47598981,
+     "sha1_base64": "c0YbsoEQDMYFackpni49BqDn+mI="
     },
     {
      "id": "Mexico_Sonora",
@@ -8988,8 +8988,8 @@
       "Sinaloa",
       "Sonora"
      ],
-     "s": 43263533,
-     "sha1_base64": "DAXe4EMtO7X/OMsz09ohVcBYEbY="
+     "s": 43590901,
+     "sha1_base64": "TZFgxxNZCAhX74srgFgH0B/zOdE="
     },
     {
      "id": "Mexico_South",
@@ -9005,8 +9005,8 @@
       "Quer\u00e9taro",
       "Veracruz de Ignacio de la Llave"
      ],
-     "s": 144927973,
-     "sha1_base64": "FFxoOVpuvK03f8i8BR27pVJKLmI="
+     "s": 145482845,
+     "sha1_base64": "bHdvhzuDblqFbbSztZOPwD0j/0w="
     }
    ]
   },
@@ -9020,8 +9020,8 @@
     "Moldova",
     "\u041f\u0440\u0438\u0434\u043d\u0435\u0441\u0442\u0440\u043e\u0432\u044c\u0435"
    ],
-   "s": 67382209,
-   "sha1_base64": "ntEu+EXeHgYznWhN1QQ94//uWRE="
+   "s": 67071945,
+   "sha1_base64": "5jizhwA6nmtGlQkEj3befZn1Osc="
   },
   {
    "id": "Monaco",
@@ -9032,8 +9032,8 @@
     "France",
     "Monaco"
    ],
-   "s": 736387,
-   "sha1_base64": "zE6tzxhbLoMtRhaRKButZW0exhc="
+   "s": 793251,
+   "sha1_base64": "Y05EgLRakuHY2+BokaRTlOVhhdk="
   },
   {
    "id": "Mongolia",
@@ -9068,8 +9068,8 @@
     "\u0413\u043e\u0432\u044c\u0441\u04af\u043c\u0431\u044d\u0440",
     "\u04e8\u0432\u04e9\u0440\u0445\u0430\u043d\u0433\u0430\u0439"
    ],
-   "s": 49732914,
-   "sha1_base64": "2d44U4Jis0xSGz/PTDkbwZvHODw="
+   "s": 49991634,
+   "sha1_base64": "IuOLTSJLT4E6Ias5GmfQ26JLEc0="
   },
   {
    "id": "Montenegro",
@@ -9079,8 +9079,8 @@
    "affiliations": [
     "Crna Gora"
    ],
-   "s": 29823243,
-   "sha1_base64": "BrpuMJ/1mZqVMX0BYW5V2oAJCoQ="
+   "s": 29895427,
+   "sha1_base64": "/CrdAKiykvslLml8iB1K1JX3Z+8="
   },
   {
    "id": "Morocco",
@@ -9098,8 +9098,8 @@
       "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
       "Souss-Massa \u2d59\u2d53\u2d59\u2d59-\u2d4e\u2d30\u2d59\u2d59\u2d30 \u0633\u0648\u0633-\u0645\u0627\u0633\u0629"
      ],
-     "s": 12172550,
-     "sha1_base64": "wkeTpxs/WyYkzkBwC1epk2WjqDM="
+     "s": 12450878,
+     "sha1_base64": "ceJwWKgy9oZUB87fsBp8Z8tOji8="
     },
     {
      "id": "Morocco_Southern",
@@ -9115,8 +9115,8 @@
       "Oriental \u2d5c\u2d30\u2d4f\u2d33\u2d4e\u2d53\u2d39\u2d5c \u0627\u0644\u0634\u0631\u0642\u064a\u0629",
       "Souss-Massa \u2d59\u2d53\u2d59\u2d59-\u2d4e\u2d30\u2d59\u2d59\u2d30 \u0633\u0648\u0633-\u0645\u0627\u0633\u0629"
      ],
-     "s": 58470510,
-     "sha1_base64": "+aYFNYZzuq2+GCHlcdpdL6L7UkQ="
+     "s": 58667070,
+     "sha1_base64": "dJLr+G7w3ovmJFu6qsRJd7RcM90="
     },
     {
      "id": "Morocco_Doukkala-Abda",
@@ -9129,8 +9129,8 @@
       "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
       "Marrakech-Safi \u2d4e\u2d55\u2d55\u2d30\u2d3d\u2d5b-\u2d30\u2d59\u2d3c\u2d49 \u0645\u0631\u0627\u0643\u0634-\u0623\u0633\u0641\u064a"
      ],
-     "s": 56497749,
-     "sha1_base64": "mPkLAzKTM3ZZ5AOepsZqjQr4pzU="
+     "s": 56433045,
+     "sha1_base64": "60H23brh/XOalv1j7dLuKORne5s="
     },
     {
      "id": "Morocco_Rabat-Sale-Zemmour-Zaer",
@@ -9144,8 +9144,8 @@
       "Rabat-Sal\u00e9-K\u00e9nitra \u2d3b\u2d54\u2d54\u2d31\u2d30\u2d5f-\u2d59\u2d4d\u2d30-\u2d47\u2d4f\u2d49\u2d5f\u2d54\u2d30 \u0627\u0644\u0631\u0628\u0627\u0637-\u0633\u0644\u0627-\u0627\u0644\u0642\u0646\u064a\u0637\u0631\u0629",
       "Tanger-T\u00e9touan-Al Hoceima \u2d5f\u2d30\u2d4f\u2d4a-\u2d5f\u2d49\u2d5c\u2d30\u2d61\u2d49\u2d4f-\u2d4d\u2d43\u2d53\u2d59\u2d49\u2d4e\u2d30 \u0637\u0646\u062c\u0629-\u062a\u0637\u0648\u0627\u0646-\u0627\u0644\u062d\u0633\u064a\u0645\u0629"
      ],
-     "s": 56357807,
-     "sha1_base64": "kpCClRqZpfSN9/VDwaFbEKLEres="
+     "s": 56471959,
+     "sha1_base64": "qEkrIgYQDM7QfS4dQdcti11wTv0="
     }
    ]
   },
@@ -9167,8 +9167,8 @@
     "Sofala",
     "Zamb\u00e9zia"
    ],
-   "s": 158503486,
-   "sha1_base64": "cyeOp36QqFvnSNiOVg1H2jzGnmY="
+   "s": 158743358,
+   "sha1_base64": "O4Gp+bGP3TCz0/5zekwoUPhBy6E="
   },
   {
    "id": "Myanmar",
@@ -9193,8 +9193,8 @@
     "\u1005\u1005\u103a\u1000\u102d\u102f\u1004\u103a\u1038\u1010\u102d\u102f\u1004\u103a\u1038 (Sagaing)",
     "\u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f\u1019\u103c\u1014\u103a\u1019\u102c\u1014\u102d\u102f\u1004\u103a\u1004\u1036\u1010\u1031\u102c\u103a\u200c"
    ],
-   "s": 138795535,
-   "sha1_base64": "pOHUUaFgxNtDO5hqUNKTfHxQ/U4="
+   "s": 139131663,
+   "sha1_base64": "7gkRptr2JFemV8wZ3YWvXTZtHgU="
   },
   {
    "id": "Namibia",
@@ -9226,8 +9226,8 @@
     "Zambezi Region",
     "\u01c1Karas Region"
    ],
-   "s": 174332543,
-   "sha1_base64": "d9mU/ynn5V4+aJm6jn7ZQpBG1NA="
+   "s": 174177679,
+   "sha1_base64": "yXii5pk5zjDjwWrotGKb4gkWjA4="
   },
   {
    "id": "Nauru",
@@ -9237,8 +9237,8 @@
    "affiliations": [
     "Naoero"
    ],
-   "s": 396136,
-   "sha1_base64": "wCeZSJPvNVIZ492ElsHj2bEr1ls="
+   "s": 397344,
+   "sha1_base64": "sUKkHwpF2q9yUMzc5RIjxEiCTgI="
   },
   {
    "id": "Nepal",
@@ -9254,8 +9254,8 @@
       "\u0938\u0941\u0926\u0941\u0930 \u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930",
       "\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930"
      ],
-     "s": 140972480,
-     "sha1_base64": "rTLO3TI3gcrszYKCIuPw0N5B3tM="
+     "s": 139033040,
+     "sha1_base64": "n7jlQfNd+RQS4OZTVo8ssz6sRQg="
     },
     {
      "id": "Nepal_Kathmandu",
@@ -9266,8 +9266,8 @@
       "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930",
       "\u0928\u0947\u092a\u093e\u0932"
      ],
-     "s": 46321811,
-     "sha1_base64": "vWgGDCKf42YAo38iaf5H1LR+/oY="
+     "s": 46174723,
+     "sha1_base64": "jsVJGS4Brzz3riADCNXOBG4L3UI="
     },
     {
      "id": "Nepal_Madhyamanchal",
@@ -9278,8 +9278,8 @@
       "\u092e\u0927\u094d\u092f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930",
       "\u0928\u0947\u092a\u093e\u0932"
      ],
-     "s": 71763099,
-     "sha1_base64": "MVS68TiYYQDzl5O3BZR4Yf8kAPo="
+     "s": 71816483,
+     "sha1_base64": "C8lVugCyCbou36F1e8J9W9CoSr8="
     },
     {
      "id": "Nepal_Purwanchal",
@@ -9290,8 +9290,8 @@
       "\u092a\u0941\u0930\u094d\u0935\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930",
       "\u0928\u0947\u092a\u093e\u0932"
      ],
-     "s": 99018597,
-     "sha1_base64": "GFrslbjAh/u0I7volj2XGzSlHX8="
+     "s": 98596477,
+     "sha1_base64": "gWDCjh44j1jkkYHSrFN3EBSlnLc="
     }
    ]
   },
@@ -9321,8 +9321,8 @@
     "Regi\u00f3n Aut\u00f3noma de la Costa Caribe Sur",
     "Rivas"
    ],
-   "s": 42043163,
-   "sha1_base64": "eGEeukGNWJS9l64z6PE7V9+pgcs="
+   "s": 41864515,
+   "sha1_base64": "OJKQyX3MRmhMcYWhWtM8nkXRe78="
   },
   {
    "id": "Niger",
@@ -9340,8 +9340,8 @@
     "Tillab\u00e9ri",
     "Zinder"
    ],
-   "s": 75820651,
-   "sha1_base64": "npKmWyJMmiL8w36E7SLH+LiegBo="
+   "s": 75566979,
+   "sha1_base64": "3oVk5+X1cpbI1joyiTlQtCg75zY="
   },
   {
    "id": "Nigeria",
@@ -9382,8 +9382,8 @@
       "Rivers",
       "Taraba"
      ],
-     "s": 245054862,
-     "sha1_base64": "voBWthYR6J16ppZ2smgogDhcEc8="
+     "s": 243062446,
+     "sha1_base64": "exYM6kOBgGJIStA6dItXwEciC+g="
     },
     {
      "id": "Nigeria_North",
@@ -9404,8 +9404,8 @@
       "Yobe",
       "Zamfara"
      ],
-     "s": 163072886,
-     "sha1_base64": "fIlRktT5DXndQx8hH5chU03BCW4="
+     "s": 163244030,
+     "sha1_base64": "NJH1lTbCmNOiX9A5EP0AwVP4QlY="
     }
    ]
   },
@@ -9417,8 +9417,8 @@
    "affiliations": [
     "Niu\u0113"
    ],
-   "s": 460913,
-   "sha1_base64": "i+2VbphkD5pq2HYAIUqC2Hxtozg="
+   "s": 460545,
+   "sha1_base64": "ER0s19wosfuuG4E3d2/kxsS0a4Q="
   },
   {
    "id": "North Korea",
@@ -9439,8 +9439,8 @@
     "\ud3c9\uc591\uc9c1\ud560\uc2dc",
     "\uc870\uc120\ubbfc\uc8fc\uc8fc\uc758\uc778\ubbfc\uacf5\ud654\uad6d"
    ],
-   "s": 61134268,
-   "sha1_base64": "o7MSmzJDZlmQpV/46Ks1SPQwTak="
+   "s": 61137228,
+   "sha1_base64": "ubfocb0c1+5ouyN6KGe7f+fD8YY="
   },
   {
    "id": "Norway",
@@ -9455,8 +9455,8 @@
       "Norge",
       "Troms"
      ],
-     "s": 210785065,
-     "sha1_base64": "1fwQ2xNnZfbTV8ADtiHYNMphqXo="
+     "s": 204425105,
+     "sha1_base64": "Th0fZjMF15f397VBfjjpMMg9iYM="
     },
     {
      "id": "Norway_Hordaland",
@@ -9467,8 +9467,8 @@
       "Hordaland",
       "Norge"
      ],
-     "s": 73016848,
-     "sha1_base64": "0dIxbAbww1H1mF1E7gJpFRbnEqk="
+     "s": 72954168,
+     "sha1_base64": "TtazU6b4nw5Z09OgydmbYfH9Wxg="
     },
     {
      "id": "Norway_Nordland",
@@ -9480,8 +9480,8 @@
       "Norge",
       "Troms"
      ],
-     "s": 179071024,
-     "sha1_base64": "Sfppv8Hod2E+upmJv0uu3LqC/wE="
+     "s": 179116784,
+     "sha1_base64": "g4UgVYoM8okPDt78x/3lyuskNj0="
     },
     {
      "id": "Norway_Svalbard",
@@ -9492,8 +9492,8 @@
       "Norge",
       "Svalbard"
      ],
-     "s": 8631096,
-     "sha1_base64": "TNNpR0ISNR51PjX1l3wjWC8jua4="
+     "s": 8737848,
+     "sha1_base64": "czlfu19ZItl1l/JRoNqAbFqa20w="
     },
     {
      "id": "Norway_Oppland",
@@ -9504,8 +9504,8 @@
       "Norge",
       "Oppland"
      ],
-     "s": 80453563,
-     "sha1_base64": "0yDai1dPPD8S4zOlFsrGRgetV+8="
+     "s": 80447458,
+     "sha1_base64": "VNjJl59jizzL5Dmxp7jWafwiygc="
     },
     {
      "id": "Norway_Rogaland",
@@ -9516,8 +9516,8 @@
       "Norge",
       "Rogaland"
      ],
-     "s": 56967032,
-     "sha1_base64": "yxiq0X3pG8xNpfuLjAENc9RY0MI="
+     "s": 57010952,
+     "sha1_base64": "2MqRPlmh/S3eeSzw/L7FD91jxx0="
     },
     {
      "id": "Norway_Hedmark",
@@ -9528,8 +9528,8 @@
       "Hedmark",
       "Norge"
      ],
-     "s": 87329298,
-     "sha1_base64": "HzTs9qe76kRNkFMagSc315hTOig="
+     "s": 87497666,
+     "sha1_base64": "3NjfuW2gDexSWkBP4cvPbC8UmL4="
     },
     {
      "id": "Norway_Jan Mayen",
@@ -9537,8 +9537,8 @@
       "Jan Mayen",
       "Norge"
      ],
-     "s": 1325780,
-     "sha1_base64": "Z2pLIR9sZ6hsTb0XQPGfQ+7OjW4="
+     "s": 1325540,
+     "sha1_base64": "mfp91t3jkxRgX07tIrJdjai5IkY="
     },
     {
      "id": "Norway_North Trondelag",
@@ -9550,8 +9550,8 @@
       "Norge",
       "S\u00f8r-Tr\u00f8ndelag"
      ],
-     "s": 124160357,
-     "sha1_base64": "1msBfXAcw/TUNcvQvwLRriGwQNA="
+     "s": 124254357,
+     "sha1_base64": "3VauVnzj7Uq86CywIhaZXEOTiiY="
     },
     {
      "id": "Norway_South Trondelag",
@@ -9562,8 +9562,8 @@
       "Norge",
       "S\u00f8r-Tr\u00f8ndelag"
      ],
-     "s": 72714409,
-     "sha1_base64": "HIh2vZ2myhmv/dqq0N9AnaafJmc="
+     "s": 72818225,
+     "sha1_base64": "Qt8ubv1tMkQMu2os9ofZX+tb+04="
     },
     {
      "id": "Norway_Southern",
@@ -9578,8 +9578,8 @@
       "Vest-Agder",
       "Vestfold"
      ],
-     "s": 216463326,
-     "sha1_base64": "bJnx8fJsDZnr0TmiR43zWcM9QLo="
+     "s": 216032854,
+     "sha1_base64": "L3cTiuPomS+nnpAWmqEI5PnUbko="
     },
     {
      "id": "Norway_Western",
@@ -9591,8 +9591,8 @@
       "Norge",
       "Sogn og Fjordane"
      ],
-     "s": 110189665,
-     "sha1_base64": "GZBn0QyJqsbxWrQmw0dP3Qxtjp4="
+     "s": 110244497,
+     "sha1_base64": "K6SBsZmS8vhebAKFlRw8JY3q0rs="
     },
     {
      "id": "Norway_Central",
@@ -9605,8 +9605,8 @@
       "Norge",
       "Oslo"
      ],
-     "s": 139814644,
-     "sha1_base64": "zMZnwcAMIitg3czUV0SV7qkl8xg="
+     "s": 139916485,
+     "sha1_base64": "CKeJ/fFqSfT1BGxjww4ms7Nc6dY="
     },
     {
      "id": "Norway_Bouvet Island",
@@ -9617,8 +9617,8 @@
       "Bouvet\u00f8ya",
       "Norge"
      ],
-     "s": 171224,
-     "sha1_base64": "t8iKrokdkeWmJ2hDiz4xjOpJ59I="
+     "s": 171200,
+     "sha1_base64": "jtQ/6oaksCKKaW0zR8ac5pTYFxc="
     }
    ]
   },
@@ -9640,8 +9640,8 @@
     "\u200f\u0633\u0644\u0637\u0646\u0629 \u0639\u0645\u0627\u0646\u200e",
     "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0628\u0631\u064a\u0645\u064a"
    ],
-   "s": 21988010,
-   "sha1_base64": "WNP+pQgOdNZd8hQ8RRyg10VWykU="
+   "s": 22340234,
+   "sha1_base64": "1/9KeMgMVUb5D4HUIPJctAngH+s="
   },
   {
    "id": "Pakistan",
@@ -9659,8 +9659,8 @@
     "\u0628\u0644\u0648\u0686\u0633\u062a\u0627\u0646 / Balochistan",
     "\u200f\u067e\u0627\u06a9\u0633\u062a\u0627\u0646\u200e"
    ],
-   "s": 132087700,
-   "sha1_base64": "RO2sQQJB/L9l72HMeFerug5IlhQ="
+   "s": 130505380,
+   "sha1_base64": "9KGdi9W1Z31IGXObaLqMLi1DjHU="
   },
   {
    "id": "Palau",
@@ -9671,8 +9671,8 @@
     "Belau",
     "PW"
    ],
-   "s": 1304918,
-   "sha1_base64": "SMMsErXdmkIEiO97xFI0AwUSxes="
+   "s": 1344278,
+   "sha1_base64": "78s2YzWUS7tDGcjw7qmOx3+4ztI="
   },
   {
    "id": "Panama",
@@ -9699,8 +9699,8 @@
     "Panam\u00e1",
     "Veraguas"
    ],
-   "s": 38631641,
-   "sha1_base64": "2u0ZLs2W18qPv3G3W/1utKrW+E8="
+   "s": 38903993,
+   "sha1_base64": "pYhDjSUWKrFsddAcaM1vRlbVJrE="
   },
   {
    "id": "Papua New Guinea",
@@ -9733,8 +9733,8 @@
     "Western",
     "Western Highlands"
    ],
-   "s": 40201873,
-   "sha1_base64": "w6Dd00lsQPBnevL7vbZsXDcbD1k="
+   "s": 40517385,
+   "sha1_base64": "aPbuukj64wY08H23DEzfIB4XjjA="
   },
   {
    "id": "Paraguay",
@@ -9764,8 +9764,8 @@
     "Presidente Hayes",
     "San Pedro"
    ],
-   "s": 102481240,
-   "sha1_base64": "9B9tibnPZwVtyMF8vGfZHoTx0WQ="
+   "s": 99475385,
+   "sha1_base64": "xIjcNOXdhDEvPqTtw+FXAvdjyxc="
   },
   {
    "id": "People's Republic of China",
@@ -9782,8 +9782,8 @@
       "\u4e2d\u56fd",
       "\u5b89\u5fbd\u7701"
      ],
-     "s": 45244636,
-     "sha1_base64": "PxkNDg+X+sguMruF2rchwcG+Fmk="
+     "s": 45005468,
+     "sha1_base64": "WKSlPhGEObzuH6612Y5EdA3ebyA="
     },
     {
      "id": "China_Chongqing",
@@ -9794,8 +9794,8 @@
       "\u91cd\u5e86\u5e02",
       "\u4e2d\u56fd"
      ],
-     "s": 42641386,
-     "sha1_base64": "raV3wDPePwuIW8lC9EEUAXR/qc8="
+     "s": 42408946,
+     "sha1_base64": "/09d+r2oibc2xL0i6AT3PMb14xs="
     },
     {
      "id": "China_Fujian",
@@ -9806,8 +9806,8 @@
       "\u4e2d\u56fd",
       "\u798f\u5efa\u7701"
      ],
-     "s": 35034154,
-     "sha1_base64": "kLgHZmh9AsiLE+Ge+ekHcCbXqWI="
+     "s": 34980058,
+     "sha1_base64": "MT24+v1rcYDJTA5/aoCNpKoSQc8="
     },
     {
      "id": "China_Gansu",
@@ -9818,8 +9818,8 @@
       "\u4e2d\u56fd",
       "\u7518\u8083\u7701"
      ],
-     "s": 39660073,
-     "sha1_base64": "3A51yQchJLpMsGJzwOiCk1OsDNM="
+     "s": 38632529,
+     "sha1_base64": "JGI4QjPqqUBgzM6FUWQfEc61DSk="
     },
     {
      "id": "China_Guangdong",
@@ -9834,8 +9834,8 @@
      "country_name_synonyms": [
       "Hong Kong"
      ],
-     "s": 209785526,
-     "sha1_base64": "YyNCm0IgxQ6YV7MlP/yfXIjvQ8k="
+     "s": 208521142,
+     "sha1_base64": "a/hZF824P5LRXnaqb+KrUyAe81I="
     },
     {
      "id": "China_Guangxi",
@@ -9846,8 +9846,8 @@
       "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a",
       "\u4e2d\u56fd"
      ],
-     "s": 42738323,
-     "sha1_base64": "8NvttneCMusK4QWpfra2cwKhc9Y="
+     "s": 42638731,
+     "sha1_base64": "1bwm43X7atZQieGApJShvBcCCJ8="
     },
     {
      "id": "China_Guizhou",
@@ -9858,8 +9858,8 @@
       "\u8d35\u5dde\u7701",
       "\u4e2d\u56fd"
      ],
-     "s": 31830145,
-     "sha1_base64": "bXzziWuYpsME9N22n5xzvvjNH4g="
+     "s": 31561073,
+     "sha1_base64": "miWjsmpwL03uuYhNy4Hrj4LaYfw="
     },
     {
      "id": "China_Hebei",
@@ -9872,8 +9872,8 @@
       "\u5929\u6d25\u5e02",
       "\u6cb3\u5317\u7701"
      ],
-     "s": 98420475,
-     "sha1_base64": "GLyBW6Yc4BLCf+AiIziUHd5e9Ng="
+     "s": 97527851,
+     "sha1_base64": "eChrmyhK1mys+4mAqlSw1ec8ofs="
     },
     {
      "id": "China_Heilongjiang",
@@ -9884,8 +9884,8 @@
       "\u4e2d\u56fd",
       "\u9ed1\u9f99\u6c5f\u7701"
      ],
-     "s": 32341971,
-     "sha1_base64": "dD9+OcYCzrwH3Jny7+6A3Z5hjvs="
+     "s": 32533531,
+     "sha1_base64": "M/DMeCOQvGaHqyaAHIiXRMlLasw="
     },
     {
      "id": "China_Henan",
@@ -9896,8 +9896,8 @@
       "\u4e2d\u56fd",
       "\u6cb3\u5357\u7701"
      ],
-     "s": 55628229,
-     "sha1_base64": "Uw4H6kVEtxzy8jT7bKC2eiy93UY="
+     "s": 55334549,
+     "sha1_base64": "1PkWESIO/EkMn2FS9Vrnx43+IYg="
     },
     {
      "id": "China_Hubei",
@@ -9909,8 +9909,8 @@
       "\u4e2d\u56fd",
       "\u6e56\u5317\u7701"
      ],
-     "s": 47081613,
-     "sha1_base64": "enTXaeCq65cKpTyT6cnYuMbXlP8="
+     "s": 46702805,
+     "sha1_base64": "P7bGDlTsIK2s2292mm2f1QLiGo8="
     },
     {
      "id": "China_Hunan",
@@ -9921,8 +9921,8 @@
       "\u4e2d\u56fd",
       "\u6e56\u5357\u7701"
      ],
-     "s": 42608883,
-     "sha1_base64": "PAPvXlsHH3fle8nZYS8otdAjYHM="
+     "s": 42306643,
+     "sha1_base64": "NBM6VRfrJj8VQQd+OGkOSKe3xJM="
     },
     {
      "id": "China_Inner Mongolia",
@@ -9933,8 +9933,8 @@
       "\u4e2d\u56fd",
       "\u5185\u8499\u53e4\u81ea\u6cbb\u533a / Inner Mongolia"
      ],
-     "s": 54288846,
-     "sha1_base64": "/G8HWGDlNSvisUU8WTNcUILtV78="
+     "s": 54512278,
+     "sha1_base64": "7KvVCg5AXHvV6qS9ZpkjsQ1fsZo="
     },
     {
      "id": "China_Jiangsu",
@@ -9946,8 +9946,8 @@
       "\u6c5f\u82cf\u7701",
       "\u79e6\u5c71\u5c9b"
      ],
-     "s": 84667058,
-     "sha1_base64": "d+yF0Blj0Sv5Is9EUuBTzqDp2es="
+     "s": 84553098,
+     "sha1_base64": "SjJQurhva8M8PNV2dsxucQwyrEs="
     },
     {
      "id": "China_Jiangxi",
@@ -9958,8 +9958,8 @@
       "\u4e2d\u56fd",
       "\u6c5f\u897f\u7701"
      ],
-     "s": 41456564,
-     "sha1_base64": "LrfljtO38tWH4UHwNIDPYKjxPdM="
+     "s": 41339300,
+     "sha1_base64": "XGjOq9tBbxkvF52x1ttAFdx2Vps="
     },
     {
      "id": "China_Jilin",
@@ -9970,8 +9970,8 @@
       "\u4e2d\u56fd",
       "\u5409\u6797\u7701"
      ],
-     "s": 33206777,
-     "sha1_base64": "OnPPB0dOlvan6riSP3VZSLXbP68="
+     "s": 33267937,
+     "sha1_base64": "bjVpaj2tZdZh4OP5YUvaTsZdSCY="
     },
     {
      "id": "China_Liaoning",
@@ -9982,8 +9982,8 @@
       "\u8fbd\u5b81\u7701",
       "\u4e2d\u56fd"
      ],
-     "s": 37111601,
-     "sha1_base64": "CKo1irnfVPW6N6qXFMYBZskPKzs="
+     "s": 37145793,
+     "sha1_base64": "JX8oRLS6dxDS987cV+mDl7brC74="
     },
     {
      "id": "China_Ningxia Hui",
@@ -9994,8 +9994,8 @@
       "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a",
       "\u4e2d\u56fd"
      ],
-     "s": 21390924,
-     "sha1_base64": "WCFesg8SPfy3OTFS6HWuZLEkVF4="
+     "s": 21251084,
+     "sha1_base64": "QSNoEmLyJymq0TPjiwsrKGFTbF0="
     },
     {
      "id": "China_Qinghai",
@@ -10006,8 +10006,8 @@
       "\u9752\u6d77\u7701",
       "\u4e2d\u56fd"
      ],
-     "s": 34809515,
-     "sha1_base64": "5kpv2vu5h18k9LTJ2E1kc+vnYng="
+     "s": 34665571,
+     "sha1_base64": "/jyE8Ly7sYx4xMPec7ka1K6MT5Q="
     },
     {
      "id": "China_Shaanxi",
@@ -10018,8 +10018,8 @@
       "\u9655\u897f\u7701",
       "\u4e2d\u56fd"
      ],
-     "s": 37776052,
-     "sha1_base64": "WrRZjv4Mv8w9YlUoA7fRwBPqGQ4="
+     "s": 37437844,
+     "sha1_base64": "Z1te4xd02G4cHw7c+SHGN12c/Qg="
     },
     {
      "id": "China_Shandong",
@@ -10030,8 +10030,8 @@
       "\u4e2d\u56fd",
       "\u5c71\u4e1c\u7701"
      ],
-     "s": 72265407,
-     "sha1_base64": "wMs2gVQNPVL5ffgNlpro/7/SoKg="
+     "s": 72113063,
+     "sha1_base64": "9hdJpYnI1SiqGnc+nBIxQ1xbv/M="
     },
     {
      "id": "China_Shanghai",
@@ -10043,8 +10043,8 @@
       "\u4e0a\u6d77\u5e02",
       "\u6d59\u6c5f\u7701"
      ],
-     "s": 20039346,
-     "sha1_base64": "4Iu3cxaRzuQcBfsIhbTO2VDj4YE="
+     "s": 20250914,
+     "sha1_base64": "yI0sCNe/Acm4jD9UdLI9v6Ggmvg="
     },
     {
      "id": "China_Shanxi",
@@ -10055,8 +10055,8 @@
       "\u4e2d\u56fd",
       "\u5c71\u897f\u7701"
      ],
-     "s": 29145520,
-     "sha1_base64": "xKJA3B0r3Vy2gUy8q0oz0C082o0="
+     "s": 28896616,
+     "sha1_base64": "Nfc317fE97cG8BgqJkiVODK36/4="
     },
     {
      "id": "China_Sichuan",
@@ -10067,8 +10067,8 @@
       "\u4e2d\u56fd",
       "\u56db\u5ddd\u7701"
      ],
-     "s": 70345387,
-     "sha1_base64": "hYFMO2gEisOI8PfZYik6cdN57mI="
+     "s": 69797827,
+     "sha1_base64": "XXk5mC7qjerNQkmTBah5C7QeV6c="
     },
     {
      "id": "China_Tibet Autonomous Region",
@@ -10079,8 +10079,8 @@
       "\u4e2d\u56fd",
       "\u897f\u85cf\u81ea\u6cbb\u533a (\u0f56\u0f7c\u0f51\u0f0b\u0f62\u0f44\u0f0b\u0f66\u0f90\u0fb1\u0f7c\u0f44\u0f0b\u0f63\u0f97\u0f7c\u0f44\u0f66\u0f0b)"
      ],
-     "s": 34027023,
-     "sha1_base64": "LtfJRupCg/b38tjFi1xhNVngGp4="
+     "s": 33059048,
+     "sha1_base64": "++wUzXJ0dJkHawWmQfGwMvLYKbA="
     },
     {
      "id": "China_Xinjiang",
@@ -10091,8 +10091,8 @@
       "\u4e2d\u56fd",
       "\u65b0\u7586\u7ef4\u543e\u5c14\u81ea\u6cbb\u533a"
      ],
-     "s": 38680238,
-     "sha1_base64": "DyonAepa9nlvBHwGCgdWRl6U+PQ="
+     "s": 37851566,
+     "sha1_base64": "n671dIgkgryR3hwjJXAHdKdWN6E="
     },
     {
      "id": "China_Yunnan",
@@ -10103,8 +10103,8 @@
       "\u4e2d\u56fd",
       "\u4e91\u5357\u7701"
      ],
-     "s": 79430792,
-     "sha1_base64": "+xs8++DAoRZ3X4fwK+aUivNX0nU="
+     "s": 78825120,
+     "sha1_base64": "vVdMQsRjm8EklNTWWkhhvlD3No8="
     },
     {
      "id": "China_Zhejiang",
@@ -10115,8 +10115,8 @@
       "\u4e2d\u56fd",
       "\u6d59\u6c5f\u7701"
      ],
-     "s": 85905399,
-     "sha1_base64": "ede92UlZQ8uKuaEchZDnXephJ60="
+     "s": 85727455,
+     "sha1_base64": "YXmeuZ6Cp0xqriXo0u3A0kGgHjY="
     }
    ]
   },
@@ -10138,8 +10138,8 @@
       "\u81fa\u5317\u5e02",
       "\u4e2d\u83ef\u6c11\u570b"
      ],
-     "s": 139801531,
-     "sha1_base64": "Eb9EB3PjolKlv1YBwrTd84Pvc2I="
+     "s": 114211121,
+     "sha1_base64": "KGDHFbJikcR3UWKLxG3UvzhQJL4="
     },
     {
      "id": "Taiwan_South",
@@ -10152,8 +10152,8 @@
       "\u81fa\u4e2d\u5e02",
       "\u4e2d\u83ef\u6c11\u570b"
      ],
-     "s": 64893848,
-     "sha1_base64": "l0cFDgOgQ4jbV0TE19PVijxZZpE="
+     "s": 64261032,
+     "sha1_base64": "1rvpyb81g/pA3eah2suiydxL+FQ="
     }
    ]
   },
@@ -10180,8 +10180,8 @@
       "Tumbes",
       "Ucayali"
      ],
-     "s": 82129153,
-     "sha1_base64": "TVCTOUQ80kY5Snbpqb3pTH2Jw18="
+     "s": 81900729,
+     "sha1_base64": "QYhjVttPwULnMM6bAem9JEtk/Tw="
     },
     {
      "id": "Peru_Lima",
@@ -10196,8 +10196,8 @@
       "Lima",
       "Per\u00fa"
      ],
-     "s": 51467575,
-     "sha1_base64": "SToY+DB/LaXtroLgucDTV/71mH8="
+     "s": 50718383,
+     "sha1_base64": "Xj4WtErnyIxzzSCHKjHMsfofkIU="
     },
     {
      "id": "Peru_South",
@@ -10215,8 +10215,8 @@
       "Puno",
       "Tacna"
      ],
-     "s": 83867585,
-     "sha1_base64": "j6Cbrj+HM+/ivPO9w+RDTTiHQeI="
+     "s": 83584521,
+     "sha1_base64": "kSDFI8WfG6R+AxbwnZ93JhXA1Jc="
     }
    ]
   },
@@ -10262,8 +10262,8 @@
       "Zamboanga del Norte",
       "Zamboanga del Sur"
      ],
-     "s": 124287809,
-     "sha1_base64": "tjfPVnIThwA41+7HCjzf1zVqzPA="
+     "s": 124341233,
+     "sha1_base64": "1PnP1uiGeImeoLO58DPjgdDyH+w="
     },
     {
      "id": "Philippines_Visayas",
@@ -10294,8 +10294,8 @@
       "Southern Leyte",
       "Sorsogon"
      ],
-     "s": 90877687,
-     "sha1_base64": "NyssxGdqJUknpfbJRPN5Bp10Qf4="
+     "s": 90671104,
+     "sha1_base64": "xkCsB38gHE2n2pc4UE4w4i7iXLA="
     },
     {
      "id": "Philippines_Luzon_South",
@@ -10318,8 +10318,8 @@
       "Sorsogon",
       "\u592a\u5e73\u5cf6"
      ],
-     "s": 24913304,
-     "sha1_base64": "Kdd+HLiFL70186DZxvzboERXOfg="
+     "s": 25234832,
+     "sha1_base64": "lpvWgrrC/X/1es0NitsO/TSBbzk="
     },
     {
      "id": "Philippines_Luzon_Manila",
@@ -10341,8 +10341,8 @@
       "Rizal",
       "Sorsogon"
      ],
-     "s": 139342996,
-     "sha1_base64": "qG7KJp8uWJy8sVbdSu1AnTj2HXU="
+     "s": 139043572,
+     "sha1_base64": "qpOoRR9MOl0qaVx6hvdxXS2mF3I="
     },
     {
      "id": "Philippines_Luzon_North",
@@ -10378,8 +10378,8 @@
       "Zambales",
       "\u6d77\u5357\u7701"
      ],
-     "s": 143816978,
-     "sha1_base64": "ZTmfCdCs4G9XBXLNuiVoztAbwrw="
+     "s": 143654371,
+     "sha1_base64": "25MOLI8uiTBf/nJe0+5PV8Ow6Uw="
     }
    ]
   },
@@ -10394,8 +10394,8 @@
    "country_name_synonyms": [
     "Pitcairn"
    ],
-   "s": 243931,
-   "sha1_base64": "cWaidcqGTO4A8FHXLn27qkDX7Yk="
+   "s": 240835,
+   "sha1_base64": "n/IpdVqdfA50au1cuGG1YUsj1To="
   },
   {
    "id": "Poland",
@@ -10410,8 +10410,8 @@
       "Territorial waters of Bornholm",
       "wojew\u00f3dztwo zachodniopomorskie"
      ],
-     "s": 82235771,
-     "sha1_base64": "I8jBuMkik+lNEeNUMh6FI3mAJ0Y="
+     "s": 82326043,
+     "sha1_base64": "+iQ288rXZnO9yhuxBSjxVAq1Ug4="
     },
     {
      "id": "Poland_Pomeranian Voivodeship",
@@ -10423,8 +10423,8 @@
       "Territorial waters of Bornholm",
       "wojew\u00f3dztwo pomorskie"
      ],
-     "s": 91863690,
-     "sha1_base64": "Vbcb5rQx5HsfGK+4htw5aqQMn1w="
+     "s": 91675923,
+     "sha1_base64": "rYk7dXxmD+Rk6yVsFPx/WJgYBJE="
     },
     {
      "id": "Poland_Podlaskie Voivodeship",
@@ -10435,8 +10435,8 @@
       "Polska",
       "wojew\u00f3dztwo podlaskie"
      ],
-     "s": 72720736,
-     "sha1_base64": "d2Ckm1NvWQvr3cN9GWllNCYUcgY="
+     "s": 73254064,
+     "sha1_base64": "dV49jPFVx2LDJma1u4AG9D5wiuY="
     },
     {
      "id": "Poland_Masovian Voivodeship",
@@ -10447,8 +10447,8 @@
       "Polska",
       "wojew\u00f3dztwo mazowieckie"
      ],
-     "s": 236719975,
-     "sha1_base64": "1Lqm5z0XjHj4sXNWJwpXHCh/hoA="
+     "s": 235109383,
+     "sha1_base64": "xGT1KmMOROB4jZNsFDcMPRe+oV4="
     },
     {
      "id": "Poland_Lubusz Voivodeship",
@@ -10459,8 +10459,8 @@
       "Polska",
       "wojew\u00f3dztwo lubuskie"
      ],
-     "s": 52986824,
-     "sha1_base64": "FycfPS9kfkEOjMHZGijboR4bRV4="
+     "s": 53104032,
+     "sha1_base64": "OclKQ3kxwq69m4kT4gZEBWw3Wx0="
     },
     {
      "id": "Poland_Lublin Voivodeship",
@@ -10471,8 +10471,8 @@
       "Polska",
       "wojew\u00f3dztwo lubelskie"
      ],
-     "s": 119335517,
-     "sha1_base64": "dmJ+Qrh3rT2sj4SFZrJXISVa5uY="
+     "s": 118844093,
+     "sha1_base64": "2D3zl3mTCpRYO/m1+C95RKY7H1Q="
     },
     {
      "id": "Poland_Lower Silesian Voivodeship",
@@ -10483,8 +10483,8 @@
       "Polska",
       "wojew\u00f3dztwo dolno\u015bl\u0105skie"
      ],
-     "s": 129085838,
-     "sha1_base64": "O0ULnfdatfmHsBEpoJvHH3uO3qk="
+     "s": 129044502,
+     "sha1_base64": "uKsgVO6kxh1wv1RlbeuKdjApHI4="
     },
     {
      "id": "Poland_Warmian-Masurian Voivodeship",
@@ -10495,8 +10495,8 @@
       "Polska",
       "wojew\u00f3dztwo warmi\u0144sko-mazurskie"
      ],
-     "s": 75963618,
-     "sha1_base64": "y67uoUp+2A3UU3ZxZK/vgFuEdos="
+     "s": 76211538,
+     "sha1_base64": "tI9QMbOoRO+Nas1lV2j+aMkbrNc="
     },
     {
      "id": "Poland_Lodz Voivodeship",
@@ -10507,8 +10507,8 @@
       "Polska",
       "wojew\u00f3dztwo \u0142\u00f3dzkie"
      ],
-     "s": 109882884,
-     "sha1_base64": "siZpMbX5FTOnIfwv+CRHR8RDGzs="
+     "s": 109478796,
+     "sha1_base64": "4i6+V0+xHRADl+mvh6zzW84f2Hg="
     },
     {
      "id": "Poland_Subcarpathian Voivodeship",
@@ -10519,8 +10519,8 @@
       "Polska",
       "wojew\u00f3dztwo podkarpackie"
      ],
-     "s": 118153412,
-     "sha1_base64": "5HIJM5lRMuHXL4Jdk8IA3tksSGM="
+     "s": 117947436,
+     "sha1_base64": "oSBLFLvfwrNTnwt8xd3RN0QD41U="
     },
     {
      "id": "Poland_Lesser Poland Voivodeship",
@@ -10531,8 +10531,8 @@
       "Polska",
       "wojew\u00f3dztwo ma\u0142opolskie"
      ],
-     "s": 158005446,
-     "sha1_base64": "lORYzDVPEuEUpPky7sx0NE1kAj4="
+     "s": 156947190,
+     "sha1_base64": "6Lcg6TTFlyx92iOIrqA5CvkjHSE="
     },
     {
      "id": "Poland_Silesian Voivodeship",
@@ -10543,8 +10543,8 @@
       "Polska",
       "wojew\u00f3dztwo \u015bl\u0105skie"
      ],
-     "s": 148860885,
-     "sha1_base64": "0xacd5q73gqWuG2ymTAaN6Emd4I="
+     "s": 148602966,
+     "sha1_base64": "zLMRul1xLoIyRFu9pYh/LblsQEI="
     },
     {
      "id": "Poland_Kuyavian-Pomeranian Voivodeship",
@@ -10555,8 +10555,8 @@
       "Polska",
       "wojew\u00f3dztwo kujawsko-pomorskie"
      ],
-     "s": 88490514,
-     "sha1_base64": "IMO0my+9Sopq4EFhY9p0IV4CssY="
+     "s": 88140626,
+     "sha1_base64": "gbHUvz+bKsAJ81rYlZ9/xykY598="
     },
     {
      "id": "Poland_Greater Poland Voivodeship",
@@ -10567,8 +10567,8 @@
       "Polska",
       "wojew\u00f3dztwo wielkopolskie"
      ],
-     "s": 143659838,
-     "sha1_base64": "lU/jupNtelXYNz57MgxIkAfIURw="
+     "s": 142560190,
+     "sha1_base64": "tmIJUVtTCQgBjczt/lre7GOF/PA="
     },
     {
      "id": "Poland_Opole Voivodeship",
@@ -10579,8 +10579,8 @@
       "Polska",
       "wojew\u00f3dztwo opolskie"
      ],
-     "s": 43519486,
-     "sha1_base64": "5MQDl4rXoGlOvws2ezQ5T9FkFJE="
+     "s": 43607214,
+     "sha1_base64": "0R0ybxN/C7MmojKFKLO/xVH3Pik="
     },
     {
      "id": "Poland_Swietokrzyskie Voivodeship",
@@ -10591,8 +10591,8 @@
       "Polska",
       "wojew\u00f3dztwo \u015bwi\u0119tokrzyskie"
      ],
-     "s": 66126002,
-     "sha1_base64": "i4TfxiiMjOpTpNZuMwtOrakbrlk="
+     "s": 65814650,
+     "sha1_base64": "P4SsiYoa5XHfLCVuGWLWC3vAIHo="
     }
    ]
   },
@@ -10609,8 +10609,8 @@
       "Norte",
       "Portugal"
      ],
-     "s": 78017882,
-     "sha1_base64": "KhJCSv1SnYGLATg3sZDCRGRDpB0="
+     "s": 77836466,
+     "sha1_base64": "R6Ip/xdqG6ldsVJCAPEiatvp+qM="
     },
     {
      "id": "Portugal_South",
@@ -10624,8 +10624,8 @@
       "Lisboa",
       "Portugal"
      ],
-     "s": 114498309,
-     "sha1_base64": "fUlkK3owOf1ULwGj9pD+mrDabSU="
+     "s": 112459917,
+     "sha1_base64": "y3KSl7pbeV8I8vlbza65iv5BY1A="
     },
     {
      "id": "Portugal_Islands",
@@ -10667,8 +10667,8 @@
       "Portugal",
       "Portugal (\u00e1guas territoriais)"
      ],
-     "s": 26653544,
-     "sha1_base64": "/KvcTha51469EYMH8iyIgAt3Dio="
+     "s": 26630776,
+     "sha1_base64": "5Ae5KywMBi0BmoyZqqOUmYjdCUw="
     },
     {
      "id": "Portugal_Viseu",
@@ -10680,8 +10680,8 @@
       "Norte",
       "Portugal"
      ],
-     "s": 93028781,
-     "sha1_base64": "iPBkCzwT0eNs7v159ANFoKVtzG8="
+     "s": 91673669,
+     "sha1_base64": "jf8SJl1O0cmmic+Ho8AeyhySoOg="
     }
    ]
   },
@@ -10703,8 +10703,8 @@
     "Umm Salal",
     "\u200f\u0642\u0637\u0631\u200e"
    ],
-   "s": 21050714,
-   "sha1_base64": "nFC3e+fBwkeK0NzAIFkawCpRZzI="
+   "s": 20920650,
+   "sha1_base64": "1J30bm7r1bXR0Qx79tiTQMm0iVk="
   },
   {
    "id": "Republic of Kosovo",
@@ -10717,8 +10717,8 @@
    "country_name_synonyms": [
     "Kosovo"
    ],
-   "s": 29780521,
-   "sha1_base64": "Mb6RFsWPTHJK8P+8wPSSDLZbDTM="
+   "s": 30022769,
+   "sha1_base64": "e70Q0cj0bR7zMPvJWM2AzE4vpMI="
   },
   {
    "id": "Romania",
@@ -10737,8 +10737,8 @@
       "Tulcea",
       "Vrancea"
      ],
-     "s": 34476452,
-     "sha1_base64": "a9EMXjWXn7813eC6BP2iHEUzzdo="
+     "s": 34679804,
+     "sha1_base64": "uYezEOCsWhBZ++dWx6gvnm2zdEM="
     },
     {
      "id": "Romania_Centre",
@@ -10754,8 +10754,8 @@
       "Rom\u00e2nia",
       "Sibiu"
      ],
-     "s": 60527017,
-     "sha1_base64": "bLW1sRwq2qMUTkSbfpmPR6gXypU="
+     "s": 60424625,
+     "sha1_base64": "k7O9Z+yUKa3sxvIt67xFRV2eCng="
     },
     {
      "id": "Romania_West",
@@ -10769,8 +10769,8 @@
       "Rom\u00e2nia",
       "Timi\u0219"
      ],
-     "s": 41215862,
-     "sha1_base64": "+RfiJBxVMLHKMdfo/Kml251yG2M="
+     "s": 41291438,
+     "sha1_base64": "MfhXhpDORVy3XlIjpJYmFb/2Gq0="
     },
     {
      "id": "Romania_North_West",
@@ -10786,8 +10786,8 @@
       "Satu Mare",
       "S\u0103laj"
      ],
-     "s": 60979207,
-     "sha1_base64": "Cpjlw2ejBYnmhULvK3EsHxzjm+I="
+     "s": 61231414,
+     "sha1_base64": "NSqKZ0KOAE1wS1KO8yMjvclim/Y="
     },
     {
      "id": "Romania_South_West",
@@ -10802,8 +10802,8 @@
       "Rom\u00e2nia",
       "V\u00e2lcea"
      ],
-     "s": 36426941,
-     "sha1_base64": "JZNrQv7C2Sbmnxdl6g/oq/Y9h2U="
+     "s": 36009405,
+     "sha1_base64": "Ysetk8hNk59P23dwiSbNOiUu2qY="
     },
     {
      "id": "Romania_North_East",
@@ -10819,8 +10819,8 @@
       "Suceava",
       "Vaslui"
      ],
-     "s": 44616438,
-     "sha1_base64": "Zonsik0GSDrZq501SN4QYjycD/M="
+     "s": 44647262,
+     "sha1_base64": "bOZflcq9S/KafNdoPhEreFjgbyc="
     },
     {
      "id": "Romania_South",
@@ -10840,8 +10840,8 @@
       "Rom\u00e2nia",
       "Teleorman"
      ],
-     "s": 56543008,
-     "sha1_base64": "5ec1v/W+ltmRVxXysmyv+Hk+1Ww="
+     "s": 56365737,
+     "sha1_base64": "rAZjEJyoZcxHAfZUiBUA0eDYn6M="
     }
    ]
   },
@@ -10861,8 +10861,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0440\u044b\u043c"
      ],
-     "s": 53527381,
-     "sha1_base64": "zNU+msjbO9jU9f61K2utn/zAR5A="
+     "s": 51682501,
+     "sha1_base64": "FwHf4cWnBX2zOX5tep2JnxvHo44="
     },
     {
      "id": "Russia_Altai Krai",
@@ -10874,8 +10874,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0410\u043b\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 139504417,
-     "sha1_base64": "ZfXu9lWUOKiBOSYHu2IBIm9fJYo="
+     "s": 139464017,
+     "sha1_base64": "CL+0+8ET7uVHmEBx/S+ciiDZMco="
     },
     {
      "id": "Russia_Altai Republic",
@@ -10887,8 +10887,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0410\u043b\u0442\u0430\u0439"
      ],
-     "s": 74705594,
-     "sha1_base64": "NvcJPZ9EamynTaSJtBvOLo7ICoQ="
+     "s": 74107641,
+     "sha1_base64": "HUOWRv0aS5n3ZD0ojw427+h3FzY="
     },
     {
      "id": "Russia_Amur Oblast",
@@ -10900,8 +10900,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0410\u043c\u0443\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 21695040,
-     "sha1_base64": "yLVMaphNS2u7g7yXUX5knax/1rU="
+     "s": 21565256,
+     "sha1_base64": "vlyDZIMzWwfpoiVFU/quhAdL8gw="
     },
     {
      "id": "Russia_Arkhangelsk Oblast_Central",
@@ -10913,8 +10913,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0410\u0440\u0445\u0430\u043d\u0433\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 73475174,
-     "sha1_base64": "Wk++sSDn5k3LDzj6LEv8gDfHJbk="
+     "s": 73472774,
+     "sha1_base64": "BA7b8vVw4L0A/Y7tIrsFg9/0zxM="
     },
     {
      "id": "Russia_Arkhangelsk Oblast_North",
@@ -10928,8 +10928,8 @@
       "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433",
       "\u0410\u0440\u0445\u0430\u043d\u0433\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 30633380,
-     "sha1_base64": "//9/NPZyghFJ5XFUJ3PLVdmrifM="
+     "s": 30750771,
+     "sha1_base64": "8vbF/cRHQZerYjG0i+Jw07+Af0I="
     },
     {
      "id": "Russia_Astrakhan Oblast",
@@ -10941,8 +10941,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0410\u0441\u0442\u0440\u0430\u0445\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 30756769,
-     "sha1_base64": "vjq/AiOfAFZ3dTIS/Cr6Vs93Rjw="
+     "s": 31070513,
+     "sha1_base64": "C+j1nASSzNpNUmTKcLOSV/q9zVU="
     },
     {
      "id": "Russia_Bashkortostan",
@@ -10954,8 +10954,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0411\u0430\u0448\u043a\u043e\u0440\u0442\u043e\u0441\u0442\u0430\u043d"
      ],
-     "s": 98346082,
-     "sha1_base64": "fRBOJcwh0vaDwro6jzQ/8RgeWMA="
+     "s": 97243658,
+     "sha1_base64": "XXsO3k1RNcBoLoSZq24ICiccNRI="
     },
     {
      "id": "Russia_Belgorod Oblast",
@@ -10967,8 +10967,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0411\u0435\u043b\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 36328076,
-     "sha1_base64": "uoHi5t2ebcHWI+maM0r0vnwp/NM="
+     "s": 36412340,
+     "sha1_base64": "nFqd3bm30RNQ9qRuBhcp21cxsh0="
     },
     {
      "id": "Russia_Bryansk Oblast",
@@ -10980,8 +10980,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0411\u0440\u044f\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 26855035,
-     "sha1_base64": "fBSoxcSI/LhUStMtD2zd5R8nETw="
+     "s": 27179931,
+     "sha1_base64": "ca+uNcVQNtvzVWdtUf4lIp4+WbA="
     },
     {
      "id": "Russia_Buryatia",
@@ -10993,8 +10993,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0411\u0443\u0440\u044f\u0442\u0438\u044f"
      ],
-     "s": 29530578,
-     "sha1_base64": "3hdgiW2kFkZovB6KfK97IS4W7qc="
+     "s": 29727130,
+     "sha1_base64": "MNh3IFcNULJP539e6a07p/msz2E="
     },
     {
      "id": "Russia_Chechen Republic",
@@ -11006,8 +11006,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 14659190,
-     "sha1_base64": "E6F0c0EeUSWqbKgVR8w0fzg/MXo="
+     "s": 14660574,
+     "sha1_base64": "CJOvcekD0eXHuv8KE2YGVuyVRXs="
     },
     {
      "id": "Russia_Chelyabinsk Oblast",
@@ -11019,8 +11019,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0427\u0435\u043b\u044f\u0431\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 80049436,
-     "sha1_base64": "yqPExKB/3tB1nkKUCuENWdZEvJI="
+     "s": 79973532,
+     "sha1_base64": "aCM9peWOUg2998BYHYclqolRStQ="
     },
     {
      "id": "Russia_Chukotka Autonomous Okrug",
@@ -11032,8 +11032,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 32104677,
-     "sha1_base64": "4UUn941W9aygUBmubCNMAY21b4Y="
+     "s": 31567812,
+     "sha1_base64": "VVIG93YgFlW1xoHHePCEpQBtXto="
     },
     {
      "id": "Russia_Chuvashia",
@@ -11045,8 +11045,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0427\u0443\u0432\u0430\u0448\u0438\u044f"
      ],
-     "s": 25829160,
-     "sha1_base64": "4TvIEiRn5VOy98Udt3nTcFMBrW8="
+     "s": 25605240,
+     "sha1_base64": "XhA9qfYbsiptNbKo71P5Zn27q70="
     },
     {
      "id": "Russia_Ingushetia",
@@ -11058,8 +11058,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0418\u043d\u0433\u0443\u0448\u0435\u0442\u0438\u044f"
      ],
-     "s": 9705332,
-     "sha1_base64": "1mejIpj6qHt4wJ8UIsJvkyxp24Y="
+     "s": 9809764,
+     "sha1_base64": "WQW6eadkQAcenPTK51J2voQoL5U="
     },
     {
      "id": "Russia_Irkutsk Oblast",
@@ -11071,8 +11071,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0418\u0440\u043a\u0443\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 77720160,
-     "sha1_base64": "XFXYXuArMF8wfIsY9yMrivfS6rA="
+     "s": 77657712,
+     "sha1_base64": "WFjISQPGA3P+M99EuuPn6Rf5Y/g="
     },
     {
      "id": "Russia_Ivanovo Oblast",
@@ -11084,8 +11084,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 28845723,
-     "sha1_base64": "oYuvZ28Rm9htPDZzI5OPuPOAM5Y="
+     "s": 28787835,
+     "sha1_base64": "4PRtdQM86Kr4HU0kZiI0jLqNapM="
     },
     {
      "id": "Russia_Jewish Autonomous Oblast",
@@ -11097,8 +11097,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 14121872,
-     "sha1_base64": "kgpWpaN+6b1oHqS4yyLiDmmiPSo="
+     "s": 14026936,
+     "sha1_base64": "zWA1Ho5tAoeYj2de6ioYHAgyhwk="
     },
     {
      "id": "Russia_Kabardino-Balkaria",
@@ -11110,8 +11110,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 22386912,
-     "sha1_base64": "eTz52VN8q/QU8qFlKM4LLRMNZAU="
+     "s": 22371336,
+     "sha1_base64": "DkyB3N04iUPPFQVZLg+rkh9w80o="
     },
     {
      "id": "Russia_Kaliningrad Oblast",
@@ -11123,8 +11123,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0430\u043b\u0438\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 23436226,
-     "sha1_base64": "pVP6s/5HMP+WkERsjE64Y36vmao="
+     "s": 23868754,
+     "sha1_base64": "X9nZEYHdXYdi8PEu7LTbIbDglgE="
     },
     {
      "id": "Russia_Kaluga Oblast",
@@ -11136,8 +11136,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0430\u043b\u0443\u0436\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 37031859,
-     "sha1_base64": "ro1c6+HPZsnuJ9vesiRC6nlZao8="
+     "s": 36992771,
+     "sha1_base64": "kfy3k9P7WE7YYDst61vHFRbguB4="
     },
     {
      "id": "Russia_Kamchatka Krai",
@@ -11149,8 +11149,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0430\u043c\u0447\u0430\u0442\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 37885282,
-     "sha1_base64": "rDWWw6neIktmOD0558iSm1PlNNc="
+     "s": 38068522,
+     "sha1_base64": "MOrc//RsYuz7Se+6njsuSTCrTWk="
     },
     {
      "id": "Russia_Karachay-Cherkessia",
@@ -11162,8 +11162,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 23121904,
-     "sha1_base64": "UpsE/pZttZ4oUSTzsOwd3PHMnNs="
+     "s": 23141096,
+     "sha1_base64": "Q98C3L0fyLCfxlnCx33FASmrgxU="
     },
     {
      "id": "Russia_Kemerov Oblast",
@@ -11175,8 +11175,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0435\u043c\u0435\u0440\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 43843558,
-     "sha1_base64": "Mmgzh3/6Jw2xqf5YQ3e0zM/kZXg="
+     "s": 43839374,
+     "sha1_base64": "cdIuzSVMpV2sFbGWoKRFsmxqwYk="
     },
     {
      "id": "Russia_Khabarovsk Krai",
@@ -11188,8 +11188,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0425\u0430\u0431\u0430\u0440\u043e\u0432\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 65838435,
-     "sha1_base64": "u52V/I3xbgtkm96N/IxZrsdSlIM="
+     "s": 66034219,
+     "sha1_base64": "VRsgWjfvDNfThGnlogFJYF6nWH0="
     },
     {
      "id": "Russia_Khakassia",
@@ -11201,8 +11201,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 23232593,
-     "sha1_base64": "TpGjwC4OlKolYS1CaDr3b+4ugAY="
+     "s": 23282361,
+     "sha1_base64": "dvngZAS7sJXu7pzvwHGrrETgq70="
     },
     {
      "id": "Russia_Kirov Oblast",
@@ -11214,8 +11214,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0438\u0440\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 99224207,
-     "sha1_base64": "Zbqi2k38SlrpNq6y2H5++x2MvpY="
+     "s": 99005087,
+     "sha1_base64": "UYv91sN7493hmUzY/aTnq1TOvn0="
     },
     {
      "id": "Russia_Komi Republic",
@@ -11227,8 +11227,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u043e\u043c\u0438"
      ],
-     "s": 55322726,
-     "sha1_base64": "Wk0xrQzw1DTb8LP+D6NkT6wQzZg="
+     "s": 55034478,
+     "sha1_base64": "80nDQkyx0T3PA6bRz1pKew7NrbA="
     },
     {
      "id": "Russia_Kostroma Oblast",
@@ -11240,8 +11240,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u043e\u0441\u0442\u0440\u043e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 29814107,
-     "sha1_base64": "ctgQQ0Kp+OxlWcIBWzEha3GzU+4="
+     "s": 29705675,
+     "sha1_base64": "BYf+nBvy+Qsbf9iC2+9vgGMHryw="
     },
     {
      "id": "Russia_Krasnodar Krai",
@@ -11253,8 +11253,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 75787248,
-     "sha1_base64": "1GabhyBYspxmgAm+d/VRxUNjKQU="
+     "s": 75599849,
+     "sha1_base64": "aeAVKzZIOWi1BHyW4WpCACdd96Q="
     },
     {
      "id": "Russia_Krasnodar Krai_Adygeya",
@@ -11267,8 +11267,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0440\u0430\u0441\u043d\u043e\u0434\u0430\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 55425697,
-     "sha1_base64": "UkYefqOpvX7y/A19wGxXLo2bXQw="
+     "s": 55617073,
+     "sha1_base64": "nq1NAn1CBlk43GGyJxmSDwymHgI="
     },
     {
      "id": "Russia_Krasnoyarsk Krai_North",
@@ -11280,8 +11280,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0440\u0430\u0441\u043d\u043e\u044f\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 44503487,
-     "sha1_base64": "jsZ3524OKbJON4AIdPsj6jRy3KM="
+     "s": 44606415,
+     "sha1_base64": "6ilb84RSCO+tAvRwLml+zUGq/to="
     },
     {
      "id": "Russia_Krasnoyarsk Krai_South",
@@ -11293,8 +11293,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0440\u0430\u0441\u043d\u043e\u044f\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 54726111,
-     "sha1_base64": "iL1hJseoPAo8O07LEZXhY4+5Mr4="
+     "s": 54540959,
+     "sha1_base64": "lmKCTWx9kYGMWkEZGK1V6onidaE="
     },
     {
      "id": "Russia_Kurgan Oblast",
@@ -11306,8 +11306,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 36042513,
-     "sha1_base64": "a9IaYRt+jLtheJx28oaIRCyZ+2w="
+     "s": 36300649,
+     "sha1_base64": "YIiEBwtWmNKoaGABHRGk1+DYOHU="
     },
     {
      "id": "Russia_Kursk Oblast",
@@ -11319,8 +11319,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041a\u0443\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 52867884,
-     "sha1_base64": "64UKHqsatDaPY13AYpzkj/eOhXY="
+     "s": 52778068,
+     "sha1_base64": "/H/DOcje18eCdwzuPkgxU/Z1F0c="
     },
     {
      "id": "Russia_Leningradskaya Oblast_Karelsky",
@@ -11332,8 +11332,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 45881770,
-     "sha1_base64": "cImKb0yd1zYAJlUtjbhTaer6J+I="
+     "s": 45736530,
+     "sha1_base64": "xWNqr4YjQE3RZVq+OnPchYsvu0Q="
     },
     {
      "id": "Russia_Leningradskaya Oblast_Southeast",
@@ -11345,8 +11345,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 81589682,
-     "sha1_base64": "+ijogKR9sPWjWwarRocUeKvKPhQ="
+     "s": 81802842,
+     "sha1_base64": "vwGkVWsqkc+R5iGDXrdfRcIrROk="
     },
     {
      "id": "Russia_Lipetsk Oblast",
@@ -11358,8 +11358,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041b\u0438\u043f\u0435\u0446\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 32271178,
-     "sha1_base64": "4RdQEOlgrmsoxIZkLw+3B5EBtD0="
+     "s": 32311266,
+     "sha1_base64": "wQ41hgBbOatBAWwfiwlUir/0U3s="
     },
     {
      "id": "Russia_Magadan Oblast",
@@ -11371,8 +11371,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041c\u0430\u0433\u0430\u0434\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 25586457,
-     "sha1_base64": "bSV5mfFTx2O1Yj4N2+djQRmx+e8="
+     "s": 25883065,
+     "sha1_base64": "mM70aFkKKPXfc1QrAXP15v05jP8="
     },
     {
      "id": "Russia_Mari El",
@@ -11384,8 +11384,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041c\u0430\u0440\u0438\u0439 \u042d\u043b"
      ],
-     "s": 29320937,
-     "sha1_base64": "jF9pnh6yzHp30s6PB3XNBdr07VU="
+     "s": 29348433,
+     "sha1_base64": "JkOP7XPmptUpauj0AYXhyJ7e15A="
     },
     {
      "id": "Russia_Moscow Oblast_East",
@@ -11397,8 +11397,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 90905573,
-     "sha1_base64": "QObchhEtyBFvzUd7OFrVAnHafbA="
+     "s": 90844717,
+     "sha1_base64": "fLLCQH3+wK7PM0oBTuLbM8XWkMY="
     },
     {
      "id": "Russia_Moscow Oblast_West",
@@ -11411,8 +11411,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041c\u043e\u0441\u043a\u0432\u0430"
      ],
-     "s": 61219015,
-     "sha1_base64": "WFzZuzNmRZGRZiVwFME0gm6v6xg="
+     "s": 60926946,
+     "sha1_base64": "dwSdfsLqVFknekS/nS0ohgwfZBg="
     },
     {
      "id": "Russia_Moscow",
@@ -11425,8 +11425,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041c\u043e\u0441\u043a\u0432\u0430"
      ],
-     "s": 75436538,
-     "sha1_base64": "LD0iRPbXfo7DevVW4WIabvxG4do="
+     "s": 74552254,
+     "sha1_base64": "m1RzFxpmJgIlLpy3Extt4X5tJmU="
     },
     {
      "id": "Russia_Murmansk Oblast",
@@ -11438,8 +11438,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 65127925,
-     "sha1_base64": "vn1JfJhITEHpnO/RPK2AObrDqFA="
+     "s": 65570605,
+     "sha1_base64": "PYY07jwSDmKdSWRDyF1Nvi7SLDk="
     },
     {
      "id": "Russia_Nenets Autonomous Okrug",
@@ -11451,8 +11451,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433"
      ],
-     "s": 31314177,
-     "sha1_base64": "CVnSRTHvwyJl01KEHn176i/RS4s="
+     "s": 31630713,
+     "sha1_base64": "f9welinJDLtwaFH4O79PRr+nA1g="
     },
     {
      "id": "Russia_Nizhny Novgorod Oblast",
@@ -11464,8 +11464,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041d\u0438\u0436\u0435\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 76411833,
-     "sha1_base64": "tCOlzos/+ZfWyVPuMzvslEWXVjI="
+     "s": 76376105,
+     "sha1_base64": "6Bz3NsbEyAzbvm5jWbHnP4PATNU="
     },
     {
      "id": "Russia_North Ossetia-Alania",
@@ -11477,8 +11477,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0421\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f - \u0410\u043b\u0430\u043d\u0438\u044f"
      ],
-     "s": 11089973,
-     "sha1_base64": "2W6fbKkHn03/JNcjhJyLDlaeyYc="
+     "s": 11200677,
+     "sha1_base64": "m0GFeczjYMG3MjPPJYYdbmMl1cg="
     },
     {
      "id": "Russia_Novgorod Oblast",
@@ -11490,8 +11490,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041d\u043e\u0432\u0433\u043e\u0440\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 31591508,
-     "sha1_base64": "pAnEOCwYCEIw6MSeSbAMCH2f5RQ="
+     "s": 31528412,
+     "sha1_base64": "CLhbORaYMaZQqy1S5ctcAuIVMX8="
     },
     {
      "id": "Russia_Novosibirsk Oblast",
@@ -11503,8 +11503,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041d\u043e\u0432\u043e\u0441\u0438\u0431\u0438\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 79288423,
-     "sha1_base64": "Xzs1sZfjZI8qfXGUVZUQOmnFlUY="
+     "s": 79176719,
+     "sha1_base64": "GIQrOiigkBvlIOkY8e9Rmy5+QSY="
     },
     {
      "id": "Russia_Omsk Oblast",
@@ -11516,8 +11516,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 62594182,
-     "sha1_base64": "LqUzyKfOcN05NVeJdHxvSynFvkw="
+     "s": 62452590,
+     "sha1_base64": "DQM5V9YFmm84ZPeOj8gDSREPU9o="
     },
     {
      "id": "Russia_Orenburg Oblast",
@@ -11529,8 +11529,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041e\u0440\u0435\u043d\u0431\u0443\u0440\u0433\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 52319735,
-     "sha1_base64": "aaRIKZ5ooFMfQvW0uR1OxVprkMo="
+     "s": 52456991,
+     "sha1_base64": "p++bZykD/HE/+5xKZnSV4muWJP0="
     },
     {
      "id": "Russia_Oryol Oblast",
@@ -11542,8 +11542,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 20233129,
-     "sha1_base64": "Ehb418GJT+sT9UA7Tt8vGIL2bdc="
+     "s": 20044753,
+     "sha1_base64": "WViSC5oN0EaNPilFUnSFc1YZdP4="
     },
     {
      "id": "Russia_Penza Oblast",
@@ -11555,8 +11555,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 32739635,
-     "sha1_base64": "vvwNS6ntzxPFVHaQy3kSMm5YcxM="
+     "s": 32509795,
+     "sha1_base64": "n3fMrtJYadThN0qFblIWPuEZuaw="
     },
     {
      "id": "Russia_Perm Krai_North",
@@ -11568,8 +11568,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041f\u0435\u0440\u043c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 44372901,
-     "sha1_base64": "BYxuC/DFVDCjVPwit2cDSpB8hG4="
+     "s": 44153733,
+     "sha1_base64": "5JC9GObAu0fg7NaqegzFfy06XW8="
     },
     {
      "id": "Russia_Perm Krai_South",
@@ -11581,8 +11581,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041f\u0435\u0440\u043c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 56363466,
-     "sha1_base64": "NxYc/oaA0hHwLqVGQ8BHn0GX+G4="
+     "s": 56163489,
+     "sha1_base64": "afMyPSiOt19S6Wr7PwbABuicMes="
     },
     {
      "id": "Russia_Primorsky Krai",
@@ -11594,8 +11594,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041f\u0440\u0438\u043c\u043e\u0440\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 46401311,
-     "sha1_base64": "/CumG5tqRHLEZYX8Ey1Wm5nfH6g="
+     "s": 46479543,
+     "sha1_base64": "vur+4t2R67LQn4OOet2mSwjjKaU="
     },
     {
      "id": "Russia_Pskov Oblast",
@@ -11607,8 +11607,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 54105959,
-     "sha1_base64": "6iXaqpXkhJUxoOEEe6QrsD46MUI="
+     "s": 53117567,
+     "sha1_base64": "y+8I+5nId3VsXD04tfBSyyNO6e0="
     },
     {
      "id": "Russia_Republic of Dagestan",
@@ -11620,8 +11620,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0414\u0430\u0433\u0435\u0441\u0442\u0430\u043d"
      ],
-     "s": 45346450,
-     "sha1_base64": "TD4WNTamkc30Ra25S9AhsvQRyCU="
+     "s": 45661242,
+     "sha1_base64": "q/cEtG6eo1gSTWl8K+s/Kx9nGcE="
     },
     {
      "id": "Russia_Republic of Kalmykia",
@@ -11634,8 +11634,8 @@
       "\u041a\u0430\u043b\u043c\u044b\u043a\u0438\u044f",
       "\u0410\u0441\u0442\u0440\u0430\u0445\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 15379782,
-     "sha1_base64": "PRSVCvYNFiB3yv3Mf76Uz8HIk0s="
+     "s": 15598358,
+     "sha1_base64": "KfEpyV3qpVyuplvpulKr7pY1dG0="
     },
     {
      "id": "Russia_Republic of Karelia_North",
@@ -11647,8 +11647,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 78871636,
-     "sha1_base64": "07+OViT69HgjJoYR3DwovURwRI0="
+     "s": 78337452,
+     "sha1_base64": "wvfQlz2nN2Vmrg84ANnHnmwglZM="
     },
     {
      "id": "Russia_Republic of Karelia_South",
@@ -11660,8 +11660,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 70144685,
-     "sha1_base64": "E+f60ArHtCe6sdKTF/12vp3NKnA="
+     "s": 69258053,
+     "sha1_base64": "6n4ghRDm+fiWBHgQ8kaYDEuJ6h8="
     },
     {
      "id": "Russia_Republic of Mordovia",
@@ -11673,8 +11673,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041c\u043e\u0440\u0434\u043e\u0432\u0438\u044f"
      ],
-     "s": 31446458,
-     "sha1_base64": "taSx3M+imwCpVoyMGpO0vYUX0hE="
+     "s": 30352689,
+     "sha1_base64": "IO1g23rFDerRTx34JjxP3bXOTbI="
     },
     {
      "id": "Russia_Rostov Oblast",
@@ -11686,8 +11686,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 69909234,
-     "sha1_base64": "5FxY0S6e6gnKJmamlpxm771lFXs="
+     "s": 69607810,
+     "sha1_base64": "GSqsN0hSatQzRC86Wx2qpkumZBg="
     },
     {
      "id": "Russia_Ryazan Oblast",
@@ -11699,8 +11699,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 33901468,
-     "sha1_base64": "qivMVNLxmGEhdBA/5/sfyqF93Tc="
+     "s": 33243588,
+     "sha1_base64": "cx6k9wr73WqMH1Rl1DaX5Z6E5Q0="
     },
     {
      "id": "Russia_Saint Petersburg",
@@ -11713,8 +11713,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u041b\u0435\u043d\u0438\u043d\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 49006496,
-     "sha1_base64": "TZIDFMVUuk/B/UJRrdp4jeVTclI="
+     "s": 48269856,
+     "sha1_base64": "SdqgtYzHUqdxEXrRuP5e25AMw+w="
     },
     {
      "id": "Russia_Sakha Republic",
@@ -11726,8 +11726,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0421\u0430\u0445\u0430 (\u042f\u043a\u0443\u0442\u0438\u044f)"
      ],
-     "s": 121407276,
-     "sha1_base64": "7sva2TKe6sDRFoONkBdNb4KuWC0="
+     "s": 120171596,
+     "sha1_base64": "nEk2LRat6An2YqJdMQb9sZPFtK0="
     },
     {
      "id": "Russia_Sakhalin Oblast",
@@ -11739,8 +11739,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0421\u0430\u0445\u0430\u043b\u0438\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 54888716,
-     "sha1_base64": "TO39xsVgsR7UDAHg5ON+FJ5hq68="
+     "s": 55320316,
+     "sha1_base64": "QH8n5+OhNqNs/nL0aEnNlt9nPHE="
     },
     {
      "id": "Russia_Samara Oblast",
@@ -11752,8 +11752,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 51521052,
-     "sha1_base64": "672uan1QcES4PoTj8oJmajINHYc="
+     "s": 51351900,
+     "sha1_base64": "4Gc1+c5exX2GyDQZz7Z0iihEDAU="
     },
     {
      "id": "Russia_Saratov Oblast",
@@ -11765,8 +11765,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0421\u0430\u0440\u0430\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 49179256,
-     "sha1_base64": "HV1JTApw/uhJ+S9zRzxI0AzQBfY="
+     "s": 48580896,
+     "sha1_base64": "pN2tF06aYS/HvgWXSCiXCO7smEk="
     },
     {
      "id": "Russia_Smolensk Oblast",
@@ -11778,8 +11778,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 42287037,
-     "sha1_base64": "hBPYXuXAM/XX+mvmECqwHJ2jQtY="
+     "s": 41861885,
+     "sha1_base64": "sb2ET46Pe+oCrXMDIbZ/YUv1vl0="
     },
     {
      "id": "Russia_Stavropol Krai",
@@ -11791,8 +11791,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0421\u0442\u0430\u0432\u0440\u043e\u043f\u043e\u043b\u044c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 37566012,
-     "sha1_base64": "NRN/X0V9Jd355/AEYjPU6K9eqwQ="
+     "s": 37649156,
+     "sha1_base64": "hK+DppQiR7Wa0bPEWD0LvlFQPYo="
     },
     {
      "id": "Russia_Sverdlovsk Oblast_Ekaterinburg",
@@ -11804,8 +11804,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0421\u0432\u0435\u0440\u0434\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 53915798,
-     "sha1_base64": "5DS9C9v8nBtU5h5djGl1LfrNqAs="
+     "s": 53798126,
+     "sha1_base64": "3fjaGsb/BEwlOM/WRdBlQyJoVJA="
     },
     {
      "id": "Russia_Sverdlovsk Oblast_North",
@@ -11817,8 +11817,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0421\u0432\u0435\u0440\u0434\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 59022590,
-     "sha1_base64": "Fld4QH3ojQvBlSrnlj7QC7rd/CQ="
+     "s": 58950142,
+     "sha1_base64": "ZVmTGmCdxslJ084hibckxFXR5RU="
     },
     {
      "id": "Russia_Tambov Oblast",
@@ -11830,8 +11830,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 40382859,
-     "sha1_base64": "NoyJ7gAdISFh9jSHmc39ngbncdc="
+     "s": 40310211,
+     "sha1_base64": "k7Nh+NxlDdzSUd5YIafrnGjx93w="
     },
     {
      "id": "Russia_Tatarstan",
@@ -11843,8 +11843,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0422\u0430\u0442\u0430\u0440\u0441\u0442\u0430\u043d"
      ],
-     "s": 77218683,
-     "sha1_base64": "C0omVtnVsL6pkgTEI/FAJoNamWY="
+     "s": 75635195,
+     "sha1_base64": "ZEWmWk8W2zbL4zNQ67L37wwEzsE="
     },
     {
      "id": "Russia_Tomsk Oblast",
@@ -11856,8 +11856,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0422\u043e\u043c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 26557599,
-     "sha1_base64": "F6APpHNAgvtEPl/o72UUA0t2Y0E="
+     "s": 26392839,
+     "sha1_base64": "XFj44Hcxr57X1La3BPIW5OuTQfw="
     },
     {
      "id": "Russia_Tula Oblast",
@@ -11869,8 +11869,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0422\u0443\u043b\u044c\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 30285219,
-     "sha1_base64": "TYooXRlb6GNP+fyYsIaXi8daOw4="
+     "s": 30260683,
+     "sha1_base64": "J7npWr0QOJMtCBFtvwSzkXzzGCM="
     },
     {
      "id": "Russia_Tuva",
@@ -11882,8 +11882,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0422\u044b\u0432\u0430"
      ],
-     "s": 12887915,
-     "sha1_base64": "e3thHhcF1PtsKl/pdLuqLYuhssQ="
+     "s": 13178347,
+     "sha1_base64": "cF8CbYoaqzxn8M+rWllDkXjv/sI="
     },
     {
      "id": "Russia_Tver Oblast",
@@ -11895,8 +11895,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0422\u0432\u0435\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 72922288,
-     "sha1_base64": "uDCb76/KL/nYqUq9kogia7uZcDE="
+     "s": 72719369,
+     "sha1_base64": "pclSjl5xabt1/a9XTyIbZyRLHuc="
     },
     {
      "id": "Russia_Tyumen Oblast",
@@ -11908,8 +11908,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 56293047,
-     "sha1_base64": "KFWb703a51G/88SIPYkBQtpRPjs="
+     "s": 55935079,
+     "sha1_base64": "WiQ9H4oUzwq4cXso/U7/UHCSycc="
     },
     {
      "id": "Russia_Udmurt Republic",
@@ -11921,8 +11921,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0423\u0434\u043c\u0443\u0440\u0442\u0438\u044f"
      ],
-     "s": 42388396,
-     "sha1_base64": "hc35lSv9WT1MapvyU1gxMLKcIx8="
+     "s": 42397668,
+     "sha1_base64": "0qh7XPEfS5FyRhBJLM2pIzKrynQ="
     },
     {
      "id": "Russia_Ulyanovsk Oblast",
@@ -11934,8 +11934,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0423\u043b\u044c\u044f\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 38827718,
-     "sha1_base64": "X9uDS3ByT13kN2ETzrWIaMk3tzY="
+     "s": 38596310,
+     "sha1_base64": "rB48RfmDUBMvYFBZxG03pc3rUlc="
     },
     {
      "id": "Russia_Vladimir Oblast",
@@ -11947,8 +11947,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0412\u043b\u0430\u0434\u0438\u043c\u0438\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 57746865,
-     "sha1_base64": "/DIgPYcLdhlUMTwoGRApU98DoCU="
+     "s": 57741513,
+     "sha1_base64": "avzF2TqOg96Dcn+XWl2wAlmkqIc="
     },
     {
      "id": "Russia_Volgograd Oblast",
@@ -11960,8 +11960,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0412\u043e\u043b\u0433\u043e\u0433\u0440\u0430\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 56103047,
-     "sha1_base64": "vOqnEXOiYTwamHIsZdxkUWR8bOk="
+     "s": 55285279,
+     "sha1_base64": "y/LCqZlG5wT7at4Hu0/ZsWz4h7U="
     },
     {
      "id": "Russia_Vologda Oblast",
@@ -11973,8 +11973,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0412\u043e\u043b\u043e\u0433\u043e\u0434\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 63042841,
-     "sha1_base64": "RchjrAdPyK+D3zqr8bzZucHwLus="
+     "s": 62356009,
+     "sha1_base64": "BhkI8P8LXKYffhqjgp60QfLiWTU="
     },
     {
      "id": "Russia_Voronezh Oblast",
@@ -11986,8 +11986,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0412\u043e\u0440\u043e\u043d\u0435\u0436\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 59493326,
-     "sha1_base64": "PhWLOEr2FGzW6F4WsLlaHXOKoso="
+     "s": 59297478,
+     "sha1_base64": "JrXguUQ7yVdAefDr0oEkxOd/dLQ="
     },
     {
      "id": "Russia_Yamalo-Nenets Autonomous Okrug",
@@ -11999,8 +11999,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 31534233,
-     "sha1_base64": "qcBjGyaVZ2swmkRQU+vzUXjr3z4="
+     "s": 31384976,
+     "sha1_base64": "x6Tw4rTy+hyXF/Ni7cJc96TeR6Q="
     },
     {
      "id": "Russia_Yaroslavl Oblast",
@@ -12012,8 +12012,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u042f\u0440\u043e\u0441\u043b\u0430\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 40537404,
-     "sha1_base64": "thE2oQRCZN3uOk3jRF40yJNn3lk="
+     "s": 40537044,
+     "sha1_base64": "2xSOwpM4/77tmlTkXIKKdY8lgXA="
     },
     {
      "id": "Russia_Yugra_Khanty",
@@ -12025,8 +12025,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 43133322,
-     "sha1_base64": "dDvnJSAfCtuU/m/dU9ht+LhxzQU="
+     "s": 42818178,
+     "sha1_base64": "mgj2tWd5y03xMWckSKrwIPGTA8w="
     },
     {
      "id": "Russia_Yugra_Surgut",
@@ -12038,8 +12038,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f"
      ],
-     "s": 39402848,
-     "sha1_base64": "kbciX9YIu+9e7TEy4K8o3jF4J28="
+     "s": 38792960,
+     "sha1_base64": "q3CtBdSKQKhAXVnpf8pM0RHc4wI="
     },
     {
      "id": "Russia_Zabaykalsky Krai",
@@ -12051,8 +12051,8 @@
       "\u0420\u043e\u0441\u0441\u0438\u0439\u0441\u043a\u0430\u044f \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044f",
       "\u0417\u0430\u0431\u0430\u0439\u043a\u0430\u043b\u044c\u0441\u043a\u0438\u0439 \u043a\u0440\u0430\u0439"
      ],
-     "s": 30729042,
-     "sha1_base64": "zdrr/LnGQPFhK/2l0zG4I7p4vQI="
+     "s": 30933338,
+     "sha1_base64": "reCv9I9YFRPImDZAvSKyqRuwFCE="
     }
    ]
   },
@@ -12069,8 +12069,8 @@
     "Rwanda",
     "Umujyi wa Kigali"
    ],
-   "s": 41093963,
-   "sha1_base64": "5mMW0LKLPIKENLPBunINztmr/gY="
+   "s": 38869315,
+   "sha1_base64": "JZkmxWB7Y8fdRzQZLES7mw24zbc="
   },
   {
    "id": "Sahrawi Arab Democratic Republic",
@@ -12082,8 +12082,8 @@
     "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
     "RASD"
    ],
-   "s": 15380865,
-   "sha1_base64": "/7TjRIMqnnp3ChApLKWRYd5E82I="
+   "s": 15882825,
+   "sha1_base64": "4orRT/yFpv6drabySoGrNB3kU2E="
   },
   {
    "id": "Saint Helena Ascension and Tristan da Cunha",
@@ -12097,8 +12097,8 @@
     "Saint Helena, Ascension and Tristan da Cunha",
     "Tristan da Cunha"
    ],
-   "s": 1749900,
-   "sha1_base64": "5sFV4go1B6XnGKMp1i+Ughq6Csw="
+   "s": 1716899,
+   "sha1_base64": "XcMgGs0cw9z5wotFS5WR3IRUxIU="
   },
   {
    "id": "Samoa",
@@ -12116,8 +12116,8 @@
     "American Samoa",
     "S\u0101moa"
    ],
-   "s": 6516620,
-   "sha1_base64": "oEZyNrP3Kn+5P0z+3Bo+oMX96o4="
+   "s": 6796708,
+   "sha1_base64": "fxfWzGuwem9qL+yij+fq7Vi0VuQ="
   },
   {
    "id": "San Marino",
@@ -12129,8 +12129,8 @@
     "Italia",
     "San Marino"
    ],
-   "s": 1805732,
-   "sha1_base64": "cBwbiMh0DlheJtJttTxq01HcaBo="
+   "s": 1567028,
+   "sha1_base64": "KkTYsOkCWQMLjIGtqD9uD0Nd0d4="
   },
   {
    "id": "Saudi Arabia",
@@ -12148,8 +12148,8 @@
       "\u0627\u0644\u0634\u0631\u0642\u064a\u0629",
       "\u200f\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629\u200e"
      ],
-     "s": 55549714,
-     "sha1_base64": "teMBTF71GrFg2Sy+/kPpHwIudSw="
+     "s": 55868202,
+     "sha1_base64": "BMr8E711uIqFEnsHLEcGtbrLCEE="
     },
     {
      "id": "Saudi Arabia_North",
@@ -12167,8 +12167,8 @@
       "\u0627\u0644\u0645\u062f\u064a\u0646\u0629 \u0627\u0644\u0645\u0646\u0648\u0631\u0629",
       "\u200f\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629\u200e"
      ],
-     "s": 56857597,
-     "sha1_base64": "ijg4xaXbKGTwZ2jAYnxJmGZrQdY="
+     "s": 56769309,
+     "sha1_base64": "UvU3V0d69895tIrYiNH0xYPkjRQ="
     }
    ]
   },
@@ -12184,8 +12184,8 @@
     "Regi\u00e3o de Cacheu",
     "Senegal"
    ],
-   "s": 79569116,
-   "sha1_base64": "gFCdqeBZBmpmiZPIGhXKDHh5yj4="
+   "s": 75283212,
+   "sha1_base64": "gIsaPDw7hCWibF6b/lbhdDuFy5o="
   },
   {
    "id": "Serbia",
@@ -12197,8 +12197,8 @@
     "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430",
     "\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u0430 \u0421\u0440\u0431\u0438\u0458\u0430"
    ],
-   "s": 153858998,
-   "sha1_base64": "CJ20nE/Mnj2JiVkHp4IZ65Q5Th4="
+   "s": 149609557,
+   "sha1_base64": "fIu7RddxhG+pAxYLB8Qpr7KZVog="
   },
   {
    "id": "Seychelles",
@@ -12208,8 +12208,8 @@
    "affiliations": [
     "Sesel"
    ],
-   "s": 2833688,
-   "sha1_base64": "2VpfDIN4eTwOFCrDsQz7BZpZa8c="
+   "s": 2803592,
+   "sha1_base64": "4Uj12TT+J8pRDWT5E4dX0bKsMJU="
   },
   {
    "id": "Sierra Leone",
@@ -12223,8 +12223,8 @@
     "Southern Province",
     "Western Area"
    ],
-   "s": 42292778,
-   "sha1_base64": "ZUpznkolMWOMK6IvawUmk4w6WWQ="
+   "s": 42344042,
+   "sha1_base64": "uQ9jDQ/xi/0wfpSZnKCyOuhgE4w="
   },
   {
    "id": "Singapore",
@@ -12236,8 +12236,8 @@
     "Malaysia",
     "Singapura"
    ],
-   "s": 25269130,
-   "sha1_base64": "eJbTAG1eq8vWtNjT4duGkcTALek="
+   "s": 25070274,
+   "sha1_base64": "qK7a2y3rHLzwBFJgkgRvOFg6bYM="
   },
   {
    "id": "Slovakia",
@@ -12251,8 +12251,8 @@
       "Pre\u0161ovsk\u00fd kraj",
       "Slovensko"
      ],
-     "s": 47276140,
-     "sha1_base64": "Yj0aRxDWYqCkh+XI0N60C+YyOOg="
+     "s": 46829540,
+     "sha1_base64": "MwAjRVqS9e3wf/arFsn74OQ83fs="
     },
     {
      "id": "Slovakia_Region of Kosice",
@@ -12263,8 +12263,8 @@
       "Ko\u0161ick\u00fd kraj",
       "Slovensko"
      ],
-     "s": 44342420,
-     "sha1_base64": "Z0dZMaHqiGkW7WRzl9x2EeNcWLs="
+     "s": 44329492,
+     "sha1_base64": "mPJywbcb/chJPKMUkp6AzmGqJh0="
     },
     {
      "id": "Slovakia_Region of Banska Bystrica",
@@ -12275,8 +12275,8 @@
       "Banskobystrick\u00fd kraj",
       "Slovensko"
      ],
-     "s": 53776524,
-     "sha1_base64": "SlL9LuB4DH8May/ms/tOV7xnsdI="
+     "s": 53084732,
+     "sha1_base64": "ml4I+iW1U1hUwT7Cj+Lg8oKZ9bo="
     },
     {
      "id": "Slovakia_Region of Trnava",
@@ -12287,8 +12287,8 @@
       "Slovensko",
       "Trnavsk\u00fd kraj"
      ],
-     "s": 25962915,
-     "sha1_base64": "uO3nPSZJioroJMEFIjUn+VzAB4s="
+     "s": 25818491,
+     "sha1_base64": "3BsTcFGoQd0lod3veuRQ2wGgtJE="
     },
     {
      "id": "Slovakia_Region of Trencin",
@@ -12299,8 +12299,8 @@
       "Slovensko",
       "Tren\u010diansky kraj"
      ],
-     "s": 36303836,
-     "sha1_base64": "3xi9WaGOH2S7w3Du06QBXAU+0c4="
+     "s": 35989228,
+     "sha1_base64": "rPScjYHyGzTwbBS5r1dqGBhtR1Y="
     },
     {
      "id": "Slovakia_Region of Nitra",
@@ -12311,8 +12311,8 @@
       "Nitriansky kraj",
       "Slovensko"
      ],
-     "s": 26264762,
-     "sha1_base64": "SMQJnz0u8UsR/I2HU6Ur8smjpbs="
+     "s": 26100633,
+     "sha1_base64": "pcRLoHRjYiJCO9rJ2yKupGUBy8A="
     },
     {
      "id": "Slovakia_Region of Bratislava",
@@ -12323,8 +12323,8 @@
       "Bratislavsk\u00fd kraj",
       "Slovensko"
      ],
-     "s": 22030841,
-     "sha1_base64": "RX62zllosrWFJkE/SWsdtRNgemQ="
+     "s": 22009233,
+     "sha1_base64": "tppy/Cp0xUQfzOtGr4BFKxtz6Oc="
     },
     {
      "id": "Slovakia_Region of Zilina",
@@ -12335,8 +12335,8 @@
       "Slovensko",
       "\u017dilinsk\u00fd kraj"
      ],
-     "s": 50048588,
-     "sha1_base64": "nWoPGCgxBeZNszpNNlfsLJjy/6c="
+     "s": 50040964,
+     "sha1_base64": "htZg4ueKt+nrjNNcQJke/PEPCo0="
     }
    ]
   },
@@ -12352,8 +12352,8 @@
       "Border SI-HR",
       "Slovenija"
      ],
-     "s": 161911226,
-     "sha1_base64": "H2TreXxZQvyvqcLsxzvhXa9DMgo="
+     "s": 161154730,
+     "sha1_base64": "b1kXJ5obFedKLMvZe7zL4023fmc="
     },
     {
      "id": "Slovenia_West",
@@ -12363,8 +12363,8 @@
      "affiliations": [
       "Slovenija"
      ],
-     "s": 118239136,
-     "sha1_base64": "OPvRG3X7FIicQjJ0WJHYHRF6mIc="
+     "s": 118086384,
+     "sha1_base64": "KviGm3t4z/IjIz6GaOZZ/99wBqw="
     }
    ]
   },
@@ -12386,8 +12386,8 @@
     "Temotu Province",
     "Western Province"
    ],
-   "s": 16903033,
-   "sha1_base64": "MzBsMdnSBLgGnGK6gP0CQINt7RA="
+   "s": 17039241,
+   "sha1_base64": "IUps3xMCyx2DQ3FqjFgrZ3TnPvU="
   },
   {
    "id": "Somalia",
@@ -12415,8 +12415,8 @@
     "Togdheer",
     "Woqooyi Galbeed"
    ],
-   "s": 151903963,
-   "sha1_base64": "mdHfGilguHuIUEFHaE7RVnIdOEE="
+   "s": 151801851,
+   "sha1_base64": "APs40XpL8BNa91veolMWFElNwFg="
   },
   {
    "id": "South Africa",
@@ -12431,8 +12431,8 @@
       "South Africa",
       "Western Cape"
      ],
-     "s": 66835697,
-     "sha1_base64": "4ZfojcsHI476fROOA3UaqfBt230="
+     "s": 66609481,
+     "sha1_base64": "z6XPHflnuqP0MLk0FFeQW1dYVJM="
     },
     {
      "id": "South Africa_Gauteng",
@@ -12443,8 +12443,8 @@
       "Gauteng",
       "South Africa"
      ],
-     "s": 41734003,
-     "sha1_base64": "um/68IHhTGsw04XDlU756/INnYI="
+     "s": 41551291,
+     "sha1_base64": "Ui/S8kB77qDaAcp/6FrHHBUJ5ZY="
     },
     {
      "id": "South Africa_North West",
@@ -12455,8 +12455,8 @@
       "North West",
       "South Africa"
      ],
-     "s": 26221591,
-     "sha1_base64": "RDT02L6cps+RfxMExuMcOTCVAsA="
+     "s": 26293271,
+     "sha1_base64": "Ytmnm6fqM6EpuQS7RUc4FpCybkw="
     },
     {
      "id": "South Africa_Free State",
@@ -12467,8 +12467,8 @@
       "Free State",
       "South Africa"
      ],
-     "s": 30503586,
-     "sha1_base64": "vAaRT6+4XPhIFXfbe3mGu3ad/9I="
+     "s": 30467338,
+     "sha1_base64": "7mprqqUalUwttnGYT5aqomLZU10="
     },
     {
      "id": "South Africa_Eastern Cape",
@@ -12479,8 +12479,8 @@
       "Eastern Cape",
       "South Africa"
      ],
-     "s": 43066586,
-     "sha1_base64": "jZkw9S0Sw3FbVCVAG6y7HVi2LKQ="
+     "s": 42908138,
+     "sha1_base64": "eArmEhwq4SXu4KoSivOGTNXOalI="
     },
     {
      "id": "South Africa_Northern Cape",
@@ -12491,8 +12491,8 @@
       "Northern Cape",
       "South Africa"
      ],
-     "s": 20577967,
-     "sha1_base64": "l/PB9DVXAH2U+2+wUubsx5jLr4k="
+     "s": 20631535,
+     "sha1_base64": "Xs0iTCrrlww/6nzUqGwF9Roxfw4="
     },
     {
      "id": "South Africa_Mpumalanga",
@@ -12503,8 +12503,8 @@
       "Mpumalanga",
       "South Africa"
      ],
-     "s": 32064979,
-     "sha1_base64": "WFs+xz2/bWG6/0ITvWH2qtFmCCU="
+     "s": 32036539,
+     "sha1_base64": "j3ZZRaLKAJdl4r3wprADpsefG+A="
     },
     {
      "id": "South Africa_Limpopo",
@@ -12515,8 +12515,8 @@
       "Limpopo",
       "South Africa"
      ],
-     "s": 32758410,
-     "sha1_base64": "XTmFfJsiEWxzOc/g/f2hhL1BQN8="
+     "s": 32959146,
+     "sha1_base64": "qWkVwfWjsf9UQp6gilZYl0jyQfE="
     },
     {
      "id": "South Africa_KwaZulu-Natal",
@@ -12527,8 +12527,8 @@
       "KwaZulu-Natal",
       "South Africa"
      ],
-     "s": 85136360,
-     "sha1_base64": "alRVJVh8otPqSPIzZ/sJYIJH5uM="
+     "s": 84526712,
+     "sha1_base64": "l2Qir+ErXe63ZA2M8m4Uag7QLNQ="
     }
    ]
   },
@@ -12544,8 +12544,8 @@
    "country_name_synonyms": [
     "South Georgia and South Sandwich Islands"
    ],
-   "s": 12322314,
-   "sha1_base64": "BiNpzVW3LZhLifr8v2csSYfaeo8="
+   "s": 12299442,
+   "sha1_base64": "iB58oqENLQsSzWPHM5NHDqA6GKY="
   },
   {
    "id": "South Ossetia",
@@ -12557,8 +12557,8 @@
     "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f",
     "\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"
    ],
-   "s": 12238432,
-   "sha1_base64": "H67Z3xWgHJvGcsbkIsF5IdYJKmc="
+   "s": 12222416,
+   "sha1_base64": "tT0Zhhp+AGfNNGTDTYFYEwgp2q0="
   },
   {
    "id": "South Sudan",
@@ -12579,8 +12579,8 @@
     "Western Equatoria",
     "\u0648\u0627\u0631\u0627\u0628"
    ],
-   "s": 86183165,
-   "sha1_base64": "/2UZlxxnMELgu9YmVPjD86cfTeQ="
+   "s": 86819197,
+   "sha1_base64": "Uhbzj3k4/+m4myiuT86t1AER/kk="
   },
   {
    "id": "Spain",
@@ -12595,8 +12595,8 @@
       "Espa\u00f1a (mare territorial)",
       "Espa\u00f1a"
      ],
-     "s": 63879427,
-     "sha1_base64": "zDx6NmISQfM+SGtDV4JCxmMKOKc="
+     "s": 63737243,
+     "sha1_base64": "06ZTkvrT/udhjey6thbb4fnMtnY="
     },
     {
      "id": "Spain_Andalusia_Sevilla",
@@ -12607,8 +12607,8 @@
       "Andaluc\u00eda",
       "Espa\u00f1a"
      ],
-     "s": 85390619,
-     "sha1_base64": "AG7jSEZAaEh3iRljYN0C3d7QQaI="
+     "s": 84516027,
+     "sha1_base64": "g6Kcb8xygrMuXynqz5NkSENJHlA="
     },
     {
      "id": "Spain_Aragon",
@@ -12619,8 +12619,8 @@
       "Arag\u00f3n",
       "Espa\u00f1a"
      ],
-     "s": 84463253,
-     "sha1_base64": "SXbmovAZ7VQLIyxlD8lOxZRFom4="
+     "s": 84020653,
+     "sha1_base64": "rdB5UDbMgK13SkHh6e/XVyMwcdA="
     },
     {
      "id": "Spain_Balearic Islands",
@@ -12631,8 +12631,8 @@
       "Illes Balears",
       "Espa\u00f1a"
      ],
-     "s": 37029129,
-     "sha1_base64": "UMP26onoIWApFR3V+MC23JUfbIM="
+     "s": 36403993,
+     "sha1_base64": "1T/UcUEkphYgp6Zu85uAFEi/GLQ="
     },
     {
      "id": "Spain_Basque Country",
@@ -12644,8 +12644,8 @@
       "Espa\u00f1a",
       "Euskadi"
      ],
-     "s": 71683096,
-     "sha1_base64": "TbwrC83EOCjWSU6Q0b0T8OGgWLo="
+     "s": 71375576,
+     "sha1_base64": "wVD6HsFmrRlXjmrzQxL/RUePrZ4="
     },
     {
      "id": "Spain_Canary Islands",
@@ -12656,8 +12656,8 @@
       "Canarias",
       "Espa\u00f1a"
      ],
-     "s": 55092015,
-     "sha1_base64": "F9iyZzHLw+pvG0omdrUVIWSzzZA="
+     "s": 55051878,
+     "sha1_base64": "bqwjThZgETu1K0nF6G0SztP8YaE="
     },
     {
      "id": "Spain_Cantabria",
@@ -12668,8 +12668,8 @@
       "Cantabria",
       "Espa\u00f1a"
      ],
-     "s": 32540804,
-     "sha1_base64": "3pgy99L4cPfJ4vZEkib1PWZLciA="
+     "s": 32083956,
+     "sha1_base64": "A2jVL2zpIngf9e86PznBA71Dmlg="
     },
     {
      "id": "Spain_Castile and Leon_West",
@@ -12680,8 +12680,8 @@
       "Castilla y Le\u00f3n",
       "Espa\u00f1a"
      ],
-     "s": 92383318,
-     "sha1_base64": "VDGL/2PYkiECdEqydBy9ayDjyHQ="
+     "s": 89548766,
+     "sha1_base64": "h10Wk/Z7l0BjWV51ztxSWDY8dmQ="
     },
     {
      "id": "Spain_Castile and Leon_East",
@@ -12692,8 +12692,8 @@
       "Castilla y Le\u00f3n",
       "Espa\u00f1a"
      ],
-     "s": 73277445,
-     "sha1_base64": "neKfYyw8hCCNd5vHmdwvSEz1R0Y="
+     "s": 71590477,
+     "sha1_base64": "MBI7gK2IzI44m7UBhHD28dxPu/4="
     },
     {
      "id": "Spain_Castile-La Mancha",
@@ -12704,8 +12704,8 @@
       "Castilla-La Mancha",
       "Espa\u00f1a"
      ],
-     "s": 110600127,
-     "sha1_base64": "UlwT65zd7y3Sf1klh5+Jev/61tY="
+     "s": 109784719,
+     "sha1_base64": "314khFdEgrYarSWntCNh5AFCgZk="
     },
     {
      "id": "Spain_Catalonia_Provincia de Barcelona",
@@ -12716,8 +12716,8 @@
       "Catalunya",
       "Espa\u00f1a"
      ],
-     "s": 114737571,
-     "sha1_base64": "PtZeFbc+dwmNRU7P0B13ipum4+Y="
+     "s": 113389643,
+     "sha1_base64": "ceNWZcc4gMaIHhFM9nFGFHvFMnE="
     },
     {
      "id": "Spain_Catalonia_Provincia de Girona",
@@ -12728,8 +12728,8 @@
       "Catalunya",
       "Espa\u00f1a"
      ],
-     "s": 45254013,
-     "sha1_base64": "LhX62hdgqcrJNWWDfmoxUp1ey7I="
+     "s": 44745045,
+     "sha1_base64": "/Yuz4TFgwbUUInslEHGGgdetzpU="
     },
     {
      "id": "Spain_Catalonia_Provincia de Lleida",
@@ -12740,8 +12740,8 @@
       "Catalunya",
       "Espa\u00f1a"
      ],
-     "s": 49060143,
-     "sha1_base64": "E92b69UxKpY1I3p4hD0b81HV+Cg="
+     "s": 48663239,
+     "sha1_base64": "uaP/VQe9io1hrFkFEYQuoFdFwZ0="
     },
     {
      "id": "Spain_Catalonia_Provincia de Tarragona",
@@ -12752,8 +12752,8 @@
       "Catalunya",
       "Espa\u00f1a"
      ],
-     "s": 39295563,
-     "sha1_base64": "P2rmCW87Vy9LfChF6gHlBfppWmU="
+     "s": 38886107,
+     "sha1_base64": "pSC5dasrw238yeNLxiTQnLtGqgg="
     },
     {
      "id": "Spain_Ceuta",
@@ -12765,8 +12765,8 @@
       "Espa\u00f1a",
       "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628"
      ],
-     "s": 595638,
-     "sha1_base64": "mbQx+1r/e7vYRIISrUE2RXzWew0="
+     "s": 769637,
+     "sha1_base64": "dwNgAeUsbTRog84sVtjMKIn61/A="
     },
     {
      "id": "Spain_Community of Madrid",
@@ -12777,8 +12777,8 @@
       "Comunidad de Madrid",
       "Espa\u00f1a"
      ],
-     "s": 73722073,
-     "sha1_base64": "VxaNgV69u0IpYmu2tjnTzuwDbjg="
+     "s": 73309665,
+     "sha1_base64": "1T/hJtr7tuNlJBS7nq4fvJqeaDM="
     },
     {
      "id": "Spain_Comunidad Foral de Navarra",
@@ -12789,8 +12789,8 @@
       "Comunidad Foral de Navarra",
       "Espa\u00f1a"
      ],
-     "s": 40120005,
-     "sha1_base64": "BjlP+v5trDJQaQOhzxQT5KDo1bg="
+     "s": 39848557,
+     "sha1_base64": "2XwS0jPUIkaIupn12ARMa5oMuJM="
     },
     {
      "id": "Spain_Extremadura",
@@ -12801,8 +12801,8 @@
       "Espa\u00f1a",
       "Extremadura"
      ],
-     "s": 39906990,
-     "sha1_base64": "i6e6w9me25rIc0uXCofpZZ+O+uI="
+     "s": 39639670,
+     "sha1_base64": "4Lciso1wdH3+zoX7WMUb7AO/2Q4="
     },
     {
      "id": "Spain_Galicia_North",
@@ -12813,8 +12813,8 @@
       "Espa\u00f1a",
       "Galicia"
      ],
-     "s": 64693458,
-     "sha1_base64": "2dlOfXrMWdaWTvuL0haLm81l7k4="
+     "s": 64540874,
+     "sha1_base64": "zYA3aZhIf/dqjyr6ot7ASRih7mc="
     },
     {
      "id": "Spain_Galicia_South",
@@ -12825,8 +12825,8 @@
       "Espa\u00f1a",
       "Galicia"
      ],
-     "s": 38488366,
-     "sha1_base64": "hXeE6hp7ENrqv56Lv7U8p3qEJ/s="
+     "s": 38038806,
+     "sha1_base64": "+0vAw/rBO5UfgOuSvGOc1UstG6I="
     },
     {
      "id": "Spain_La Rioja",
@@ -12837,8 +12837,8 @@
       "Espa\u00f1a",
       "La Rioja"
      ],
-     "s": 15362824,
-     "sha1_base64": "w+Vxly87HBPAFGq70E8w2UrLwPI="
+     "s": 15184832,
+     "sha1_base64": "MV9SxN+or32yaySP5+3F3Q2i1Zc="
     },
     {
      "id": "Spain_Melilla",
@@ -12851,8 +12851,8 @@
       "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
       "Melilla"
      ],
-     "s": 845654,
-     "sha1_base64": "Dn0EDxPzxkXiNBPqZ2jbZuARF1s="
+     "s": 1235398,
+     "sha1_base64": "ZHIYPxxXuooWaz1Jz9B+1Cy+gbM="
     },
     {
      "id": "Spain_Principado de Asturias",
@@ -12863,8 +12863,8 @@
       "Espa\u00f1a",
       "Principado de Asturias"
      ],
-     "s": 33163565,
-     "sha1_base64": "bNZJXLlM6v0G1pOi6AuMYOVosAw="
+     "s": 32938829,
+     "sha1_base64": "Yc24zR56aNhzHq4yJvsKtXOlLWc="
     },
     {
      "id": "Spain_Region de Murcia",
@@ -12875,8 +12875,8 @@
       "Espa\u00f1a",
       "Regi\u00f3n de Murcia"
      ],
-     "s": 36883844,
-     "sha1_base64": "xbIv6/btKThiQjIqho1Qbil2pMI="
+     "s": 36309244,
+     "sha1_base64": "cJijJXebgsPy7wDebIK8Xwf+gxM="
     },
     {
      "id": "Spain_Valencian Community",
@@ -12887,8 +12887,8 @@
       "Comunitat Valenciana",
       "Espa\u00f1a"
      ],
-     "s": 109542652,
-     "sha1_base64": "2e39GPnr5U3MiZ3YDwL6INQTctU="
+     "s": 107453780,
+     "sha1_base64": "E46yTSauU2isuSuNdwRAT4mQ2GA="
     }
    ]
   },
@@ -12908,8 +12908,8 @@
       "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd",
       "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc"
      ],
-     "s": 8222555,
-     "sha1_base64": "dxhV3HcgoWoS7W+1MbOqzd0cjmY="
+     "s": 8458899,
+     "sha1_base64": "4Sg9Qf7duW4hsOVYIY/U+68Aczk="
     },
     {
      "id": "Palestine",
@@ -12921,8 +12921,8 @@
       "Area B",
       "Area C"
      ],
-     "s": 28448433,
-     "sha1_base64": "Z6jpsJVF9W7b233DLcBT3bb0O/E="
+     "s": 28795489,
+     "sha1_base64": "b7Ks9MMmI8YCdbSJa5BReAKomYY="
     }
    ]
   },
@@ -12943,8 +12943,8 @@
     "Western Province",
     "\u0dc1\u0dca\u200d\u0dbb\u0dd3 \u0dbd\u0d82\u0d9a\u0dcf"
    ],
-   "s": 114322816,
-   "sha1_base64": "PyV/B6dJG129VB/k9ZtWde56+yw="
+   "s": 113023080,
+   "sha1_base64": "2DB9walOdfZ/70LVUY9aNSdFBnY="
   },
   {
    "id": "Sudan",
@@ -12967,8 +12967,8 @@
       "an-Nil al-Azraq",
       "ash-Shamaliyah"
      ],
-     "s": 37573785,
-     "sha1_base64": "CBPjWa3BIEO2helmG3sWr9diC6Y="
+     "s": 37992089,
+     "sha1_base64": "qTbMPzQPY/XMFVbEoWJGRruBDpU="
     },
     {
      "id": "Sudan_West",
@@ -12993,8 +12993,8 @@
       "ash-Shamaliyah",
       "\u0648\u0627\u0631\u0627\u0628"
      ],
-     "s": 62704836,
-     "sha1_base64": "3wjVrcsYiCRBoskOMrBSCctnq6A="
+     "s": 61701116,
+     "sha1_base64": "N+TY1edLLyj4LnVZAqgbsgW6CBI="
     }
    ]
   },
@@ -13016,8 +13016,8 @@
     "Suriname",
     "Wanica"
    ],
-   "s": 34541584,
-   "sha1_base64": "2MJbh96P5ACf4k+Pgqj9IY1mXbQ="
+   "s": 34821648,
+   "sha1_base64": "vcyz0wjhSq8CoXamJ/laU4l5Qcg="
   },
   {
    "id": "Swaziland",
@@ -13034,8 +13034,8 @@
    "country_name_synonyms": [
     "Eswatini"
    ],
-   "s": 24217084,
-   "sha1_base64": "03mHjrSajeP5C0CB4sLXdZeuf7M="
+   "s": 24287300,
+   "sha1_base64": "djaKumB7wGDFUj9WSBRIQLf8Aro="
   },
   {
    "id": "Sweden",
@@ -13051,8 +13051,8 @@
       "Uppsala l\u00e4n",
       "V\u00e4stmanlands l\u00e4n"
      ],
-     "s": 63660777,
-     "sha1_base64": "Sid2UIMN69deqE8wMrtsrwk1uyA="
+     "s": 63522929,
+     "sha1_base64": "fyI2KZ9q0sv8mGJUxW7ZJRzOtJ8="
     },
     {
      "id": "Sweden_Stockholm",
@@ -13063,8 +13063,8 @@
       "Stockholms l\u00e4n",
       "Sverige"
      ],
-     "s": 61780168,
-     "sha1_base64": "O+N4BAlS9N7j+pfoQUskwY5whIo="
+     "s": 61525152,
+     "sha1_base64": "gEJrCFoXaD8h3UmpAU0nuKU9JJI="
     },
     {
      "id": "Sweden_Ostra Gotaland",
@@ -13081,8 +13081,8 @@
       "Sverige",
       "Territorial waters of Gotland"
      ],
-     "s": 107225476,
-     "sha1_base64": "anb9oXY4lKdP/O6ofyjV8JgBeOY="
+     "s": 106848604,
+     "sha1_base64": "Z8igcShlZYc60+P0yON8vtvobWs="
     },
     {
      "id": "Sweden_Norra Sverige",
@@ -13094,8 +13094,8 @@
       "Sverige",
       "V\u00e4sterbottens l\u00e4n"
      ],
-     "s": 66654129,
-     "sha1_base64": "Vji0XP4ON+GUv2RMjB1tlVx1b9A="
+     "s": 65591617,
+     "sha1_base64": "YxZIvbg5pecnfH58gbc9AXHA+QQ="
     },
     {
      "id": "Sweden_Mellannorrland",
@@ -13107,8 +13107,8 @@
       "Sverige",
       "V\u00e4sternorrlands l\u00e4n"
      ],
-     "s": 124150402,
-     "sha1_base64": "DugXimLIncj9o0D80T1lEzAuGyw="
+     "s": 123745034,
+     "sha1_base64": "e6vlQN66oN3eTMZGca5/2RkqQ44="
     },
     {
      "id": "Sweden_Bergslagen",
@@ -13122,8 +13122,8 @@
       "Sverige",
       "V\u00e4rmlands l\u00e4n"
      ],
-     "s": 143368772,
-     "sha1_base64": "n03ua34VgrJpsLvftZjhxvsTO8w="
+     "s": 142163748,
+     "sha1_base64": "gnC6GEyNLqAUy94iuoLSaHADQ64="
     },
     {
      "id": "Sweden_Vastra Gotaland",
@@ -13136,8 +13136,8 @@
       "Sverige",
       "V\u00e4stra G\u00f6talands l\u00e4n"
      ],
-     "s": 122967636,
-     "sha1_base64": "5TKwkLZ1Q9Kb08zvtj+tGnRpGKM="
+     "s": 122536444,
+     "sha1_base64": "AjTHzLhm3IxBrq7ykoFMkRFRn/k="
     },
     {
      "id": "Sweden_Sodra Gotaland",
@@ -13151,8 +13151,8 @@
       "Sverige",
       "Territorial waters of Bornholm"
      ],
-     "s": 56302961,
-     "sha1_base64": "JGy36V0jQZv1VVaxL47U3hWhjYc="
+     "s": 56388665,
+     "sha1_base64": "Tk+V5f6kS2dImy9juc+ZiW6GvO0="
     }
    ]
   },
@@ -13174,8 +13174,8 @@
       "Schweiz, Suisse, Svizzera, Svizra",
       "Thurgau"
      ],
-     "s": 79639892,
-     "sha1_base64": "Z7/CIvKd3jmedorfoK4IQS5+8NU="
+     "s": 79628116,
+     "sha1_base64": "NELRUJCHhD25xQj928vACghYo/E="
     },
     {
      "id": "Switzerland_Central",
@@ -13191,8 +13191,8 @@
       "Uri",
       "Zug"
      ],
-     "s": 43691486,
-     "sha1_base64": "YAHuYc5uIDAokgXJ+VEIQW4iLGM="
+     "s": 43587590,
+     "sha1_base64": "+Rw/1PkcrKHzcR54gpFQvS3dULc="
     },
     {
      "id": "Switzerland_Espace Mittelland_Bern",
@@ -13209,8 +13209,8 @@
       "Solothurn",
       "Vaud"
      ],
-     "s": 75358610,
-     "sha1_base64": "E82gk6AwEvA1D6iA0yF+ai5He0Y="
+     "s": 75061330,
+     "sha1_base64": "JFOSQ0UELbt9lKhVnMwUvHaUAxY="
     },
     {
      "id": "Switzerland_Espace Mittelland_East",
@@ -13221,8 +13221,8 @@
       "Bern - Berne",
       "Schweiz, Suisse, Svizzera, Svizra"
      ],
-     "s": 43864220,
-     "sha1_base64": "Hmm3TmQPIuLdK91JqEY9z2cNkxY="
+     "s": 43807100,
+     "sha1_base64": "+2mTgVVrNHB70PFjxNsVNI7HYXY="
     },
     {
      "id": "Switzerland_Ticino",
@@ -13233,8 +13233,8 @@
       "Schweiz, Suisse, Svizzera, Svizra",
       "Ticino"
      ],
-     "s": 25505650,
-     "sha1_base64": "+uAJbRRFK1RiulfeEEfnoOdeCN0="
+     "s": 24794353,
+     "sha1_base64": "zjrb3L+TSsHjQUC+D3IqwGg/QF0="
     },
     {
      "id": "Switzerland_Northwestern",
@@ -13247,8 +13247,8 @@
       "Basel-Stadt",
       "Schweiz, Suisse, Svizzera, Svizra"
      ],
-     "s": 46035168,
-     "sha1_base64": "e9NBiHfzgLYPc7aLUTC0mkv83A0="
+     "s": 46358159,
+     "sha1_base64": "uQp92yBOirOCJJzscAG1N7AhOBk="
     },
     {
      "id": "Switzerland_Lake Geneva region",
@@ -13262,8 +13262,8 @@
       "Vaud",
       "Valais - Wallis"
      ],
-     "s": 87711866,
-     "sha1_base64": "1iRY8pDu90/IhDdGi+tHWR2D6Cw="
+     "s": 86963538,
+     "sha1_base64": "mx3KdY7rmGCMVoQN5ZzB1ZZev/4="
     },
     {
      "id": "Switzerland_Zurich",
@@ -13274,8 +13274,8 @@
       "Schweiz, Suisse, Svizzera, Svizra",
       "Z\u00fcrich"
      ],
-     "s": 53275113,
-     "sha1_base64": "D3TDb4SsgByXV128FWXl6pYvUIQ="
+     "s": 52889137,
+     "sha1_base64": "ijgC8T/CAdoJcCZCHqbm/vPPEmU="
     }
    ]
   },
@@ -13301,8 +13301,8 @@
     "UNDOF",
     "\u062d\u0645\u0635"
    ],
-   "s": 83958087,
-   "sha1_base64": "iWziguBr279cKgyWNfygQyAbusA="
+   "s": 83487806,
+   "sha1_base64": "c7z2MsLSBuNBNZxUEngwITxiOwg="
   },
   {
    "id": "Sao Tome and Principe",
@@ -13314,8 +13314,8 @@
     "S\u00e3o Tom\u00e9 Province",
     "S\u00e3o Tom\u00e9 e Pr\u00edncipe"
    ],
-   "s": 1448848,
-   "sha1_base64": "iutCuBkiN7vLYx7iMQNMKlV0H18="
+   "s": 1347584,
+   "sha1_base64": "uuglPj5MQSnsztUBH8dmyfb3QSk="
   },
   {
    "id": "Tajikistan",
@@ -13329,8 +13329,8 @@
     "\u041d\u043e\u04b3\u0438\u044f\u04b3\u043e\u0438 \u0442\u043e\u0431\u0435\u0438 \u04b7\u0443\u043c\u04b3\u0443\u0440\u04e3",
     "\u0422\u043e\u04b7\u0438\u043a\u0438\u0441\u0442\u043e\u043d"
    ],
-   "s": 45169964,
-   "sha1_base64": "rjRDE0z4kb94pk96Epclty0wSL4="
+   "s": 44673212,
+   "sha1_base64": "/dzGt+rFrnodfW1WEsOqCHLkJWU="
   },
   {
    "id": "Tanzania",
@@ -13365,8 +13365,8 @@
     "Unguja Kusini",
     "Unguja Mjini Magharibi"
    ],
-   "s": 538945413,
-   "sha1_base64": "Tzgkh3BsCWJUVWy5jlF/rtQ85lU="
+   "s": 530993821,
+   "sha1_base64": "bX/KJUuvBT1oR7wCpyjML0FukE8="
   },
   {
    "id": "Thailand",
@@ -13392,8 +13392,8 @@
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e40\u0e0a\u0e35\u0e22\u0e07\u0e43\u0e2b\u0e21\u0e48",
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e41\u0e21\u0e48\u0e2e\u0e48\u0e2d\u0e07\u0e2a\u0e2d\u0e19"
      ],
-     "s": 63921425,
-     "sha1_base64": "6mujpkw3ThaSaKqx2FyH6lld788="
+     "s": 63959113,
+     "sha1_base64": "Tj4REu2N35Tk1Xg34TvHqlm6N9U="
     },
     {
      "id": "Thailand_Central",
@@ -13439,8 +13439,8 @@
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e33\u0e19\u0e32\u0e08\u0e40\u0e08\u0e23\u0e34\u0e0d",
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e23\u0e30\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e2d\u0e22\u0e38\u0e18\u0e22\u0e32"
      ],
-     "s": 122953162,
-     "sha1_base64": "1eAX5iIdfqxUCNNklQngB5x6zU4="
+     "s": 123253706,
+     "sha1_base64": "1I+Mo4KSXLbKr0K8LE1Pd64bXHg="
     },
     {
      "id": "Thailand_South",
@@ -13482,8 +13482,8 @@
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e19\u0e04\u0e23\u0e28\u0e23\u0e35\u0e18\u0e23\u0e23\u0e21\u0e23\u0e32\u0e0a",
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1b\u0e23\u0e30\u0e08\u0e27\u0e1a\u0e04\u0e35\u0e23\u0e35\u0e02\u0e31\u0e19\u0e18\u0e4c"
      ],
-     "s": 131080083,
-     "sha1_base64": "l3/2SPvCzOaU20ErMdfvS2P1D3k="
+     "s": 130994387,
+     "sha1_base64": "kiwLpMf3Nf33AivVT/Rj1vgPazI="
     }
    ]
   },
@@ -13499,8 +13499,8 @@
    "country_name_synonyms": [
     "Bahamas"
    ],
-   "s": 14012443,
-   "sha1_base64": "65A0JHrazOwz0njNSjQnac/hWME="
+   "s": 14217411,
+   "sha1_base64": "fTM7cIkQKAq9tgKhbI4WX/vSwRI="
   },
   {
    "id": "The Gambia",
@@ -13519,8 +13519,8 @@
     "Mansakonko",
     "Senegal"
    ],
-   "s": 15297270,
-   "sha1_base64": "WMabNS0wxljxd+22jIQvKQdjz7Y="
+   "s": 15320318,
+   "sha1_base64": "2CiygTdtMuGUxLkbMQ003FxzRV0="
   },
   {
    "id": "Netherlands",
@@ -13534,8 +13534,8 @@
       "Drenthe",
       "Nederland"
      ],
-     "s": 42392510,
-     "sha1_base64": "qeq9DLglnN1ufDHexHhkpHs4x5o="
+     "s": 42469734,
+     "sha1_base64": "UGRGeCXxhwrbMT612D1icktcpCM="
     },
     {
      "id": "Netherlands_Flevoland",
@@ -13546,8 +13546,8 @@
       "Flevoland",
       "Nederland"
      ],
-     "s": 24707033,
-     "sha1_base64": "4Hu622eEYY1GI/FtfriamiH4hIk="
+     "s": 24710537,
+     "sha1_base64": "kLBUBNIaZaI+kwAg/RfiwCZLP1U="
     },
     {
      "id": "Netherlands_Friesland",
@@ -13558,8 +13558,8 @@
       "Friesland",
       "Nederland"
      ],
-     "s": 62498871,
-     "sha1_base64": "Sb0pzJmCle6baqCi5vYvusEfRu4="
+     "s": 62266103,
+     "sha1_base64": "RCU0lpCSXXYkjt7foBL+IZF363g="
     },
     {
      "id": "Netherlands_Gelderland_Nijmegen",
@@ -13570,8 +13570,8 @@
       "Gelderland",
       "Nederland"
      ],
-     "s": 38601294,
-     "sha1_base64": "/QvhwW6V3QaEUK7gu63PF5PcHdg="
+     "s": 38545870,
+     "sha1_base64": "5X5dYdRwExR8DJxFN6ylKQ+79KM="
     },
     {
      "id": "Netherlands_Gelderland_North",
@@ -13582,8 +13582,8 @@
       "Gelderland",
       "Nederland"
      ],
-     "s": 65860064,
-     "sha1_base64": "I71zJAuNmQ8rbiw7OG8GeQBVkJ0="
+     "s": 65864792,
+     "sha1_base64": "YdOdlqAKvCp96b1HkJLkZ7HAVPA="
     },
     {
      "id": "Netherlands_Gelderland_Zutphen",
@@ -13594,8 +13594,8 @@
       "Gelderland",
       "Nederland"
      ],
-     "s": 26132050,
-     "sha1_base64": "aMkTY1krC5K38IxZ4cLW543nK5s="
+     "s": 26120154,
+     "sha1_base64": "8xC0OYyrmPIIy1SDTaTbD5CYgrM="
     },
     {
      "id": "Netherlands_Groningen",
@@ -13608,8 +13608,8 @@
       "Nederland",
       "Niedersachsen"
      ],
-     "s": 41133918,
-     "sha1_base64": "LL3iE6alTQxg9V0+w26adAuTBV4="
+     "s": 41493558,
+     "sha1_base64": "bp6Q7XCtKKT7Y8wSCzvhTS2EUdQ="
     },
     {
      "id": "Netherlands_Limburg",
@@ -13620,8 +13620,8 @@
       "Limburg",
       "Nederland"
      ],
-     "s": 75103120,
-     "sha1_base64": "WHiyo5Mm0t6n/jsumuwp/KoBlFE="
+     "s": 75018544,
+     "sha1_base64": "4txXbJnBo2079aofS18aKmGMq3g="
     },
     {
      "id": "Netherlands_North Brabant_Eindhoven",
@@ -13632,8 +13632,8 @@
       "Nederland",
       "Noord-Brabant"
      ],
-     "s": 58732950,
-     "sha1_base64": "qSCxIJkhq9cpnTtuBrdVnufvinE="
+     "s": 58745102,
+     "sha1_base64": "2KhZvGT9vZyZfH/05QIv8pSPJjM="
     },
     {
      "id": "Netherlands_North Brabant_Roosendaal",
@@ -13644,8 +13644,8 @@
       "Nederland",
       "Noord-Brabant"
      ],
-     "s": 20124119,
-     "sha1_base64": "YTYwNlCcO4HPp+t41dRLFRpLpxI="
+     "s": 20309039,
+     "sha1_base64": "qsUdWwZroo3c6SPEV6xLavEPVaM="
     },
     {
      "id": "Netherlands_North Brabant_Tiburg",
@@ -13657,8 +13657,8 @@
       "Nederland - Belgique / Belgi\u00eb / Belgien",
       "Noord-Brabant"
      ],
-     "s": 47411533,
-     "sha1_base64": "dkLUnOv4hnBdxcUERujCUnXu1IQ="
+     "s": 47248069,
+     "sha1_base64": "gkiCyoKrXA/uQNs35hhoWlTQ5LQ="
     },
     {
      "id": "Netherlands_North Brabant_Uden",
@@ -13669,8 +13669,8 @@
       "Nederland",
       "Noord-Brabant"
      ],
-     "s": 21982943,
-     "sha1_base64": "e23EtaBBSKusAkUQW24IbYV/jx0="
+     "s": 21893911,
+     "sha1_base64": "gfnzc9AOzIEfdVKjMlGdlHSPToA="
     },
     {
      "id": "Netherlands_North Holland_Alkmaar",
@@ -13681,8 +13681,8 @@
       "Nederland",
       "Noord-Holland"
      ],
-     "s": 37661459,
-     "sha1_base64": "De6d0/MzGo1hvvoalavdC+iNxVE="
+     "s": 37690371,
+     "sha1_base64": "u45I4ls/CIbAVnwbsauWJ7nciZE="
     },
     {
      "id": "Netherlands_North Holland_Amsterdam",
@@ -13693,8 +13693,8 @@
       "Nederland",
       "Noord-Holland"
      ],
-     "s": 78945622,
-     "sha1_base64": "OW9peaGidaF8D7bS5HAoue28WFA="
+     "s": 78657166,
+     "sha1_base64": "d8ujgc/REVrWMRbfmApqf97MViA="
     },
     {
      "id": "Netherlands_North Holland_Zaandam",
@@ -13705,8 +13705,8 @@
       "Nederland",
       "Noord-Holland"
      ],
-     "s": 26626913,
-     "sha1_base64": "0jn2fAlpcyD+cuG6ZNMKFBO5jFo="
+     "s": 26597393,
+     "sha1_base64": "u/hDpoL7xk5vwB0wM8ZKtILPLvo="
     },
     {
      "id": "Netherlands_Overijssel_Enschede",
@@ -13717,8 +13717,8 @@
       "Nederland",
       "Overijssel"
      ],
-     "s": 40326476,
-     "sha1_base64": "pf4NFDFyECsVRvyRktZlhOSvzxg="
+     "s": 40239716,
+     "sha1_base64": "1XRDB4fMyDpG5nL4b9xfE/FYCZ4="
     },
     {
      "id": "Netherlands_Overijssel_Zwolle",
@@ -13729,8 +13729,8 @@
       "Nederland",
       "Overijssel"
      ],
-     "s": 39462837,
-     "sha1_base64": "b+V38CIe/QqN3hMY9hHsShq+nKo="
+     "s": 39437829,
+     "sha1_base64": "8chbNH4sI/AmAjUUw08wr7X8pNI="
     },
     {
      "id": "Netherlands_South Holland_Brielle",
@@ -13741,8 +13741,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 20587107,
-     "sha1_base64": "RgU+Rf/M0gFvMUkNvKvpdB/NkX4="
+     "s": 20693579,
+     "sha1_base64": "yA2H0l1h7KHVTvjMK7PEd/6S0kY="
     },
     {
      "id": "Netherlands_South Holland_Den Haag",
@@ -13753,8 +13753,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 60547767,
-     "sha1_base64": "oNes8Ostr6KjA/Zm6YVVIexkmhU="
+     "s": 60497935,
+     "sha1_base64": "URFMS9FZxENBw8j5K4sIVcywwC0="
     },
     {
      "id": "Netherlands_South Holland_Leiden",
@@ -13765,8 +13765,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 26423827,
-     "sha1_base64": "LpsbfOY3EG2uMdvjCEp9WHHNGLI="
+     "s": 26505355,
+     "sha1_base64": "HWlpIhwAagromBopVV7rXOMuTxY="
     },
     {
      "id": "Netherlands_South Holland_Rotterdam",
@@ -13777,8 +13777,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 61412011,
-     "sha1_base64": "w8syFFnlv6ZGiHPRUFqHQPMZuzM="
+     "s": 61399907,
+     "sha1_base64": "hxlVzoVZFmT+Dt8ANifjalMMuyk="
     },
     {
      "id": "Netherlands_Utrecht_Amersfoort",
@@ -13789,8 +13789,8 @@
       "Utrecht",
       "Nederland"
      ],
-     "s": 30186915,
-     "sha1_base64": "4BLdvZMsx4/ca9Q9AG6IUNEynR8="
+     "s": 30196483,
+     "sha1_base64": "vwXyzDCjGs7sSErYOuWVmcj2aZQ="
     },
     {
      "id": "Netherlands_Utrecht_Utrecht",
@@ -13801,8 +13801,8 @@
       "Utrecht",
       "Nederland"
      ],
-     "s": 36352374,
-     "sha1_base64": "OQ70a5vKjeyqu7chNwBQpKYvDQ8="
+     "s": 36265830,
+     "sha1_base64": "QTdtEm/1/tgS6y1nN5srn45M5Vk="
     },
     {
      "id": "Netherlands_Zeeland",
@@ -13813,8 +13813,8 @@
       "Nederland",
       "Zeeland"
      ],
-     "s": 34051940,
-     "sha1_base64": "VTHDocLUiGPR7l1W7CXCL5tC4mw="
+     "s": 34150932,
+     "sha1_base64": "Tue6Stln6d+i9NDSCUsqelbI6rI="
     }
    ]
   },
@@ -13831,8 +13831,8 @@
     "R\u00e9gion des Savanes",
     "Togo"
    ],
-   "s": 49611752,
-   "sha1_base64": "sespFV49Ds38OTAV9Q9JgQHSv18="
+   "s": 48498120,
+   "sha1_base64": "tyEgvVajpBfzEySl06PHFti6Dl4="
   },
   {
    "id": "Tonga",
@@ -13852,8 +13852,8 @@
     "Vahe Vaini",
     "Vava\u02bbu"
    ],
-   "s": 3707873,
-   "sha1_base64": "ggdjpMrAaTpJF86JQJ8xSyaCwwI="
+   "s": 3705921,
+   "sha1_base64": "iyU7Gk95XsOTI+Gwujd09oTWb+Q="
   },
   {
    "id": "Tunisia",
@@ -13887,8 +13887,8 @@
     "\u0627\u0644\u0642\u064a\u0631\u0648\u0627\u0646",
     "\u0627\u0644\u0645\u0646\u0633\u062a\u064a\u0631"
    ],
-   "s": 81256665,
-   "sha1_base64": "1djgo2NKDo1JXsBkb+RP54MIMkk="
+   "s": 81357513,
+   "sha1_base64": "Dba3BR5lgY2hlq45e6nVnOXv1lU="
   },
   {
    "id": "Turkey",
@@ -13909,8 +13909,8 @@
       "Osmaniye",
       "T\u00fcrkiye"
      ],
-     "s": 89719831,
-     "sha1_base64": "YACPgUnRDLUrOb8tB6fzQ90S8EM="
+     "s": 88907160,
+     "sha1_base64": "8cUlB0Gsj1iHLzLBOXCAJen9PdI="
     },
     {
      "id": "Turkey_Southeastern Anatolia Region",
@@ -13930,8 +13930,8 @@
       "\u015eanl\u0131urfa",
       "\u015e\u0131rnak"
      ],
-     "s": 68031533,
-     "sha1_base64": "KzpIJtFqctLZ+xq0kL6dtN33S+M="
+     "s": 67557277,
+     "sha1_base64": "Yv+V2na+QNE2+UE/nloWghE4HOs="
     },
     {
      "id": "Turkey_Marmara Region_Istanbul",
@@ -13948,8 +13948,8 @@
       "\u00c7anakkale",
       "\u0130stanbul"
      ],
-     "s": 76484121,
-     "sha1_base64": "zz9KoYjyRtGgqpBmJ0qDnmntqjA="
+     "s": 76138697,
+     "sha1_base64": "pojwbpEbt1aSHmyfpu+5utUexCs="
     },
     {
      "id": "Turkey_Marmara Region_Bursa",
@@ -13969,8 +13969,8 @@
       "\u00c7anakkale",
       "\u0130stanbul"
      ],
-     "s": 53150870,
-     "sha1_base64": "NAaEAGoZ2pb3xcTPs4mjxHD2kFs="
+     "s": 52879038,
+     "sha1_base64": "XnCEomlgUaHQPS0OT+z02EH4yyI="
     },
     {
      "id": "Turkey_Eastern Anatolia Region",
@@ -13994,8 +13994,8 @@
       "Tunceli",
       "T\u00fcrkiye"
      ],
-     "s": 41540946,
-     "sha1_base64": "lWLkARrXUy0n2iYpP6tuy1J1W00="
+     "s": 40832882,
+     "sha1_base64": "QEH4wU1Du1UHS/daBGaZ4ASuejw="
     },
     {
      "id": "Turkey_Black Sea Region",
@@ -14023,8 +14023,8 @@
       "Zonguldak",
       "\u00c7orum"
      ],
-     "s": 98581778,
-     "sha1_base64": "vLlTBvg298AEdRedtxzSTn7UBJg="
+     "s": 97278906,
+     "sha1_base64": "WFqOOpLwbNncDqn7PnF8f8ggw6M="
     },
     {
      "id": "Turkey_Central Anatolia Region_Ankara",
@@ -14042,8 +14042,8 @@
       "T\u00fcrkiye",
       "\u00c7ank\u0131r\u0131"
      ],
-     "s": 52580886,
-     "sha1_base64": "KRNRbhXI71ntHwc42Sssi/N2HN8="
+     "s": 52430398,
+     "sha1_base64": "5rwVjmlvMBx5prCz4T8cJSGLE1M="
     },
     {
      "id": "Turkey_Central Anatolia Region_Kayseri",
@@ -14059,8 +14059,8 @@
       "T\u00fcrkiye",
       "Yozgat"
      ],
-     "s": 55174443,
-     "sha1_base64": "4xQLPFXMlZLuZuX/b9SjNJ03iHU="
+     "s": 55091979,
+     "sha1_base64": "4k+AGS3LJ5O985xin56SVWedCJE="
     },
     {
      "id": "Turkey_Aegean Region",
@@ -14078,8 +14078,8 @@
       "U\u015fak",
       "\u0130zmir"
      ],
-     "s": 79368745,
-     "sha1_base64": "C+eFGisL/ctMErCjQHsUPK21xD0="
+     "s": 79166209,
+     "sha1_base64": "J3/yNJgqCyRwSvQdC314aGTaN44="
     }
    ]
   },
@@ -14096,8 +14096,8 @@
     "Mary",
     "T\u00fcrkmenistan"
    ],
-   "s": 17786889,
-   "sha1_base64": "+hvfZQVedy8vahCE5gqco/JjBN8="
+   "s": 18142969,
+   "sha1_base64": "78yu5okZBFp66i0htFZAghvOiog="
   },
   {
    "id": "Turks and Caicos Islands",
@@ -14109,8 +14109,8 @@
     "The Bahamas",
     "Turks and Caicos Islands"
    ],
-   "s": 1347584,
-   "sha1_base64": "4C50JRuGTTGwfWW0soM9Xm+xbVo="
+   "s": 1529880,
+   "sha1_base64": "Vwx5Owp2gxx+j+JiXz14rlsEG5A="
   },
   {
    "id": "Tuvalu",
@@ -14120,8 +14120,8 @@
    "affiliations": [
     "Tuvalu"
    ],
-   "s": 446671,
-   "sha1_base64": "2sJnUZKQlpQRzti/+va2lXgjj6k="
+   "s": 539279,
+   "sha1_base64": "OoJnyUuOsWgghPkMUQmv4AsRkIo="
   },
   {
    "id": "Uganda",
@@ -14170,8 +14170,8 @@
     "Uganda",
     "Western Region"
    ],
-   "s": 279336436,
-   "sha1_base64": "4geCpCK/iTMurM7q/rSkQrWInQA="
+   "s": 279682077,
+   "sha1_base64": "GPNde6LlmFcPwhmy3fcQsFkenmc="
   },
   {
    "id": "Ukraine",
@@ -14185,8 +14185,8 @@
       "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 40731946,
-     "sha1_base64": "4z5liQfpYQuxlJQkJuJ8d31NqjA="
+     "s": 40992435,
+     "sha1_base64": "NCFVB2vvpQMeXYhc4rbJreUcme4="
     },
     {
      "id": "Ukraine_Chernihiv Oblast",
@@ -14197,8 +14197,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0427\u0435\u0440\u043d\u0456\u0433\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 33989019,
-     "sha1_base64": "4ceeoH2dvn8uBA03rhQ65NWi5/g="
+     "s": 34579283,
+     "sha1_base64": "fuNgyroxQyySpIrcxb4cRkXnB0w="
     },
     {
      "id": "Ukraine_Chernivtsi Oblast",
@@ -14209,8 +14209,8 @@
       "\u0427\u0435\u0440\u043d\u0456\u0432\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 27909296,
-     "sha1_base64": "QK5rZEwVsZTjiK2NZDovU+Zt/hg="
+     "s": 28074768,
+     "sha1_base64": "t2dZnF6JJsPLCUV/DSbuEdJGqOA="
     },
     {
      "id": "Ukraine_Dnipropetrovsk Oblast",
@@ -14221,8 +14221,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0414\u043d\u0456\u043f\u0440\u043e\u043f\u0435\u0442\u0440\u043e\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 57445390,
-     "sha1_base64": "gzf6O0DSNbgioVAhK+nUUFYkcRE="
+     "s": 58792078,
+     "sha1_base64": "hBO8FBE+7IUeFmMqJFd1wd/MbCQ="
     },
     {
      "id": "Ukraine_Donetsk Oblast",
@@ -14233,8 +14233,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0414\u043e\u043d\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 66585119,
-     "sha1_base64": "+3lRJMmpVaM44fVRmP0hYGSFBBM="
+     "s": 66523847,
+     "sha1_base64": "FfwHEz/1prLzo42OJtdMRI1+tUc="
     },
     {
      "id": "Ukraine_Ivano-Frankivsk Oblast",
@@ -14245,8 +14245,8 @@
       "\u0406\u0432\u0430\u043d\u043e-\u0424\u0440\u0430\u043d\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 37661762,
-     "sha1_base64": "JF5YCnEZeaI0xXnBJreAm72slJI="
+     "s": 37803594,
+     "sha1_base64": "n/2HHBBJDgEZge+1tud2BaKk6ls="
     },
     {
      "id": "Ukraine_Kharkiv Oblast",
@@ -14257,8 +14257,8 @@
       "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 59257846,
-     "sha1_base64": "Cn9auaSxA++G3y5p8mCMrFa39J4="
+     "s": 59363502,
+     "sha1_base64": "yDrc7NCQDTFYvUpvQmiH5K0fadY="
     },
     {
      "id": "Ukraine_Kherson Oblast",
@@ -14269,8 +14269,8 @@
       "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 21182352,
-     "sha1_base64": "EsPARPAiGjMy11JyNDpKy+5Znr4="
+     "s": 21539320,
+     "sha1_base64": "HsHm6CYe0m4brBzXya5UoASo9Qo="
     },
     {
      "id": "Ukraine_Khmelnytskyi Oblast",
@@ -14281,8 +14281,8 @@
       "\u0425\u043c\u0435\u043b\u044c\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 33915753,
-     "sha1_base64": "wwlOZQoE8O/B6SoX++isJ6qQS7E="
+     "s": 33740241,
+     "sha1_base64": "ZAAPVWyP+7RXVMl/FskI+ljtCy8="
     },
     {
      "id": "Ukraine_Kirovohrad Oblast",
@@ -14293,8 +14293,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041a\u0456\u0440\u043e\u0432\u043e\u0433\u0440\u0430\u0434\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 33043577,
-     "sha1_base64": "kzBaXF5q2jbJ5bOcI9Xx8WZnvaY="
+     "s": 33686593,
+     "sha1_base64": "AETuxmA6pS1d52UszNFOqPHuhsY="
     },
     {
      "id": "Ukraine_Kyiv Oblast",
@@ -14306,8 +14306,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041a\u0438\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 74941441,
-     "sha1_base64": "yX8Az+vTM856VI7aPmLcJ4j11KM="
+     "s": 73785113,
+     "sha1_base64": "sfMkPWh0ehTComIQIEg2YOtgoB8="
     },
     {
      "id": "Ukraine_Luhansk Oblast",
@@ -14318,8 +14318,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041b\u0443\u0433\u0430\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 49326547,
-     "sha1_base64": "Yr2EufQr8g9G60SnbjarP7YBWvQ="
+     "s": 49471164,
+     "sha1_base64": "eRj8tU0+ZUhZ5RGEyLcabkb+e38="
     },
     {
      "id": "Ukraine_Lviv Oblast",
@@ -14330,8 +14330,8 @@
       "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 63484816,
-     "sha1_base64": "NaQ/6OHiF19IBXfu9CLbCmh3220="
+     "s": 63456040,
+     "sha1_base64": "2XW2olmIYjq2+rh3c38gZ6o1sxU="
     },
     {
      "id": "Ukraine_Mykolaiv Oblast",
@@ -14342,8 +14342,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041c\u0438\u043a\u043e\u043b\u0430\u0457\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 32386538,
-     "sha1_base64": "x39Vm3tLjhSDrdshbQhaZi64haM="
+     "s": 32787730,
+     "sha1_base64": "1mSoas/Ixdt2f7awu0HPsLQTgBA="
     },
     {
      "id": "Ukraine_Odessa Oblast",
@@ -14354,8 +14354,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041e\u0434\u0435\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 41737389,
-     "sha1_base64": "akyb5HK++Xp0t7BTM3okMOXmKyA="
+     "s": 42031965,
+     "sha1_base64": "a4sEcqeliLWlLDlnEGzXfsBfRg8="
     },
     {
      "id": "Ukraine_Poltava Oblast",
@@ -14366,8 +14366,8 @@
       "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 36049245,
-     "sha1_base64": "Feg2ixLWSRBXPn5o+8akXs5NBt4="
+     "s": 36079181,
+     "sha1_base64": "fcsWezksB8vRydZE5Oyb+qCUBrw="
     },
     {
      "id": "Ukraine_Rivne Oblast",
@@ -14378,8 +14378,8 @@
       "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 28532352,
-     "sha1_base64": "F8hw441WgDmII1jNz4dxg5cXLqw="
+     "s": 28711528,
+     "sha1_base64": "2KC+oLnYubkUPf/5SfZDkC2F68Q="
     },
     {
      "id": "Ukraine_Sumy Oblast",
@@ -14390,8 +14390,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0421\u0443\u043c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 32516467,
-     "sha1_base64": "SsCvI+BJjmH+ppjVLfZQcwN8Irs="
+     "s": 32828651,
+     "sha1_base64": "XQAg2JKxfSNaDVXf90uu/KMlVrw="
     },
     {
      "id": "Ukraine_Ternopil Oblast",
@@ -14402,8 +14402,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0422\u0435\u0440\u043d\u043e\u043f\u0456\u043b\u044c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 29927456,
-     "sha1_base64": "U2PFn1/L6CrI1QrGxnsO2MbDsK4="
+     "s": 29589352,
+     "sha1_base64": "dkgDpzoHeeEycSNaAuI6ZYpg7JY="
     },
     {
      "id": "Ukraine_Vinnytsia Oblast",
@@ -14414,8 +14414,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0412\u0456\u043d\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 36403465,
-     "sha1_base64": "QvM4yxQZWsOF/TBHBer7av18xIw="
+     "s": 35910097,
+     "sha1_base64": "ib5yNylN2FqkgmiuQ+VWKFJjmV8="
     },
     {
      "id": "Ukraine_Volyn Oblast",
@@ -14426,8 +14426,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0412\u043e\u043b\u0438\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 29989777,
-     "sha1_base64": "r2bKTqvmECIdOfLF+Doj3A7tupY="
+     "s": 30252881,
+     "sha1_base64": "bXq+PfxXrY5Pb56n4LLTOoh1SJo="
     },
     {
      "id": "Ukraine_Zakarpattia Oblast",
@@ -14438,8 +14438,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0417\u0430\u043a\u0430\u0440\u043f\u0430\u0442\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
      ],
-     "s": 35996090,
-     "sha1_base64": "SBQgyXiaaxZicbZAhrbUOzGyd0s="
+     "s": 36417314,
+     "sha1_base64": "MopiAkk0/yIqBM7oZ/MMww84Bog="
     },
     {
      "id": "Ukraine_Zaporizhia Oblast",
@@ -14450,8 +14450,8 @@
       "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 31822825,
-     "sha1_base64": "btUCE+1CJBcxnLRKdb/DH/xaVXo="
+     "s": 32212673,
+     "sha1_base64": "mptsbn647eWXCMOoVW+CMquXBKk="
     },
     {
      "id": "Ukraine_Zhytomyr Oblast",
@@ -14462,8 +14462,8 @@
       "\u0416\u0438\u0442\u043e\u043c\u0438\u0440\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
      ],
-     "s": 33682514,
-     "sha1_base64": "IobhoPFG4nHAPcbcMOD6otS8jnQ="
+     "s": 33581026,
+     "sha1_base64": "HcXaM4dT4zFvNCn8+L8p0gfMHKc="
     },
     {
      "id": "Crimea",
@@ -14478,8 +14478,8 @@
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0440\u044b\u043c"
      ],
-     "s": 53527381,
-     "sha1_base64": "zNU+msjbO9jU9f61K2utn/zAR5A="
+     "s": 51682501,
+     "sha1_base64": "FwHf4cWnBX2zOX5tep2JnxvHo44="
     }
    ]
   },
@@ -14499,8 +14499,8 @@
     "\u0627\u0644\u0634\u0627\u0631\u0642\u0629",
     "\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629 \u0627\u0644\u0645\u062a\u0651\u062d\u062f\u0629"
    ],
-   "s": 85099921,
-   "sha1_base64": "lrTRf6iyCGzAWupS9aIwKRtcfEA="
+   "s": 84313417,
+   "sha1_base64": "iwMDWqEJHusOklx0X9uLr8rRoxI="
   },
   {
    "id": "Falkland Islands",
@@ -14510,8 +14510,8 @@
    "affiliations": [
     "Falkland Islands"
    ],
-   "s": 10358868,
-   "sha1_base64": "FYwx14ZfFM9mR3mrGfUyp5J0dis="
+   "s": 10357188,
+   "sha1_base64": "r3+BJtb38QNwoYkGgnV54mLcJSU="
   },
   {
    "id": "United Kingdom",
@@ -14524,8 +14524,8 @@
      "affiliations": [
       "British Indian Ocean Territory"
      ],
-     "s": 549641,
-     "sha1_base64": "Tlah4Tu4BhugM7TRHHJx/51ego0="
+     "s": 549697,
+     "sha1_base64": "rbFtTAv2YY6LAl5fFIg14nntXtE="
     },
     {
      "id": "UK_England_East Midlands",
@@ -14536,8 +14536,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 108895869,
-     "sha1_base64": "qun49Dd3cY+t3bxqx8hqPtK1SF0="
+     "s": 108147325,
+     "sha1_base64": "FCF20L/3Xy9XTrqj4lv1iUcBGwY="
     },
     {
      "id": "UK_England_East of England_Essex",
@@ -14548,8 +14548,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 63622995,
-     "sha1_base64": "1pd5Y14MPtSN6TTN4aS8pEjIqvc="
+     "s": 63096561,
+     "sha1_base64": "HH925IAK9hkI3Ac9fgmoAhaGtcs="
     },
     {
      "id": "UK_England_East of England_Norfolk",
@@ -14560,8 +14560,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 80778547,
-     "sha1_base64": "4Sd/xPNbLGDeur19fRDjSE8Rb6E="
+     "s": 80278619,
+     "sha1_base64": "9ZkhMeIrfAe0hqWFFvT0uxSMZLc="
     },
     {
      "id": "UK_England_Greater London",
@@ -14572,8 +14572,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 99484380,
-     "sha1_base64": "e63NiTjATdSQ6y2QkLirNZppvrw="
+     "s": 96812716,
+     "sha1_base64": "QbXX1xNSynIHONvLDUO/HLzKJww="
     },
     {
      "id": "UK_England_North East England",
@@ -14584,8 +14584,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 58504152,
-     "sha1_base64": "MNZ24Ue4qSxCkI2nRCOSDqSMYlQ="
+     "s": 58121336,
+     "sha1_base64": "xy/X/juhN0fhvbyhLSJKpJE8dw4="
     },
     {
      "id": "UK_England_North West England_Manchester",
@@ -14596,8 +14596,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 100248180,
-     "sha1_base64": "4JW7PFpFJ5sAm2bEV1lLeezGXCU="
+     "s": 98738004,
+     "sha1_base64": "w7vDDroQe5s1f24XDjI5HUphfx4="
     },
     {
      "id": "UK_England_North West England_Lancaster",
@@ -14608,8 +14608,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 46605271,
-     "sha1_base64": "Ahy5PAMV5wq/HHzkWoGV08oCUkE="
+     "s": 46401143,
+     "sha1_base64": "kfCg9oMOua3n5VecmFi7kezgrjg="
     },
     {
      "id": "UK_England_South East_Brighton",
@@ -14620,8 +14620,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 102089588,
-     "sha1_base64": "zA1lR3oy88fE2d/Atn4SjqbsYzM="
+     "s": 100701252,
+     "sha1_base64": "8EGceiqqETyVCWxM64mciwHNChU="
     },
     {
      "id": "UK_England_South East_Oxford",
@@ -14632,8 +14632,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 101435945,
-     "sha1_base64": "Yt3xGUrtN9/asee+rVvBFh7E8ck="
+     "s": 100794745,
+     "sha1_base64": "xZh7dr00kl5uW14DDWMm4bNNZzk="
     },
     {
      "id": "UK_England_South West England_Bristol",
@@ -14644,8 +14644,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 114754860,
-     "sha1_base64": "SRESosDVMGdoOrgpeDzTJ87dKfA="
+     "s": 114455052,
+     "sha1_base64": "zD7Zsp10En8yVY4jgnePoYLlMHY="
     },
     {
      "id": "UK_England_South West England_Cornwall",
@@ -14656,8 +14656,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 65997578,
-     "sha1_base64": "CDY//ZjvI6uVw9uOuU0qnkDvNWM="
+     "s": 65248362,
+     "sha1_base64": "aoLf4vXApdmgG5Kx2bG9KFd3UJM="
     },
     {
      "id": "UK_England_West Midlands",
@@ -14668,8 +14668,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 130896878,
-     "sha1_base64": "43tOWEpsjYn3Pv2iStqtv/oN+wg="
+     "s": 129541638,
+     "sha1_base64": "FENu1wtrHoz1KL97PROIIOIAOys="
     },
     {
      "id": "UK_England_Yorkshire and the Humber",
@@ -14680,8 +14680,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 119969878,
-     "sha1_base64": "BXEuRmIRjQwsBXMx6WZKIO9lc2g="
+     "s": 119408462,
+     "sha1_base64": "OrWBagQ0APqAJhgX8sJ3pIilqoM="
     },
     {
      "id": "UK_Northern Ireland",
@@ -14693,8 +14693,8 @@
       "Scotland",
       "United Kingdom"
      ],
-     "s": 45257598,
-     "sha1_base64": "zPcBpY1uFFffYUKq6eQydTolm9M="
+     "s": 44523230,
+     "sha1_base64": "9mM5cWfz+w9eFaDCQGfi1Q1Fehc="
     },
     {
      "id": "UK_Scotland_North",
@@ -14705,8 +14705,8 @@
       "Scotland",
       "United Kingdom"
      ],
-     "s": 130308060,
-     "sha1_base64": "Ee1s3eD3MdsoHitS6BEPDcMgm3k="
+     "s": 128894892,
+     "sha1_base64": "beFReiwuyddaVkXUvG2619GGQz4="
     },
     {
      "id": "UK_Scotland_South",
@@ -14718,8 +14718,8 @@
       "Scotland",
       "United Kingdom"
      ],
-     "s": 106429193,
-     "sha1_base64": "DpwqNyfBiMidDYujpnl27DqBLTE="
+     "s": 105378177,
+     "sha1_base64": "vpJzYUbOqRWWigAN/gbKCEKb5SU="
     },
     {
      "id": "UK_Wales",
@@ -14730,8 +14730,8 @@
       "United Kingdom",
       "Wales"
      ],
-     "s": 108531004,
-     "sha1_base64": "gerWurQLgvqJT5KeVrM86Jyn2GU="
+     "s": 107314324,
+     "sha1_base64": "wyay80YKoB5MrG6WQLNVcDxnym8="
     }
    ]
   },
@@ -14746,8 +14746,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 47169838,
-     "sha1_base64": "tYckKWPnEq6RpYY41Bi7Ao8fkQ4="
+     "s": 46016422,
+     "sha1_base64": "LkjiR6qUszCUCaS6kyyC+3JLRjI="
     },
     {
      "id": "Ireland_Leinster",
@@ -14757,8 +14757,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 88744385,
-     "sha1_base64": "92sjZ5O8iHg4c8zEkTf7oYaCrRc="
+     "s": 87706833,
+     "sha1_base64": "g0RMqvVP6RbYWBfYt9SrLa/SDXg="
     },
     {
      "id": "Ireland_Munster",
@@ -14768,8 +14768,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 66076407,
-     "sha1_base64": "aS7nzdc5+FcqqbLAw9nV+XCwuf4="
+     "s": 65811399,
+     "sha1_base64": "eLJz6YB0SzhMgQ6Seh/hSlZHvjA="
     },
     {
      "id": "Ireland_Northern Counties",
@@ -14779,8 +14779,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 25835354,
-     "sha1_base64": "XN+5RK8O+otGm8YosAEDx5e5vxw="
+     "s": 26022130,
+     "sha1_base64": "FYgoZs8v9AUc1HwaYvfRP6OxxiQ="
     }
    ]
   },
@@ -14800,8 +14800,8 @@
         "AL",
         "United States of America"
        ],
-       "s": 48758160,
-       "sha1_base64": "PltsIm1Rf+pW+J0fb1h7wAFdh5g="
+       "s": 48568543,
+       "sha1_base64": "hU53sW94CJX7emo+aREEEwcdr1w="
       },
       {
        "id": "US_Alabama_Montgomery",
@@ -14813,8 +14813,8 @@
         "AL",
         "United States of America"
        ],
-       "s": 76049106,
-       "sha1_base64": "fxZOrIiYbElZwZRUah84d9VHa10="
+       "s": 75912930,
+       "sha1_base64": "Ge/Brjd7v3WuQHeF5RBYL0WeywI="
       }
      ]
     },
@@ -14828,8 +14828,8 @@
       "AK",
       "United States of America"
      ],
-     "s": 166716599,
-     "sha1_base64": "Zzr47iEY+qfVoUogAF0GBsKahYU="
+     "s": 166218223,
+     "sha1_base64": "pB/tFntUxVME6iBndS9//IhzMO0="
     },
     {
      "id": "Arizona",
@@ -14844,8 +14844,8 @@
         "AZ",
         "United States of America"
        ],
-       "s": 86441616,
-       "sha1_base64": "bJ49MZEpu8CMDGauCb2iMvsnDUg="
+       "s": 86223960,
+       "sha1_base64": "zsiLQwOuhXq2+XhnxaCHftaGTT0="
       },
       {
        "id": "US_Arizona_Phoenix",
@@ -14857,8 +14857,8 @@
         "AZ",
         "United States of America"
        ],
-       "s": 128514307,
-       "sha1_base64": "x4wt64dFxEdICrGMsdSKwJPr0uk="
+       "s": 125924419,
+       "sha1_base64": "pYIgFb636gMxm916n0GhcFNLYGo="
       },
       {
        "id": "US_Arizona_Tucson",
@@ -14870,8 +14870,8 @@
         "AZ",
         "United States of America"
        ],
-       "s": 53888510,
-       "sha1_base64": "C1KZTe0ET/AQwtRNUXpxhTHSvz8="
+       "s": 53461814,
+       "sha1_base64": "Eh1cMABAmrdShoCKhIBPmR267yo="
       }
      ]
     },
@@ -14888,8 +14888,8 @@
         "AR",
         "United States of America"
        ],
-       "s": 51700471,
-       "sha1_base64": "+HOWDPa3h50dPRbO51IkDxLSOfw="
+       "s": 51582759,
+       "sha1_base64": "5QvyYQcdcKfT/09TPQk9cq4YETw="
       },
       {
        "id": "US_Arkansas_South",
@@ -14901,8 +14901,8 @@
         "AR",
         "United States of America"
        ],
-       "s": 32154906,
-       "sha1_base64": "3000UMqe9UodGSYPdS4+Zk13WOw="
+       "s": 32102210,
+       "sha1_base64": "VpXzgWY0jKQ6/emr86Uj26jyfi8="
       }
      ]
     },
@@ -14919,8 +14919,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 48834173,
-       "sha1_base64": "RD7i54r4MEBc2jyfeHPcSQF7TSE="
+       "s": 48946677,
+       "sha1_base64": "euh5bX+NrBwZoZJs/qzWquHWP/0="
       },
       {
        "id": "US_California_Bakersfield_Bakersfield",
@@ -14932,8 +14932,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 42660243,
-       "sha1_base64": "7yxqrklBqbmroz2yv0Eu7f48Wrc="
+       "s": 42820411,
+       "sha1_base64": "3V3GrOjksvp7YrmZJv7ACjS7os4="
       },
       {
        "id": "US_California_Bakersfield_Lancaster",
@@ -14945,8 +14945,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 47359195,
-       "sha1_base64": "wWTAk4ZP3TYqfa+pB6IFpkJasUI="
+       "s": 47528115,
+       "sha1_base64": "akc/S+/x/KT3t9eIOz/iYCir3mI="
       },
       {
        "id": "US_California_LA",
@@ -14958,8 +14958,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 222486381,
-       "sha1_base64": "VPOr79qu7CpzAYPhRZoImPuZsA0="
+       "s": 220805093,
+       "sha1_base64": "cedlkeNu+qkd6eFxqvY94zRrgxA="
       },
       {
        "id": "US_California_LA North",
@@ -14971,8 +14971,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 66360246,
-       "sha1_base64": "r0a1EdzYSLRdz4BHnshFoZHJecI="
+       "s": 66592574,
+       "sha1_base64": "SXB+qlC6ozvqHucK9eHHy+iuPqo="
       },
       {
        "id": "US_California_Redding",
@@ -14985,8 +14985,8 @@
         "Hoopa Valley Tribe",
         "United States of America"
        ],
-       "s": 61308005,
-       "sha1_base64": "q7cLIQfmWLDxnHR9apWPGYtVOGg="
+       "s": 61631069,
+       "sha1_base64": "jDjxlOFyYXpKks6UpUD5lQgJFp4="
       },
       {
        "id": "US_California_Sacramento_Sacramento",
@@ -14998,8 +14998,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 42114396,
-       "sha1_base64": "4qtOxz/k6mWZ847p5uvqBATuo40="
+       "s": 42043868,
+       "sha1_base64": "O9gRbpIbfmj2mNGO9aYEPskTAjA="
       },
       {
        "id": "US_California_Sacramento_Fresno",
@@ -15011,8 +15011,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 47143100,
-       "sha1_base64": "LqlZie0vTKi8KmwcF9pyuFIkWmc="
+       "s": 46868036,
+       "sha1_base64": "n4cwlmS2ml702kLxlB6Dxtn6Tik="
       },
       {
        "id": "US_California_Sacramento_Stockton",
@@ -15024,8 +15024,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 54422686,
-       "sha1_base64": "fbmcB1UCtWzYMPwuSKwGUcEIMX0="
+       "s": 54111822,
+       "sha1_base64": "mmtnc7QgF+Is6BguRxkOHMlNQLo="
       },
       {
        "id": "US_California_San Diego",
@@ -15037,8 +15037,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 84654489,
-       "sha1_base64": "zBtVG78D5CX0/lBubDKGC/qvTwE="
+       "s": 84774137,
+       "sha1_base64": "42BwrGkCsma2ADQ9IrrusQGOmbU="
       },
       {
        "id": "US_California_Santa_Clara_Santa Cruz",
@@ -15050,8 +15050,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 30720323,
-       "sha1_base64": "d+W8gsT06QsJBFv6fq6WQCAAQAI="
+       "s": 30931763,
+       "sha1_base64": "GC2ePyh9uVbrV13kz4cXgLVjl+4="
       },
       {
        "id": "US_California_Santa_Clara_Palo Alto",
@@ -15063,8 +15063,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 167376085,
-       "sha1_base64": "4vFKZPDvp92/iM+2/wYm/Q6NA6g="
+       "s": 166822629,
+       "sha1_base64": "Ic2XiyHgO/9zzkxtET3AHZcgzXE="
       }
      ]
     },
@@ -15081,8 +15081,8 @@
         "CO",
         "United States of America"
        ],
-       "s": 68518479,
-       "sha1_base64": "gU9XuEieHGzC/meky+FiJMu4pXM="
+       "s": 68445630,
+       "sha1_base64": "uX9r2SBmmhlOaKnbJI3z1nlh8ZU="
       },
       {
        "id": "US_Colorado_Denver",
@@ -15094,8 +15094,8 @@
         "CO",
         "United States of America"
        ],
-       "s": 119615101,
-       "sha1_base64": "0C7QF2WOloQhQ8DEXx/VTOdjey4="
+       "s": 118652372,
+       "sha1_base64": "LXq2zODoyL9uoLvD8zjN62iBK5k="
       },
       {
        "id": "US_Colorado_South",
@@ -15107,8 +15107,8 @@
         "CO",
         "United States of America"
        ],
-       "s": 65403439,
-       "sha1_base64": "l2BqxqzQfTlpNM9NYcAfn9V0izY="
+       "s": 65678639,
+       "sha1_base64": "pvyLN+2UaK8x/FCkbM8TKGs/KHw="
       }
      ]
     },
@@ -15122,8 +15122,8 @@
       "CT",
       "United States of America"
      ],
-     "s": 154909099,
-     "sha1_base64": "wsheemFFpG+mRT/q3WFLjb8ECSM="
+     "s": 154637003,
+     "sha1_base64": "6zWxIRLii4sn7mGhC4jPL2A0lng="
     },
     {
      "id": "US_Delaware",
@@ -15135,8 +15135,8 @@
       "DE",
       "United States of America"
      ],
-     "s": 18451034,
-     "sha1_base64": "+IEffyD9JEPEH3bSTYPJscrVNvo="
+     "s": 18681234,
+     "sha1_base64": "agfpFT/NRdpGGWKlNnQJua8UtRE="
     },
     {
      "id": "Florida",
@@ -15151,8 +15151,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 169031177,
-       "sha1_base64": "DuhzA8pdZmD0ZNCqGZrAw45aaEc="
+       "s": 163530833,
+       "sha1_base64": "EmPrGvYD1c5UVOXXrxnvafFAx0Y="
       },
       {
        "id": "US_Florida_Miami",
@@ -15164,8 +15164,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 134315907,
-       "sha1_base64": "Fi2zGif8EkGeYMCcS1MYXiVsbPA="
+       "s": 132912443,
+       "sha1_base64": "xNnY9l8fh4I4rSvMuZ3aVt/bzts="
       },
       {
        "id": "US_Florida_Orlando",
@@ -15177,8 +15177,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 57977814,
-       "sha1_base64": "PWHXb1MtNQdj6U6DOztzY8JeY5w="
+       "s": 55034382,
+       "sha1_base64": "CXqit8jHZFk05zOzOXJf+39W0BA="
       },
       {
        "id": "US_Florida_Tampa",
@@ -15190,8 +15190,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 97507291,
-       "sha1_base64": "LuvQZB39aZ5BzlL1hVfbdF/dLxo="
+       "s": 97549972,
+       "sha1_base64": "az+Ecd3JObuUU0dCwo2xY8T0q7Y="
       },
       {
        "id": "US_Florida_Gainesville",
@@ -15203,8 +15203,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 77836496,
-       "sha1_base64": "xx4YY92A9nLq6IBXY51PcZyug4g="
+       "s": 66237263,
+       "sha1_base64": "MKCqeS2AlNXyaNNACQHKM0yBIVc="
       }
      ]
     },
@@ -15221,8 +15221,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 109254619,
-       "sha1_base64": "So6rwQDFIfbNZEcobxLQp3buE1A="
+       "s": 107405378,
+       "sha1_base64": "nidZisyrnt3wUApPTQKqf350ZOE="
       },
       {
        "id": "US_Georgia_Macon",
@@ -15234,8 +15234,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 55155560,
-       "sha1_base64": "MEdSbRKrkjEZNFlDFOEuuzUvPxg="
+       "s": 55120072,
+       "sha1_base64": "+HZngE5bdcbuVKVdvMdw27Ydy4c="
       },
       {
        "id": "US_Georgia_North",
@@ -15247,8 +15247,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 41950766,
-       "sha1_base64": "bDwXE1fZQR92dltyGHVK1wL424A="
+       "s": 41657550,
+       "sha1_base64": "s+xGgCPt4/fGEDZoIzCLhlFj/Zw="
       },
       {
        "id": "US_Georgia_South",
@@ -15260,8 +15260,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 59253376,
-       "sha1_base64": "SYYGXr8T+B8AqxQwYzQQfaeffFA="
+       "s": 59128560,
+       "sha1_base64": "CXJxxyJ2Kpx8quV7arw74+jdRUA="
       }
      ]
     },
@@ -15281,8 +15281,8 @@
      "country_name_synonyms": [
       "Guam"
      ],
-     "s": 3894550,
-     "sha1_base64": "IaEkoJJV7uIfOVjPoWXne0+91wA="
+     "s": 4017582,
+     "sha1_base64": "qVZ9XjwznIIw1Bvm4nFnckA6Zh0="
     },
     {
      "id": "US_Hawaii",
@@ -15294,8 +15294,8 @@
       "HI",
       "United States of America"
      ],
-     "s": 19789264,
-     "sha1_base64": "EfHVuxSjsBM6oIBonqZpUlcxU3c="
+     "s": 19907376,
+     "sha1_base64": "cemC5muen4LajMcp1jupUH+eOH8="
     },
     {
      "id": "US_Idaho",
@@ -15310,8 +15310,8 @@
         "ID",
         "United States of America"
        ],
-       "s": 37312389,
-       "sha1_base64": "suEYw+K1YGHfBzFd8Mwl5r7RWYQ="
+       "s": 37447989,
+       "sha1_base64": "JTeZi1npW2V+gONvXoKzvV3PvkE="
       },
       {
        "id": "US_Idaho_South",
@@ -15323,8 +15323,8 @@
         "ID",
         "United States of America"
        ],
-       "s": 61603832,
-       "sha1_base64": "MR+PubLFoImZ3fg1vtl/eomOwZ4="
+       "s": 61257936,
+       "sha1_base64": "l2+KQz51CqmuZyDQWUVsvxVZGo0="
       }
      ]
     },
@@ -15341,8 +15341,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 43814511,
-       "sha1_base64": "ZbcC3rAkntko+xREonJZ7IPTviw="
+       "s": 43014527,
+       "sha1_base64": "t8mFezSkAIa7xx08p7nFZmmhvZ0="
       },
       {
        "id": "US_Illinois_Chickago",
@@ -15354,8 +15354,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 75425785,
-       "sha1_base64": "6xF5Z55Yad/jDNTKaT6Lk9mID6w="
+       "s": 74500873,
+       "sha1_base64": "PLN2QEmdxSpKpmeKiiUqh/M/DVI="
       },
       {
        "id": "US_Illinois_Elgin",
@@ -15367,8 +15367,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 40119334,
-       "sha1_base64": "tzq7h9848eewG7KPU4jaL32wTiM="
+       "s": 39834430,
+       "sha1_base64": "zvJIzXDyiMqv7YhDv2htAlVxcII="
       },
       {
        "id": "US_Illinois_Rockford",
@@ -15380,8 +15380,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 28169514,
-       "sha1_base64": "NtRtEPJFv7XZWK33WlOaP9vvYDc="
+       "s": 28134522,
+       "sha1_base64": "Ba7HS9OfvpQ5SSnnImm56CaPAjs="
       },
       {
        "id": "US_Illinois_Springfield",
@@ -15393,8 +15393,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 61638729,
-       "sha1_base64": "08J1pBkelfmfa8rZ4Gbu7Eah0os="
+       "s": 61427881,
+       "sha1_base64": "UZ6us6dwarx1QmmK6fUjbSdoXNc="
       }
      ]
     },
@@ -15411,8 +15411,8 @@
         "IN",
         "United States of America"
        ],
-       "s": 64625090,
-       "sha1_base64": "3shBbHGbzmojIuX96R/4JgJow/o="
+       "s": 63657018,
+       "sha1_base64": "BChWplSflcBJNsa+n5Ps+bby16E="
       },
       {
        "id": "US_Indiana_Evansville",
@@ -15424,8 +15424,8 @@
         "IN",
         "United States of America"
        ],
-       "s": 31738075,
-       "sha1_base64": "WFnHlqPO0ncYb81CY6QnZ5s4m18="
+       "s": 31548155,
+       "sha1_base64": "+tjWHXI+5XrO3Ix6Rep0Lbw5aHM="
       },
       {
        "id": "US_Indiana_Indianapolis",
@@ -15437,8 +15437,8 @@
         "IN",
         "United States of America"
        ],
-       "s": 64441319,
-       "sha1_base64": "kZAkMZ9Ggfxk6mf4lzUgbITRtdY="
+       "s": 63464303,
+       "sha1_base64": "v51DIc5ug/6TnJEusu71VQ4JUus="
       }
      ]
     },
@@ -15455,8 +15455,8 @@
         "IA",
         "United States of America"
        ],
-       "s": 42585156,
-       "sha1_base64": "o4Tl3MmihPt3mu+fi6HcLgu+IRs="
+       "s": 42270708,
+       "sha1_base64": "gLa0Ygz0hfXxcGjFsrSDaRrWRzg="
       },
       {
        "id": "US_Iowa_Waterloo",
@@ -15468,8 +15468,8 @@
         "IA",
         "United States of America"
        ],
-       "s": 38460940,
-       "sha1_base64": "uCc13VIJ6n1B9/ICdDK1VOtOito="
+       "s": 38413204,
+       "sha1_base64": "aj/YxwvCl1nG5ntVotrxqYq/J6w="
       },
       {
        "id": "US_Iowa_West",
@@ -15481,8 +15481,8 @@
         "IA",
         "United States of America"
        ],
-       "s": 39854516,
-       "sha1_base64": "V6tqsFRPusneOvbUxWmlychldds="
+       "s": 39815940,
+       "sha1_base64": "GYPjVbhG3yslKIOnsorN9o8yy4Q="
       }
      ]
     },
@@ -15499,8 +15499,8 @@
         "KS",
         "United States of America"
        ],
-       "s": 47376662,
-       "sha1_base64": "ezEXcFgEHK0UB+SmnhNp2TBEiek="
+       "s": 47282918,
+       "sha1_base64": "MDeZcZfRA9Ekg3mgnDvSxqS/Kuc="
       },
       {
        "id": "US_Kansas_West",
@@ -15512,8 +15512,8 @@
         "KS",
         "United States of America"
        ],
-       "s": 28095074,
-       "sha1_base64": "RE2PrsahnzUnfOcosBGBY5eeRoo="
+       "s": 27761554,
+       "sha1_base64": "gjsnVouysmXkMGd1jbBvRJdE2zQ="
       },
       {
        "id": "US_Kansas_Wichita",
@@ -15525,8 +15525,8 @@
         "KS",
         "United States of America"
        ],
-       "s": 36785938,
-       "sha1_base64": "CZXt1Azeo4v6k0pdw5V3PzoPRCI="
+       "s": 36504786,
+       "sha1_base64": "g53eeL4H/a4eheU0UWU4s573kwY="
       }
      ]
     },
@@ -15543,8 +15543,8 @@
         "KY",
         "United States of America"
        ],
-       "s": 58946785,
-       "sha1_base64": "eL8oovjBWPdB/jMKV6M6CwHxPs0="
+       "s": 58981929,
+       "sha1_base64": "G/yPrUMP+qtwVImDKUy8dlwmOLY="
       },
       {
        "id": "US_Kentucky_West",
@@ -15556,8 +15556,8 @@
         "KY",
         "United States of America"
        ],
-       "s": 34796811,
-       "sha1_base64": "NKL4WcB6m+Rj0jf9MKSkgdCvi2I="
+       "s": 34869419,
+       "sha1_base64": "4izDw8P3WGlTBOntBbLub+E0gZ0="
       },
       {
        "id": "US_Kentucky_Louisville",
@@ -15569,8 +15569,8 @@
         "KY",
         "United States of America"
        ],
-       "s": 40639157,
-       "sha1_base64": "fet4PaTd7FU8/jcmOVqv0sCRetw="
+       "s": 40644341,
+       "sha1_base64": "W04zGornMWoRSbsLnIyXQVmBewk="
       }
      ]
     },
@@ -15587,8 +15587,8 @@
         "LA",
         "United States of America"
        ],
-       "s": 45549948,
-       "sha1_base64": "lL22Y9/vUqwBZOXdixb0JPnwI6g="
+       "s": 45671204,
+       "sha1_base64": "kz7AtAfavjlrgWASV6mnfl3Q53c="
       },
       {
        "id": "US_Louisiana_New Orleans",
@@ -15600,8 +15600,8 @@
         "LA",
         "United States of America"
        ],
-       "s": 74532960,
-       "sha1_base64": "uwYFWm5DdfzvrnSe23UdlZ2f9fU="
+       "s": 74735024,
+       "sha1_base64": "RQ7tBrMAXt8L+KRCuzNVQP+gHZc="
       }
      ]
     },
@@ -15615,8 +15615,8 @@
       "ME",
       "United States of America"
      ],
-     "s": 90775083,
-     "sha1_base64": "nlHZmQRWTcD2iucRLITSNCAHoII="
+     "s": 90444795,
+     "sha1_base64": "iVqWA/W1Cgw9OVMheP5Y5l5GxLg="
     },
     {
      "id": "Maryland",
@@ -15631,8 +15631,8 @@
         "MD",
         "United States of America"
        ],
-       "s": 102913907,
-       "sha1_base64": "tmbuC6VbKYEr5qbrKYeVOTQZAbw="
+       "s": 103001675,
+       "sha1_base64": "2C3UPAnhUpDF9eul4OxQuMSWuFM="
       },
       {
        "id": "US_Maryland_and_DC",
@@ -15647,8 +15647,8 @@
         "MD",
         "United States of America"
        ],
-       "s": 78800874,
-       "sha1_base64": "qlD5RrmW9+p3rMCF3XDX7AcKR5Q="
+       "s": 78546042,
+       "sha1_base64": "Yfe2+DgKu5eHw96yiLFjHiC/fmA="
       }
      ]
     },
@@ -15665,8 +15665,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 80105631,
-       "sha1_base64": "ueu403azwBIJvOLx5vPzRpqv+Ak="
+       "s": 80274863,
+       "sha1_base64": "azOY5F75JxT0OtSA6+WbzjrHewk="
       },
       {
        "id": "US_Massachusetts_Central",
@@ -15678,8 +15678,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 36911843,
-       "sha1_base64": "5134JETxlcLDmk4b1EyW9E6eBNM="
+       "s": 36855723,
+       "sha1_base64": "A03aoT+L7XNPWbaPt8lMLIbpJf8="
       },
       {
        "id": "US_Massachusetts_Plymouth",
@@ -15691,8 +15691,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 39023635,
-       "sha1_base64": "LRNeHZQ/Lqn2T7RqGMDEOFZUBo0="
+       "s": 39260747,
+       "sha1_base64": "aHxYmeO09qh2tgD0RIsK8Y6Zfgk="
       },
       {
        "id": "US_Massachusetts_Southeastern",
@@ -15704,8 +15704,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 18014296,
-       "sha1_base64": "zpEowTdl281WGjW5Xi9SLuCdyWc="
+       "s": 18194191,
+       "sha1_base64": "8wqAk+exg9r+N/l9m/W8dN23IkE="
       },
       {
        "id": "US_Massachusetts_West",
@@ -15717,8 +15717,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 36486698,
-       "sha1_base64": "pv6N14Ue1X06X/JbgcC1w31bPlI="
+       "s": 36555434,
+       "sha1_base64": "/4D8klzYJfWSv8wspk7fS2a7J2k="
       }
      ]
     },
@@ -15735,8 +15735,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 80362410,
-       "sha1_base64": "gV+2y4/SxXXPHpxsxBpnX36+kwU="
+       "s": 79666666,
+       "sha1_base64": "fNec1xcVJ6pWop3KyxOt+tAyEDs="
       },
       {
        "id": "US_Michigan_North",
@@ -15748,8 +15748,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 42264389,
-       "sha1_base64": "wcfuirOdBH8r8xZVffpw1XSxwig="
+       "s": 42104869,
+       "sha1_base64": "laMzdRk26pGOp3WSQfntxMb4+h4="
       },
       {
        "id": "US_Michigan_Grand Rapids",
@@ -15767,8 +15767,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 59015328,
-       "sha1_base64": "S1on9Gw3vB13V+iy65KbjeP3Y3o="
+       "s": 58807304,
+       "sha1_base64": "RCjhF3JloPM2KoykoPnKeJza8gk="
       },
       {
        "id": "US_Michigan_Lansing",
@@ -15782,8 +15782,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 61174945,
-       "sha1_base64": "S0WSbtUAOrN+goPnxAMFQzDM8NU="
+       "s": 60956273,
+       "sha1_base64": "HV85l2ceDR4j5YN6oyQDu1LNt3E="
       }
      ]
     },
@@ -15800,8 +15800,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 44852206,
-       "sha1_base64": "Agq/E5CbnkLcoYhRr2XEoz5eV7E="
+       "s": 44821430,
+       "sha1_base64": "RrZYZ/OHZIbZhqBZquQ+070cSB0="
       },
       {
        "id": "US_Minnesota_Minneapolis",
@@ -15813,8 +15813,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 63273374,
-       "sha1_base64": "6n6AEwtxoZoo0UZtOJVPDarNz6U="
+       "s": 62916407,
+       "sha1_base64": "VzqL//gOYXyJRHLHgIJh3doroik="
       },
       {
        "id": "US_Minnesota_North",
@@ -15826,8 +15826,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 60360112,
-       "sha1_base64": "2y2cVY8ZG4IVlrA/ynkz7Qv1vdw="
+       "s": 60352088,
+       "sha1_base64": "2sfUANdflc/kuMNiAAst13A0ACk="
       },
       {
        "id": "US_Minnesota_Saint Cloud",
@@ -15839,8 +15839,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 37703235,
-       "sha1_base64": "uTyy+smQcUU1d3Jti+kVTC53+AE="
+       "s": 37773211,
+       "sha1_base64": "A4ZRxn4n64sIOLbac2txxL3+A9k="
       }
      ]
     },
@@ -15857,8 +15857,8 @@
         "MS",
         "United States of America"
        ],
-       "s": 26610642,
-       "sha1_base64": "wmssBqsdOBfTjxcwkeMVcURA/pE="
+       "s": 26519626,
+       "sha1_base64": "pEusLx7MWkSZqTAKkdAqamopzLY="
       },
       {
        "id": "US_Mississippi_North",
@@ -15870,8 +15870,8 @@
         "MS",
         "United States of America"
        ],
-       "s": 55918097,
-       "sha1_base64": "7lTN/CR1HvVX0xRs5xCJqrLy45Y="
+       "s": 55448225,
+       "sha1_base64": "DfLty5id98UUkSLRLa5szJG1zj4="
       }
      ]
     },
@@ -15888,8 +15888,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 19480985,
-       "sha1_base64": "nRpFMW6YaUD3Av5aZiiAOgTXEFg="
+       "s": 19726825,
+       "sha1_base64": "4MwVquGWkxrI4HHnHKH4GI1JoWg="
       },
       {
        "id": "US_Missouri_Springfield",
@@ -15901,8 +15901,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 38491692,
-       "sha1_base64": "9l4vUmNFmzkRdiAPPAQGuJf2ZrA="
+       "s": 38625636,
+       "sha1_base64": "f7ozzlW+v5imibz2nUKuT9YHhX0="
       },
       {
        "id": "US_Missouri_Kansas",
@@ -15914,8 +15914,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 47171598,
-       "sha1_base64": "Gd4XBDfkevIvarsJM3DgLDAjNU4="
+       "s": 46390550,
+       "sha1_base64": "nxIgCJApd6q90LFL0uuALCwCR+Y="
       },
       {
        "id": "US_Missouri_St Louis",
@@ -15927,8 +15927,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 64276150,
-       "sha1_base64": "n2+h0BGu+HP2Mm23PywmN67m7J0="
+       "s": 64196622,
+       "sha1_base64": "FILDkhx3BD5nkxdvpRu2hk89KP8="
       }
      ]
     },
@@ -15945,8 +15945,8 @@
         "MT",
         "United States of America"
        ],
-       "s": 40405500,
-       "sha1_base64": "JGFhfdDMd1WKmwv/bURkp9glYDI="
+       "s": 40726460,
+       "sha1_base64": "LDim0ChJZ4FEVt6Ux1xR7Up0ggM="
       },
       {
        "id": "US_Montana_West",
@@ -15958,8 +15958,8 @@
         "MT",
         "United States of America"
        ],
-       "s": 49907276,
-       "sha1_base64": "uGYkPENhqYJ2LJ5Rol2yaTmv+sY="
+       "s": 50251876,
+       "sha1_base64": "uCqHSJyUrd7yqFOrBL3ChNEMixs="
       }
      ]
     },
@@ -15976,8 +15976,8 @@
         "NE",
         "United States of America"
        ],
-       "s": 36613613,
-       "sha1_base64": "AZXzO4R5ib5m2fRhLY1UN8ZS/zQ="
+       "s": 36649477,
+       "sha1_base64": "qGrTXwPA+4SwwmOhEykMGBpCTxk="
       },
       {
        "id": "US_Nebraska_West",
@@ -15989,8 +15989,8 @@
         "NE",
         "United States of America"
        ],
-       "s": 47176509,
-       "sha1_base64": "eRHxAHmyY6z2Uqc5EyiF9Ajf3zs="
+       "s": 47190757,
+       "sha1_base64": "B7b0Hjznv+qIOERcJvlqNSKwRmc="
       }
      ]
     },
@@ -16004,8 +16004,8 @@
       "NV",
       "United States of America"
      ],
-     "s": 72984320,
-     "sha1_base64": "Yn9jvfgjZU9f/u7ESvCRMOt+g20="
+     "s": 72913512,
+     "sha1_base64": "atc9gA6skSTVSL1u2XWdk+y2Ebg="
     },
     {
      "id": "US_New Hampshire",
@@ -16017,8 +16017,8 @@
       "NH",
       "United States of America"
      ],
-     "s": 48925519,
-     "sha1_base64": "Tdg49eWa5jCS0EBUZMJthWmIPkY="
+     "s": 49048880,
+     "sha1_base64": "Ipu2pFGU2MYzoF2XvrPoe0w1aiw="
     },
     {
      "id": "New Jersey",
@@ -16033,8 +16033,8 @@
         "NJ",
         "United States of America"
        ],
-       "s": 60943693,
-       "sha1_base64": "3lScyvqkPfdr/sRz8EGUvdL4bvs="
+       "s": 60648157,
+       "sha1_base64": "pqxdCUtkyxd46C0vi4+diAs8j2I="
       },
       {
        "id": "US_New Jersey_South",
@@ -16046,8 +16046,8 @@
         "NJ",
         "United States of America"
        ],
-       "s": 72249495,
-       "sha1_base64": "plKIir6I3a0v23W+BH5Fi8gI0vs="
+       "s": 72225663,
+       "sha1_base64": "t0K0o0PhufN+LIfErhiYqsqnqZ8="
       }
      ]
     },
@@ -16064,8 +16064,8 @@
         "NM",
         "United States of America"
        ],
-       "s": 70505682,
-       "sha1_base64": "Q0VHIqXnvHz5Vx35BWHYIe+w/y8="
+       "s": 70488482,
+       "sha1_base64": "eaqFeQu5YDIA6FOi2l+NIQ9Lr18="
       },
       {
        "id": "US_New Mexico_Roswell",
@@ -16077,8 +16077,8 @@
         "NM",
         "United States of America"
        ],
-       "s": 52500302,
-       "sha1_base64": "3wCm9X9gdH3FhElEJP3CQ7mysPo="
+       "s": 52575062,
+       "sha1_base64": "Yo6RWg3//21mzlwP/8QVora/iYE="
       }
      ]
     },
@@ -16096,8 +16096,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 107055145,
-       "sha1_base64": "XCINqTosDRRO1Jomlbx4zawy6Oc="
+       "s": 106884945,
+       "sha1_base64": "yOg7//eYli37kYbDaqHVrNmhEKw="
       },
       {
        "id": "US_New York_New York",
@@ -16111,8 +16111,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 92298131,
-       "sha1_base64": "xEbEURBbKn7kkgnTM1Kjb20gFUY="
+       "s": 90603187,
+       "sha1_base64": "90BLq0XmJrCmpI+VmNbw1PaCcmU="
       },
       {
        "id": "US_New York_North",
@@ -16124,8 +16124,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 100868427,
-       "sha1_base64": "S/X7a+q4lrfyUe1kDG8YKN6yrYI="
+       "s": 100604651,
+       "sha1_base64": "cF6v7gHyS74LNYbK6lZHQ5rbfZY="
       },
       {
        "id": "US_New York_West",
@@ -16137,8 +16137,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 165187557,
-       "sha1_base64": "uDIUWNGoxw4t9VyMvSooyHo5Hh0="
+       "s": 164050965,
+       "sha1_base64": "4XtxV2KFG6XJ17X6Tyevn8MMN7Q="
       }
      ]
     },
@@ -16155,8 +16155,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 42270125,
-       "sha1_base64": "fR8MYiEzNxq70+gCNMjVddCrTms="
+       "s": 41891901,
+       "sha1_base64": "4eEE6ohLKO6qrCq66KPTn5Ieh9c="
       },
       {
        "id": "US_North Carolina_Asheville",
@@ -16168,8 +16168,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 40772038,
-       "sha1_base64": "9AVV91KPAp82sRJe2Df8C+xbwRo="
+       "s": 40685662,
+       "sha1_base64": "RMpfwMwe/c6HcHNAlhX+hdOwbL4="
       },
       {
        "id": "US_North Carolina_Charlotte",
@@ -16181,8 +16181,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 73266630,
-       "sha1_base64": "aLLrsQY3NnewdQGyQIrQar/WLzk="
+       "s": 72542422,
+       "sha1_base64": "sLz2uGLLswLlKMeJpT5u5IteAug="
       },
       {
        "id": "US_North Carolina_Greensboro",
@@ -16194,8 +16194,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 54483200,
-       "sha1_base64": "O2sSUtWH1Z2Ddc99DX2Fw3GaADw="
+       "s": 54475336,
+       "sha1_base64": "9iPw5YUxMcSLfJq5/uckXYUqoF8="
       },
       {
        "id": "US_North Carolina_Raleigh",
@@ -16207,8 +16207,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 79682383,
-       "sha1_base64": "ECpRoyOOWLSOJxXJYJb95VfhFFQ="
+       "s": 79145383,
+       "sha1_base64": "yBri6kSTumx38ZBGgTzoHX88VT4="
       },
       {
        "id": "US_North Carolina_Wilmington",
@@ -16220,8 +16220,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 40434636,
-       "sha1_base64": "3QvB5XEWBzK9gwjjgxXKnkv5Nv0="
+       "s": 40650820,
+       "sha1_base64": "GcdY2dmhbmpEyMw4VMWPpHZ2uok="
       }
      ]
     },
@@ -16238,8 +16238,8 @@
         "ND",
         "United States of America"
        ],
-       "s": 30250346,
-       "sha1_base64": "s2rLge1GgpkFlssAbUlV8EKvUiU="
+       "s": 30342098,
+       "sha1_base64": "u3/S1mjE6az7hsJd0NYZbfWaj2w="
       },
       {
        "id": "US_North Dakota_East",
@@ -16251,8 +16251,8 @@
         "ND",
         "United States of America"
        ],
-       "s": 39178515,
-       "sha1_base64": "WkwET7wiKfybwecAOWmKxGI6Mkw="
+       "s": 39453219,
+       "sha1_base64": "j5Qu5WNTUI4L0HsRSnr/KBlxaYA="
       },
       {
        "id": "US_North Dakota_Minot",
@@ -16264,8 +16264,8 @@
         "ND",
         "United States of America"
        ],
-       "s": 25012473,
-       "sha1_base64": "OK4Wvd7d7NFxpdUH7/VxgKROYnY="
+       "s": 25250800,
+       "sha1_base64": "IOMJwVI8yPVKyZMPaX2yyjRTAEw="
       }
      ]
     },
@@ -16282,8 +16282,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 71456908,
-       "sha1_base64": "jzO0tUtA4PUqpd75JuQEhC9SBAY="
+       "s": 70874348,
+       "sha1_base64": "jpOPNJFIj8rXdi4yV5hLjcSO3QA="
       },
       {
        "id": "US_Ohio_Cincinnati",
@@ -16295,8 +16295,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 71190513,
-       "sha1_base64": "kQEAZb0NeJMovFfOlkX6U4s62qc="
+       "s": 71249778,
+       "sha1_base64": "Dl4RuljUlqs71kdEn1PBXysd5FY="
       },
       {
        "id": "US_Ohio_Columbus",
@@ -16308,8 +16308,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 51242511,
-       "sha1_base64": "jDAxqQisIPM1VFoXNGvXjks8dMk="
+       "s": 51123935,
+       "sha1_base64": "Jv+QjJHP55HOHhbGwiSe0h8KLHg="
       },
       {
        "id": "US_Ohio_Toledo",
@@ -16321,8 +16321,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 40854510,
-       "sha1_base64": "nLUo2bmaOtE49yud7CdofYBTHvE="
+       "s": 40942758,
+       "sha1_base64": "0GiYtN/OvV3ZMCmRGYhN+iXQ4hI="
       }
      ]
     },
@@ -16339,8 +16339,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 22551499,
-       "sha1_base64": "09qrEQJequOYl3L5oa+B9rYInaI="
+       "s": 22709779,
+       "sha1_base64": "OSPWn3cuk2hb4Zn5CQalaSMwYVM="
       },
       {
        "id": "US_Oklahoma_West",
@@ -16352,8 +16352,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 26649658,
-       "sha1_base64": "YcKsr9/k/qd366y2QMI+XjIzGMY="
+       "s": 26860682,
+       "sha1_base64": "CP4Jn8AEn3fxiRgsBzY3xSU3we4="
       },
       {
        "id": "US_Oklahoma_Tulsa",
@@ -16365,8 +16365,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 44091268,
-       "sha1_base64": "2EyGGnQovzN81GsIDn8h7zZW2bY="
+       "s": 44151252,
+       "sha1_base64": "jvNxpkEiCJYVZTiNj+zhvL9WdVQ="
       },
       {
        "id": "US_Oklahoma_Oklahoma",
@@ -16378,8 +16378,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 38169356,
-       "sha1_base64": "PEkPYT3p7tXTcRewsZFS/Ez+IY8="
+       "s": 38023956,
+       "sha1_base64": "PYHdzktp5YcweJTqh5BnnktqI10="
       }
      ]
     },
@@ -16396,8 +16396,8 @@
         "OR",
         "United States of America"
        ],
-       "s": 68040697,
-       "sha1_base64": "ux5V9iIP7tq8qr4bYOu4x1EOLCE="
+       "s": 68068417,
+       "sha1_base64": "TzA7zxxocwHWa7QQ6U5mjeDnfnw="
       },
       {
        "id": "US_Oregon_Portland",
@@ -16409,8 +16409,8 @@
         "OR",
         "United States of America"
        ],
-       "s": 92966740,
-       "sha1_base64": "UAreDmBZ+c9OSR5g0CvWbiHFieo="
+       "s": 92945796,
+       "sha1_base64": "AnOqExBopGoiN1DisibN/enkWDA="
       },
       {
        "id": "US_Oregon_West",
@@ -16422,8 +16422,8 @@
         "OR",
         "United States of America"
        ],
-       "s": 59804183,
-       "sha1_base64": "ULYbMUNhEtDCQyJSp6J1fKmuA3g="
+       "s": 59860215,
+       "sha1_base64": "vpVS7rzVCMGHoAXcLhdy2kjy2aI="
       }
      ]
     },
@@ -16440,8 +16440,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 65634529,
-       "sha1_base64": "pDQIeiF9y7dYS4vXaDVMcVnGEiM="
+       "s": 64962233,
+       "sha1_base64": "cQIC2Wa3/OKV5Mh3S49zMGIP67E="
       },
       {
        "id": "US_Pennsylvania_Pittsburgh",
@@ -16453,8 +16453,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 69493480,
-       "sha1_base64": "BShI3/ddjOOhAWhTvTVDBYHMcDw="
+       "s": 69469672,
+       "sha1_base64": "BL8jDZwNvGl5HwllYRn60z9Aouk="
       },
       {
        "id": "US_Pennsylvania_Reading",
@@ -16466,8 +16466,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 63183684,
-       "sha1_base64": "k8jN5NqcFDqiHjrqBNCq7a6NqnQ="
+       "s": 62666060,
+       "sha1_base64": "EcKWbk90FKWDlFO+44RczEl+MpI="
       },
       {
        "id": "US_Pennsylvania_Scranton",
@@ -16479,8 +16479,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 51939056,
-       "sha1_base64": "K5R7hR3GdvOa1wHJiC4i9wJRIY0="
+       "s": 51793152,
+       "sha1_base64": "nHiQdjhBF+llLm8OgS82SMKCT5o="
       }
      ]
     },
@@ -16495,8 +16495,8 @@
       "Rep\u00fablica Dominicana",
       "United States of America"
      ],
-     "s": 67346858,
-     "sha1_base64": "HLq4e8NnQawOSeh1IdSJsvEJ3gs="
+     "s": 67642602,
+     "sha1_base64": "YVPaCmmrehtdvBMIHBBQGIeT7Xc="
     },
     {
      "id": "US_Rhode Island",
@@ -16509,8 +16509,8 @@
       "RI",
       "United States of America"
      ],
-     "s": 30094963,
-     "sha1_base64": "/hI6GcjHim+spLpQ/pQxXNNYINI="
+     "s": 30485435,
+     "sha1_base64": "GeXtwZKLeNJbuq85B4i3Iaq7v2o="
     },
     {
      "id": "South Carolina",
@@ -16525,8 +16525,8 @@
         "SC",
         "United States of America"
        ],
-       "s": 36411570,
-       "sha1_base64": "asZqr3DG0KJM+CCCNGHjmxfo+GI="
+       "s": 36595698,
+       "sha1_base64": "E4xFiG0Vrm+TnQMpEBS2OY85gqc="
       },
       {
        "id": "US_South Carolina_Columbia",
@@ -16538,8 +16538,8 @@
         "SC",
         "United States of America"
        ],
-       "s": 65092241,
-       "sha1_base64": "01hM01xhc8CuCzuQRmJNnZrlWZ0="
+       "s": 64651409,
+       "sha1_base64": "w7kGhyF3NwoYAWYpL9wyXlSvhE8="
       },
       {
        "id": "US_South Carolina_Florence",
@@ -16551,8 +16551,8 @@
         "SC",
         "United States of America"
        ],
-       "s": 40091372,
-       "sha1_base64": "tp8IVKcTbB0KFzBZcLjVZ9ahptM="
+       "s": 40178444,
+       "sha1_base64": "mLgS1Sh6kaSSNM9OxMN+ykHUbW0="
       }
      ]
     },
@@ -16566,8 +16566,8 @@
       "SD",
       "United States of America"
      ],
-     "s": 56078423,
-     "sha1_base64": "lmrY4wNWZeXc/5iEnS3dFJ7CuxQ="
+     "s": 56111199,
+     "sha1_base64": "EdjEo//8QMHjGVUQ+x2n8BsKzrs="
     },
     {
      "id": "Tennessee",
@@ -16582,8 +16582,8 @@
         "TN",
         "United States of America"
        ],
-       "s": 77740753,
-       "sha1_base64": "5Dk+G0lZ/rzgHtUQPxetNBfzq5Q="
+       "s": 77292457,
+       "sha1_base64": "cu+Ggjrys6DmxhQCHqe7V+Ycv4A="
       },
       {
        "id": "US_Tennessee_West",
@@ -16595,8 +16595,8 @@
         "TN",
         "United States of America"
        ],
-       "s": 72859986,
-       "sha1_base64": "v//99MnZKmO5EO2rO+Jjd0O6v5g="
+       "s": 72935097,
+       "sha1_base64": "/t0WuXySnASv9kBXCi8kRMZLo0w="
       }
      ]
     },
@@ -16613,8 +16613,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 71415289,
-       "sha1_base64": "WCd2SPn/pqeLy39PDo9SmE9PN7w="
+       "s": 71121193,
+       "sha1_base64": "NWQwKzKfEJ5vboLKswsu9zSiDWM="
       },
       {
        "id": "US_Texas_Victoria",
@@ -16626,8 +16626,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 24109610,
-       "sha1_base64": "5dfZNyU9kicMJe7HehSYayiZuIk="
+       "s": 24425290,
+       "sha1_base64": "6P8uJ/0vo6182Hr6QItII8M6frE="
       },
       {
        "id": "US_Texas_Dallas",
@@ -16639,8 +16639,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 137765620,
-       "sha1_base64": "AtdxPiFm9O0SOTmyMefP/Kztd6E="
+       "s": 137202196,
+       "sha1_base64": "vZHN4SkRnbMcyyhENmcpt/abRhU="
       },
       {
        "id": "US_Texas_Houston",
@@ -16652,8 +16652,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 81408763,
-       "sha1_base64": "LmJPvkU8fWHsokVAtiH55bIypnw="
+       "s": 81479331,
+       "sha1_base64": "rjazAVlC3N5POeiB6PXZwmVzRak="
       },
       {
        "id": "US_Texas_Amarillo",
@@ -16665,8 +16665,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 29232329,
-       "sha1_base64": "oPAtieklZpQz1Man01Jhwu0hWDk="
+       "s": 29345825,
+       "sha1_base64": "2r1X09jZ0Ayh7mP8N+YQ0MmyPXU="
       },
       {
        "id": "US_Texas_Lubbock",
@@ -16678,8 +16678,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 31811321,
-       "sha1_base64": "1h/sGH4TOUn0qk/upaKc8XA7n6Y="
+       "s": 31872921,
+       "sha1_base64": "/RDogoeZnJLqddjHKxNK1HoAau8="
       },
       {
        "id": "US_Texas_San Antonio",
@@ -16691,8 +16691,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 44749647,
-       "sha1_base64": "IRUyFeDM9pyoLMGupXpax8kBgR4="
+       "s": 44960063,
+       "sha1_base64": "Xj3MQbniuVKJqrkYaKc/Gu3+SFc="
       },
       {
        "id": "US_Texas_Southwest",
@@ -16704,8 +16704,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 37250395,
-       "sha1_base64": "TVcy9gTfr2ZGrO48S+muEJKQRp0="
+       "s": 37296339,
+       "sha1_base64": "8JxGl8amd2nk4YCfoVKg/0WgH9k="
       },
       {
        "id": "US_Texas_Tyler",
@@ -16717,8 +16717,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 50346800,
-       "sha1_base64": "Y+WFZ/2/OatYpW71FFEA2E2hAMg="
+       "s": 50490432,
+       "sha1_base64": "txNu7zpWsBLXPYoAnVxT3MLGk9E="
       },
       {
        "id": "US_Texas_Wako",
@@ -16730,8 +16730,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 34102515,
-       "sha1_base64": "4/YLoM0cg8HBr03Z320hgAM1K1E="
+       "s": 34001355,
+       "sha1_base64": "8FKoQuxHNOmH7RpHYEykz8z4i4Y="
       },
       {
        "id": "US_Texas_West",
@@ -16743,8 +16743,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 45356452,
-       "sha1_base64": "lCCguBvbI7iehnMOVv/sAbM5Al4="
+       "s": 45418220,
+       "sha1_base64": "WWu2z7QkTgyboy7o2NW/wLmONng="
       }
      ]
     },
@@ -16754,8 +16754,8 @@
       "Navassa Island",
       "United States Minor Outlying Islands"
      ],
-     "s": 721666,
-     "sha1_base64": "9itp6H0XcvEVgtCEwodx6Dg7VUw="
+     "s": 878642,
+     "sha1_base64": "ua7lDKJ5oYaG73FCsS0VQNNj0iE="
     },
     {
      "id": "US_Utah",
@@ -16770,8 +16770,8 @@
         "Utah",
         "UT"
        ],
-       "s": 52688195,
-       "sha1_base64": "OeVAjmiW/ArgMPQNANYRbRoI6nE="
+       "s": 52332227,
+       "sha1_base64": "ENDKIUXRhEl1msLq+shv5HPNxZE="
       },
       {
        "id": "US_Utah_North",
@@ -16783,8 +16783,8 @@
         "Utah",
         "UT"
        ],
-       "s": 88404152,
-       "sha1_base64": "LSQd0blHzG049SFsSbJReVON1P4="
+       "s": 88104736,
+       "sha1_base64": "PaVRdeQzekjQ4pmD2dokzoUuVWY="
       }
      ]
     },
@@ -16798,8 +16798,8 @@
       "Vermont",
       "VT"
      ],
-     "s": 34071188,
-     "sha1_base64": "cPoM1REsti7BWQ21+VkjsjYq7Sk="
+     "s": 33927140,
+     "sha1_base64": "HplqzMKH8IOsC0fn94grR3aXA6w="
     },
     {
      "id": "Virginia",
@@ -16814,8 +16814,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 44927446,
-       "sha1_base64": "NaUvrLWbY4eyDXNvh7ksqJrYt60="
+       "s": 45112190,
+       "sha1_base64": "PlNe4r9pRm6oOFFhzrLobykXPxs="
       },
       {
        "id": "US_Virginia_Norfolk",
@@ -16827,8 +16827,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 81114311,
-       "sha1_base64": "iI0XrLLPeE+rUQKqYA5NNJexQI0="
+       "s": 81470479,
+       "sha1_base64": "jRYQkfFF0udtCaUlVVf78FSwLmU="
       },
       {
        "id": "US_Virginia_Lynchburg",
@@ -16840,8 +16840,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 61507663,
-       "sha1_base64": "bTcODk7z5H8ZTND1I54OkkwQifg="
+       "s": 61266463,
+       "sha1_base64": "JKtWDBPulCAnIpFEo4qeyrxNVdo="
       },
       {
        "id": "US_Virginia_Richmond",
@@ -16853,8 +16853,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 59733879,
-       "sha1_base64": "QJ+CmkbnmVcpGXluFsQwahKDoKw="
+       "s": 59792791,
+       "sha1_base64": "bjS5eUSpfAtJlOJixRfHrQXCBTo="
       },
       {
        "id": "US_Virginia_Alexandria",
@@ -16866,8 +16866,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 77591858,
-       "sha1_base64": "vLV3K4PV0YwrIsCnaeKAjMwvh4g="
+       "s": 76954242,
+       "sha1_base64": "hDqmxj2NwfV+0t842w+a1gGN+eQ="
       }
      ]
     },
@@ -16886,8 +16886,8 @@
         "Washington",
         "WA"
        ],
-       "s": 115075818,
-       "sha1_base64": "ls75xTUfVcm2Cx8sREb6nFfRNg0="
+       "s": 114826987,
+       "sha1_base64": "v4x02SFn+4IHVQjYpQGbYXkcjOE="
       },
       {
        "id": "US_Washington_Seattle",
@@ -16899,8 +16899,8 @@
         "Washington",
         "WA"
        ],
-       "s": 79588971,
-       "sha1_base64": "puBj/6H6oLdrsoH8zes74OOYZ4M="
+       "s": 79224851,
+       "sha1_base64": "u38msQTPmWWXnHQvkq5KgXkXzRY="
       },
       {
        "id": "US_Washington_Yakima",
@@ -16912,8 +16912,8 @@
         "Washington",
         "WA"
        ],
-       "s": 70786258,
-       "sha1_base64": "9Jk7VduDoAu9UJFJdWe550EYhW8="
+       "s": 70636994,
+       "sha1_base64": "TrIQgmc1Q3QR0FpIOunq3gpUXlg="
       }
      ]
     },
@@ -16927,8 +16927,8 @@
       "West Virginia",
       "WV"
      ],
-     "s": 88843771,
-     "sha1_base64": "Od7i+TylLI4BEAWE1SEFPUpxlQ4="
+     "s": 87852700,
+     "sha1_base64": "DKhE0qYNQSn9g3PiSFPNPRRH0gU="
     },
     {
      "id": "Wisconsin",
@@ -16943,8 +16943,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 98466780,
-       "sha1_base64": "CuZY64TaLi9JBJcWcAG01WEgmmA="
+       "s": 97667972,
+       "sha1_base64": "cOJzWRW93OcT/cS+MJY2WEfzXx4="
       },
       {
        "id": "US_Wisconsin_North",
@@ -16956,8 +16956,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 43224573,
-       "sha1_base64": "+ZoYpiUY3KyosRiR6NlyB9GqSmA="
+       "s": 42031973,
+       "sha1_base64": "4biRZxPvyBvQRluh82eI+ByyykQ="
       },
       {
        "id": "US_Wisconsin_Madison",
@@ -16969,8 +16969,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 42072860,
-       "sha1_base64": "MkKRbAXLbuELprJoumStjaSoHSs="
+       "s": 42110500,
+       "sha1_base64": "2dmt1V3A/vM4lqDRKmm341fv16o="
       },
       {
        "id": "US_Wisconsin_Eau Claire",
@@ -16982,8 +16982,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 39349309,
-       "sha1_base64": "1FlMsh5e1Uig39inHPIwSK6PpYk="
+       "s": 39164421,
+       "sha1_base64": "88X3DSr1vpuUz3RggZe5MXdGTqQ="
       }
      ]
     },
@@ -16997,8 +16997,8 @@
       "Wyoming",
       "WY"
      ],
-     "s": 61048920,
-     "sha1_base64": "Vdcafx6wSgb3RGgdz5GxjrsWcYA="
+     "s": 60808984,
+     "sha1_base64": "HnKHG86bE6vSkCGE0tz+L3FHsLg="
     }
    ]
   },
@@ -17030,8 +17030,8 @@
     "Treinta y Tres",
     "Uruguay"
    ],
-   "s": 65820100,
-   "sha1_base64": "vR+iqcdUOG1yP77fQSF++iS4lS0="
+   "s": 65917748,
+   "sha1_base64": "kFdVBul1y13y1zNNq/KIvD6rbt8="
   },
   {
    "id": "Uzbekistan",
@@ -17056,8 +17056,8 @@
     "Toshkent",
     "Xorazm Viloyati"
    ],
-   "s": 88271347,
-   "sha1_base64": "2blDjdfjBK3f7Xx/ZoF1EXGrz94="
+   "s": 85808786,
+   "sha1_base64": "2qUqnmeghaaE45EElxecJTPveYM="
   },
   {
    "id": "Vanuatu",
@@ -17073,8 +17073,8 @@
     "Vanuatu",
     "Torba"
    ],
-   "s": 9070754,
-   "sha1_base64": "hx1xYWJLvyadsvr0t08872WGgY0="
+   "s": 9029618,
+   "sha1_base64": "0ne4CRG8ZLcolPvLhQapdBM9CnU="
   },
   {
    "id": "Venezuela",
@@ -17109,8 +17109,8 @@
       "Yaracuy",
       "Zulia"
      ],
-     "s": 49637000,
-     "sha1_base64": "BsC9EKoWjB52ubY8pEvV2v42zAo="
+     "s": 49718552,
+     "sha1_base64": "DdDLlCrEceU1dADaui/BGBhrvkQ="
     },
     {
      "id": "Venezuela_South",
@@ -17131,8 +17131,8 @@
       "Venezuela",
       "Zulia"
      ],
-     "s": 42953314,
-     "sha1_base64": "t4KO5hrY7xn3CRr2hvWbJWQEm0Y="
+     "s": 43626946,
+     "sha1_base64": "oWeWZOwwVDNrt6G3qS/7w6zSJKY="
     }
    ]
   },
@@ -17207,8 +17207,8 @@
     "T\u1ec9nh H\u00e0 Giang",
     "Vi\u1ec7t Nam"
    ],
-   "s": 247721594,
-   "sha1_base64": "FJPyaCrRla/JeLVbuSl2JMZEKaY="
+   "s": 246181954,
+   "sha1_base64": "brs+AfrWUcB1oIRNUe4dEqKz+sI="
   },
   {
    "id": "Yemen",
@@ -17239,8 +17239,8 @@
     "\u1e28a\u1e11ramawt",
     "\u0627\u0644\u064a\u0645\u0646"
    ],
-   "s": 53896610,
-   "sha1_base64": "XO4llRvvB3Ues31AcWskuHL+CtQ="
+   "s": 54031266,
+   "sha1_base64": "kOJTPHt5Fvq11/zv/wNpLCBPAlg="
   },
   {
    "id": "Zambia",
@@ -17260,8 +17260,8 @@
     "Western Province",
     "Zambia"
    ],
-   "s": 202949645,
-   "sha1_base64": "VlqyTAPU/DxCJZVxYIWWgQ2PLHY="
+   "s": 202496373,
+   "sha1_base64": "/R//LyQxNDqeae5lPRy0N+e59+w="
   },
   {
    "id": "Zimbabwe",
@@ -17281,16 +17281,16 @@
     "Midlands Province",
     "Zimbabwe"
    ],
-   "s": 128816651,
-   "sha1_base64": "4M2Yu/iYA+0y9NuH0JAI2j9HwC4="
+   "s": 128460275,
+   "sha1_base64": "y09zDnvGzpXyGxFi0pZbXO2gdEA="
   },
   {
    "id": "Antarctica",
    "affiliations": [
     "South Georgia and South Sandwich Islands"
    ],
-   "s": 64297972,
-   "sha1_base64": "XDGDFYCc0LYgzMR7x2Kou7c0C3A="
+   "s": 64258011,
+   "sha1_base64": "fyYGINGeL5WBvy8izmSElCtWK3w="
   },
   {
    "id": "New Zealand",
@@ -17303,8 +17303,8 @@
      "affiliations": [
       "Tokelau"
      ],
-     "s": 398993,
-     "sha1_base64": "4csrcTqTFrdfCoU+J/3y5XhZ1nM="
+     "s": 397697,
+     "sha1_base64": "C8tk2M1TsyNntYyzwSGRl/Jdrmw="
     },
     {
      "id": "New Zealand North_Auckland",
@@ -17318,8 +17318,8 @@
       "Northland",
       "Waikato"
      ],
-     "s": 125575493,
-     "sha1_base64": "kGXQHmM5ffSPGOiwI1DP8kNBY40="
+     "s": 123833997,
+     "sha1_base64": "ee36zHJ4G9eu0a+9YkSKO/pJRjQ="
     },
     {
      "id": "New Zealand North_Wellington",
@@ -17334,8 +17334,8 @@
       "Taranaki",
       "Wellington"
      ],
-     "s": 88503915,
-     "sha1_base64": "55CfyxUr25nvuQPtJ4Vd7/+GWjs="
+     "s": 86970650,
+     "sha1_base64": "0n18XE1D5nnaI7ThxhBo9oPsUL0="
     },
     {
      "id": "New Zealand South_Canterbury",
@@ -17351,8 +17351,8 @@
       "Tasman",
       "West Coast"
      ],
-     "s": 97084002,
-     "sha1_base64": "d14WbAudM41dgZ/da+3XpkREJGY="
+     "s": 96097209,
+     "sha1_base64": "tUHy5KlHP5Lh4ziNLZJ736Vjl10="
     },
     {
      "id": "New Zealand South_Southland",
@@ -17365,8 +17365,8 @@
       "Southland",
       "West Coast"
      ],
-     "s": 59949989,
-     "sha1_base64": "aAMKSPcukSvktnzoODXdPn6EiVk="
+     "s": 59558653,
+     "sha1_base64": "io05PAb4tr5b6ZjnCoT0i4uO428="
     }
    ]
   },
@@ -17390,8 +17390,8 @@
       "\ucda9\uccad\ub0a8\ub3c4",
       "\ucda9\uccad\ubd81\ub3c4"
      ],
-     "s": 143447237,
-     "sha1_base64": "AYjQ0jW9muica2Jk0DnFCdKYmV4="
+     "s": 141993205,
+     "sha1_base64": "H3QNXTq/op0/02IB35Z/g1FWkHc="
     },
     {
      "id": "South Korea_South",
@@ -17411,8 +17411,8 @@
       "\uc804\ub77c\ub0a8\ub3c4",
       "\uc804\ub77c\ubd81\ub3c4"
      ],
-     "s": 118858002,
-     "sha1_base64": "hATFfDXL6NuGk1O+1JKhhb52/zM="
+     "s": 117504146,
+     "sha1_base64": "jZ+Xe9dkDE6TaD963ROsyskQg4c="
     }
    ]
   }
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index d7b58a0e35..faf1f08e6e 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 0c86c24150..307d274897 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -2360,7 +2360,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16582
     }
     caption {
@@ -2376,7 +2376,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16980
     }
     caption {
@@ -2392,7 +2392,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16980
     }
     caption {
@@ -10886,7 +10886,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10902,7 +10902,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10918,7 +10918,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10934,7 +10934,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10988,7 +10988,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11004,7 +11004,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11020,7 +11020,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11036,7 +11036,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11090,7 +11090,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11106,7 +11106,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11122,7 +11122,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -11138,7 +11138,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -89189,10 +89189,10 @@ cont {
 cont {
   name: "shop-antiques"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "antiques-m"
-      priority: 16631
+      name: "shop-m"
+      priority: 16592
       min_distance: 10
     }
     caption {
@@ -89202,49 +89202,15 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15631
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15631
+      priority: 15592
     }
   }
   element {
     scale: 19
     symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
+      name: "shop-m"
+      priority: 16592
+      min_distance: 10
     }
     caption {
       primary {
@@ -89253,7 +89219,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 15592
     }
   }
 }
@@ -89297,9 +89263,9 @@ cont {
 cont {
   name: "shop-art"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "art-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -89313,46 +89279,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "art-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "art-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "art-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -90047,77 +89979,6 @@ cont {
     }
   }
 }
-cont {
-  name: "shop-camera"
-  element {
-    scale: 16
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-}
 cont {
   name: "shop-cannabis"
   element {
@@ -90638,9 +90499,9 @@ cont {
 cont {
   name: "shop-cheese"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "cheese-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -90654,46 +90515,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "cheese-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "cheese-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "cheese-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -92996,9 +92823,9 @@ cont {
 cont {
   name: "shop-interior_decoration"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "interior_decoration-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -93012,46 +92839,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "interior_decoration-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "interior_decoration-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "interior_decoration-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d1dd90a92b..996b2597c8 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 00519bd349..4f7cd8ef7d 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2360,7 +2360,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16582
     }
     caption {
@@ -2376,7 +2376,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16980
     }
     caption {
@@ -2392,7 +2392,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16980
     }
     caption {
@@ -10655,7 +10655,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10671,7 +10671,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10687,7 +10687,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10703,7 +10703,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10757,7 +10757,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10773,7 +10773,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10789,7 +10789,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10805,7 +10805,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10859,7 +10859,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10875,7 +10875,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10891,7 +10891,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10907,7 +10907,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -88691,10 +88691,10 @@ cont {
 cont {
   name: "shop-antiques"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "antiques-m"
-      priority: 16631
+      name: "shop-m"
+      priority: 16592
       min_distance: 10
     }
     caption {
@@ -88704,49 +88704,15 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15631
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15631
+      priority: 15592
     }
   }
   element {
     scale: 19
     symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
+      name: "shop-m"
+      priority: 16592
+      min_distance: 10
     }
     caption {
       primary {
@@ -88755,7 +88721,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 15592
     }
   }
 }
@@ -88799,9 +88765,9 @@ cont {
 cont {
   name: "shop-art"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "art-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -88815,46 +88781,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "art-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "art-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "art-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -89549,77 +89481,6 @@ cont {
     }
   }
 }
-cont {
-  name: "shop-camera"
-  element {
-    scale: 16
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-}
 cont {
   name: "shop-cannabis"
   element {
@@ -90140,9 +90001,9 @@ cont {
 cont {
   name: "shop-cheese"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "cheese-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -90156,46 +90017,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "cheese-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "cheese-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "cheese-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -92498,9 +92325,9 @@ cont {
 cont {
   name: "shop-interior_decoration"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "interior_decoration-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -92514,46 +92341,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "interior_decoration-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "interior_decoration-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "interior_decoration-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -101613,14 +101406,6 @@ colors {
     name: "RouteFakeOutline"
     color: 7434609
   }
-  value {
-    name: "RouteFirstSegmentArrowsMaskBicycle"
-    color: 4288423856
-  }
-  value {
-    name: "RouteFirstSegmentArrowsMaskCar"
-    color: 4278401920
-  }
   value {
     name: "RouteMarkPrimaryText"
   }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 9097466f3c..ce4b91b4d3 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index f4074afa3b..4c359b17cc 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2360,7 +2360,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16582
     }
     caption {
@@ -2376,7 +2376,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16980
     }
     caption {
@@ -2392,7 +2392,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "airport_gate-m"
+      name: "gate-m"
       priority: 16980
     }
     caption {
@@ -10655,7 +10655,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10671,7 +10671,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10687,7 +10687,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10703,7 +10703,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10757,7 +10757,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10773,7 +10773,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10789,7 +10789,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10805,7 +10805,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10859,7 +10859,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10875,7 +10875,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10891,7 +10891,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -10907,7 +10907,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "dot-m"
       priority: 16000
     }
     caption {
@@ -88776,10 +88776,10 @@ cont {
 cont {
   name: "shop-antiques"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "antiques-m"
-      priority: 16631
+      name: "shop-m"
+      priority: 16592
       min_distance: 10
     }
     caption {
@@ -88789,49 +88789,15 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15631
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15631
+      priority: 15592
     }
   }
   element {
     scale: 19
     symbol {
-      name: "antiques-m"
-      priority: 16631
-      min_distance: 24
+      name: "shop-m"
+      priority: 16592
+      min_distance: 10
     }
     caption {
       primary {
@@ -88840,7 +88806,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15631
+      priority: 15592
     }
   }
 }
@@ -88884,9 +88850,9 @@ cont {
 cont {
   name: "shop-art"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "art-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -88900,46 +88866,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "art-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "art-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "art-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -89634,77 +89566,6 @@ cont {
     }
   }
 }
-cont {
-  name: "shop-camera"
-  element {
-    scale: 16
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "photo-shop-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-}
 cont {
   name: "shop-cannabis"
   element {
@@ -90225,9 +90086,9 @@ cont {
 cont {
   name: "shop-cheese"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "cheese-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -90241,46 +90102,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "cheese-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "cheese-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "cheese-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -92583,9 +92410,9 @@ cont {
 cont {
   name: "shop-interior_decoration"
   element {
-    scale: 16
+    scale: 18
     symbol {
-      name: "interior_decoration-m"
+      name: "shop-m"
       priority: 16592
       min_distance: 10
     }
@@ -92599,46 +92426,12 @@ cont {
       priority: 15592
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "interior_decoration-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "interior_decoration-m"
-      priority: 16592
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15592
-    }
-  }
   element {
     scale: 19
     symbol {
-      name: "interior_decoration-m"
+      name: "shop-m"
       priority: 16592
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -101699,14 +101492,6 @@ colors {
     name: "RouteFakeOutline"
     color: 7434609
   }
-  value {
-    name: "RouteFirstSegmentArrowsMaskBicycle"
-    color: 4294921100
-  }
-  value {
-    name: "RouteFirstSegmentArrowsMaskCar"
-    color: 4278542285
-  }
   value {
     name: "RouteMarkPrimaryText"
     color: 8947848
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index e72a28bf32..15fc9229c2 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index cedd85c0c1..13c20bfc00 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -73881,14 +73881,6 @@ colors {
     name: "RouteFakeOutline"
     color: 7434609
   }
-  value {
-    name: "RouteFirstSegmentArrowsMaskBicycle"
-    color: 4288423856
-  }
-  value {
-    name: "RouteFirstSegmentArrowsMaskCar"
-    color: 4278401920
-  }
   value {
     name: "RouteMarkPrimaryText"
   }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 691b40608a..79f7a9910a 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 65de829b15..e3c1feb919 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -74206,14 +74206,6 @@ colors {
     name: "RouteFakeOutline"
     color: 7434609
   }
-  value {
-    name: "RouteFirstSegmentArrowsMaskBicycle"
-    color: 4294921100
-  }
-  value {
-    name: "RouteFirstSegmentArrowsMaskCar"
-    color: 4278542285
-  }
   value {
     name: "RouteMarkPrimaryText"
     color: 8947848
diff --git a/data/editor.config b/data/editor.config
index 8a5f5d72db..79878cc0be 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1000,9 +1000,6 @@
       <type id="shop-car_parts" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-camera" group="shop">
-        <include group="poi_internet" />
-      </type>
       <!-- Uncomment this after our editor core supports complex types
       <type id="amenity-vending_machine-cigarettes">
         <tag k="amenity" v="vending_machine" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 40c86e26a9..c5832e6354 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -38,9 +38,9 @@ highway|cycleway;37;
 landuse|farm;38;
 amenity|place_of_worship;39;
 highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40;
-addr:interpolation|odd;41;
+deprecated|deprecated;41;x
 highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;
-addr:interpolation|even;43;
+deprecated|deprecated;43;x
 highway|motorway_link;44;
 waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;
 highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46;
@@ -538,7 +538,7 @@ deprecated|deprecated;537;x
 deprecated|deprecated;538;x
 railway|funicular|tunnel;[railway=funicular][tunnel?];;name;int_name;539;
 barrier|cycle_barrier;540;
-addr:interpolation;[addr:interpolation];;addr:housenumber;name;541;
+deprecated|deprecated;541;x
 amenity|speed_trap;542;highway|speed_camera
 area:highway|track;543;
 area:highway|primary;544;
@@ -1559,4 +1559,3 @@ shop|curtain;1558;
 shop|fashion_accessories;1559;
 shop|cannabis;1560;
 shop|herbalist;1561;
-shop|camera;1562;
\ No newline at end of file
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index ec5b2e48f5..0b150d492c 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index b5c3c4a058..b0d1685139 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -3,700 +3,695 @@
  <file width="2048" height="2048">
   <symbol minX="0" maxX="182" minY="0" maxY="110" name="route-arrow"/>
   <symbol minX="182" maxX="282" minY="0" maxY="100" name="compass-image"/>
-  <symbol minX="282" maxX="382" minY="0" maxY="95" name="route-point-finish"/>
-  <symbol minX="382" maxX="463" minY="0" maxY="95" name="shield-us-i-thin-scaled"/>
-  <symbol minX="463" maxX="558" minY="0" maxY="95" name="shield-us-i-wide-scaled"/>
-  <symbol minX="558" maxX="653" minY="0" maxY="95" name="cross_geoposition"/>
-  <symbol minX="653" maxX="743" minY="0" maxY="90" name="search-result-shop-convenience"/>
-  <symbol minX="743" maxX="833" minY="0" maxY="90" name="search-result-bakery"/>
-  <symbol minX="833" maxX="923" minY="0" maxY="90" name="search-result-shop-confectionery"/>
-  <symbol minX="923" maxX="1013" minY="0" maxY="90" name="search-result-shop-clothes"/>
-  <symbol minX="1013" maxX="1103" minY="0" maxY="90" name="search-result-shop-butcher"/>
-  <symbol minX="1103" maxX="1193" minY="0" maxY="90" name="search-result-shop-alcohol"/>
-  <symbol minX="1193" maxX="1283" minY="0" maxY="90" name="search-result-restaurant"/>
-  <symbol minX="1283" maxX="1373" minY="0" maxY="90" name="search-result-pub"/>
+  <symbol minX="282" maxX="377" minY="0" maxY="95" name="cross_geoposition"/>
+  <symbol minX="377" maxX="477" minY="0" maxY="95" name="route-point-finish"/>
+  <symbol minX="477" maxX="572" minY="0" maxY="95" name="shield-us-i-wide-scaled"/>
+  <symbol minX="572" maxX="653" minY="0" maxY="95" name="shield-us-i-thin-scaled"/>
+  <symbol minX="653" maxX="743" minY="0" maxY="90" name="search-result-shop-supermarket"/>
+  <symbol minX="743" maxX="833" minY="0" maxY="90" name="search-result-fastfood"/>
+  <symbol minX="833" maxX="923" minY="0" maxY="90" name="search-result-shop-department_store"/>
+  <symbol minX="923" maxX="1013" minY="0" maxY="90" name="search-result-marketplace"/>
+  <symbol minX="1013" maxX="1103" minY="0" maxY="90" name="search-result-shop-sports"/>
+  <symbol minX="1103" maxX="1193" minY="0" maxY="90" name="search-result-shop-cosmetics"/>
+  <symbol minX="1193" maxX="1283" minY="0" maxY="90" name="search-result-shop-convenience"/>
+  <symbol minX="1283" maxX="1373" minY="0" maxY="90" name="search-result-nightclub"/>
   <symbol minX="1373" maxX="1463" minY="0" maxY="90" name="search-result-playground"/>
-  <symbol minX="1463" maxX="1553" minY="0" maxY="90" name="search-result-nightclub"/>
-  <symbol minX="1553" maxX="1643" minY="0" maxY="90" name="search-result-marketplace"/>
-  <symbol minX="1643" maxX="1733" minY="0" maxY="90" name="search-result-fastfood"/>
-  <symbol minX="1733" maxX="1823" minY="0" maxY="90" name="search-result-cinema"/>
-  <symbol minX="1823" maxX="1913" minY="0" maxY="90" name="search-result-casino"/>
-  <symbol minX="1913" maxX="2003" minY="0" maxY="90" name="search-result-cafe"/>
-  <symbol minX="0" maxX="90" minY="110" maxY="200" name="search-result-bar"/>
-  <symbol minX="90" maxX="180" minY="110" maxY="200" name="search-result-shop-department_store"/>
-  <symbol minX="180" maxX="275" minY="110" maxY="200" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="275" maxX="365" minY="110" maxY="200" name="search-result-zoo"/>
-  <symbol minX="365" maxX="455" minY="110" maxY="200" name="search-result-water-park"/>
-  <symbol minX="455" maxX="545" minY="110" maxY="200" name="search-result-theme-park"/>
-  <symbol minX="545" maxX="635" minY="110" maxY="200" name="search-result-shop-toys"/>
-  <symbol minX="635" maxX="725" minY="110" maxY="200" name="search-result-shop-supermarket"/>
-  <symbol minX="725" maxX="815" minY="110" maxY="200" name="search-result-shop-sports"/>
-  <symbol minX="815" maxX="905" minY="110" maxY="200" name="search-result-shop-shoes"/>
-  <symbol minX="905" maxX="995" minY="110" maxY="200" name="search-result-shop-seafood"/>
-  <symbol minX="995" maxX="1085" minY="110" maxY="200" name="search-result-shop-mall"/>
-  <symbol minX="1085" maxX="1175" minY="110" maxY="200" name="search-result-shop-jewelry"/>
-  <symbol minX="1175" maxX="1265" minY="110" maxY="200" name="search-result-shop-greengrocer"/>
-  <symbol minX="1265" maxX="1355" minY="110" maxY="200" name="search-result-shop-gift"/>
-  <symbol minX="1355" maxX="1445" minY="110" maxY="200" name="search-result-shop-cosmetics"/>
-  <symbol minX="1445" maxX="1526" minY="110" maxY="196" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="1526" maxX="1592" minY="110" maxY="193" name="unpaved_road"/>
-  <symbol minX="1592" maxX="1658" minY="110" maxY="193" name="ferry"/>
-  <symbol minX="1658" maxX="1724" minY="110" maxY="193" name="paid_road"/>
-  <symbol minX="1724" maxX="1805" minY="110" maxY="191" name="track_marker_selected"/>
-  <symbol minX="1805" maxX="1886" minY="110" maxY="191" name="infosign"/>
-  <symbol minX="1886" maxX="1940" minY="110" maxY="187" name="bookmark-parking-m"/>
-  <symbol minX="1940" maxX="1994" minY="110" maxY="187" name="bookmark-water-m"/>
-  <symbol minX="1994" maxX="2048" minY="110" maxY="187" name="bookmark-viewpoint-m"/>
-  <symbol minX="0" maxX="54" minY="200" maxY="277" name="bookmark-medicine-m"/>
-  <symbol minX="54" maxX="108" minY="200" maxY="277" name="bookmark-animals-m"/>
-  <symbol minX="108" maxX="162" minY="200" maxY="277" name="bookmark-transport-m"/>
-  <symbol minX="162" maxX="216" minY="200" maxY="277" name="bookmark-swim-m"/>
-  <symbol minX="216" maxX="270" minY="200" maxY="277" name="bookmark-bar-m"/>
-  <symbol minX="270" maxX="324" minY="200" maxY="277" name="bookmark-bg-m"/>
-  <symbol minX="324" maxX="378" minY="200" maxY="277" name="bookmark-start-m"/>
-  <symbol minX="378" maxX="432" minY="200" maxY="277" name="bookmark-sport-m"/>
-  <symbol minX="432" maxX="486" minY="200" maxY="277" name="bookmark-sights-m"/>
-  <symbol minX="486" maxX="540" minY="200" maxY="277" name="bookmark-shop-m"/>
-  <symbol minX="540" maxX="594" minY="200" maxY="277" name="bookmark-buddhism-m"/>
-  <symbol minX="594" maxX="648" minY="200" maxY="277" name="bookmark-park-m"/>
-  <symbol minX="648" maxX="702" minY="200" maxY="277" name="bookmark-museum-m"/>
-  <symbol minX="702" maxX="756" minY="200" maxY="277" name="bookmark-mountain-m"/>
-  <symbol minX="756" maxX="810" minY="200" maxY="277" name="bookmark-judaism-m"/>
-  <symbol minX="810" maxX="864" minY="200" maxY="277" name="bookmark-islam-m"/>
-  <symbol minX="864" maxX="918" minY="200" maxY="277" name="bookmark-hotel-m"/>
-  <symbol minX="918" maxX="972" minY="200" maxY="277" name="bookmark-gas-m"/>
-  <symbol minX="972" maxX="1026" minY="200" maxY="277" name="bookmark-food-m"/>
-  <symbol minX="1026" maxX="1080" minY="200" maxY="277" name="bookmark-finish-m"/>
-  <symbol minX="1080" maxX="1134" minY="200" maxY="277" name="bookmark-exchange-m"/>
-  <symbol minX="1134" maxX="1188" minY="200" maxY="277" name="bookmark-entertainment-m"/>
-  <symbol minX="1188" maxX="1242" minY="200" maxY="277" name="bookmark-default-m"/>
-  <symbol minX="1242" maxX="1296" minY="200" maxY="277" name="bookmark-christianity-m"/>
-  <symbol minX="1296" maxX="1350" minY="200" maxY="277" name="bookmark-building-m"/>
-  <symbol minX="1350" maxX="1450" minY="200" maxY="271" name="coloredmark-default-l"/>
-  <symbol minX="1450" maxX="1521" minY="200" maxY="271" name="route-point-start"/>
-  <symbol minX="1521" maxX="1592" minY="200" maxY="271" name="route-point-9"/>
-  <symbol minX="1592" maxX="1663" minY="200" maxY="271" name="route-point-8"/>
-  <symbol minX="1663" maxX="1734" minY="200" maxY="271" name="route-point-7"/>
-  <symbol minX="1734" maxX="1805" minY="200" maxY="271" name="route-point-6"/>
-  <symbol minX="1805" maxX="1876" minY="200" maxY="271" name="route-point-5"/>
-  <symbol minX="1876" maxX="1947" minY="200" maxY="271" name="route-point-4"/>
-  <symbol minX="1947" maxX="2018" minY="200" maxY="271" name="route-point-3"/>
-  <symbol minX="0" maxX="71" minY="277" maxY="348" name="route-point-20"/>
-  <symbol minX="71" maxX="142" minY="277" maxY="348" name="route-point-2"/>
-  <symbol minX="142" maxX="213" minY="277" maxY="348" name="route-point-19"/>
-  <symbol minX="213" maxX="284" minY="277" maxY="348" name="route-point-18"/>
-  <symbol minX="284" maxX="384" minY="277" maxY="348" name="coloredmark-bg-l"/>
-  <symbol minX="384" maxX="455" minY="277" maxY="348" name="route-point-17"/>
-  <symbol minX="455" maxX="555" minY="277" maxY="348" name="norating-bg-l"/>
-  <symbol minX="555" maxX="655" minY="277" maxY="348" name="norating-default-l"/>
-  <symbol minX="655" maxX="726" minY="277" maxY="348" name="route-point-1"/>
-  <symbol minX="726" maxX="797" minY="277" maxY="348" name="route-point-10"/>
-  <symbol minX="797" maxX="868" minY="277" maxY="348" name="route-point-11"/>
-  <symbol minX="868" maxX="939" minY="277" maxY="348" name="route-point-12"/>
-  <symbol minX="939" maxX="1010" minY="277" maxY="348" name="route-point-13"/>
-  <symbol minX="1010" maxX="1081" minY="277" maxY="348" name="route-point-14"/>
-  <symbol minX="1081" maxX="1152" minY="277" maxY="348" name="route-point-15"/>
-  <symbol minX="1152" maxX="1223" minY="277" maxY="348" name="route-point-16"/>
-  <symbol minX="1223" maxX="1275" minY="277" maxY="339" name="shield-us-i-thin"/>
-  <symbol minX="1275" maxX="1341" minY="277" maxY="339" name="shield-us-i-wide"/>
-  <symbol minX="1341" maxX="1399" minY="277" maxY="335" name="subway-foshan-m"/>
-  <symbol minX="1399" maxX="1457" minY="277" maxY="335" name="subway-ekb-m"/>
-  <symbol minX="1457" maxX="1515" minY="277" maxY="335" name="subway-dubai-m"/>
-  <symbol minX="1515" maxX="1571" minY="277" maxY="335" name="subway-delhi-m"/>
-  <symbol minX="1571" maxX="1629" minY="277" maxY="335" name="subway-chicago-m"/>
-  <symbol minX="1629" maxX="1687" minY="277" maxY="335" name="subway-chengdu-m"/>
-  <symbol minX="1687" maxX="1745" minY="277" maxY="335" name="subway-changchun-m"/>
-  <symbol minX="1745" maxX="1803" minY="277" maxY="335" name="subway-catania-m"/>
-  <symbol minX="1803" maxX="1861" minY="277" maxY="335" name="subway-caracas-m"/>
-  <symbol minX="1861" maxX="1919" minY="277" maxY="335" name="subway-cairo-m"/>
-  <symbol minX="1919" maxX="1977" minY="277" maxY="335" name="subway-bursaray-m"/>
-  <symbol minX="1977" maxX="2035" minY="277" maxY="335" name="subway-buenosaires-m"/>
-  <symbol minX="0" maxX="58" minY="348" maxY="406" name="subway-budapest-m"/>
-  <symbol minX="58" maxX="111" minY="348" maxY="406" name="subway-brescia-m"/>
-  <symbol minX="111" maxX="169" minY="348" maxY="406" name="subway-brasilia-m"/>
-  <symbol minX="169" maxX="227" minY="348" maxY="406" name="subway-marseille-s"/>
-  <symbol minX="227" maxX="285" minY="348" maxY="406" name="subway-bengaluru-m"/>
-  <symbol minX="285" maxX="343" minY="348" maxY="406" name="subway-kobe-m"/>
-  <symbol minX="343" maxX="401" minY="348" maxY="406" name="subway-m"/>
-  <symbol minX="401" maxX="459" minY="348" maxY="406" name="subway-losangeles-m"/>
-  <symbol minX="459" maxX="517" minY="348" maxY="406" name="subway-lisboa-m"/>
-  <symbol minX="517" maxX="575" minY="348" maxY="406" name="subway-lima-m"/>
-  <symbol minX="575" maxX="633" minY="348" maxY="406" name="subway-lille-m"/>
-  <symbol minX="633" maxX="691" minY="348" maxY="406" name="subway-lausanne-m"/>
-  <symbol minX="691" maxX="749" minY="348" maxY="406" name="subway-kyoto-m"/>
-  <symbol minX="749" maxX="807" minY="348" maxY="406" name="subway-kunming-m"/>
-  <symbol minX="807" maxX="865" minY="348" maxY="406" name="subway-glasgow-m"/>
-  <symbol minX="865" maxX="923" minY="348" maxY="406" name="subway-kazan-m"/>
-  <symbol minX="923" maxX="970" minY="348" maxY="406" name="subway-istanbul-m"/>
-  <symbol minX="970" maxX="1028" minY="348" maxY="406" name="subway-isfahan-m"/>
-  <symbol minX="1028" maxX="1086" minY="348" maxY="406" name="subway-hirosima-m"/>
-  <symbol minX="1086" maxX="1144" minY="348" maxY="406" name="subway-helsinki-m"/>
-  <symbol minX="1144" maxX="1202" minY="348" maxY="406" name="airport-m"/>
-  <symbol minX="1202" maxX="1260" minY="348" maxY="406" name="subway-guadalajara-m"/>
-  <symbol minX="1260" maxX="1318" minY="348" maxY="406" name="school-m"/>
-  <symbol minX="1318" maxX="1376" minY="348" maxY="406" name="shop-m"/>
-  <symbol minX="1376" maxX="1434" minY="348" maxY="406" name="shop-bicycle-m"/>
-  <symbol minX="1434" maxX="1492" minY="348" maxY="406" name="shoes-m"/>
-  <symbol minX="1492" maxX="1550" minY="348" maxY="406" name="ship-m"/>
-  <symbol minX="1550" maxX="1608" minY="348" maxY="406" name="shinto-m"/>
-  <symbol minX="1608" maxX="1666" minY="348" maxY="406" name="shelter-m"/>
-  <symbol minX="1666" maxX="1724" minY="348" maxY="406" name="second_hand_shop-m"/>
-  <symbol minX="1724" maxX="1782" minY="348" maxY="406" name="seafood-shop-m"/>
+  <symbol minX="1463" maxX="1553" minY="0" maxY="90" name="search-result-shop-jewelry"/>
+  <symbol minX="1553" maxX="1643" minY="0" maxY="90" name="search-result-pub"/>
+  <symbol minX="1643" maxX="1733" minY="0" maxY="90" name="search-result-restaurant"/>
+  <symbol minX="1733" maxX="1828" minY="0" maxY="90" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="1828" maxX="1918" minY="0" maxY="90" name="search-result-shop-toys"/>
+  <symbol minX="1918" maxX="2008" minY="0" maxY="90" name="search-result-shop-confectionery"/>
+  <symbol minX="0" maxX="90" minY="110" maxY="200" name="search-result-theme-park"/>
+  <symbol minX="90" maxX="180" minY="110" maxY="200" name="search-result-shop-alcohol"/>
+  <symbol minX="180" maxX="270" minY="110" maxY="200" name="search-result-water-park"/>
+  <symbol minX="270" maxX="360" minY="110" maxY="200" name="search-result-shop-butcher"/>
+  <symbol minX="360" maxX="450" minY="110" maxY="200" name="search-result-zoo"/>
+  <symbol minX="450" maxX="540" minY="110" maxY="200" name="search-result-shop-clothes"/>
+  <symbol minX="540" maxX="630" minY="110" maxY="200" name="search-result-cinema"/>
+  <symbol minX="630" maxX="720" minY="110" maxY="200" name="search-result-shop-gift"/>
+  <symbol minX="720" maxX="810" minY="110" maxY="200" name="search-result-bar"/>
+  <symbol minX="810" maxX="900" minY="110" maxY="200" name="search-result-shop-seafood"/>
+  <symbol minX="900" maxX="990" minY="110" maxY="200" name="search-result-bakery"/>
+  <symbol minX="990" maxX="1080" minY="110" maxY="200" name="search-result-shop-mall"/>
+  <symbol minX="1080" maxX="1170" minY="110" maxY="200" name="search-result-shop-shoes"/>
+  <symbol minX="1170" maxX="1260" minY="110" maxY="200" name="search-result-shop-greengrocer"/>
+  <symbol minX="1260" maxX="1350" minY="110" maxY="200" name="search-result-casino"/>
+  <symbol minX="1350" maxX="1440" minY="110" maxY="200" name="search-result-cafe"/>
+  <symbol minX="1440" maxX="1521" minY="110" maxY="196" name="shield-us-hw-thin-scaled"/>
+  <symbol minX="1521" maxX="1587" minY="110" maxY="193" name="unpaved_road"/>
+  <symbol minX="1587" maxX="1653" minY="110" maxY="193" name="paid_road"/>
+  <symbol minX="1653" maxX="1719" minY="110" maxY="193" name="ferry"/>
+  <symbol minX="1719" maxX="1800" minY="110" maxY="191" name="track_marker_selected"/>
+  <symbol minX="1800" maxX="1881" minY="110" maxY="191" name="infosign"/>
+  <symbol minX="1881" maxX="1935" minY="110" maxY="187" name="bookmark-gas-m"/>
+  <symbol minX="1935" maxX="1989" minY="110" maxY="187" name="bookmark-parking-m"/>
+  <symbol minX="1989" maxX="2043" minY="110" maxY="187" name="bookmark-food-m"/>
+  <symbol minX="0" maxX="54" minY="200" maxY="277" name="bookmark-shop-m"/>
+  <symbol minX="54" maxX="108" minY="200" maxY="277" name="bookmark-buddhism-m"/>
+  <symbol minX="108" maxX="162" minY="200" maxY="277" name="bookmark-building-m"/>
+  <symbol minX="162" maxX="216" minY="200" maxY="277" name="bookmark-christianity-m"/>
+  <symbol minX="216" maxX="270" minY="200" maxY="277" name="bookmark-park-m"/>
+  <symbol minX="270" maxX="324" minY="200" maxY="277" name="bookmark-default-m"/>
+  <symbol minX="324" maxX="378" minY="200" maxY="277" name="bookmark-sights-m"/>
+  <symbol minX="378" maxX="432" minY="200" maxY="277" name="bookmark-entertainment-m"/>
+  <symbol minX="432" maxX="486" minY="200" maxY="277" name="bookmark-exchange-m"/>
+  <symbol minX="486" maxX="540" minY="200" maxY="277" name="bookmark-finish-m"/>
+  <symbol minX="540" maxX="594" minY="200" maxY="277" name="bookmark-hotel-m"/>
+  <symbol minX="594" maxX="648" minY="200" maxY="277" name="bookmark-bg-m"/>
+  <symbol minX="648" maxX="702" minY="200" maxY="277" name="bookmark-islam-m"/>
+  <symbol minX="702" maxX="756" minY="200" maxY="277" name="bookmark-bar-m"/>
+  <symbol minX="756" maxX="810" minY="200" maxY="277" name="bookmark-museum-m"/>
+  <symbol minX="810" maxX="864" minY="200" maxY="277" name="bookmark-sport-m"/>
+  <symbol minX="864" maxX="918" minY="200" maxY="277" name="bookmark-start-m"/>
+  <symbol minX="918" maxX="972" minY="200" maxY="277" name="bookmark-swim-m"/>
+  <symbol minX="972" maxX="1026" minY="200" maxY="277" name="bookmark-animals-m"/>
+  <symbol minX="1026" maxX="1080" minY="200" maxY="277" name="bookmark-transport-m"/>
+  <symbol minX="1080" maxX="1134" minY="200" maxY="277" name="bookmark-viewpoint-m"/>
+  <symbol minX="1134" maxX="1188" minY="200" maxY="277" name="bookmark-judaism-m"/>
+  <symbol minX="1188" maxX="1242" minY="200" maxY="277" name="bookmark-medicine-m"/>
+  <symbol minX="1242" maxX="1296" minY="200" maxY="277" name="bookmark-mountain-m"/>
+  <symbol minX="1296" maxX="1350" minY="200" maxY="277" name="bookmark-water-m"/>
+  <symbol minX="1350" maxX="1421" minY="200" maxY="271" name="route-point-19"/>
+  <symbol minX="1421" maxX="1492" minY="200" maxY="271" name="route-point-17"/>
+  <symbol minX="1492" maxX="1592" minY="200" maxY="271" name="norating-default-l"/>
+  <symbol minX="1592" maxX="1692" minY="200" maxY="271" name="norating-bg-l"/>
+  <symbol minX="1692" maxX="1763" minY="200" maxY="271" name="route-point-16"/>
+  <symbol minX="1763" maxX="1834" minY="200" maxY="271" name="route-point-1"/>
+  <symbol minX="1834" maxX="1905" minY="200" maxY="271" name="route-point-15"/>
+  <symbol minX="1905" maxX="1976" minY="200" maxY="271" name="route-point-10"/>
+  <symbol minX="1976" maxX="2047" minY="200" maxY="271" name="route-point-14"/>
+  <symbol minX="0" maxX="71" minY="277" maxY="348" name="route-point-13"/>
+  <symbol minX="71" maxX="171" minY="277" maxY="348" name="coloredmark-default-l"/>
+  <symbol minX="171" maxX="271" minY="277" maxY="348" name="coloredmark-bg-l"/>
+  <symbol minX="271" maxX="342" minY="277" maxY="348" name="route-point-12"/>
+  <symbol minX="342" maxX="413" minY="277" maxY="348" name="route-point-11"/>
+  <symbol minX="413" maxX="484" minY="277" maxY="348" name="route-point-3"/>
+  <symbol minX="484" maxX="555" minY="277" maxY="348" name="route-point-8"/>
+  <symbol minX="555" maxX="626" minY="277" maxY="348" name="route-point-9"/>
+  <symbol minX="626" maxX="697" minY="277" maxY="348" name="route-point-7"/>
+  <symbol minX="697" maxX="768" minY="277" maxY="348" name="route-point-6"/>
+  <symbol minX="768" maxX="839" minY="277" maxY="348" name="route-point-5"/>
+  <symbol minX="839" maxX="910" minY="277" maxY="348" name="route-point-4"/>
+  <symbol minX="910" maxX="981" minY="277" maxY="348" name="route-point-20"/>
+  <symbol minX="981" maxX="1052" minY="277" maxY="348" name="route-point-18"/>
+  <symbol minX="1052" maxX="1123" minY="277" maxY="348" name="route-point-start"/>
+  <symbol minX="1123" maxX="1194" minY="277" maxY="348" name="route-point-2"/>
+  <symbol minX="1194" maxX="1260" minY="277" maxY="339" name="shield-us-i-wide"/>
+  <symbol minX="1260" maxX="1312" minY="277" maxY="339" name="shield-us-i-thin"/>
+  <symbol minX="1312" maxX="1370" minY="277" maxY="335" name="restaurant-m"/>
+  <symbol minX="1370" maxX="1428" minY="277" maxY="335" name="shop-m"/>
+  <symbol minX="1428" maxX="1486" minY="277" maxY="335" name="shop-bicycle-m"/>
+  <symbol minX="1486" maxX="1544" minY="277" maxY="335" name="subway-cairo-m"/>
+  <symbol minX="1544" maxX="1602" minY="277" maxY="335" name="shoes-m"/>
+  <symbol minX="1602" maxX="1660" minY="277" maxY="335" name="subway-bangkok-m"/>
+  <symbol minX="1660" maxX="1718" minY="277" maxY="335" name="subway-caracas-m"/>
+  <symbol minX="1718" maxX="1776" minY="277" maxY="335" name="subway-catania-m"/>
+  <symbol minX="1776" maxX="1834" minY="277" maxY="335" name="subway-changchun-m"/>
+  <symbol minX="1834" maxX="1892" minY="277" maxY="335" name="subway-chengdu-m"/>
+  <symbol minX="1892" maxX="1950" minY="277" maxY="335" name="ship-m"/>
+  <symbol minX="1950" maxX="2008" minY="277" maxY="335" name="sample_collection-m"/>
+  <symbol minX="0" maxX="58" minY="348" maxY="406" name="sauna-m"/>
+  <symbol minX="58" maxX="116" minY="348" maxY="406" name="remains-m"/>
+  <symbol minX="116" maxX="174" minY="348" maxY="406" name="shinto-m"/>
+  <symbol minX="174" maxX="232" minY="348" maxY="406" name="shelter-m"/>
+  <symbol minX="232" maxX="290" minY="348" maxY="406" name="subway-chicago-m"/>
+  <symbol minX="290" maxX="348" minY="348" maxY="406" name="sawmill-m"/>
+  <symbol minX="348" maxX="406" minY="348" maxY="406" name="second_hand_shop-m"/>
+  <symbol minX="406" maxX="464" minY="348" maxY="406" name="seafood-shop-m"/>
+  <symbol minX="464" maxX="522" minY="348" maxY="406" name="school-m"/>
+  <symbol minX="522" maxX="578" minY="348" maxY="406" name="subway-delhi-m"/>
+  <symbol minX="578" maxX="636" minY="348" maxY="406" name="stationery_shop-m"/>
+  <symbol minX="636" maxX="694" minY="348" maxY="406" name="subway-lille-m"/>
+  <symbol minX="694" maxX="752" minY="348" maxY="406" name="subway-beijing-m"/>
+  <symbol minX="752" maxX="808" minY="348" maxY="406" name="subway-athens-m"/>
+  <symbol minX="808" maxX="866" minY="348" maxY="406" name="subway-ankara-s"/>
+  <symbol minX="866" maxX="924" minY="348" maxY="406" name="subway-ankara-m"/>
+  <symbol minX="924" maxX="975" minY="348" maxY="406" name="subway-amsterdam-m"/>
+  <symbol minX="975" maxX="1033" minY="348" maxY="406" name="subway-algeria-m"/>
+  <symbol minX="1033" maxX="1091" minY="348" maxY="406" name="subway-bengaluru-m"/>
+  <symbol minX="1091" maxX="1149" minY="348" maxY="406" name="subway-adana-s"/>
+  <symbol minX="1149" maxX="1207" minY="348" maxY="406" name="subway-adana-m"/>
+  <symbol minX="1207" maxX="1265" minY="348" maxY="406" name="subway-brasilia-m"/>
+  <symbol minX="1265" maxX="1323" minY="348" maxY="406" name="subway-bursaray-m"/>
+  <symbol minX="1323" maxX="1376" minY="348" maxY="406" name="subway-brescia-m"/>
+  <symbol minX="1376" maxX="1434" minY="348" maxY="406" name="stadium-m"/>
+  <symbol minX="1434" maxX="1492" minY="348" maxY="406" name="sports-m"/>
+  <symbol minX="1492" maxX="1550" minY="348" maxY="406" name="speedcam-alert-l"/>
+  <symbol minX="1550" maxX="1608" minY="348" maxY="406" name="speech_therapist-m"/>
+  <symbol minX="1608" maxX="1666" minY="348" maxY="406" name="soccer-m"/>
+  <symbol minX="1666" maxX="1724" minY="348" maxY="406" name="skiing-m"/>
+  <symbol minX="1724" maxX="1782" minY="348" maxY="406" name="skateboard-m"/>
   <symbol minX="1782" maxX="1840" minY="348" maxY="406" name="shower-m"/>
-  <symbol minX="1840" maxX="1898" minY="348" maxY="406" name="sawmill-m"/>
-  <symbol minX="1898" maxX="1956" minY="348" maxY="406" name="sauna-m"/>
-  <symbol minX="1956" maxX="2014" minY="348" maxY="406" name="sample_collection-m"/>
-  <symbol minX="0" maxX="58" minY="406" maxY="464" name="restaurant-m"/>
-  <symbol minX="58" maxX="116" minY="406" maxY="464" name="remains-m"/>
-  <symbol minX="116" maxX="174" minY="406" maxY="464" name="subway-guangzhou-m"/>
-  <symbol minX="174" maxX="232" minY="406" maxY="464" name="recycling-m"/>
-  <symbol minX="232" maxX="290" minY="406" maxY="464" name="stationery_shop-m"/>
-  <symbol minX="290" maxX="348" minY="406" maxY="464" name="subway-bangkok-m"/>
-  <symbol minX="348" maxX="404" minY="406" maxY="464" name="subway-athens-m"/>
-  <symbol minX="404" maxX="462" minY="406" maxY="464" name="subway-ankara-s"/>
-  <symbol minX="462" maxX="520" minY="406" maxY="464" name="subway-ankara-m"/>
-  <symbol minX="520" maxX="571" minY="406" maxY="464" name="subway-amsterdam-m"/>
-  <symbol minX="571" maxX="629" minY="406" maxY="464" name="subway-algeria-m"/>
-  <symbol minX="629" maxX="687" minY="406" maxY="464" name="subway-adana-s"/>
-  <symbol minX="687" maxX="745" minY="406" maxY="464" name="subway-adana-m"/>
-  <symbol minX="745" maxX="803" minY="406" maxY="464" name="subway-beijing-m"/>
-  <symbol minX="803" maxX="861" minY="406" maxY="464" name="stadium-m"/>
-  <symbol minX="861" maxX="919" minY="406" maxY="464" name="sports-m"/>
-  <symbol minX="919" maxX="977" minY="406" maxY="464" name="speedcam-alert-l"/>
-  <symbol minX="977" maxX="1035" minY="406" maxY="464" name="speech_therapist-m"/>
-  <symbol minX="1035" maxX="1093" minY="406" maxY="464" name="soccer-m"/>
-  <symbol minX="1093" maxX="1151" minY="406" maxY="464" name="skiing-m"/>
-  <symbol minX="1151" maxX="1209" minY="406" maxY="464" name="skateboard-m"/>
-  <symbol minX="1209" maxX="1267" minY="406" maxY="464" name="taoist-m"/>
-  <symbol minX="1267" maxX="1325" minY="406" maxY="464" name="toll_booth-m"/>
-  <symbol minX="1325" maxX="1383" minY="406" maxY="464" name="toilets-m"/>
-  <symbol minX="1383" maxX="1441" minY="406" maxY="464" name="tire-repair-m"/>
-  <symbol minX="1441" maxX="1499" minY="406" maxY="464" name="ticket-shop-m"/>
-  <symbol minX="1499" maxX="1557" minY="406" maxY="464" name="theme_park-m"/>
-  <symbol minX="1557" maxX="1615" minY="406" maxY="464" name="theatre-m"/>
-  <symbol minX="1615" maxX="1673" minY="406" maxY="464" name="tennis-m"/>
-  <symbol minX="1673" maxX="1731" minY="406" maxY="464" name="taxi-m"/>
-  <symbol minX="1731" maxX="1789" minY="406" maxY="464" name="tomb-m"/>
-  <symbol minX="1789" maxX="1847" minY="406" maxY="464" name="table-tennis-m"/>
-  <symbol minX="1847" maxX="1905" minY="406" maxY="464" name="swimming-m"/>
-  <symbol minX="1905" maxX="1963" minY="406" maxY="464" name="sweets-m"/>
-  <symbol minX="1963" maxX="2021" minY="406" maxY="464" name="survey_point-m"/>
-  <symbol minX="0" maxX="58" minY="464" maxY="522" name="subway-yokohama-m"/>
-  <symbol minX="58" maxX="116" minY="464" maxY="522" name="subway-wuhan-m"/>
-  <symbol minX="116" maxX="174" minY="464" maxY="522" name="subway-washington-m"/>
-  <symbol minX="174" maxX="232" minY="464" maxY="522" name="video-games-m"/>
-  <symbol minX="232" maxX="290" minY="464" maxY="522" name="zoo-m"/>
-  <symbol minX="290" maxX="348" minY="464" maxY="522" name="yoga-m"/>
-  <symbol minX="348" maxX="406" minY="464" maxY="522" name="windmill-m"/>
-  <symbol minX="406" maxX="464" minY="464" maxY="522" name="wayside_shrine-m"/>
-  <symbol minX="464" maxX="522" minY="464" maxY="522" name="waterfall-m"/>
-  <symbol minX="522" maxX="580" minY="464" maxY="522" name="waste-basket-m"/>
-  <symbol minX="580" maxX="638" minY="464" maxY="522" name="volleyball-m"/>
-  <symbol minX="638" maxX="696" minY="464" maxY="522" name="viewpoint-m"/>
-  <symbol minX="696" maxX="754" minY="464" maxY="522" name="subway-warszawa-m"/>
-  <symbol minX="754" maxX="812" minY="464" maxY="522" name="veterinary-m"/>
-  <symbol minX="812" maxX="870" minY="464" maxY="522" name="vending-m"/>
-  <symbol minX="870" maxX="928" minY="464" maxY="522" name="travel_agency_shop-m"/>
-  <symbol minX="928" maxX="986" minY="464" maxY="522" name="tram-m"/>
-  <symbol minX="986" maxX="1044" minY="464" maxY="522" name="train-m"/>
-  <symbol minX="1044" maxX="1102" minY="464" maxY="522" name="toys-m"/>
-  <symbol minX="1102" maxX="1160" minY="464" maxY="522" name="tourism-m"/>
-  <symbol minX="1160" maxX="1218" minY="464" maxY="522" name="subway-newyork-m"/>
-  <symbol minX="1218" maxX="1276" minY="464" maxY="522" name="subway-rennes-m"/>
-  <symbol minX="1276" maxX="1334" minY="464" maxY="522" name="subway-pyongyang-m"/>
-  <symbol minX="1334" maxX="1390" minY="464" maxY="522" name="subway-porto-m"/>
-  <symbol minX="1390" maxX="1448" minY="464" maxY="522" name="subway-pittsburgh-m"/>
-  <symbol minX="1448" maxX="1506" minY="464" maxY="522" name="subway-perugia-m"/>
-  <symbol minX="1506" maxX="1564" minY="464" maxY="522" name="subway-panama-m"/>
-  <symbol minX="1564" maxX="1622" minY="464" maxY="522" name="subway-oslo-m"/>
-  <symbol minX="1622" maxX="1678" minY="464" maxY="522" name="subway-nnov-m"/>
-  <symbol minX="1678" maxX="1736" minY="464" maxY="522" name="subway-reseau-paris-m"/>
-  <symbol minX="1736" maxX="1794" minY="464" maxY="522" name="subway-nagoya-m"/>
-  <symbol minX="1794" maxX="1852" minY="464" maxY="522" name="subway-minatomirai-m"/>
-  <symbol minX="1852" maxX="1910" minY="464" maxY="522" name="subway-milan-m"/>
-  <symbol minX="1910" maxX="1966" minY="464" maxY="522" name="subway-mexico-m"/>
-  <symbol minX="1966" maxX="2024" minY="464" maxY="522" name="subway-medellin-m"/>
-  <symbol minX="0" maxX="58" minY="522" maxY="580" name="subway-mecca-m"/>
-  <symbol minX="58" maxX="116" minY="522" maxY="580" name="subway-massachusetts-m"/>
-  <symbol minX="116" maxX="174" minY="522" maxY="580" name="subway-stlouis-m"/>
-  <symbol minX="174" maxX="232" minY="522" maxY="580" name="subway-volgograd-m"/>
-  <symbol minX="232" maxX="290" minY="522" maxY="580" name="subway-vienna-m"/>
-  <symbol minX="290" maxX="348" minY="522" maxY="580" name="subway-valencia-m"/>
-  <symbol minX="348" maxX="406" minY="522" maxY="580" name="subway-tyneandwear-m"/>
-  <symbol minX="406" maxX="464" minY="522" maxY="580" name="subway-tokyo-m"/>
-  <symbol minX="464" maxX="522" minY="522" maxY="580" name="subway-tianjin-m"/>
-  <symbol minX="522" maxX="580" minY="522" maxY="580" name="subway-tashkent-m"/>
-  <symbol minX="580" maxX="638" minY="522" maxY="580" name="subway-stockholm-m"/>
-  <symbol minX="638" maxX="694" minY="522" maxY="580" name="subway-mashhad-m"/>
-  <symbol minX="694" maxX="752" minY="522" maxY="580" name="subway-southkorea-m"/>
-  <symbol minX="752" maxX="810" minY="522" maxY="580" name="subway-sofia-m"/>
-  <symbol minX="810" maxX="868" minY="522" maxY="580" name="subway-shiraz-m"/>
-  <symbol minX="868" maxX="926" minY="522" maxY="580" name="subway-saopaulo-m"/>
-  <symbol minX="926" maxX="984" minY="522" maxY="580" name="subway-santodomingo-m"/>
-  <symbol minX="984" maxX="1042" minY="522" maxY="580" name="subway-samara-m"/>
-  <symbol minX="1042" maxX="1100" minY="522" maxY="580" name="subway-riodejaneiro-m"/>
-  <symbol minX="1100" maxX="1158" minY="522" maxY="580" name="buddhist-m"/>
-  <symbol minX="1158" maxX="1216" minY="522" maxY="580" name="curling-m"/>
-  <symbol minX="1216" maxX="1274" minY="522" maxY="580" name="bowling_alley-m"/>
-  <symbol minX="1274" maxX="1332" minY="522" maxY="580" name="helipad-m"/>
-  <symbol minX="1332" maxX="1390" minY="522" maxY="580" name="motorcycle_shop-m"/>
-  <symbol minX="1390" maxX="1448" minY="522" maxY="580" name="heliport-m"/>
-  <symbol minX="1448" maxX="1506" minY="522" maxY="580" name="hindu-m"/>
-  <symbol minX="1506" maxX="1564" minY="522" maxY="580" name="cross-m"/>
-  <symbol minX="1564" maxX="1622" minY="522" maxY="580" name="cricket-m"/>
-  <symbol minX="1622" maxX="1680" minY="522" maxY="580" name="copyshop-m"/>
-  <symbol minX="1680" maxX="1738" minY="522" maxY="580" name="brewery-m"/>
-  <symbol minX="1738" maxX="1796" minY="522" maxY="580" name="convenience-m"/>
-  <symbol minX="1796" maxX="1854" minY="522" maxY="580" name="museum-m"/>
-  <symbol minX="1854" maxX="1912" minY="522" maxY="580" name="historic-ship-m"/>
-  <symbol minX="1912" maxX="1970" minY="522" maxY="580" name="bus-m"/>
-  <symbol minX="1970" maxX="2028" minY="522" maxY="580" name="hockey-m"/>
-  <symbol minX="0" maxX="58" minY="580" maxY="638" name="monument-m"/>
-  <symbol minX="58" maxX="116" minY="580" maxY="638" name="butcher-m"/>
-  <symbol minX="116" maxX="174" minY="580" maxY="638" name="cable-car-m"/>
-  <symbol minX="174" maxX="232" minY="580" maxY="638" name="home-m"/>
-  <symbol minX="232" maxX="290" minY="580" maxY="638" name="mobile_phone-m"/>
-  <symbol minX="290" maxX="348" minY="580" maxY="638" name="hospital-m"/>
-  <symbol minX="348" maxX="406" minY="580" maxY="638" name="military-m"/>
-  <symbol minX="406" maxX="464" minY="580" maxY="638" name="computer-m"/>
-  <symbol minX="464" maxX="522" minY="580" maxY="638" name="guidepost"/>
-  <symbol minX="522" maxX="580" minY="580" maxY="638" name="needle_and_thread-m"/>
-  <symbol minX="580" maxX="638" minY="580" maxY="638" name="dentist-m"/>
-  <symbol minX="638" maxX="696" minY="580" maxY="638" name="gift-m"/>
-  <symbol minX="696" maxX="754" minY="580" maxY="638" name="golf-m"/>
-  <symbol minX="754" maxX="812" minY="580" maxY="638" name="greengrocer-m"/>
-  <symbol minX="812" maxX="870" minY="580" maxY="638" name="bicycle-repair-station"/>
-  <symbol minX="870" maxX="928" minY="580" maxY="638" name="defibrillator-m"/>
-  <symbol minX="928" maxX="986" minY="580" maxY="638" name="muslim-m"/>
-  <symbol minX="986" maxX="1044" minY="580" maxY="638" name="grocery-m"/>
-  <symbol minX="1044" maxX="1102" minY="580" maxY="638" name="blacksmith-m"/>
-  <symbol minX="1102" maxX="1160" minY="580" maxY="638" name="musical-instrument-m"/>
-  <symbol minX="1160" maxX="1218" minY="580" maxY="638" name="metal_construction-m"/>
-  <symbol minX="1218" maxX="1276" minY="580" maxY="638" name="blood_donation-m"/>
-  <symbol minX="1276" maxX="1334" minY="580" maxY="638" name="gym-m"/>
-  <symbol minX="1334" maxX="1392" minY="580" maxY="638" name="music_school-m"/>
-  <symbol minX="1392" maxX="1450" minY="580" maxY="638" name="hairdresser-m"/>
-  <symbol minX="1450" maxX="1508" minY="580" maxY="638" name="music-m"/>
-  <symbol minX="1508" maxX="1566" minY="580" maxY="638" name="hand-m"/>
-  <symbol minX="1566" maxX="1624" minY="580" maxY="638" name="book-shop-m"/>
-  <symbol minX="1624" maxX="1682" minY="580" maxY="638" name="handball-m"/>
-  <symbol minX="1682" maxX="1740" minY="580" maxY="638" name="bookmaker-m"/>
-  <symbol minX="1740" maxX="1798" minY="580" maxY="638" name="bowling-m"/>
-  <symbol minX="1798" maxX="1856" minY="580" maxY="638" name="chemist-m"/>
-  <symbol minX="1856" maxX="1914" minY="580" maxY="638" name="caravan_site-m"/>
-  <symbol minX="1914" maxX="1972" minY="580" maxY="638" name="information-m"/>
-  <symbol minX="1972" maxX="2030" minY="580" maxY="638" name="interior_decoration-m"/>
-  <symbol minX="0" maxX="58" minY="638" maxY="696" name="internet_cafe-m"/>
-  <symbol minX="58" maxX="116" minY="638" maxY="696" name="carpenter-m"/>
-  <symbol minX="116" maxX="174" minY="638" maxY="696" name="jewelry-m"/>
-  <symbol minX="174" maxX="232" minY="638" maxY="696" name="lighthouse-m"/>
-  <symbol minX="232" maxX="290" minY="638" maxY="696" name="chess-m"/>
-  <symbol minX="290" maxX="348" minY="638" maxY="696" name="lift_gate-m"/>
-  <symbol minX="348" maxX="406" minY="638" maxY="696" name="jewish-m"/>
-  <symbol minX="406" maxX="464" minY="638" maxY="696" name="library-m"/>
-  <symbol minX="464" maxX="522" minY="638" maxY="696" name="mail-m"/>
-  <symbol minX="522" maxX="580" minY="638" maxY="696" name="lawyer-m"/>
-  <symbol minX="580" maxX="638" minY="638" maxY="696" name="cheese-m"/>
-  <symbol minX="638" maxX="696" minY="638" maxY="696" name="casino-m"/>
-  <symbol minX="696" maxX="754" minY="638" maxY="696" name="charity_shop-m"/>
-  <symbol minX="754" maxX="812" minY="638" maxY="696" name="kindergarten-m"/>
-  <symbol minX="812" maxX="870" minY="638" maxY="696" name="charging-station-m"/>
-  <symbol minX="870" maxX="928" minY="638" maxY="696" name="kiosk-m"/>
-  <symbol minX="928" maxX="986" minY="638" maxY="696" name="laundry-m"/>
-  <symbol minX="986" maxX="1044" minY="638" maxY="696" name="cemetery-m"/>
-  <symbol minX="1044" maxX="1102" minY="638" maxY="696" name="language_school-m"/>
-  <symbol minX="1102" maxX="1160" minY="638" maxY="696" name="christian-m"/>
-  <symbol minX="1160" maxX="1218" minY="638" maxY="696" name="media-m"/>
-  <symbol minX="1218" maxX="1276" minY="638" maxY="696" name="college-m"/>
-  <symbol minX="1276" maxX="1334" minY="638" maxY="696" name="marketplace-m"/>
-  <symbol minX="1334" maxX="1392" minY="638" maxY="696" name="clothes-m"/>
-  <symbol minX="1392" maxX="1450" minY="638" maxY="696" name="marina-m"/>
-  <symbol minX="1450" maxX="1508" minY="638" maxY="696" name="hostel-m"/>
-  <symbol minX="1508" maxX="1566" minY="638" maxY="696" name="cafe-m"/>
-  <symbol minX="1566" maxX="1624" minY="638" maxY="696" name="campsite-m"/>
-  <symbol minX="1624" maxX="1682" minY="638" maxY="696" name="hotel-m"/>
-  <symbol minX="1682" maxX="1740" minY="638" maxY="696" name="climbing-m"/>
-  <symbol minX="1740" maxX="1798" minY="638" maxY="696" name="cinema-m"/>
-  <symbol minX="1798" maxX="1856" minY="638" maxY="696" name="bicycle-m"/>
-  <symbol minX="1856" maxX="1914" minY="638" maxY="696" name="car-part-m"/>
-  <symbol minX="1914" maxX="1972" minY="638" maxY="696" name="car-repair-m"/>
-  <symbol minX="1972" maxX="2030" minY="638" maxY="696" name="public-building-m"/>
-  <symbol minX="0" maxX="58" minY="696" maxY="754" name="chimney-m"/>
-  <symbol minX="58" maxX="116" minY="696" maxY="754" name="car-wash-m"/>
-  <symbol minX="116" maxX="174" minY="696" maxY="754" name="car_sharing-m"/>
-  <symbol minX="174" maxX="232" minY="696" maxY="754" name="car_shop-m"/>
-  <symbol minX="232" maxX="290" minY="696" maxY="754" name="caravan-shop-m"/>
-  <symbol minX="290" maxX="348" minY="696" maxY="754" name="hunting-tower-m"/>
-  <symbol minX="348" maxX="406" minY="696" maxY="754" name="ice_cream-m"/>
-  <symbol minX="406" maxX="464" minY="696" maxY="754" name="audiologist-m"/>
-  <symbol minX="464" maxX="522" minY="696" maxY="754" name="pelota-m"/>
-  <symbol minX="522" maxX="580" minY="696" maxY="754" name="antiques-m"/>
-  <symbol minX="580" maxX="638" minY="696" maxY="754" name="fire_station-m"/>
-  <symbol minX="638" maxX="696" minY="696" maxY="754" name="apartment-m"/>
-  <symbol minX="696" maxX="754" minY="696" maxY="754" name="firehydrant-m"/>
-  <symbol minX="754" maxX="812" minY="696" maxY="754" name="florist-m"/>
-  <symbol minX="812" maxX="870" minY="696" maxY="754" name="archaeological-site-m"/>
-  <symbol minX="870" maxX="928" minY="696" maxY="754" name="archery-m"/>
-  <symbol minX="928" maxX="986" minY="696" maxY="754" name="art-m"/>
-  <symbol minX="986" maxX="1044" minY="696" maxY="754" name="equestrian-m"/>
-  <symbol minX="1044" maxX="1102" minY="696" maxY="754" name="atm-m"/>
-  <symbol minX="1102" maxX="1160" minY="696" maxY="754" name="petshop-m"/>
-  <symbol minX="1160" maxX="1218" minY="696" maxY="754" name="parking-meter-m"/>
-  <symbol minX="1218" maxX="1276" minY="696" maxY="754" name="emergency-phone-m"/>
-  <symbol minX="1276" maxX="1334" minY="696" maxY="754" name="embassy-m"/>
-  <symbol minX="1334" maxX="1392" minY="696" maxY="754" name="electronics-m"/>
-  <symbol minX="1392" maxX="1450" minY="696" maxY="754" name="australian-football-m"/>
-  <symbol minX="1450" maxX="1508" minY="696" maxY="754" name="electrician-m"/>
-  <symbol minX="1508" maxX="1566" minY="696" maxY="754" name="dump-station-m"/>
-  <symbol minX="1566" maxX="1624" minY="696" maxY="754" name="driving_school-m"/>
-  <symbol minX="1624" maxX="1682" minY="696" maxY="754" name="geyser-m"/>
-  <symbol minX="1682" maxX="1740" minY="696" maxY="754" name="badminton-m"/>
-  <symbol minX="1740" maxX="1798" minY="696" maxY="754" name="bakery-m"/>
-  <symbol minX="1798" maxX="1856" minY="696" maxY="754" name="alcohol-m"/>
-  <symbol minX="1856" maxX="1914" minY="696" maxY="754" name="erotic-m"/>
-  <symbol minX="1914" maxX="1972" minY="696" maxY="754" name="airport_gate-m"/>
-  <symbol minX="1972" maxX="2030" minY="696" maxY="754" name="psychotherapist-m"/>
-  <symbol minX="0" maxX="58" minY="754" maxY="812" name="prison-m"/>
-  <symbol minX="58" maxX="116" minY="754" maxY="812" name="fastfood-m"/>
-  <symbol minX="116" maxX="174" minY="754" maxY="812" name="power-m"/>
-  <symbol minX="174" maxX="232" minY="754" maxY="812" name="postbox-m"/>
-  <symbol minX="232" maxX="290" minY="754" maxY="812" name="police-m"/>
-  <symbol minX="290" maxX="348" minY="754" maxY="812" name="podiatrist-m"/>
-  <symbol minX="348" maxX="406" minY="754" maxY="812" name="plumber-m"/>
-  <symbol minX="406" maxX="464" minY="754" maxY="812" name="playground-m"/>
-  <symbol minX="464" maxX="522" minY="754" maxY="812" name="fountain-m"/>
-  <symbol minX="522" maxX="580" minY="754" maxY="812" name="alpine_hut-m"/>
-  <symbol minX="580" maxX="638" minY="754" maxY="812" name="place-of-worship-m"/>
-  <symbol minX="638" maxX="696" minY="754" maxY="812" name="alternative-m"/>
-  <symbol minX="696" maxX="754" minY="754" maxY="812" name="pitch-m"/>
-  <symbol minX="754" maxX="812" minY="754" maxY="812" name="america-football-m"/>
-  <symbol minX="812" maxX="870" minY="754" maxY="812" name="picnic_table-m"/>
-  <symbol minX="870" maxX="928" minY="754" maxY="812" name="picnic-m"/>
-  <symbol minX="928" maxX="986" minY="754" maxY="812" name="physiotherapist-m"/>
-  <symbol minX="986" maxX="1044" minY="754" maxY="812" name="photo-shop-m"/>
-  <symbol minX="1044" maxX="1102" minY="754" maxY="812" name="phone-m"/>
-  <symbol minX="1102" maxX="1160" minY="754" maxY="812" name="pharmacy-m"/>
-  <symbol minX="1160" maxX="1218" minY="754" maxY="812" name="beauty-m"/>
-  <symbol minX="1218" maxX="1276" minY="754" maxY="812" name="basketball-m"/>
-  <symbol minX="1276" maxX="1334" minY="754" maxY="812" name="bbq-m"/>
-  <symbol minX="1334" maxX="1392" minY="754" maxY="812" name="newsagent_shop-m"/>
-  <symbol minX="1392" maxX="1450" minY="754" maxY="812" name="bcontrol-m"/>
-  <symbol minX="1450" maxX="1508" minY="754" maxY="812" name="optician-m"/>
-  <symbol minX="1508" maxX="1566" minY="754" maxY="812" name="furniture-m"/>
-  <symbol minX="1566" maxX="1624" minY="754" maxY="812" name="office-m"/>
-  <symbol minX="1624" maxX="1682" minY="754" maxY="812" name="gallery-m"/>
-  <symbol minX="1682" maxX="1740" minY="754" maxY="812" name="beach-m"/>
-  <symbol minX="1740" maxX="1798" minY="754" maxY="812" name="dog_park-m"/>
-  <symbol minX="1798" maxX="1856" minY="754" maxY="812" name="baseball-m"/>
-  <symbol minX="1856" maxX="1914" minY="754" maxY="812" name="garden-m"/>
-  <symbol minX="1914" maxX="1972" minY="754" maxY="812" name="nparkf-outline-m"/>
-  <symbol minX="1972" maxX="2030" minY="754" maxY="812" name="garden-outline-m"/>
-  <symbol minX="0" maxX="58" minY="812" maxY="870" name="nparkf-m"/>
-  <symbol minX="58" maxX="116" minY="812" maxY="870" name="garden_center-m"/>
-  <symbol minX="116" maxX="174" minY="812" maxY="870" name="npark-m"/>
-  <symbol minX="174" maxX="232" minY="812" maxY="870" name="diving-m"/>
-  <symbol minX="232" maxX="290" minY="812" maxY="870" name="nightclub-m"/>
-  <symbol minX="290" maxX="348" minY="812" maxY="870" name="department_store-m"/>
-  <symbol minX="348" maxX="406" minY="812" maxY="870" name="painter-m"/>
-  <symbol minX="406" maxX="464" minY="812" maxY="870" name="fountain-s"/>
-  <symbol minX="464" maxX="522" minY="812" maxY="870" name="park-outline-m"/>
-  <symbol minX="522" maxX="580" minY="812" maxY="870" name="bank-l"/>
-  <symbol minX="580" maxX="638" minY="812" maxY="870" name="beer-m"/>
-  <symbol minX="638" maxX="696" minY="812" maxY="870" name="bank-m"/>
-  <symbol minX="696" maxX="754" minY="812" maxY="870" name="beekeeper-m"/>
-  <symbol minX="754" maxX="812" minY="812" maxY="870" name="park-m"/>
-  <symbol minX="812" maxX="870" minY="812" maxY="870" name="fuel-dispenser-m"/>
-  <symbol minX="870" maxX="928" minY="812" maxY="870" name="fuel-m"/>
-  <symbol minX="928" maxX="986" minY="812" maxY="870" name="geyser-l"/>
-  <symbol minX="986" maxX="1044" minY="812" maxY="870" name="banknote-l"/>
-  <symbol minX="1044" maxX="1102" minY="812" maxY="870" name="funicular-m"/>
-  <symbol minX="1102" maxX="1160" minY="812" maxY="870" name="drinking-water-m"/>
-  <symbol minX="1160" maxX="1218" minY="812" maxY="870" name="padel-m"/>
-  <symbol minX="1218" maxX="1276" minY="812" maxY="870" name="doityourself-m"/>
-  <symbol minX="1276" maxX="1334" minY="812" maxY="870" name="banknote-m"/>
-  <symbol minX="1334" maxX="1392" minY="812" maxY="870" name="bar-m"/>
-  <symbol minX="1392" maxX="1450" minY="812" maxY="870" name="outdoor-shop-m"/>
-  <symbol minX="1450" maxX="1508" minY="812" maxY="870" name="funeral_directors-m"/>
-  <symbol minX="1508" maxX="1566" minY="812" maxY="870" name="optometrist-m"/>
-  <symbol minX="1566" maxX="1632" minY="812" maxY="869" name="shield-us-hw-wide"/>
-  <symbol minX="1632" maxX="1689" minY="812" maxY="869" name="shield-us-hw-thin"/>
-  <symbol minX="1689" maxX="1745" minY="812" maxY="868" name="subway-montreal-m"/>
-  <symbol minX="1745" maxX="1803" minY="812" maxY="868" name="subway-dalian-m"/>
-  <symbol minX="1803" maxX="1859" minY="812" maxY="868" name="subway-ekb-s"/>
-  <symbol minX="1859" maxX="1917" minY="812" maxY="868" name="subway-maracaibo-m"/>
-  <symbol minX="1917" maxX="1975" minY="812" maxY="868" name="subway-sapporo-m"/>
-  <symbol minX="1975" maxX="2031" minY="812" maxY="868" name="subway-spb-m"/>
-  <symbol minX="0" maxX="58" minY="870" maxY="926" name="subway-shanghai-m"/>
-  <symbol minX="58" maxX="114" minY="870" maxY="926" name="subway-southkorea-s"/>
-  <symbol minX="114" maxX="172" minY="870" maxY="925" name="subway-marseille-m"/>
-  <symbol minX="172" maxX="226" minY="870" maxY="924" name="subway-stlouis-s"/>
-  <symbol minX="226" maxX="265" minY="870" maxY="924" name="bookmark-default-s"/>
-  <symbol minX="265" maxX="319" minY="870" maxY="924" name="subway-algeria-s"/>
-  <symbol minX="319" maxX="373" minY="870" maxY="924" name="subway-entrance-m"/>
-  <symbol minX="373" maxX="424" minY="870" maxY="924" name="subway-warsaw-m"/>
-  <symbol minX="424" maxX="463" minY="870" maxY="924" name="bookmark-bg-s"/>
-  <symbol minX="463" maxX="521" minY="870" maxY="923" name="subway-izmir-m"/>
-  <symbol minX="521" maxX="573" minY="870" maxY="922" name="current-position"/>
-  <symbol minX="573" maxX="625" minY="870" maxY="922" name="track_marker_deselected"/>
-  <symbol minX="625" maxX="676" minY="870" maxY="921" name="subway-pittsburgh-s"/>
-  <symbol minX="676" maxX="721" minY="870" maxY="921" name="subway-istanbul-s"/>
-  <symbol minX="721" maxX="772" minY="870" maxY="921" name="lightrail-berlin-m"/>
-  <symbol minX="772" maxX="830" minY="870" maxY="920" name="subway-taoyuan-m"/>
-  <symbol minX="830" maxX="879" minY="870" maxY="919" name="subway-medellin-s"/>
-  <symbol minX="879" maxX="924" minY="870" maxY="919" name="subway-brescia-s"/>
-  <symbol minX="924" maxX="971" minY="870" maxY="919" name="subway-mashhad-s"/>
-  <symbol minX="971" maxX="1020" minY="870" maxY="919" name="bike-parking-m"/>
-  <symbol minX="1020" maxX="1069" minY="870" maxY="919" name="subway-cairo-s"/>
-  <symbol minX="1069" maxX="1118" minY="870" maxY="919" name="subway-sapporo-s"/>
-  <symbol minX="1118" maxX="1176" minY="870" maxY="919" name="subway-rotterdam-m"/>
-  <symbol minX="1176" maxX="1225" minY="870" maxY="919" name="bicycle-rental"/>
-  <symbol minX="1225" maxX="1276" minY="870" maxY="919" name="subway-izmir-s"/>
-  <symbol minX="1276" maxX="1325" minY="870" maxY="919" name="subway-panama-s"/>
-  <symbol minX="1325" maxX="1374" minY="870" maxY="919" name="subway-isfahan-s"/>
-  <symbol minX="1374" maxX="1423" minY="870" maxY="919" name="speedcam-m"/>
-  <symbol minX="1423" maxX="1481" minY="870" maxY="919" name="subway-tbilisi-m"/>
-  <symbol minX="1481" maxX="1530" minY="870" maxY="919" name="parking-disabled-m"/>
-  <symbol minX="1530" maxX="1579" minY="870" maxY="919" name="parking-m"/>
-  <symbol minX="1579" maxX="1628" minY="870" maxY="919" name="parking_entrance-m"/>
-  <symbol minX="1628" maxX="1677" minY="870" maxY="919" name="motorcycle-parking-m"/>
-  <symbol minX="1677" maxX="1726" minY="870" maxY="919" name="parking_pay-m"/>
-  <symbol minX="1726" maxX="1784" minY="870" maxY="918" name="subway-almaty-m"/>
-  <symbol minX="1784" maxX="1829" minY="870" maxY="917" name="subway-delhi-s"/>
-  <symbol minX="1829" maxX="1874" minY="870" maxY="917" name="subway-tianjin-s"/>
-  <symbol minX="1874" maxX="1932" minY="870" maxY="917" name="subway-santiago-m"/>
-  <symbol minX="1932" maxX="1990" minY="870" maxY="917" name="subway-yerevan-m"/>
-  <symbol minX="1990" maxX="2041" minY="870" maxY="917" name="subway-seattle-m"/>
-  <symbol minX="0" maxX="47" minY="926" maxY="973" name="subway-warszawa-s"/>
-  <symbol minX="47" maxX="94" minY="926" maxY="973" name="subway-hirosima-s"/>
-  <symbol minX="94" maxX="141" minY="926" maxY="973" name="subway-ubahn-m"/>
-  <symbol minX="141" maxX="195" minY="926" maxY="973" name="subway-moscow-m"/>
-  <symbol minX="195" maxX="253" minY="926" maxY="973" name="subway-lyon-m"/>
-  <symbol minX="253" maxX="298" minY="926" maxY="973" name="subway-athens-s"/>
-  <symbol minX="298" maxX="343" minY="926" maxY="973" name="subway-porto-s"/>
-  <symbol minX="343" maxX="390" minY="926" maxY="973" name="subway-paris-m"/>
-  <symbol minX="390" maxX="437" minY="926" maxY="973" name="subway-rome-m"/>
-  <symbol minX="437" maxX="482" minY="926" maxY="973" name="subway-pyongyang-s"/>
-  <symbol minX="482" maxX="529" minY="926" maxY="973" name="subway-rennes-s"/>
-  <symbol minX="529" maxX="574" minY="926" maxY="971" name="subway-bengaluru-s"/>
-  <symbol minX="574" maxX="619" minY="926" maxY="971" name="subway-guadalajara-s"/>
-  <symbol minX="619" maxX="664" minY="926" maxY="971" name="subway-valencia-s"/>
-  <symbol minX="664" maxX="709" minY="926" maxY="971" name="subway-buenosaires-s"/>
-  <symbol minX="709" maxX="754" minY="926" maxY="971" name="subway-guangzhou-s"/>
-  <symbol minX="754" maxX="799" minY="926" maxY="971" name="subway-helsinki-s"/>
-  <symbol minX="799" maxX="844" minY="926" maxY="971" name="subway-budapest-s"/>
-  <symbol minX="844" maxX="889" minY="926" maxY="971" name="subway-tyneandwear-s"/>
-  <symbol minX="889" maxX="934" minY="926" maxY="971" name="subway-brasilia-s"/>
-  <symbol minX="934" maxX="979" minY="926" maxY="971" name="subway-nagoya-s"/>
-  <symbol minX="979" maxX="1024" minY="926" maxY="971" name="subway-beijing-s"/>
-  <symbol minX="1024" maxX="1069" minY="926" maxY="971" name="subway-tokyo-s"/>
-  <symbol minX="1069" maxX="1114" minY="926" maxY="971" name="subway-bangkok-s"/>
-  <symbol minX="1114" maxX="1172" minY="926" maxY="971" name="subway-alicante-m"/>
-  <symbol minX="1172" maxX="1217" minY="926" maxY="971" name="subway-chicago-s"/>
-  <symbol minX="1217" maxX="1262" minY="926" maxY="971" name="subway-caracas-s"/>
-  <symbol minX="1262" maxX="1307" minY="926" maxY="971" name="subway-dalian-s"/>
-  <symbol minX="1307" maxX="1352" minY="926" maxY="971" name="subway-chengdu-s"/>
-  <symbol minX="1352" maxX="1410" minY="926" maxY="971" name="subway-dnepro-m"/>
-  <symbol minX="1410" maxX="1455" minY="926" maxY="971" name="subway-changchun-s"/>
-  <symbol minX="1455" maxX="1500" minY="926" maxY="971" name="subway-yokohama-s"/>
-  <symbol minX="1500" maxX="1545" minY="926" maxY="971" name="subway-dubai-s"/>
-  <symbol minX="1545" maxX="1601" minY="926" maxY="971" name="subway-yerevan-s"/>
-  <symbol minX="1601" maxX="1646" minY="926" maxY="971" name="subway-catania-s"/>
-  <symbol minX="1646" maxX="1691" minY="926" maxY="971" name="subway-vienna-s"/>
-  <symbol minX="1691" maxX="1736" minY="926" maxY="971" name="subway-bursaray-s"/>
-  <symbol minX="1736" maxX="1781" minY="926" maxY="971" name="subway-wuhan-s"/>
-  <symbol minX="1781" maxX="1826" minY="926" maxY="971" name="subway-washington-s"/>
-  <symbol minX="1826" maxX="1871" minY="926" maxY="971" name="subway-foshan-s"/>
-  <symbol minX="1871" maxX="1927" minY="926" maxY="971" name="subway-fukuoka-s"/>
-  <symbol minX="1927" maxX="1967" minY="926" maxY="971" name="subway-warsaw-s"/>
-  <symbol minX="1967" maxX="2012" minY="926" maxY="971" name="subway-volgograd-s"/>
-  <symbol minX="0" maxX="47" minY="973" maxY="1018" name="subway-glasgow-s"/>
-  <symbol minX="47" maxX="92" minY="973" maxY="1018" name="subway-reseau-paris-s"/>
-  <symbol minX="92" maxX="137" minY="973" maxY="1018" name="subway-lille-s"/>
-  <symbol minX="137" maxX="182" minY="973" maxY="1018" name="subway-lima-s"/>
-  <symbol minX="182" maxX="227" minY="973" maxY="1018" name="subway-lisboa-s"/>
-  <symbol minX="227" maxX="272" minY="973" maxY="1018" name="subway-saopaulo-s"/>
-  <symbol minX="272" maxX="317" minY="973" maxY="1018" name="subway-santodomingo-s"/>
-  <symbol minX="317" maxX="362" minY="973" maxY="1018" name="subway-losangeles-s"/>
-  <symbol minX="362" maxX="407" minY="973" maxY="1018" name="subway-samara-s"/>
-  <symbol minX="407" maxX="465" minY="973" maxY="1018" name="subway-omsk-m"/>
-  <symbol minX="465" maxX="510" minY="973" maxY="1018" name="subway-riodejaneiro-s"/>
-  <symbol minX="510" maxX="566" minY="973" maxY="1018" name="subway-santiago-s"/>
-  <symbol minX="566" maxX="611" minY="973" maxY="1018" name="subway-massachusetts-s"/>
-  <symbol minX="611" maxX="656" minY="973" maxY="1018" name="subway-mecca-s"/>
-  <symbol minX="656" maxX="701" minY="973" maxY="1018" name="subway-perugia-s"/>
-  <symbol minX="701" maxX="746" minY="973" maxY="1018" name="subway-milan-s"/>
-  <symbol minX="746" maxX="791" minY="973" maxY="1018" name="subway-minatomirai-s"/>
-  <symbol minX="791" maxX="849" minY="973" maxY="1018" name="subway-omsk-s"/>
-  <symbol minX="849" maxX="894" minY="973" maxY="1018" name="subway-oslo-s"/>
-  <symbol minX="894" maxX="939" minY="973" maxY="1018" name="subway-montreal-s"/>
-  <symbol minX="939" maxX="990" minY="973" maxY="1018" name="subway-taoyuan-s"/>
-  <symbol minX="990" maxX="1035" minY="973" maxY="1018" name="subway-tashkent-s"/>
-  <symbol minX="1035" maxX="1080" minY="973" maxY="1018" name="subway-stockholm-s"/>
-  <symbol minX="1080" maxX="1125" minY="973" maxY="1018" name="subway-kobe-s"/>
-  <symbol minX="1125" maxX="1183" minY="973" maxY="1018" name="subway-kryvyirih-m"/>
-  <symbol minX="1183" maxX="1228" minY="973" maxY="1018" name="subway-nnov-s"/>
-  <symbol minX="1228" maxX="1286" minY="973" maxY="1018" name="subway-tabriz-m"/>
-  <symbol minX="1286" maxX="1331" minY="973" maxY="1018" name="subway-sofia-s"/>
-  <symbol minX="1331" maxX="1376" minY="973" maxY="1018" name="subway-kazan-s"/>
-  <symbol minX="1376" maxX="1421" minY="973" maxY="1018" name="subway-kunming-s"/>
-  <symbol minX="1421" maxX="1466" minY="973" maxY="1018" name="subway-shiraz-s"/>
-  <symbol minX="1466" maxX="1511" minY="973" maxY="1018" name="subway-kyoto-s"/>
-  <symbol minX="1511" maxX="1556" minY="973" maxY="1018" name="subway-shanghai-s"/>
-  <symbol minX="1556" maxX="1614" minY="973" maxY="1017" name="subway-philadelphia-m"/>
-  <symbol minX="1614" maxX="1672" minY="973" maxY="1016" name="subway-osaka-m"/>
-  <symbol minX="1672" maxX="1712" minY="973" maxY="1015" name="subway-amsterdam-s"/>
-  <symbol minX="1712" maxX="1768" minY="973" maxY="1015" name="subway-tabriz-s"/>
-  <symbol minX="1768" maxX="1822" minY="973" maxY="1015" name="subway-almaty-s"/>
-  <symbol minX="1822" maxX="1880" minY="973" maxY="1015" name="subway-barcelona-m"/>
-  <symbol minX="1880" maxX="1920" minY="973" maxY="1015" name="subway-mexico-s"/>
-  <symbol minX="1920" maxX="1962" minY="973" maxY="1015" name="subway-lausanne-s"/>
-  <symbol minX="1962" maxX="2004" minY="973" maxY="1015" name="cave-m"/>
-  <symbol minX="2004" maxX="2046" minY="973" maxY="1015" name="subway-spb-s"/>
-  <symbol minX="0" maxX="45" minY="1018" maxY="1060" name="subway-maracaibo-s"/>
-  <symbol minX="45" maxX="103" minY="1018" maxY="1060" name="subway-madrid-m"/>
-  <symbol minX="103" maxX="145" minY="1018" maxY="1060" name="search-result"/>
-  <symbol minX="145" maxX="203" minY="1018" maxY="1060" name="subway-lucknow-s"/>
-  <symbol minX="203" maxX="259" minY="1018" maxY="1060" name="subway-london-m"/>
-  <symbol minX="259" maxX="317" minY="1018" maxY="1059" name="subway-lucknow-m"/>
-  <symbol minX="317" maxX="357" minY="1018" maxY="1058" name="waste-basket-s"/>
-  <symbol minX="357" maxX="397" minY="1018" maxY="1058" name="waterfall-s"/>
-  <symbol minX="397" maxX="437" minY="1018" maxY="1058" name="airport-s"/>
-  <symbol minX="437" maxX="477" minY="1018" maxY="1058" name="charging-station-s"/>
-  <symbol minX="477" maxX="555" minY="1018" maxY="1058" name="coloredmark-default-s"/>
-  <symbol minX="555" maxX="595" minY="1018" maxY="1058" name="zoo-s"/>
-  <symbol minX="595" maxX="635" minY="1018" maxY="1058" name="drinking-water-s"/>
-  <symbol minX="635" maxX="713" minY="1018" maxY="1058" name="coloredmark-bg-s"/>
-  <symbol minX="713" maxX="753" minY="1018" maxY="1058" name="non-found-search-result"/>
-  <symbol minX="753" maxX="798" minY="1018" maxY="1058" name="subway-rotterdam-s"/>
-  <symbol minX="798" maxX="838" minY="1018" maxY="1058" name="car-repair-s"/>
-  <symbol minX="838" maxX="878" minY="1018" maxY="1058" name="christian-s"/>
-  <symbol minX="878" maxX="918" minY="1018" maxY="1058" name="college-s"/>
-  <symbol minX="918" maxX="958" minY="1018" maxY="1058" name="cable-car-s"/>
-  <symbol minX="958" maxX="998" minY="1018" maxY="1058" name="bus-s"/>
-  <symbol minX="998" maxX="1038" minY="1018" maxY="1058" name="buddhist-s"/>
-  <symbol minX="1038" maxX="1078" minY="1018" maxY="1058" name="shop-s"/>
-  <symbol minX="1078" maxX="1123" minY="1018" maxY="1058" name="subway-tbilisi-s"/>
-  <symbol minX="1123" maxX="1163" minY="1018" maxY="1058" name="hindu-s"/>
-  <symbol minX="1163" maxX="1203" minY="1018" maxY="1058" name="shinto-s"/>
-  <symbol minX="1203" maxX="1243" minY="1018" maxY="1058" name="hospital-s"/>
-  <symbol minX="1243" maxX="1283" minY="1018" maxY="1058" name="hotel-s"/>
-  <symbol minX="1283" maxX="1323" minY="1018" maxY="1058" name="subway-s"/>
-  <symbol minX="1323" maxX="1374" minY="1018" maxY="1058" name="subway-philadelphia-s"/>
-  <symbol minX="1374" maxX="1414" minY="1018" maxY="1058" name="jewish-s"/>
-  <symbol minX="1414" maxX="1470" minY="1018" maxY="1058" name="subway-palma-s"/>
-  <symbol minX="1470" maxX="1528" minY="1018" maxY="1058" name="subway-palma-m"/>
-  <symbol minX="1528" maxX="1577" minY="1018" maxY="1058" name="subway-osaka-s"/>
-  <symbol minX="1577" maxX="1617" minY="1018" maxY="1058" name="subway-newyork-s"/>
-  <symbol minX="1617" maxX="1657" minY="1018" maxY="1058" name="ship-s"/>
-  <symbol minX="1657" maxX="1697" minY="1018" maxY="1058" name="viewpoint-s"/>
-  <symbol minX="1697" maxX="1737" minY="1018" maxY="1058" name="lighthouse-s"/>
-  <symbol minX="1737" maxX="1777" minY="1018" maxY="1058" name="stadium-s"/>
-  <symbol minX="1777" maxX="1835" minY="1018" maxY="1058" name="subway-kolkata-m"/>
-  <symbol minX="1835" maxX="1875" minY="1018" maxY="1058" name="monument-s"/>
-  <symbol minX="1875" maxX="1915" minY="1018" maxY="1058" name="museum-s"/>
-  <symbol minX="1915" maxX="1955" minY="1018" maxY="1058" name="subway-entrance-s"/>
-  <symbol minX="1955" maxX="1995" minY="1018" maxY="1058" name="muslim-s"/>
-  <symbol minX="0" maxX="54" minY="1060" maxY="1100" name="subway-dnepro-s"/>
-  <symbol minX="54" maxX="94" minY="1060" maxY="1100" name="nparkf-outline-s"/>
-  <symbol minX="94" maxX="134" minY="1060" maxY="1100" name="nparkf-s"/>
-  <symbol minX="134" maxX="192" minY="1060" maxY="1100" name="subway-bilbao-m"/>
-  <symbol minX="192" maxX="232" minY="1060" maxY="1100" name="park-s"/>
-  <symbol minX="232" maxX="272" minY="1060" maxY="1100" name="park-outline-s"/>
-  <symbol minX="272" maxX="303" minY="1060" maxY="1100" name="transit_train-m"/>
-  <symbol minX="303" maxX="343" minY="1060" maxY="1100" name="remains-s"/>
-  <symbol minX="343" maxX="374" minY="1060" maxY="1100" name="transit_light_rail-m"/>
-  <symbol minX="374" maxX="419" minY="1060" maxY="1100" name="transfer_arrow"/>
-  <symbol minX="419" maxX="459" minY="1060" maxY="1100" name="tram-s"/>
-  <symbol minX="459" maxX="499" minY="1060" maxY="1100" name="train-s"/>
-  <symbol minX="499" maxX="539" minY="1060" maxY="1100" name="tourism-s"/>
-  <symbol minX="539" maxX="579" minY="1060" maxY="1100" name="fuel-s"/>
-  <symbol minX="579" maxX="619" minY="1060" maxY="1100" name="place-of-worship-s"/>
-  <symbol minX="619" maxX="659" minY="1060" maxY="1100" name="toll_booth-s"/>
-  <symbol minX="659" maxX="699" minY="1060" maxY="1100" name="theme_park-s"/>
-  <symbol minX="699" maxX="739" minY="1060" maxY="1100" name="theatre-s"/>
-  <symbol minX="739" maxX="779" minY="1060" maxY="1100" name="taoist-s"/>
-  <symbol minX="779" maxX="819" minY="1060" maxY="1100" name="geyser-s"/>
-  <symbol minX="819" maxX="846" minY="1060" maxY="1099" name="bookmark-default-xs"/>
-  <symbol minX="846" maxX="904" minY="1060" maxY="1099" name="subway-novosibirsk-m"/>
-  <symbol minX="904" maxX="931" minY="1060" maxY="1099" name="bookmark-bg-xs"/>
-  <symbol minX="931" maxX="989" minY="1060" maxY="1099" name="subway-fukuoka-m"/>
-  <symbol minX="989" maxX="1047" minY="1060" maxY="1099" name="subway-bucharest-m"/>
-  <symbol minX="1047" maxX="1105" minY="1060" maxY="1099" name="subway-sanfrancisco-m"/>
-  <symbol minX="1105" maxX="1150" minY="1060" maxY="1098" name="subway-lyon-s"/>
-  <symbol minX="1150" maxX="1208" minY="1060" maxY="1098" name="subway-sanfrancisco-s"/>
-  <symbol minX="1208" maxX="1259" minY="1060" maxY="1098" name="subway-madrid-s"/>
-  <symbol minX="1259" maxX="1317" minY="1060" maxY="1098" name="subway-brussel-s"/>
-  <symbol minX="1317" maxX="1373" minY="1060" maxY="1098" name="subway-kiev-m"/>
-  <symbol minX="1373" maxX="1431" minY="1060" maxY="1098" name="subway-kharkiv-s"/>
-  <symbol minX="1431" maxX="1462" minY="1060" maxY="1098" name="transit_monorail-m"/>
-  <symbol minX="1462" maxX="1500" minY="1060" maxY="1098" name="lightrail-berlin-s"/>
-  <symbol minX="1500" maxX="1549" minY="1060" maxY="1098" name="subway-kryvyirih-s"/>
-  <symbol minX="1549" maxX="1600" minY="1060" maxY="1098" name="subway-barcelona-s"/>
-  <symbol minX="1600" maxX="1656" minY="1060" maxY="1098" name="subway-novosibirsk-s"/>
-  <symbol minX="1656" maxX="1714" minY="1060" maxY="1098" name="subway-sendai-m"/>
-  <symbol minX="1714" maxX="1752" minY="1060" maxY="1098" name="subway-paris-s"/>
-  <symbol minX="1752" maxX="1790" minY="1060" maxY="1098" name="elevator"/>
-  <symbol minX="1790" maxX="1826" minY="1060" maxY="1096" name="transit_subway-m"/>
-  <symbol minX="1826" maxX="1862" minY="1060" maxY="1096" name="storage-tank"/>
-  <symbol minX="1862" maxX="1920" minY="1060" maxY="1096" name="subway-haagse-s"/>
-  <symbol minX="1920" maxX="1978" minY="1060" maxY="1096" name="subway-kharkiv-m"/>
-  <symbol minX="1978" maxX="2034" minY="1060" maxY="1096" name="subway-bucharest-s"/>
-  <symbol minX="0" maxX="47" minY="1100" maxY="1136" name="subway-alicante-s"/>
-  <symbol minX="47" maxX="83" minY="1100" maxY="1136" name="board"/>
-  <symbol minX="83" maxX="119" minY="1100" maxY="1136" name="map"/>
-  <symbol minX="119" maxX="177" minY="1100" maxY="1136" name="subway-brussel-m"/>
-  <symbol minX="177" maxX="204" minY="1100" maxY="1136" name="transit_train-s"/>
-  <symbol minX="204" maxX="242" minY="1100" maxY="1136" name="subway-moscow-s"/>
-  <symbol minX="242" maxX="300" minY="1100" maxY="1136" name="subway-sendai-s"/>
-  <symbol minX="300" maxX="358" minY="1100" maxY="1135" name="subway-manila-m"/>
-  <symbol minX="358" maxX="416" minY="1100" maxY="1133" name="subway-haagse-m"/>
-  <symbol minX="416" maxX="449" minY="1100" maxY="1133" name="subway-ubahn-s"/>
-  <symbol minX="449" maxX="507" minY="1100" maxY="1133" name="subway-taipei-s"/>
-  <symbol minX="507" maxX="565" minY="1100" maxY="1133" name="subway-edmonton-s"/>
-  <symbol minX="565" maxX="601" minY="1100" maxY="1133" name="subway-seattle-s"/>
-  <symbol minX="601" maxX="634" minY="1100" maxY="1133" name="subway-rome-s"/>
-  <symbol minX="634" maxX="676" minY="1100" maxY="1133" name="subway-london-s"/>
-  <symbol minX="676" maxX="709" minY="1100" maxY="1133" name="cave-s"/>
-  <symbol minX="709" maxX="765" minY="1100" maxY="1133" name="subway-manila-s"/>
-  <symbol minX="765" maxX="814" minY="1100" maxY="1133" name="subway-bilbao-s"/>
-  <symbol minX="814" maxX="863" minY="1100" maxY="1131" name="railway-crossing-l"/>
-  <symbol minX="863" maxX="883" minY="1100" maxY="1131" name="entrance-s"/>
-  <symbol minX="883" maxX="916" minY="1100" maxY="1131" name="main_entrance-s"/>
-  <symbol minX="916" maxX="947" minY="1100" maxY="1131" name="parking-s"/>
-  <symbol minX="947" maxX="985" minY="1100" maxY="1131" name="bench"/>
-  <symbol minX="985" maxX="1016" minY="1100" maxY="1131" name="transit_subway-s"/>
-  <symbol minX="1016" maxX="1043" minY="1100" maxY="1131" name="transit_monorail-s"/>
-  <symbol minX="1043" maxX="1074" minY="1100" maxY="1131" name="star-l"/>
-  <symbol minX="1074" maxX="1105" minY="1100" maxY="1131" name="subway-xs"/>
-  <symbol minX="1105" maxX="1132" minY="1100" maxY="1131" name="transit_light_rail-s"/>
-  <symbol minX="1132" maxX="1163" minY="1100" maxY="1131" name="speedcam-s"/>
-  <symbol minX="1163" maxX="1194" minY="1100" maxY="1131" name="subway-newyork-xs"/>
-  <symbol minX="1194" maxX="1225" minY="1100" maxY="1131" name="gate-s"/>
-  <symbol minX="1225" maxX="1283" minY="1100" maxY="1130" name="subway-edmonton-m"/>
-  <symbol minX="1283" maxX="1312" minY="1100" maxY="1129" name="star-m"/>
-  <symbol minX="1312" maxX="1345" minY="1100" maxY="1129" name="volcano-m"/>
-  <symbol minX="1345" maxX="1401" minY="1100" maxY="1129" name="subway-malaga-s"/>
-  <symbol minX="1401" maxX="1443" minY="1100" maxY="1129" name="subway-kolkata-s"/>
-  <symbol minX="1443" maxX="1490" minY="1100" maxY="1129" name="subway-kiev-s"/>
-  <symbol minX="1490" maxX="1548" minY="1100" maxY="1128" name="subway-taipei-m"/>
-  <symbol minX="1548" maxX="1606" minY="1100" maxY="1128" name="subway-malaga-m"/>
-  <symbol minX="1606" maxX="1662" minY="1100" maxY="1127" name="subway-baku-s"/>
-  <symbol minX="1662" maxX="1704" minY="1100" maxY="1127" name="railway-crossing-m"/>
-  <symbol minX="1704" maxX="1735" minY="1100" maxY="1127" name="plaque"/>
-  <symbol minX="1735" maxX="1782" minY="1100" maxY="1127" name="subway-minsk-m"/>
-  <symbol minX="1782" maxX="1840" minY="1100" maxY="1126" name="subway-baku-m"/>
-  <symbol minX="1840" maxX="1898" minY="1100" maxY="1125" name="subway-chongqing-s"/>
-  <symbol minX="1898" maxX="1922" minY="1100" maxY="1124" name="star-s"/>
-  <symbol minX="1922" maxX="1964" minY="1100" maxY="1124" name="subway-minsk-s"/>
-  <symbol minX="1964" maxX="2022" minY="1100" maxY="1123" name="subway-chongqing-m"/>
-  <symbol minX="0" maxX="51" minY="1136" maxY="1158" name="arrow-m"/>
-  <symbol minX="51" maxX="75" minY="1136" maxY="1158" name="peakt-m"/>
-  <symbol minX="75" maxX="115" minY="1136" maxY="1158" name="mountain-pass"/>
-  <symbol minX="115" maxX="139" minY="1136" maxY="1158" name="volcano-s"/>
-  <symbol minX="139" maxX="159" minY="1136" maxY="1156" name="zero-icon"/>
-  <symbol minX="159" maxX="179" minY="1136" maxY="1154" name="peakt-s"/>
-  <symbol minX="179" maxX="217" minY="1136" maxY="1151" name="arrow-s"/>
-  <symbol minX="217" maxX="232" minY="1136" maxY="1151" name="dot-m"/>
-  <symbol minX="232" maxX="256" minY="1136" maxY="1147" name="arrow-xs"/>
+  <symbol minX="1840" maxX="1898" minY="348" maxY="406" name="subway-budapest-m"/>
+  <symbol minX="1898" maxX="1956" minY="348" maxY="406" name="subway-buenosaires-m"/>
+  <symbol minX="1956" maxX="2014" minY="348" maxY="406" name="subway-volgograd-m"/>
+  <symbol minX="0" maxX="58" minY="406" maxY="464" name="taxi-m"/>
+  <symbol minX="58" maxX="116" minY="406" maxY="464" name="zoo-m"/>
+  <symbol minX="116" maxX="174" minY="406" maxY="464" name="taoist-m"/>
+  <symbol minX="174" maxX="232" minY="406" maxY="464" name="table-tennis-m"/>
+  <symbol minX="232" maxX="290" minY="406" maxY="464" name="swimming-m"/>
+  <symbol minX="290" maxX="348" minY="406" maxY="464" name="sweets-m"/>
+  <symbol minX="348" maxX="406" minY="406" maxY="464" name="survey_point-m"/>
+  <symbol minX="406" maxX="464" minY="406" maxY="464" name="subway-yokohama-m"/>
+  <symbol minX="464" maxX="522" minY="406" maxY="464" name="subway-wuhan-m"/>
+  <symbol minX="522" maxX="580" minY="406" maxY="464" name="subway-washington-m"/>
+  <symbol minX="580" maxX="638" minY="406" maxY="464" name="subway-warszawa-m"/>
+  <symbol minX="638" maxX="696" minY="406" maxY="464" name="tennis-m"/>
+  <symbol minX="696" maxX="754" minY="406" maxY="464" name="subway-vienna-m"/>
+  <symbol minX="754" maxX="812" minY="406" maxY="464" name="subway-valencia-m"/>
+  <symbol minX="812" maxX="870" minY="406" maxY="464" name="subway-tyneandwear-m"/>
+  <symbol minX="870" maxX="928" minY="406" maxY="464" name="subway-tokyo-m"/>
+  <symbol minX="928" maxX="986" minY="406" maxY="464" name="subway-tianjin-m"/>
+  <symbol minX="986" maxX="1044" minY="406" maxY="464" name="subway-tashkent-m"/>
+  <symbol minX="1044" maxX="1102" minY="406" maxY="464" name="subway-stockholm-m"/>
+  <symbol minX="1102" maxX="1160" minY="406" maxY="464" name="subway-stlouis-m"/>
+  <symbol minX="1160" maxX="1218" minY="406" maxY="464" name="subway-southkorea-m"/>
+  <symbol minX="1218" maxX="1276" minY="406" maxY="464" name="subway-sofia-m"/>
+  <symbol minX="1276" maxX="1334" minY="406" maxY="464" name="tourism-m"/>
+  <symbol minX="1334" maxX="1392" minY="406" maxY="464" name="vending-m"/>
+  <symbol minX="1392" maxX="1450" minY="406" maxY="464" name="veterinary-m"/>
+  <symbol minX="1450" maxX="1508" minY="406" maxY="464" name="video-games-m"/>
+  <symbol minX="1508" maxX="1566" minY="406" maxY="464" name="viewpoint-m"/>
+  <symbol minX="1566" maxX="1624" minY="406" maxY="464" name="volleyball-m"/>
+  <symbol minX="1624" maxX="1682" minY="406" maxY="464" name="waste-basket-m"/>
+  <symbol minX="1682" maxX="1740" minY="406" maxY="464" name="tram-m"/>
+  <symbol minX="1740" maxX="1798" minY="406" maxY="464" name="waterfall-m"/>
+  <symbol minX="1798" maxX="1856" minY="406" maxY="464" name="train-m"/>
+  <symbol minX="1856" maxX="1914" minY="406" maxY="464" name="toys-m"/>
+  <symbol minX="1914" maxX="1972" minY="406" maxY="464" name="subway-shiraz-m"/>
+  <symbol minX="1972" maxX="2030" minY="406" maxY="464" name="tomb-m"/>
+  <symbol minX="0" maxX="58" minY="464" maxY="522" name="wayside_shrine-m"/>
+  <symbol minX="58" maxX="116" minY="464" maxY="522" name="toll_booth-m"/>
+  <symbol minX="116" maxX="174" minY="464" maxY="522" name="toilets-m"/>
+  <symbol minX="174" maxX="232" minY="464" maxY="522" name="tire-repair-m"/>
+  <symbol minX="232" maxX="290" minY="464" maxY="522" name="ticket-shop-m"/>
+  <symbol minX="290" maxX="348" minY="464" maxY="522" name="windmill-m"/>
+  <symbol minX="348" maxX="406" minY="464" maxY="522" name="theme_park-m"/>
+  <symbol minX="406" maxX="464" minY="464" maxY="522" name="yoga-m"/>
+  <symbol minX="464" maxX="522" minY="464" maxY="522" name="theatre-m"/>
+  <symbol minX="522" maxX="580" minY="464" maxY="522" name="subway-kobe-m"/>
+  <symbol minX="580" maxX="638" minY="464" maxY="522" name="subway-marseille-s"/>
+  <symbol minX="638" maxX="696" minY="464" maxY="522" name="subway-m"/>
+  <symbol minX="696" maxX="754" minY="464" maxY="522" name="subway-lyon-m"/>
+  <symbol minX="754" maxX="812" minY="464" maxY="522" name="subway-losangeles-m"/>
+  <symbol minX="812" maxX="870" minY="464" maxY="522" name="subway-lisboa-m"/>
+  <symbol minX="870" maxX="928" minY="464" maxY="522" name="subway-lima-m"/>
+  <symbol minX="928" maxX="986" minY="464" maxY="522" name="travel_agency_shop-m"/>
+  <symbol minX="986" maxX="1044" minY="464" maxY="522" name="subway-lausanne-m"/>
+  <symbol minX="1044" maxX="1102" minY="464" maxY="522" name="subway-kyoto-m"/>
+  <symbol minX="1102" maxX="1160" minY="464" maxY="522" name="subway-kunming-m"/>
+  <symbol minX="1160" maxX="1216" minY="464" maxY="522" name="subway-mashhad-m"/>
+  <symbol minX="1216" maxX="1274" minY="464" maxY="522" name="subway-kazan-m"/>
+  <symbol minX="1274" maxX="1321" minY="464" maxY="522" name="subway-istanbul-m"/>
+  <symbol minX="1321" maxX="1379" minY="464" maxY="522" name="subway-isfahan-m"/>
+  <symbol minX="1379" maxX="1437" minY="464" maxY="522" name="subway-hirosima-m"/>
+  <symbol minX="1437" maxX="1495" minY="464" maxY="522" name="subway-helsinki-m"/>
+  <symbol minX="1495" maxX="1553" minY="464" maxY="522" name="subway-guangzhou-m"/>
+  <symbol minX="1553" maxX="1611" minY="464" maxY="522" name="subway-guadalajara-m"/>
+  <symbol minX="1611" maxX="1669" minY="464" maxY="522" name="subway-glasgow-m"/>
+  <symbol minX="1669" maxX="1727" minY="464" maxY="522" name="subway-foshan-m"/>
+  <symbol minX="1727" maxX="1785" minY="464" maxY="522" name="subway-ekb-m"/>
+  <symbol minX="1785" maxX="1843" minY="464" maxY="522" name="subway-panama-m"/>
+  <symbol minX="1843" maxX="1901" minY="464" maxY="522" name="subway-saopaulo-m"/>
+  <symbol minX="1901" maxX="1959" minY="464" maxY="522" name="subway-santodomingo-m"/>
+  <symbol minX="1959" maxX="2017" minY="464" maxY="522" name="subway-samara-m"/>
+  <symbol minX="0" maxX="58" minY="522" maxY="580" name="subway-riodejaneiro-m"/>
+  <symbol minX="58" maxX="116" minY="522" maxY="580" name="subway-reseau-paris-m"/>
+  <symbol minX="116" maxX="174" minY="522" maxY="580" name="subway-rennes-m"/>
+  <symbol minX="174" maxX="232" minY="522" maxY="580" name="subway-pyongyang-m"/>
+  <symbol minX="232" maxX="288" minY="522" maxY="580" name="subway-porto-m"/>
+  <symbol minX="288" maxX="346" minY="522" maxY="580" name="subway-pittsburgh-m"/>
+  <symbol minX="346" maxX="404" minY="522" maxY="580" name="subway-perugia-m"/>
+  <symbol minX="404" maxX="462" minY="522" maxY="580" name="subway-dubai-m"/>
+  <symbol minX="462" maxX="520" minY="522" maxY="580" name="subway-oslo-m"/>
+  <symbol minX="520" maxX="576" minY="522" maxY="580" name="subway-nnov-m"/>
+  <symbol minX="576" maxX="634" minY="522" maxY="580" name="subway-newyork-m"/>
+  <symbol minX="634" maxX="692" minY="522" maxY="580" name="subway-nagoya-m"/>
+  <symbol minX="692" maxX="750" minY="522" maxY="580" name="subway-minatomirai-m"/>
+  <symbol minX="750" maxX="808" minY="522" maxY="580" name="subway-milan-m"/>
+  <symbol minX="808" maxX="864" minY="522" maxY="580" name="subway-mexico-m"/>
+  <symbol minX="864" maxX="922" minY="522" maxY="580" name="subway-medellin-m"/>
+  <symbol minX="922" maxX="980" minY="522" maxY="580" name="subway-mecca-m"/>
+  <symbol minX="980" maxX="1038" minY="522" maxY="580" name="subway-massachusetts-m"/>
+  <symbol minX="1038" maxX="1096" minY="522" maxY="580" name="australian-football-m"/>
+  <symbol minX="1096" maxX="1154" minY="522" maxY="580" name="audiologist-m"/>
+  <symbol minX="1154" maxX="1212" minY="522" maxY="580" name="fountain-s"/>
+  <symbol minX="1212" maxX="1270" minY="522" maxY="580" name="fountain-m"/>
+  <symbol minX="1270" maxX="1328" minY="522" maxY="580" name="florist-m"/>
+  <symbol minX="1328" maxX="1386" minY="522" maxY="580" name="firehydrant-m"/>
+  <symbol minX="1386" maxX="1444" minY="522" maxY="580" name="fire_station-m"/>
+  <symbol minX="1444" maxX="1502" minY="522" maxY="580" name="recycling-m"/>
+  <symbol minX="1502" maxX="1560" minY="522" maxY="580" name="fastfood-m"/>
+  <symbol minX="1560" maxX="1618" minY="522" maxY="580" name="erotic-m"/>
+  <symbol minX="1618" maxX="1676" minY="522" maxY="580" name="equestrian-m"/>
+  <symbol minX="1676" maxX="1734" minY="522" maxY="580" name="emergency-phone-m"/>
+  <symbol minX="1734" maxX="1792" minY="522" maxY="580" name="embassy-m"/>
+  <symbol minX="1792" maxX="1850" minY="522" maxY="580" name="electronics-m"/>
+  <symbol minX="1850" maxX="1908" minY="522" maxY="580" name="fuel-dispenser-m"/>
+  <symbol minX="1908" maxX="1966" minY="522" maxY="580" name="electrician-m"/>
+  <symbol minX="1966" maxX="2024" minY="522" maxY="580" name="dump-station-m"/>
+  <symbol minX="0" maxX="58" minY="580" maxY="638" name="driving_school-m"/>
+  <symbol minX="58" maxX="116" minY="580" maxY="638" name="drinking-water-m"/>
+  <symbol minX="116" maxX="174" minY="580" maxY="638" name="doityourself-m"/>
+  <symbol minX="174" maxX="232" minY="580" maxY="638" name="dog_park-m"/>
+  <symbol minX="232" maxX="290" minY="580" maxY="638" name="diving-m"/>
+  <symbol minX="290" maxX="348" minY="580" maxY="638" name="department_store-m"/>
+  <symbol minX="348" maxX="406" minY="580" maxY="638" name="dentist-m"/>
+  <symbol minX="406" maxX="464" minY="580" maxY="638" name="defibrillator-m"/>
+  <symbol minX="464" maxX="522" minY="580" maxY="638" name="curling-m"/>
+  <symbol minX="522" maxX="580" minY="580" maxY="638" name="cross-m"/>
+  <symbol minX="580" maxX="638" minY="580" maxY="638" name="apartment-m"/>
+  <symbol minX="638" maxX="696" minY="580" maxY="638" name="heliport-m"/>
+  <symbol minX="696" maxX="754" minY="580" maxY="638" name="helipad-m"/>
+  <symbol minX="754" maxX="812" minY="580" maxY="638" name="handball-m"/>
+  <symbol minX="812" maxX="870" minY="580" maxY="638" name="hand-m"/>
+  <symbol minX="870" maxX="928" minY="580" maxY="638" name="hairdresser-m"/>
+  <symbol minX="928" maxX="986" minY="580" maxY="638" name="gym-m"/>
+  <symbol minX="986" maxX="1044" minY="580" maxY="638" name="guidepost"/>
+  <symbol minX="1044" maxX="1102" minY="580" maxY="638" name="grocery-m"/>
+  <symbol minX="1102" maxX="1160" minY="580" maxY="638" name="greengrocer-m"/>
+  <symbol minX="1160" maxX="1218" minY="580" maxY="638" name="golf-m"/>
+  <symbol minX="1218" maxX="1276" minY="580" maxY="638" name="america-football-m"/>
+  <symbol minX="1276" maxX="1334" minY="580" maxY="638" name="gift-m"/>
+  <symbol minX="1334" maxX="1392" minY="580" maxY="638" name="geyser-m"/>
+  <symbol minX="1392" maxX="1450" minY="580" maxY="638" name="cricket-m"/>
+  <symbol minX="1450" maxX="1508" minY="580" maxY="638" name="geyser-l"/>
+  <symbol minX="1508" maxX="1566" minY="580" maxY="638" name="gate-m"/>
+  <symbol minX="1566" maxX="1624" minY="580" maxY="638" name="garden_center-m"/>
+  <symbol minX="1624" maxX="1682" minY="580" maxY="638" name="garden-outline-m"/>
+  <symbol minX="1682" maxX="1740" minY="580" maxY="638" name="archaeological-site-m"/>
+  <symbol minX="1740" maxX="1798" minY="580" maxY="638" name="garden-m"/>
+  <symbol minX="1798" maxX="1856" minY="580" maxY="638" name="gallery-m"/>
+  <symbol minX="1856" maxX="1914" minY="580" maxY="638" name="furniture-m"/>
+  <symbol minX="1914" maxX="1972" minY="580" maxY="638" name="archery-m"/>
+  <symbol minX="1972" maxX="2030" minY="580" maxY="638" name="funicular-m"/>
+  <symbol minX="0" maxX="58" minY="638" maxY="696" name="funeral_directors-m"/>
+  <symbol minX="58" maxX="116" minY="638" maxY="696" name="atm-m"/>
+  <symbol minX="116" maxX="174" minY="638" maxY="696" name="banknote-l"/>
+  <symbol minX="174" maxX="232" minY="638" maxY="696" name="cafe-m"/>
+  <symbol minX="232" maxX="290" minY="638" maxY="696" name="bank-m"/>
+  <symbol minX="290" maxX="348" minY="638" maxY="696" name="cable-car-m"/>
+  <symbol minX="348" maxX="406" minY="638" maxY="696" name="butcher-m"/>
+  <symbol minX="406" maxX="464" minY="638" maxY="696" name="bus-m"/>
+  <symbol minX="464" maxX="522" minY="638" maxY="696" name="buddhist-m"/>
+  <symbol minX="522" maxX="580" minY="638" maxY="696" name="brewery-m"/>
+  <symbol minX="580" maxX="638" minY="638" maxY="696" name="bowling_alley-m"/>
+  <symbol minX="638" maxX="696" minY="638" maxY="696" name="bowling-m"/>
+  <symbol minX="696" maxX="754" minY="638" maxY="696" name="bookmaker-m"/>
+  <symbol minX="754" maxX="812" minY="638" maxY="696" name="book-shop-m"/>
+  <symbol minX="812" maxX="870" minY="638" maxY="696" name="blood_donation-m"/>
+  <symbol minX="870" maxX="928" minY="638" maxY="696" name="blacksmith-m"/>
+  <symbol minX="928" maxX="986" minY="638" maxY="696" name="campsite-m"/>
+  <symbol minX="986" maxX="1044" minY="638" maxY="696" name="bicycle-repair-station"/>
+  <symbol minX="1044" maxX="1102" minY="638" maxY="696" name="bicycle-m"/>
+  <symbol minX="1102" maxX="1160" minY="638" maxY="696" name="beer-m"/>
+  <symbol minX="1160" maxX="1218" minY="638" maxY="696" name="beekeeper-m"/>
+  <symbol minX="1218" maxX="1276" minY="638" maxY="696" name="beauty-m"/>
+  <symbol minX="1276" maxX="1334" minY="638" maxY="696" name="beach-m"/>
+  <symbol minX="1334" maxX="1392" minY="638" maxY="696" name="bcontrol-m"/>
+  <symbol minX="1392" maxX="1450" minY="638" maxY="696" name="bbq-m"/>
+  <symbol minX="1450" maxX="1508" minY="638" maxY="696" name="basketball-m"/>
+  <symbol minX="1508" maxX="1566" minY="638" maxY="696" name="baseball-m"/>
+  <symbol minX="1566" maxX="1624" minY="638" maxY="696" name="bar-m"/>
+  <symbol minX="1624" maxX="1682" minY="638" maxY="696" name="banknote-m"/>
+  <symbol minX="1682" maxX="1740" minY="638" maxY="696" name="charging-station-m"/>
+  <symbol minX="1740" maxX="1798" minY="638" maxY="696" name="copyshop-m"/>
+  <symbol minX="1798" maxX="1856" minY="638" maxY="696" name="convenience-m"/>
+  <symbol minX="1856" maxX="1914" minY="638" maxY="696" name="computer-m"/>
+  <symbol minX="1914" maxX="1972" minY="638" maxY="696" name="college-m"/>
+  <symbol minX="1972" maxX="2030" minY="638" maxY="696" name="clothes-m"/>
+  <symbol minX="0" maxX="58" minY="696" maxY="754" name="climbing-m"/>
+  <symbol minX="58" maxX="116" minY="696" maxY="754" name="cinema-m"/>
+  <symbol minX="116" maxX="174" minY="696" maxY="754" name="badminton-m"/>
+  <symbol minX="174" maxX="232" minY="696" maxY="754" name="christian-m"/>
+  <symbol minX="232" maxX="290" minY="696" maxY="754" name="chimney-m"/>
+  <symbol minX="290" maxX="348" minY="696" maxY="754" name="chess-m"/>
+  <symbol minX="348" maxX="406" minY="696" maxY="754" name="chemist-m"/>
+  <symbol minX="406" maxX="464" minY="696" maxY="754" name="charity_shop-m"/>
+  <symbol minX="464" maxX="522" minY="696" maxY="754" name="fuel-m"/>
+  <symbol minX="522" maxX="580" minY="696" maxY="754" name="cemetery-m"/>
+  <symbol minX="580" maxX="638" minY="696" maxY="754" name="bakery-m"/>
+  <symbol minX="638" maxX="696" minY="696" maxY="754" name="casino-m"/>
+  <symbol minX="696" maxX="754" minY="696" maxY="754" name="carpenter-m"/>
+  <symbol minX="754" maxX="812" minY="696" maxY="754" name="caravan_site-m"/>
+  <symbol minX="812" maxX="870" minY="696" maxY="754" name="caravan-shop-m"/>
+  <symbol minX="870" maxX="928" minY="696" maxY="754" name="car_shop-m"/>
+  <symbol minX="928" maxX="986" minY="696" maxY="754" name="car_sharing-m"/>
+  <symbol minX="986" maxX="1044" minY="696" maxY="754" name="car-wash-m"/>
+  <symbol minX="1044" maxX="1102" minY="696" maxY="754" name="car-repair-m"/>
+  <symbol minX="1102" maxX="1160" minY="696" maxY="754" name="car-part-m"/>
+  <symbol minX="1160" maxX="1218" minY="696" maxY="754" name="bank-l"/>
+  <symbol minX="1218" maxX="1276" minY="696" maxY="754" name="alpine_hut-m"/>
+  <symbol minX="1276" maxX="1334" minY="696" maxY="754" name="nparkf-outline-m"/>
+  <symbol minX="1334" maxX="1392" minY="696" maxY="754" name="nparkf-m"/>
+  <symbol minX="1392" maxX="1450" minY="696" maxY="754" name="npark-m"/>
+  <symbol minX="1450" maxX="1508" minY="696" maxY="754" name="nightclub-m"/>
+  <symbol minX="1508" maxX="1566" minY="696" maxY="754" name="airport-m"/>
+  <symbol minX="1566" maxX="1624" minY="696" maxY="754" name="newsagent_shop-m"/>
+  <symbol minX="1624" maxX="1682" minY="696" maxY="754" name="alcohol-m"/>
+  <symbol minX="1682" maxX="1740" minY="696" maxY="754" name="needle_and_thread-m"/>
+  <symbol minX="1740" maxX="1798" minY="696" maxY="754" name="muslim-m"/>
+  <symbol minX="1798" maxX="1856" minY="696" maxY="754" name="musical-instrument-m"/>
+  <symbol minX="1856" maxX="1914" minY="696" maxY="754" name="hindu-m"/>
+  <symbol minX="1914" maxX="1972" minY="696" maxY="754" name="music-m"/>
+  <symbol minX="1972" maxX="2030" minY="696" maxY="754" name="museum-m"/>
+  <symbol minX="0" maxX="58" minY="754" maxY="812" name="office-m"/>
+  <symbol minX="58" maxX="116" minY="754" maxY="812" name="motorcycle_shop-m"/>
+  <symbol minX="116" maxX="174" minY="754" maxY="812" name="monument-m"/>
+  <symbol minX="174" maxX="232" minY="754" maxY="812" name="mobile_phone-m"/>
+  <symbol minX="232" maxX="290" minY="754" maxY="812" name="military-m"/>
+  <symbol minX="290" maxX="348" minY="754" maxY="812" name="metal_construction-m"/>
+  <symbol minX="348" maxX="406" minY="754" maxY="812" name="media-m"/>
+  <symbol minX="406" maxX="464" minY="754" maxY="812" name="marketplace-m"/>
+  <symbol minX="464" maxX="522" minY="754" maxY="812" name="marina-m"/>
+  <symbol minX="522" maxX="580" minY="754" maxY="812" name="mail-m"/>
+  <symbol minX="580" maxX="638" minY="754" maxY="812" name="lighthouse-m"/>
+  <symbol minX="638" maxX="696" minY="754" maxY="812" name="lift_gate-m"/>
+  <symbol minX="696" maxX="754" minY="754" maxY="812" name="library-m"/>
+  <symbol minX="754" maxX="812" minY="754" maxY="812" name="lawyer-m"/>
+  <symbol minX="812" maxX="870" minY="754" maxY="812" name="physiotherapist-m"/>
+  <symbol minX="870" maxX="928" minY="754" maxY="812" name="public-building-m"/>
+  <symbol minX="928" maxX="986" minY="754" maxY="812" name="psychotherapist-m"/>
+  <symbol minX="986" maxX="1044" minY="754" maxY="812" name="prison-m"/>
+  <symbol minX="1044" maxX="1102" minY="754" maxY="812" name="power-m"/>
+  <symbol minX="1102" maxX="1160" minY="754" maxY="812" name="postbox-m"/>
+  <symbol minX="1160" maxX="1218" minY="754" maxY="812" name="police-m"/>
+  <symbol minX="1218" maxX="1276" minY="754" maxY="812" name="podiatrist-m"/>
+  <symbol minX="1276" maxX="1334" minY="754" maxY="812" name="plumber-m"/>
+  <symbol minX="1334" maxX="1392" minY="754" maxY="812" name="playground-m"/>
+  <symbol minX="1392" maxX="1450" minY="754" maxY="812" name="place-of-worship-m"/>
+  <symbol minX="1450" maxX="1508" minY="754" maxY="812" name="pitch-m"/>
+  <symbol minX="1508" maxX="1566" minY="754" maxY="812" name="picnic_table-m"/>
+  <symbol minX="1566" maxX="1624" minY="754" maxY="812" name="picnic-m"/>
+  <symbol minX="1624" maxX="1682" minY="754" maxY="812" name="music_school-m"/>
+  <symbol minX="1682" maxX="1740" minY="754" maxY="812" name="photo-shop-m"/>
+  <symbol minX="1740" maxX="1798" minY="754" maxY="812" name="phone-m"/>
+  <symbol minX="1798" maxX="1856" minY="754" maxY="812" name="pharmacy-m"/>
+  <symbol minX="1856" maxX="1914" minY="754" maxY="812" name="petshop-m"/>
+  <symbol minX="1914" maxX="1972" minY="754" maxY="812" name="pelota-m"/>
+  <symbol minX="1972" maxX="2030" minY="754" maxY="812" name="parking-meter-m"/>
+  <symbol minX="0" maxX="58" minY="812" maxY="870" name="park-outline-m"/>
+  <symbol minX="58" maxX="116" minY="812" maxY="870" name="park-m"/>
+  <symbol minX="116" maxX="174" minY="812" maxY="870" name="painter-m"/>
+  <symbol minX="174" maxX="232" minY="812" maxY="870" name="padel-m"/>
+  <symbol minX="232" maxX="290" minY="812" maxY="870" name="outdoor-shop-m"/>
+  <symbol minX="290" maxX="348" minY="812" maxY="870" name="optometrist-m"/>
+  <symbol minX="348" maxX="406" minY="812" maxY="870" name="optician-m"/>
+  <symbol minX="406" maxX="464" minY="812" maxY="870" name="jewelry-m"/>
+  <symbol minX="464" maxX="522" minY="812" maxY="870" name="kindergarten-m"/>
+  <symbol minX="522" maxX="580" minY="812" maxY="870" name="hunting-tower-m"/>
+  <symbol minX="580" maxX="638" minY="812" maxY="870" name="home-m"/>
+  <symbol minX="638" maxX="696" minY="812" maxY="870" name="ice_cream-m"/>
+  <symbol minX="696" maxX="754" minY="812" maxY="870" name="jewish-m"/>
+  <symbol minX="754" maxX="812" minY="812" maxY="870" name="hockey-m"/>
+  <symbol minX="812" maxX="870" minY="812" maxY="870" name="kiosk-m"/>
+  <symbol minX="870" maxX="928" minY="812" maxY="870" name="language_school-m"/>
+  <symbol minX="928" maxX="986" minY="812" maxY="870" name="hospital-m"/>
+  <symbol minX="986" maxX="1044" minY="812" maxY="870" name="alternative-m"/>
+  <symbol minX="1044" maxX="1102" minY="812" maxY="870" name="hotel-m"/>
+  <symbol minX="1102" maxX="1160" minY="812" maxY="870" name="historic-ship-m"/>
+  <symbol minX="1160" maxX="1218" minY="812" maxY="870" name="internet_cafe-m"/>
+  <symbol minX="1218" maxX="1276" minY="812" maxY="870" name="information-m"/>
+  <symbol minX="1276" maxX="1334" minY="812" maxY="870" name="laundry-m"/>
+  <symbol minX="1334" maxX="1392" minY="812" maxY="870" name="hostel-m"/>
+  <symbol minX="1392" maxX="1449" minY="812" maxY="869" name="shield-us-hw-thin"/>
+  <symbol minX="1449" maxX="1515" minY="812" maxY="869" name="shield-us-hw-wide"/>
+  <symbol minX="1515" maxX="1571" minY="812" maxY="868" name="subway-montreal-m"/>
+  <symbol minX="1571" maxX="1629" minY="812" maxY="868" name="subway-dalian-m"/>
+  <symbol minX="1629" maxX="1687" minY="812" maxY="868" name="subway-sapporo-m"/>
+  <symbol minX="1687" maxX="1743" minY="812" maxY="868" name="subway-ekb-s"/>
+  <symbol minX="1743" maxX="1801" minY="812" maxY="868" name="subway-shanghai-m"/>
+  <symbol minX="1801" maxX="1857" minY="812" maxY="868" name="subway-southkorea-s"/>
+  <symbol minX="1857" maxX="1913" minY="812" maxY="868" name="subway-spb-m"/>
+  <symbol minX="1913" maxX="1971" minY="812" maxY="868" name="subway-maracaibo-m"/>
+  <symbol minX="1971" maxX="2029" minY="812" maxY="867" name="subway-marseille-m"/>
+  <symbol minX="0" maxX="54" minY="870" maxY="924" name="subway-entrance-m"/>
+  <symbol minX="54" maxX="93" minY="870" maxY="924" name="bookmark-bg-s"/>
+  <symbol minX="93" maxX="132" minY="870" maxY="924" name="bookmark-default-s"/>
+  <symbol minX="132" maxX="186" minY="870" maxY="924" name="subway-algeria-s"/>
+  <symbol minX="186" maxX="237" minY="870" maxY="924" name="subway-warsaw-m"/>
+  <symbol minX="237" maxX="291" minY="870" maxY="924" name="subway-stlouis-s"/>
+  <symbol minX="291" maxX="349" minY="870" maxY="923" name="subway-izmir-m"/>
+  <symbol minX="349" maxX="401" minY="870" maxY="922" name="track_marker_deselected"/>
+  <symbol minX="401" maxX="453" minY="870" maxY="922" name="current-position"/>
+  <symbol minX="453" maxX="504" minY="870" maxY="921" name="subway-pittsburgh-s"/>
+  <symbol minX="504" maxX="555" minY="870" maxY="921" name="lightrail-berlin-m"/>
+  <symbol minX="555" maxX="600" minY="870" maxY="921" name="subway-istanbul-s"/>
+  <symbol minX="600" maxX="658" minY="870" maxY="920" name="subway-taoyuan-m"/>
+  <symbol minX="658" maxX="705" minY="870" maxY="919" name="subway-mashhad-s"/>
+  <symbol minX="705" maxX="754" minY="870" maxY="919" name="parking_pay-m"/>
+  <symbol minX="754" maxX="812" minY="870" maxY="919" name="subway-rotterdam-m"/>
+  <symbol minX="812" maxX="861" minY="870" maxY="919" name="parking_entrance-m"/>
+  <symbol minX="861" maxX="910" minY="870" maxY="919" name="subway-medellin-s"/>
+  <symbol minX="910" maxX="959" minY="870" maxY="919" name="subway-cairo-s"/>
+  <symbol minX="959" maxX="1008" minY="870" maxY="919" name="parking-m"/>
+  <symbol minX="1008" maxX="1057" minY="870" maxY="919" name="parking-disabled-m"/>
+  <symbol minX="1057" maxX="1102" minY="870" maxY="919" name="subway-brescia-s"/>
+  <symbol minX="1102" maxX="1151" minY="870" maxY="919" name="speedcam-m"/>
+  <symbol minX="1151" maxX="1200" minY="870" maxY="919" name="subway-sapporo-s"/>
+  <symbol minX="1200" maxX="1249" minY="870" maxY="919" name="bike-parking-m"/>
+  <symbol minX="1249" maxX="1298" minY="870" maxY="919" name="subway-panama-s"/>
+  <symbol minX="1298" maxX="1356" minY="870" maxY="919" name="subway-tbilisi-m"/>
+  <symbol minX="1356" maxX="1407" minY="870" maxY="919" name="subway-izmir-s"/>
+  <symbol minX="1407" maxX="1456" minY="870" maxY="919" name="subway-isfahan-s"/>
+  <symbol minX="1456" maxX="1505" minY="870" maxY="919" name="motorcycle-parking-m"/>
+  <symbol minX="1505" maxX="1554" minY="870" maxY="919" name="bicycle-rental"/>
+  <symbol minX="1554" maxX="1612" minY="870" maxY="918" name="subway-almaty-m"/>
+  <symbol minX="1612" maxX="1657" minY="870" maxY="917" name="subway-athens-s"/>
+  <symbol minX="1657" maxX="1715" minY="870" maxY="917" name="subway-santiago-m"/>
+  <symbol minX="1715" maxX="1766" minY="870" maxY="917" name="subway-seattle-m"/>
+  <symbol minX="1766" maxX="1811" minY="870" maxY="917" name="subway-tianjin-s"/>
+  <symbol minX="1811" maxX="1856" minY="870" maxY="917" name="subway-delhi-s"/>
+  <symbol minX="1856" maxX="1903" minY="870" maxY="917" name="subway-rome-m"/>
+  <symbol minX="1903" maxX="1961" minY="870" maxY="917" name="subway-yerevan-m"/>
+  <symbol minX="1961" maxX="2008" minY="870" maxY="917" name="subway-warszawa-s"/>
+  <symbol minX="0" maxX="54" minY="924" maxY="971" name="subway-moscow-m"/>
+  <symbol minX="54" maxX="101" minY="924" maxY="971" name="subway-paris-m"/>
+  <symbol minX="101" maxX="148" minY="924" maxY="971" name="subway-hirosima-s"/>
+  <symbol minX="148" maxX="193" minY="924" maxY="971" name="subway-porto-s"/>
+  <symbol minX="193" maxX="238" minY="924" maxY="971" name="subway-pyongyang-s"/>
+  <symbol minX="238" maxX="285" minY="924" maxY="971" name="subway-rennes-s"/>
+  <symbol minX="285" maxX="332" minY="924" maxY="971" name="subway-ubahn-m"/>
+  <symbol minX="332" maxX="377" minY="924" maxY="969" name="subway-guangzhou-s"/>
+  <symbol minX="377" maxX="433" minY="924" maxY="969" name="subway-fukuoka-s"/>
+  <symbol minX="433" maxX="478" minY="924" maxY="969" name="subway-helsinki-s"/>
+  <symbol minX="478" maxX="523" minY="924" maxY="969" name="subway-foshan-s"/>
+  <symbol minX="523" maxX="568" minY="924" maxY="969" name="subway-yokohama-s"/>
+  <symbol minX="568" maxX="615" minY="924" maxY="969" name="subway-glasgow-s"/>
+  <symbol minX="615" maxX="671" minY="924" maxY="969" name="subway-yerevan-s"/>
+  <symbol minX="671" maxX="729" minY="924" maxY="969" name="subway-tabriz-m"/>
+  <symbol minX="729" maxX="780" minY="924" maxY="969" name="subway-taoyuan-s"/>
+  <symbol minX="780" maxX="825" minY="924" maxY="969" name="subway-wuhan-s"/>
+  <symbol minX="825" maxX="870" minY="924" maxY="969" name="subway-washington-s"/>
+  <symbol minX="870" maxX="915" minY="924" maxY="969" name="subway-tashkent-s"/>
+  <symbol minX="915" maxX="955" minY="924" maxY="969" name="subway-warsaw-s"/>
+  <symbol minX="955" maxX="1000" minY="924" maxY="969" name="subway-volgograd-s"/>
+  <symbol minX="1000" maxX="1045" minY="924" maxY="969" name="subway-vienna-s"/>
+  <symbol minX="1045" maxX="1090" minY="924" maxY="969" name="subway-kazan-s"/>
+  <symbol minX="1090" maxX="1135" minY="924" maxY="969" name="subway-guadalajara-s"/>
+  <symbol minX="1135" maxX="1180" minY="924" maxY="969" name="subway-valencia-s"/>
+  <symbol minX="1180" maxX="1225" minY="924" maxY="969" name="subway-tyneandwear-s"/>
+  <symbol minX="1225" maxX="1270" minY="924" maxY="969" name="subway-tokyo-s"/>
+  <symbol minX="1270" maxX="1315" minY="924" maxY="969" name="subway-brasilia-s"/>
+  <symbol minX="1315" maxX="1360" minY="924" maxY="969" name="subway-stockholm-s"/>
+  <symbol minX="1360" maxX="1405" minY="924" maxY="969" name="subway-chengdu-s"/>
+  <symbol minX="1405" maxX="1450" minY="924" maxY="969" name="subway-oslo-s"/>
+  <symbol minX="1450" maxX="1495" minY="924" maxY="969" name="subway-losangeles-s"/>
+  <symbol minX="1495" maxX="1553" minY="924" maxY="969" name="subway-omsk-s"/>
+  <symbol minX="1553" maxX="1611" minY="924" maxY="969" name="subway-omsk-m"/>
+  <symbol minX="1611" maxX="1656" minY="924" maxY="969" name="subway-beijing-s"/>
+  <symbol minX="1656" maxX="1701" minY="924" maxY="969" name="subway-nnov-s"/>
+  <symbol minX="1701" maxX="1746" minY="924" maxY="969" name="subway-bengaluru-s"/>
+  <symbol minX="1746" maxX="1791" minY="924" maxY="969" name="subway-lyon-s"/>
+  <symbol minX="1791" maxX="1836" minY="924" maxY="969" name="subway-nagoya-s"/>
+  <symbol minX="1836" maxX="1881" minY="924" maxY="969" name="subway-bangkok-s"/>
+  <symbol minX="1881" maxX="1926" minY="924" maxY="969" name="subway-changchun-s"/>
+  <symbol minX="1926" maxX="1971" minY="924" maxY="969" name="subway-montreal-s"/>
+  <symbol minX="1971" maxX="2016" minY="924" maxY="969" name="subway-minatomirai-s"/>
+  <symbol minX="0" maxX="45" minY="971" maxY="1016" name="subway-catania-s"/>
+  <symbol minX="45" maxX="90" minY="971" maxY="1016" name="subway-milan-s"/>
+  <symbol minX="90" maxX="135" minY="971" maxY="1016" name="subway-caracas-s"/>
+  <symbol minX="135" maxX="180" minY="971" maxY="1016" name="subway-budapest-s"/>
+  <symbol minX="180" maxX="225" minY="971" maxY="1016" name="subway-mecca-s"/>
+  <symbol minX="225" maxX="270" minY="971" maxY="1016" name="subway-massachusetts-s"/>
+  <symbol minX="270" maxX="315" minY="971" maxY="1016" name="subway-buenosaires-s"/>
+  <symbol minX="315" maxX="360" minY="971" maxY="1016" name="subway-bursaray-s"/>
+  <symbol minX="360" maxX="405" minY="971" maxY="1016" name="subway-samara-s"/>
+  <symbol minX="405" maxX="450" minY="971" maxY="1016" name="subway-kobe-s"/>
+  <symbol minX="450" maxX="495" minY="971" maxY="1016" name="subway-dubai-s"/>
+  <symbol minX="495" maxX="540" minY="971" maxY="1016" name="subway-sofia-s"/>
+  <symbol minX="540" maxX="585" minY="971" maxY="1016" name="subway-shiraz-s"/>
+  <symbol minX="585" maxX="643" minY="971" maxY="1016" name="subway-kryvyirih-m"/>
+  <symbol minX="643" maxX="688" minY="971" maxY="1016" name="subway-shanghai-s"/>
+  <symbol minX="688" maxX="746" minY="971" maxY="1016" name="subway-dnepro-m"/>
+  <symbol minX="746" maxX="791" minY="971" maxY="1016" name="subway-kunming-s"/>
+  <symbol minX="791" maxX="836" minY="971" maxY="1016" name="subway-saopaulo-s"/>
+  <symbol minX="836" maxX="881" minY="971" maxY="1016" name="subway-santodomingo-s"/>
+  <symbol minX="881" maxX="926" minY="971" maxY="1016" name="subway-kyoto-s"/>
+  <symbol minX="926" maxX="982" minY="971" maxY="1016" name="subway-santiago-s"/>
+  <symbol minX="982" maxX="1027" minY="971" maxY="1016" name="subway-chicago-s"/>
+  <symbol minX="1027" maxX="1085" minY="971" maxY="1016" name="subway-alicante-m"/>
+  <symbol minX="1085" maxX="1130" minY="971" maxY="1016" name="subway-riodejaneiro-s"/>
+  <symbol minX="1130" maxX="1175" minY="971" maxY="1016" name="subway-dalian-s"/>
+  <symbol minX="1175" maxX="1220" minY="971" maxY="1016" name="subway-reseau-paris-s"/>
+  <symbol minX="1220" maxX="1265" minY="971" maxY="1016" name="subway-lille-s"/>
+  <symbol minX="1265" maxX="1310" minY="971" maxY="1016" name="subway-lima-s"/>
+  <symbol minX="1310" maxX="1355" minY="971" maxY="1016" name="subway-perugia-s"/>
+  <symbol minX="1355" maxX="1400" minY="971" maxY="1016" name="subway-lisboa-s"/>
+  <symbol minX="1400" maxX="1458" minY="971" maxY="1015" name="subway-philadelphia-m"/>
+  <symbol minX="1458" maxX="1516" minY="971" maxY="1014" name="subway-osaka-m"/>
+  <symbol minX="1516" maxX="1561" minY="971" maxY="1013" name="subway-maracaibo-s"/>
+  <symbol minX="1561" maxX="1617" minY="971" maxY="1013" name="subway-tabriz-s"/>
+  <symbol minX="1617" maxX="1671" minY="971" maxY="1013" name="subway-almaty-s"/>
+  <symbol minX="1671" maxX="1711" minY="971" maxY="1013" name="subway-amsterdam-s"/>
+  <symbol minX="1711" maxX="1769" minY="971" maxY="1013" name="subway-barcelona-m"/>
+  <symbol minX="1769" maxX="1811" minY="971" maxY="1013" name="subway-lausanne-s"/>
+  <symbol minX="1811" maxX="1867" minY="971" maxY="1013" name="subway-london-m"/>
+  <symbol minX="1867" maxX="1925" minY="971" maxY="1013" name="subway-lucknow-s"/>
+  <symbol minX="1925" maxX="1983" minY="971" maxY="1013" name="subway-madrid-m"/>
+  <symbol minX="1983" maxX="2023" minY="971" maxY="1013" name="subway-mexico-s"/>
+  <symbol minX="0" maxX="42" minY="1016" maxY="1058" name="search-result"/>
+  <symbol minX="42" maxX="84" minY="1016" maxY="1058" name="cave-m"/>
+  <symbol minX="84" maxX="126" minY="1016" maxY="1058" name="subway-spb-s"/>
+  <symbol minX="126" maxX="184" minY="1016" maxY="1057" name="subway-lucknow-m"/>
+  <symbol minX="184" maxX="224" minY="1016" maxY="1056" name="waterfall-s"/>
+  <symbol minX="224" maxX="264" minY="1016" maxY="1056" name="waste-basket-s"/>
+  <symbol minX="264" maxX="342" minY="1016" maxY="1056" name="coloredmark-bg-s"/>
+  <symbol minX="342" maxX="420" minY="1016" maxY="1056" name="coloredmark-default-s"/>
+  <symbol minX="420" maxX="460" minY="1016" maxY="1056" name="viewpoint-s"/>
+  <symbol minX="460" maxX="500" minY="1016" maxY="1056" name="non-found-search-result"/>
+  <symbol minX="500" maxX="540" minY="1016" maxY="1056" name="zoo-s"/>
+  <symbol minX="540" maxX="580" minY="1016" maxY="1056" name="airport-s"/>
+  <symbol minX="580" maxX="620" minY="1016" maxY="1056" name="shop-s"/>
+  <symbol minX="620" maxX="660" minY="1016" maxY="1056" name="nparkf-outline-s"/>
+  <symbol minX="660" maxX="700" minY="1016" maxY="1056" name="nparkf-s"/>
+  <symbol minX="700" maxX="740" minY="1016" maxY="1056" name="park-outline-s"/>
+  <symbol minX="740" maxX="780" minY="1016" maxY="1056" name="park-s"/>
+  <symbol minX="780" maxX="820" minY="1016" maxY="1056" name="place-of-worship-s"/>
+  <symbol minX="820" maxX="860" minY="1016" maxY="1056" name="remains-s"/>
+  <symbol minX="860" maxX="900" minY="1016" maxY="1056" name="shinto-s"/>
+  <symbol minX="900" maxX="940" minY="1016" maxY="1056" name="ship-s"/>
+  <symbol minX="940" maxX="980" minY="1016" maxY="1056" name="muslim-s"/>
+  <symbol minX="980" maxX="1020" minY="1016" maxY="1056" name="stadium-s"/>
+  <symbol minX="1020" maxX="1078" minY="1016" maxY="1056" name="subway-bilbao-m"/>
+  <symbol minX="1078" maxX="1132" minY="1016" maxY="1056" name="subway-dnepro-s"/>
+  <symbol minX="1132" maxX="1172" minY="1016" maxY="1056" name="subway-entrance-s"/>
+  <symbol minX="1172" maxX="1230" minY="1016" maxY="1056" name="subway-kolkata-m"/>
+  <symbol minX="1230" maxX="1270" minY="1016" maxY="1056" name="subway-newyork-s"/>
+  <symbol minX="1270" maxX="1319" minY="1016" maxY="1056" name="subway-osaka-s"/>
+  <symbol minX="1319" maxX="1377" minY="1016" maxY="1056" name="subway-palma-m"/>
+  <symbol minX="1377" maxX="1417" minY="1016" maxY="1056" name="fuel-s"/>
+  <symbol minX="1417" maxX="1457" minY="1016" maxY="1056" name="buddhist-s"/>
+  <symbol minX="1457" maxX="1497" minY="1016" maxY="1056" name="bus-s"/>
+  <symbol minX="1497" maxX="1537" minY="1016" maxY="1056" name="cable-car-s"/>
+  <symbol minX="1537" maxX="1577" minY="1016" maxY="1056" name="car-repair-s"/>
+  <symbol minX="1577" maxX="1617" minY="1016" maxY="1056" name="charging-station-s"/>
+  <symbol minX="1617" maxX="1657" minY="1016" maxY="1056" name="christian-s"/>
+  <symbol minX="1657" maxX="1697" minY="1016" maxY="1056" name="college-s"/>
+  <symbol minX="1697" maxX="1737" minY="1016" maxY="1056" name="drinking-water-s"/>
+  <symbol minX="1737" maxX="1768" minY="1016" maxY="1056" name="transit_train-m"/>
+  <symbol minX="1768" maxX="1808" minY="1016" maxY="1056" name="geyser-s"/>
+  <symbol minX="1808" maxX="1848" minY="1016" maxY="1056" name="hindu-s"/>
+  <symbol minX="1848" maxX="1888" minY="1016" maxY="1056" name="hospital-s"/>
+  <symbol minX="1888" maxX="1928" minY="1016" maxY="1056" name="hotel-s"/>
+  <symbol minX="1928" maxX="1968" minY="1016" maxY="1056" name="jewish-s"/>
+  <symbol minX="1968" maxX="2008" minY="1016" maxY="1056" name="lighthouse-s"/>
+  <symbol minX="2008" maxX="2048" minY="1016" maxY="1056" name="monument-s"/>
+  <symbol minX="0" maxX="40" minY="1058" maxY="1098" name="museum-s"/>
+  <symbol minX="40" maxX="80" minY="1058" maxY="1098" name="taoist-s"/>
+  <symbol minX="80" maxX="120" minY="1058" maxY="1098" name="subway-s"/>
+  <symbol minX="120" maxX="165" minY="1058" maxY="1098" name="subway-rotterdam-s"/>
+  <symbol minX="165" maxX="196" minY="1058" maxY="1098" name="transit_light_rail-m"/>
+  <symbol minX="196" maxX="241" minY="1058" maxY="1098" name="transfer_arrow"/>
+  <symbol minX="241" maxX="281" minY="1058" maxY="1098" name="tram-s"/>
+  <symbol minX="281" maxX="321" minY="1058" maxY="1098" name="train-s"/>
+  <symbol minX="321" maxX="377" minY="1058" maxY="1098" name="subway-palma-s"/>
+  <symbol minX="377" maxX="417" minY="1058" maxY="1098" name="tourism-s"/>
+  <symbol minX="417" maxX="457" minY="1058" maxY="1098" name="toll_booth-s"/>
+  <symbol minX="457" maxX="497" minY="1058" maxY="1098" name="theme_park-s"/>
+  <symbol minX="497" maxX="537" minY="1058" maxY="1098" name="theatre-s"/>
+  <symbol minX="537" maxX="582" minY="1058" maxY="1098" name="subway-tbilisi-s"/>
+  <symbol minX="582" maxX="633" minY="1058" maxY="1098" name="subway-philadelphia-s"/>
+  <symbol minX="633" maxX="660" minY="1058" maxY="1097" name="bookmark-bg-xs"/>
+  <symbol minX="660" maxX="718" minY="1058" maxY="1097" name="subway-fukuoka-m"/>
+  <symbol minX="718" maxX="745" minY="1058" maxY="1097" name="bookmark-default-xs"/>
+  <symbol minX="745" maxX="803" minY="1058" maxY="1097" name="subway-bucharest-m"/>
+  <symbol minX="803" maxX="861" minY="1058" maxY="1097" name="subway-sanfrancisco-m"/>
+  <symbol minX="861" maxX="919" minY="1058" maxY="1097" name="subway-novosibirsk-m"/>
+  <symbol minX="919" maxX="970" minY="1058" maxY="1096" name="subway-barcelona-s"/>
+  <symbol minX="970" maxX="1028" minY="1058" maxY="1096" name="subway-brussel-s"/>
+  <symbol minX="1028" maxX="1066" minY="1058" maxY="1096" name="lightrail-berlin-s"/>
+  <symbol minX="1066" maxX="1124" minY="1058" maxY="1096" name="subway-sanfrancisco-s"/>
+  <symbol minX="1124" maxX="1155" minY="1058" maxY="1096" name="transit_monorail-m"/>
+  <symbol minX="1155" maxX="1213" minY="1058" maxY="1096" name="subway-sendai-m"/>
+  <symbol minX="1213" maxX="1251" minY="1058" maxY="1096" name="elevator"/>
+  <symbol minX="1251" maxX="1302" minY="1058" maxY="1096" name="subway-madrid-s"/>
+  <symbol minX="1302" maxX="1340" minY="1058" maxY="1096" name="subway-paris-s"/>
+  <symbol minX="1340" maxX="1396" minY="1058" maxY="1096" name="subway-novosibirsk-s"/>
+  <symbol minX="1396" maxX="1445" minY="1058" maxY="1096" name="subway-kryvyirih-s"/>
+  <symbol minX="1445" maxX="1501" minY="1058" maxY="1096" name="subway-kiev-m"/>
+  <symbol minX="1501" maxX="1559" minY="1058" maxY="1096" name="subway-kharkiv-s"/>
+  <symbol minX="1559" maxX="1595" minY="1058" maxY="1094" name="storage-tank"/>
+  <symbol minX="1595" maxX="1653" minY="1058" maxY="1094" name="subway-sendai-s"/>
+  <symbol minX="1653" maxX="1680" minY="1058" maxY="1094" name="transit_train-s"/>
+  <symbol minX="1680" maxX="1716" minY="1058" maxY="1094" name="transit_subway-m"/>
+  <symbol minX="1716" maxX="1752" minY="1058" maxY="1094" name="board"/>
+  <symbol minX="1752" maxX="1790" minY="1058" maxY="1094" name="subway-moscow-s"/>
+  <symbol minX="1790" maxX="1837" minY="1058" maxY="1094" name="subway-alicante-s"/>
+  <symbol minX="1837" maxX="1873" minY="1058" maxY="1094" name="map"/>
+  <symbol minX="1873" maxX="1931" minY="1058" maxY="1094" name="subway-haagse-s"/>
+  <symbol minX="1931" maxX="1989" minY="1058" maxY="1094" name="subway-kharkiv-m"/>
+  <symbol minX="1989" maxX="2047" minY="1058" maxY="1094" name="subway-brussel-m"/>
+  <symbol minX="0" maxX="56" minY="1098" maxY="1134" name="subway-bucharest-s"/>
+  <symbol minX="56" maxX="114" minY="1098" maxY="1133" name="subway-manila-m"/>
+  <symbol minX="114" maxX="172" minY="1098" maxY="1131" name="subway-taipei-s"/>
+  <symbol minX="172" maxX="230" minY="1098" maxY="1131" name="subway-haagse-m"/>
+  <symbol minX="230" maxX="263" minY="1098" maxY="1131" name="subway-rome-s"/>
+  <symbol minX="263" maxX="296" minY="1098" maxY="1131" name="subway-ubahn-s"/>
+  <symbol minX="296" maxX="352" minY="1098" maxY="1131" name="subway-manila-s"/>
+  <symbol minX="352" maxX="388" minY="1098" maxY="1131" name="subway-seattle-s"/>
+  <symbol minX="388" maxX="446" minY="1098" maxY="1131" name="subway-edmonton-s"/>
+  <symbol minX="446" maxX="488" minY="1098" maxY="1131" name="subway-london-s"/>
+  <symbol minX="488" maxX="521" minY="1098" maxY="1131" name="cave-s"/>
+  <symbol minX="521" maxX="570" minY="1098" maxY="1131" name="subway-bilbao-s"/>
+  <symbol minX="570" maxX="601" minY="1098" maxY="1129" name="transit_subway-s"/>
+  <symbol minX="601" maxX="628" minY="1098" maxY="1129" name="transit_light_rail-s"/>
+  <symbol minX="628" maxX="661" minY="1098" maxY="1129" name="main_entrance-s"/>
+  <symbol minX="661" maxX="688" minY="1098" maxY="1129" name="transit_monorail-s"/>
+  <symbol minX="688" maxX="726" minY="1098" maxY="1129" name="bench"/>
+  <symbol minX="726" maxX="746" minY="1098" maxY="1129" name="entrance-s"/>
+  <symbol minX="746" maxX="777" minY="1098" maxY="1129" name="speedcam-s"/>
+  <symbol minX="777" maxX="808" minY="1098" maxY="1129" name="subway-xs"/>
+  <symbol minX="808" maxX="839" minY="1098" maxY="1129" name="subway-newyork-xs"/>
+  <symbol minX="839" maxX="870" minY="1098" maxY="1129" name="parking-s"/>
+  <symbol minX="870" maxX="919" minY="1098" maxY="1129" name="railway-crossing-l"/>
+  <symbol minX="919" maxX="950" minY="1098" maxY="1129" name="star-l"/>
+  <symbol minX="950" maxX="1008" minY="1098" maxY="1128" name="subway-edmonton-m"/>
+  <symbol minX="1008" maxX="1050" minY="1098" maxY="1127" name="subway-kolkata-s"/>
+  <symbol minX="1050" maxX="1097" minY="1098" maxY="1127" name="subway-kiev-s"/>
+  <symbol minX="1097" maxX="1130" minY="1098" maxY="1127" name="volcano-m"/>
+  <symbol minX="1130" maxX="1186" minY="1098" maxY="1127" name="subway-malaga-s"/>
+  <symbol minX="1186" maxX="1215" minY="1098" maxY="1127" name="star-m"/>
+  <symbol minX="1215" maxX="1273" minY="1098" maxY="1126" name="subway-malaga-m"/>
+  <symbol minX="1273" maxX="1331" minY="1098" maxY="1126" name="subway-taipei-m"/>
+  <symbol minX="1331" maxX="1373" minY="1098" maxY="1125" name="railway-crossing-m"/>
+  <symbol minX="1373" maxX="1429" minY="1098" maxY="1125" name="subway-baku-s"/>
+  <symbol minX="1429" maxX="1460" minY="1098" maxY="1125" name="plaque"/>
+  <symbol minX="1460" maxX="1507" minY="1098" maxY="1125" name="subway-minsk-m"/>
+  <symbol minX="1507" maxX="1565" minY="1098" maxY="1124" name="subway-baku-m"/>
+  <symbol minX="1565" maxX="1623" minY="1098" maxY="1123" name="subway-chongqing-s"/>
+  <symbol minX="1623" maxX="1647" minY="1098" maxY="1122" name="star-s"/>
+  <symbol minX="1647" maxX="1689" minY="1098" maxY="1122" name="subway-minsk-s"/>
+  <symbol minX="1689" maxX="1747" minY="1098" maxY="1121" name="subway-chongqing-m"/>
+  <symbol minX="1747" maxX="1798" minY="1098" maxY="1120" name="arrow-m"/>
+  <symbol minX="1798" maxX="1822" minY="1098" maxY="1120" name="volcano-s"/>
+  <symbol minX="1822" maxX="1846" minY="1098" maxY="1120" name="peakt-m"/>
+  <symbol minX="1846" maxX="1886" minY="1098" maxY="1120" name="mountain-pass"/>
+  <symbol minX="1886" maxX="1906" minY="1098" maxY="1118" name="zero-icon"/>
+  <symbol minX="1906" maxX="1926" minY="1098" maxY="1116" name="peakt-s"/>
+  <symbol minX="1926" maxX="1941" minY="1098" maxY="1113" name="dot-m"/>
+  <symbol minX="1941" maxX="1979" minY="1098" maxY="1113" name="arrow-s"/>
+  <symbol minX="1979" maxX="2003" minY="1098" maxY="1109" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 18895fccd7..6f63614f65 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index ee2ad8d51a..cee927af25 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -3,699 +3,694 @@
  <file width="2048" height="2048">
   <symbol minX="0" maxX="182" minY="0" maxY="110" name="route-arrow"/>
   <symbol minX="182" maxX="282" minY="0" maxY="100" name="compass-image"/>
-  <symbol minX="282" maxX="382" minY="0" maxY="95" name="route-point-finish"/>
-  <symbol minX="382" maxX="463" minY="0" maxY="95" name="shield-us-i-thin-scaled"/>
-  <symbol minX="463" maxX="558" minY="0" maxY="95" name="cross_geoposition"/>
+  <symbol minX="282" maxX="377" minY="0" maxY="95" name="cross_geoposition"/>
+  <symbol minX="377" maxX="458" minY="0" maxY="95" name="shield-us-i-thin-scaled"/>
+  <symbol minX="458" maxX="558" minY="0" maxY="95" name="route-point-finish"/>
   <symbol minX="558" maxX="653" minY="0" maxY="95" name="shield-us-i-wide-scaled"/>
-  <symbol minX="653" maxX="743" minY="0" maxY="90" name="search-result-restaurant"/>
-  <symbol minX="743" maxX="833" minY="0" maxY="90" name="search-result-shop-gift"/>
-  <symbol minX="833" maxX="923" minY="0" maxY="90" name="search-result-shop-department_store"/>
-  <symbol minX="923" maxX="1013" minY="0" maxY="90" name="search-result-nightclub"/>
-  <symbol minX="1013" maxX="1103" minY="0" maxY="90" name="search-result-shop-cosmetics"/>
-  <symbol minX="1103" maxX="1193" minY="0" maxY="90" name="search-result-shop-convenience"/>
-  <symbol minX="1193" maxX="1291" minY="0" maxY="90" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="1291" maxX="1381" minY="0" maxY="90" name="search-result-playground"/>
-  <symbol minX="1381" maxX="1471" minY="0" maxY="90" name="search-result-pub"/>
-  <symbol minX="1471" maxX="1561" minY="0" maxY="90" name="search-result-marketplace"/>
-  <symbol minX="1561" maxX="1651" minY="0" maxY="90" name="search-result-shop-confectionery"/>
-  <symbol minX="1651" maxX="1741" minY="0" maxY="90" name="search-result-shop-clothes"/>
-  <symbol minX="1741" maxX="1831" minY="0" maxY="90" name="search-result-shop-alcohol"/>
-  <symbol minX="1831" maxX="1921" minY="0" maxY="90" name="search-result-shop-butcher"/>
-  <symbol minX="1921" maxX="2011" minY="0" maxY="90" name="search-result-shop-jewelry"/>
-  <symbol minX="0" maxX="90" minY="110" maxY="200" name="search-result-shop-sports"/>
-  <symbol minX="90" maxX="180" minY="110" maxY="200" name="search-result-shop-supermarket"/>
-  <symbol minX="180" maxX="270" minY="110" maxY="200" name="search-result-shop-shoes"/>
-  <symbol minX="270" maxX="360" minY="110" maxY="200" name="search-result-shop-seafood"/>
-  <symbol minX="360" maxX="450" minY="110" maxY="200" name="search-result-shop-mall"/>
-  <symbol minX="450" maxX="540" minY="110" maxY="200" name="search-result-shop-toys"/>
-  <symbol minX="540" maxX="630" minY="110" maxY="200" name="search-result-bakery"/>
-  <symbol minX="630" maxX="720" minY="110" maxY="200" name="search-result-bar"/>
-  <symbol minX="720" maxX="810" minY="110" maxY="200" name="search-result-theme-park"/>
-  <symbol minX="810" maxX="900" minY="110" maxY="200" name="search-result-cafe"/>
+  <symbol minX="653" maxX="743" minY="0" maxY="90" name="search-result-playground"/>
+  <symbol minX="743" maxX="833" minY="0" maxY="90" name="search-result-shop-department_store"/>
+  <symbol minX="833" maxX="923" minY="0" maxY="90" name="search-result-cinema"/>
+  <symbol minX="923" maxX="1013" minY="0" maxY="90" name="search-result-shop-cosmetics"/>
+  <symbol minX="1013" maxX="1103" minY="0" maxY="90" name="search-result-shop-convenience"/>
+  <symbol minX="1103" maxX="1193" minY="0" maxY="90" name="search-result-marketplace"/>
+  <symbol minX="1193" maxX="1283" minY="0" maxY="90" name="search-result-zoo"/>
+  <symbol minX="1283" maxX="1373" minY="0" maxY="90" name="search-result-shop-sports"/>
+  <symbol minX="1373" maxX="1463" minY="0" maxY="90" name="search-result-nightclub"/>
+  <symbol minX="1463" maxX="1553" minY="0" maxY="90" name="search-result-fastfood"/>
+  <symbol minX="1553" maxX="1643" minY="0" maxY="90" name="search-result-water-park"/>
+  <symbol minX="1643" maxX="1733" minY="0" maxY="90" name="search-result-theme-park"/>
+  <symbol minX="1733" maxX="1823" minY="0" maxY="90" name="search-result-shop-alcohol"/>
+  <symbol minX="1823" maxX="1913" minY="0" maxY="90" name="search-result-shop-supermarket"/>
+  <symbol minX="1913" maxX="2011" minY="0" maxY="90" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="0" maxX="90" minY="110" maxY="200" name="search-result-pub"/>
+  <symbol minX="90" maxX="180" minY="110" maxY="200" name="search-result-restaurant"/>
+  <symbol minX="180" maxX="270" minY="110" maxY="200" name="search-result-shop-confectionery"/>
+  <symbol minX="270" maxX="360" minY="110" maxY="200" name="search-result-shop-toys"/>
+  <symbol minX="360" maxX="450" minY="110" maxY="200" name="search-result-shop-shoes"/>
+  <symbol minX="450" maxX="540" minY="110" maxY="200" name="search-result-shop-butcher"/>
+  <symbol minX="540" maxX="630" minY="110" maxY="200" name="search-result-shop-gift"/>
+  <symbol minX="630" maxX="720" minY="110" maxY="200" name="search-result-bakery"/>
+  <symbol minX="720" maxX="810" minY="110" maxY="200" name="search-result-bar"/>
+  <symbol minX="810" maxX="900" minY="110" maxY="200" name="search-result-shop-jewelry"/>
   <symbol minX="900" maxX="990" minY="110" maxY="200" name="search-result-casino"/>
-  <symbol minX="990" maxX="1080" minY="110" maxY="200" name="search-result-cinema"/>
-  <symbol minX="1080" maxX="1170" minY="110" maxY="200" name="search-result-shop-greengrocer"/>
-  <symbol minX="1170" maxX="1260" minY="110" maxY="200" name="search-result-water-park"/>
-  <symbol minX="1260" maxX="1350" minY="110" maxY="200" name="search-result-zoo"/>
-  <symbol minX="1350" maxX="1440" minY="110" maxY="200" name="search-result-fastfood"/>
+  <symbol minX="990" maxX="1080" minY="110" maxY="200" name="search-result-shop-mall"/>
+  <symbol minX="1080" maxX="1170" minY="110" maxY="200" name="search-result-cafe"/>
+  <symbol minX="1170" maxX="1260" minY="110" maxY="200" name="search-result-shop-seafood"/>
+  <symbol minX="1260" maxX="1350" minY="110" maxY="200" name="search-result-shop-clothes"/>
+  <symbol minX="1350" maxX="1440" minY="110" maxY="200" name="search-result-shop-greengrocer"/>
   <symbol minX="1440" maxX="1521" minY="110" maxY="198" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="1521" maxX="1587" minY="110" maxY="193" name="unpaved_road"/>
-  <symbol minX="1587" maxX="1653" minY="110" maxY="193" name="ferry"/>
-  <symbol minX="1653" maxX="1719" minY="110" maxY="193" name="paid_road"/>
-  <symbol minX="1719" maxX="1800" minY="110" maxY="191" name="infosign"/>
-  <symbol minX="1800" maxX="1881" minY="110" maxY="191" name="track_marker_selected"/>
-  <symbol minX="1881" maxX="1935" minY="110" maxY="187" name="bookmark-food-m"/>
-  <symbol minX="1935" maxX="1989" minY="110" maxY="187" name="bookmark-shop-m"/>
-  <symbol minX="1989" maxX="2043" minY="110" maxY="187" name="bookmark-parking-m"/>
-  <symbol minX="0" maxX="54" minY="200" maxY="277" name="bookmark-museum-m"/>
+  <symbol minX="1521" maxX="1587" minY="110" maxY="193" name="paid_road"/>
+  <symbol minX="1587" maxX="1653" minY="110" maxY="193" name="unpaved_road"/>
+  <symbol minX="1653" maxX="1719" minY="110" maxY="193" name="ferry"/>
+  <symbol minX="1719" maxX="1800" minY="110" maxY="191" name="track_marker_selected"/>
+  <symbol minX="1800" maxX="1881" minY="110" maxY="191" name="infosign"/>
+  <symbol minX="1881" maxX="1935" minY="110" maxY="187" name="bookmark-hotel-m"/>
+  <symbol minX="1935" maxX="1989" minY="110" maxY="187" name="bookmark-park-m"/>
+  <symbol minX="1989" maxX="2043" minY="110" maxY="187" name="bookmark-default-m"/>
+  <symbol minX="0" maxX="54" minY="200" maxY="277" name="bookmark-sights-m"/>
   <symbol minX="54" maxX="108" minY="200" maxY="277" name="bookmark-mountain-m"/>
-  <symbol minX="108" maxX="162" minY="200" maxY="277" name="bookmark-medicine-m"/>
-  <symbol minX="162" maxX="216" minY="200" maxY="277" name="bookmark-judaism-m"/>
+  <symbol minX="108" maxX="162" minY="200" maxY="277" name="bookmark-gas-m"/>
+  <symbol minX="162" maxX="216" minY="200" maxY="277" name="bookmark-medicine-m"/>
   <symbol minX="216" maxX="270" minY="200" maxY="277" name="bookmark-islam-m"/>
-  <symbol minX="270" maxX="324" minY="200" maxY="277" name="bookmark-hotel-m"/>
-  <symbol minX="324" maxX="378" minY="200" maxY="277" name="bookmark-gas-m"/>
-  <symbol minX="378" maxX="432" minY="200" maxY="277" name="bookmark-park-m"/>
+  <symbol minX="270" maxX="324" minY="200" maxY="277" name="bookmark-judaism-m"/>
+  <symbol minX="324" maxX="378" minY="200" maxY="277" name="bookmark-entertainment-m"/>
+  <symbol minX="378" maxX="432" minY="200" maxY="277" name="bookmark-exchange-m"/>
   <symbol minX="432" maxX="486" minY="200" maxY="277" name="bookmark-finish-m"/>
-  <symbol minX="486" maxX="540" minY="200" maxY="277" name="bookmark-exchange-m"/>
-  <symbol minX="540" maxX="594" minY="200" maxY="277" name="bookmark-entertainment-m"/>
-  <symbol minX="594" maxX="648" minY="200" maxY="277" name="bookmark-default-m"/>
-  <symbol minX="648" maxX="702" minY="200" maxY="277" name="bookmark-christianity-m"/>
-  <symbol minX="702" maxX="756" minY="200" maxY="277" name="bookmark-building-m"/>
-  <symbol minX="756" maxX="810" minY="200" maxY="277" name="bookmark-animals-m"/>
-  <symbol minX="810" maxX="864" minY="200" maxY="277" name="bookmark-buddhism-m"/>
-  <symbol minX="864" maxX="918" minY="200" maxY="277" name="bookmark-bar-m"/>
-  <symbol minX="918" maxX="972" minY="200" maxY="277" name="bookmark-bg-m"/>
-  <symbol minX="972" maxX="1026" minY="200" maxY="277" name="bookmark-sights-m"/>
-  <symbol minX="1026" maxX="1080" minY="200" maxY="277" name="bookmark-sport-m"/>
-  <symbol minX="1080" maxX="1134" minY="200" maxY="277" name="bookmark-start-m"/>
-  <symbol minX="1134" maxX="1188" minY="200" maxY="277" name="bookmark-swim-m"/>
-  <symbol minX="1188" maxX="1242" minY="200" maxY="277" name="bookmark-transport-m"/>
-  <symbol minX="1242" maxX="1296" minY="200" maxY="277" name="bookmark-water-m"/>
-  <symbol minX="1296" maxX="1350" minY="200" maxY="277" name="bookmark-viewpoint-m"/>
-  <symbol minX="1350" maxX="1450" minY="200" maxY="271" name="coloredmark-default-l"/>
-  <symbol minX="1450" maxX="1550" minY="200" maxY="271" name="coloredmark-bg-l"/>
-  <symbol minX="1550" maxX="1621" minY="200" maxY="271" name="route-point-13"/>
-  <symbol minX="1621" maxX="1692" minY="200" maxY="271" name="route-point-12"/>
-  <symbol minX="1692" maxX="1763" minY="200" maxY="271" name="route-point-start"/>
-  <symbol minX="1763" maxX="1834" minY="200" maxY="271" name="route-point-7"/>
-  <symbol minX="1834" maxX="1905" minY="200" maxY="271" name="route-point-11"/>
-  <symbol minX="1905" maxX="1976" minY="200" maxY="271" name="route-point-10"/>
-  <symbol minX="1976" maxX="2047" minY="200" maxY="271" name="route-point-8"/>
-  <symbol minX="0" maxX="100" minY="277" maxY="348" name="norating-bg-l"/>
-  <symbol minX="100" maxX="171" minY="277" maxY="348" name="route-point-9"/>
-  <symbol minX="171" maxX="242" minY="277" maxY="348" name="route-point-1"/>
-  <symbol minX="242" maxX="342" minY="277" maxY="348" name="norating-default-l"/>
-  <symbol minX="342" maxX="413" minY="277" maxY="348" name="route-point-14"/>
-  <symbol minX="413" maxX="484" minY="277" maxY="348" name="route-point-6"/>
-  <symbol minX="484" maxX="555" minY="277" maxY="348" name="route-point-15"/>
-  <symbol minX="555" maxX="626" minY="277" maxY="348" name="route-point-2"/>
-  <symbol minX="626" maxX="697" minY="277" maxY="348" name="route-point-5"/>
-  <symbol minX="697" maxX="768" minY="277" maxY="348" name="route-point-4"/>
-  <symbol minX="768" maxX="839" minY="277" maxY="348" name="route-point-16"/>
-  <symbol minX="839" maxX="910" minY="277" maxY="348" name="route-point-17"/>
-  <symbol minX="910" maxX="981" minY="277" maxY="348" name="route-point-3"/>
-  <symbol minX="981" maxX="1052" minY="277" maxY="348" name="route-point-18"/>
-  <symbol minX="1052" maxX="1123" minY="277" maxY="348" name="route-point-20"/>
-  <symbol minX="1123" maxX="1194" minY="277" maxY="348" name="route-point-19"/>
-  <symbol minX="1194" maxX="1246" minY="277" maxY="339" name="shield-us-i-thin"/>
-  <symbol minX="1246" maxX="1312" minY="277" maxY="339" name="shield-us-i-wide"/>
-  <symbol minX="1312" maxX="1370" minY="277" maxY="335" name="subway-panama-m"/>
-  <symbol minX="1370" maxX="1428" minY="277" maxY="335" name="stadium-m"/>
-  <symbol minX="1428" maxX="1486" minY="277" maxY="335" name="subway-vienna-m"/>
-  <symbol minX="1486" maxX="1544" minY="277" maxY="335" name="subway-perugia-m"/>
-  <symbol minX="1544" maxX="1602" minY="277" maxY="335" name="subway-algeria-m"/>
-  <symbol minX="1602" maxX="1660" minY="277" maxY="335" name="subway-adana-s"/>
-  <symbol minX="1660" maxX="1718" minY="277" maxY="335" name="subway-adana-m"/>
-  <symbol minX="1718" maxX="1776" minY="277" maxY="335" name="subway-valencia-m"/>
-  <symbol minX="1776" maxX="1834" minY="277" maxY="335" name="stationery_shop-m"/>
-  <symbol minX="1834" maxX="1892" minY="277" maxY="335" name="subway-pittsburgh-m"/>
-  <symbol minX="1892" maxX="1948" minY="277" maxY="335" name="subway-porto-m"/>
-  <symbol minX="1948" maxX="2006" minY="277" maxY="335" name="subway-pyongyang-m"/>
-  <symbol minX="0" maxX="58" minY="348" maxY="406" name="subway-rennes-m"/>
-  <symbol minX="58" maxX="116" minY="348" maxY="406" name="subway-reseau-paris-m"/>
-  <symbol minX="116" maxX="174" minY="348" maxY="406" name="subway-riodejaneiro-m"/>
-  <symbol minX="174" maxX="232" minY="348" maxY="406" name="subway-tyneandwear-m"/>
-  <symbol minX="232" maxX="290" minY="348" maxY="406" name="subway-wuhan-m"/>
-  <symbol minX="290" maxX="348" minY="348" maxY="406" name="sweets-m"/>
-  <symbol minX="348" maxX="406" minY="348" maxY="406" name="subway-beijing-m"/>
-  <symbol minX="406" maxX="464" minY="348" maxY="406" name="survey_point-m"/>
-  <symbol minX="464" maxX="522" minY="348" maxY="406" name="subway-yokohama-m"/>
-  <symbol minX="522" maxX="580" minY="348" maxY="406" name="subway-nagoya-m"/>
-  <symbol minX="580" maxX="638" minY="348" maxY="406" name="subway-bangkok-m"/>
-  <symbol minX="638" maxX="696" minY="348" maxY="406" name="subway-newyork-m"/>
-  <symbol minX="696" maxX="752" minY="348" maxY="406" name="subway-nnov-m"/>
-  <symbol minX="752" maxX="810" minY="348" maxY="406" name="subway-volgograd-m"/>
-  <symbol minX="810" maxX="866" minY="348" maxY="406" name="subway-athens-m"/>
-  <symbol minX="866" maxX="924" minY="348" maxY="406" name="subway-ankara-s"/>
-  <symbol minX="924" maxX="982" minY="348" maxY="406" name="subway-ankara-m"/>
-  <symbol minX="982" maxX="1040" minY="348" maxY="406" name="subway-washington-m"/>
-  <symbol minX="1040" maxX="1098" minY="348" maxY="406" name="subway-warszawa-m"/>
-  <symbol minX="1098" maxX="1156" minY="348" maxY="406" name="subway-oslo-m"/>
-  <symbol minX="1156" maxX="1207" minY="348" maxY="406" name="subway-amsterdam-m"/>
-  <symbol minX="1207" maxX="1265" minY="348" maxY="406" name="sauna-m"/>
-  <symbol minX="1265" maxX="1323" minY="348" maxY="406" name="subway-stockholm-m"/>
-  <symbol minX="1323" maxX="1381" minY="348" maxY="406" name="shinto-m"/>
-  <symbol minX="1381" maxX="1439" minY="348" maxY="406" name="shelter-m"/>
-  <symbol minX="1439" maxX="1497" minY="348" maxY="406" name="seafood-shop-m"/>
-  <symbol minX="1497" maxX="1555" minY="348" maxY="406" name="school-m"/>
-  <symbol minX="1555" maxX="1613" minY="348" maxY="406" name="subway-shiraz-m"/>
-  <symbol minX="1613" maxX="1671" minY="348" maxY="406" name="subway-stlouis-m"/>
-  <symbol minX="1671" maxX="1729" minY="348" maxY="406" name="sawmill-m"/>
-  <symbol minX="1729" maxX="1787" minY="348" maxY="406" name="ship-m"/>
-  <symbol minX="1787" maxX="1845" minY="348" maxY="406" name="sample_collection-m"/>
-  <symbol minX="1845" maxX="1903" minY="348" maxY="406" name="restaurant-m"/>
-  <symbol minX="1903" maxX="1961" minY="348" maxY="406" name="subway-sofia-m"/>
-  <symbol minX="1961" maxX="2019" minY="348" maxY="406" name="remains-m"/>
-  <symbol minX="0" maxX="58" minY="406" maxY="464" name="recycling-m"/>
-  <symbol minX="58" maxX="116" minY="406" maxY="464" name="subway-southkorea-m"/>
-  <symbol minX="116" maxX="174" minY="406" maxY="464" name="second_hand_shop-m"/>
-  <symbol minX="174" maxX="232" minY="406" maxY="464" name="shower-m"/>
+  <symbol minX="486" maxX="540" minY="200" maxY="277" name="bookmark-shop-m"/>
+  <symbol minX="540" maxX="594" minY="200" maxY="277" name="bookmark-parking-m"/>
+  <symbol minX="594" maxX="648" minY="200" maxY="277" name="bookmark-museum-m"/>
+  <symbol minX="648" maxX="702" minY="200" maxY="277" name="bookmark-food-m"/>
+  <symbol minX="702" maxX="756" minY="200" maxY="277" name="bookmark-christianity-m"/>
+  <symbol minX="756" maxX="810" minY="200" maxY="277" name="bookmark-water-m"/>
+  <symbol minX="810" maxX="864" minY="200" maxY="277" name="bookmark-viewpoint-m"/>
+  <symbol minX="864" maxX="918" minY="200" maxY="277" name="bookmark-transport-m"/>
+  <symbol minX="918" maxX="972" minY="200" maxY="277" name="bookmark-swim-m"/>
+  <symbol minX="972" maxX="1026" minY="200" maxY="277" name="bookmark-animals-m"/>
+  <symbol minX="1026" maxX="1080" minY="200" maxY="277" name="bookmark-start-m"/>
+  <symbol minX="1080" maxX="1134" minY="200" maxY="277" name="bookmark-sport-m"/>
+  <symbol minX="1134" maxX="1188" minY="200" maxY="277" name="bookmark-bar-m"/>
+  <symbol minX="1188" maxX="1242" minY="200" maxY="277" name="bookmark-bg-m"/>
+  <symbol minX="1242" maxX="1296" minY="200" maxY="277" name="bookmark-buddhism-m"/>
+  <symbol minX="1296" maxX="1350" minY="200" maxY="277" name="bookmark-building-m"/>
+  <symbol minX="1350" maxX="1421" minY="200" maxY="271" name="route-point-11"/>
+  <symbol minX="1421" maxX="1492" minY="200" maxY="271" name="route-point-18"/>
+  <symbol minX="1492" maxX="1592" minY="200" maxY="271" name="norating-default-l"/>
+  <symbol minX="1592" maxX="1692" minY="200" maxY="271" name="norating-bg-l"/>
+  <symbol minX="1692" maxX="1763" minY="200" maxY="271" name="route-point-1"/>
+  <symbol minX="1763" maxX="1834" minY="200" maxY="271" name="route-point-10"/>
+  <symbol minX="1834" maxX="1934" minY="200" maxY="271" name="coloredmark-default-l"/>
+  <symbol minX="1934" maxX="2034" minY="200" maxY="271" name="coloredmark-bg-l"/>
+  <symbol minX="0" maxX="71" minY="277" maxY="348" name="route-point-16"/>
+  <symbol minX="71" maxX="142" minY="277" maxY="348" name="route-point-13"/>
+  <symbol minX="142" maxX="213" minY="277" maxY="348" name="route-point-15"/>
+  <symbol minX="213" maxX="284" minY="277" maxY="348" name="route-point-14"/>
+  <symbol minX="284" maxX="355" minY="277" maxY="348" name="route-point-12"/>
+  <symbol minX="355" maxX="426" minY="277" maxY="348" name="route-point-start"/>
+  <symbol minX="426" maxX="497" minY="277" maxY="348" name="route-point-9"/>
+  <symbol minX="497" maxX="568" minY="277" maxY="348" name="route-point-19"/>
+  <symbol minX="568" maxX="639" minY="277" maxY="348" name="route-point-8"/>
+  <symbol minX="639" maxX="710" minY="277" maxY="348" name="route-point-17"/>
+  <symbol minX="710" maxX="781" minY="277" maxY="348" name="route-point-7"/>
+  <symbol minX="781" maxX="852" minY="277" maxY="348" name="route-point-6"/>
+  <symbol minX="852" maxX="923" minY="277" maxY="348" name="route-point-5"/>
+  <symbol minX="923" maxX="994" minY="277" maxY="348" name="route-point-2"/>
+  <symbol minX="994" maxX="1065" minY="277" maxY="348" name="route-point-4"/>
+  <symbol minX="1065" maxX="1136" minY="277" maxY="348" name="route-point-3"/>
+  <symbol minX="1136" maxX="1207" minY="277" maxY="348" name="route-point-20"/>
+  <symbol minX="1207" maxX="1273" minY="277" maxY="339" name="shield-us-i-wide"/>
+  <symbol minX="1273" maxX="1325" minY="277" maxY="339" name="shield-us-i-thin"/>
+  <symbol minX="1325" maxX="1383" minY="277" maxY="335" name="shelter-m"/>
+  <symbol minX="1383" maxX="1441" minY="277" maxY="335" name="shop-m"/>
+  <symbol minX="1441" maxX="1499" minY="277" maxY="335" name="subway-caracas-m"/>
+  <symbol minX="1499" maxX="1557" minY="277" maxY="335" name="shop-bicycle-m"/>
+  <symbol minX="1557" maxX="1615" minY="277" maxY="335" name="shoes-m"/>
+  <symbol minX="1615" maxX="1673" minY="277" maxY="335" name="subway-catania-m"/>
+  <symbol minX="1673" maxX="1731" minY="277" maxY="335" name="subway-changchun-m"/>
+  <symbol minX="1731" maxX="1789" minY="277" maxY="335" name="subway-chengdu-m"/>
+  <symbol minX="1789" maxX="1847" minY="277" maxY="335" name="subway-chicago-m"/>
+  <symbol minX="1847" maxX="1905" minY="277" maxY="335" name="subway-lille-m"/>
+  <symbol minX="1905" maxX="1963" minY="277" maxY="335" name="ship-m"/>
+  <symbol minX="1963" maxX="2021" minY="277" maxY="335" name="shinto-m"/>
+  <symbol minX="0" maxX="58" minY="348" maxY="406" name="subway-beijing-m"/>
+  <symbol minX="58" maxX="116" minY="348" maxY="406" name="second_hand_shop-m"/>
+  <symbol minX="116" maxX="174" minY="348" maxY="406" name="seafood-shop-m"/>
+  <symbol minX="174" maxX="230" minY="348" maxY="406" name="subway-delhi-m"/>
+  <symbol minX="230" maxX="288" minY="348" maxY="406" name="school-m"/>
+  <symbol minX="288" maxX="346" minY="348" maxY="406" name="sawmill-m"/>
+  <symbol minX="346" maxX="404" minY="348" maxY="406" name="sauna-m"/>
+  <symbol minX="404" maxX="462" minY="348" maxY="406" name="sample_collection-m"/>
+  <symbol minX="462" maxX="520" minY="348" maxY="406" name="subway-dubai-m"/>
+  <symbol minX="520" maxX="578" minY="348" maxY="406" name="restaurant-m"/>
+  <symbol minX="578" maxX="636" minY="348" maxY="406" name="subway-bangkok-m"/>
+  <symbol minX="636" maxX="694" minY="348" maxY="406" name="speedcam-alert-l"/>
+  <symbol minX="694" maxX="752" minY="348" maxY="406" name="subway-brasilia-m"/>
+  <symbol minX="752" maxX="805" minY="348" maxY="406" name="subway-brescia-m"/>
+  <symbol minX="805" maxX="863" minY="348" maxY="406" name="stationery_shop-m"/>
+  <symbol minX="863" maxX="921" minY="348" maxY="406" name="subway-adana-s"/>
+  <symbol minX="921" maxX="979" minY="348" maxY="406" name="subway-algeria-m"/>
+  <symbol minX="979" maxX="1030" minY="348" maxY="406" name="subway-amsterdam-m"/>
+  <symbol minX="1030" maxX="1088" minY="348" maxY="406" name="subway-ankara-m"/>
+  <symbol minX="1088" maxX="1146" minY="348" maxY="406" name="subway-ankara-s"/>
+  <symbol minX="1146" maxX="1204" minY="348" maxY="406" name="stadium-m"/>
+  <symbol minX="1204" maxX="1262" minY="348" maxY="406" name="sports-m"/>
+  <symbol minX="1262" maxX="1320" minY="348" maxY="406" name="subway-bengaluru-m"/>
+  <symbol minX="1320" maxX="1378" minY="348" maxY="406" name="subway-adana-m"/>
+  <symbol minX="1378" maxX="1436" minY="348" maxY="406" name="subway-budapest-m"/>
+  <symbol minX="1436" maxX="1494" minY="348" maxY="406" name="speech_therapist-m"/>
+  <symbol minX="1494" maxX="1552" minY="348" maxY="406" name="soccer-m"/>
+  <symbol minX="1552" maxX="1608" minY="348" maxY="406" name="subway-athens-m"/>
+  <symbol minX="1608" maxX="1666" minY="348" maxY="406" name="subway-buenosaires-m"/>
+  <symbol minX="1666" maxX="1724" minY="348" maxY="406" name="skiing-m"/>
+  <symbol minX="1724" maxX="1782" minY="348" maxY="406" name="subway-bursaray-m"/>
+  <symbol minX="1782" maxX="1840" minY="348" maxY="406" name="skateboard-m"/>
+  <symbol minX="1840" maxX="1898" minY="348" maxY="406" name="shower-m"/>
+  <symbol minX="1898" maxX="1956" minY="348" maxY="406" name="subway-cairo-m"/>
+  <symbol minX="1956" maxX="2014" minY="348" maxY="406" name="subway-warszawa-m"/>
+  <symbol minX="0" maxX="58" minY="406" maxY="464" name="taxi-m"/>
+  <symbol minX="58" maxX="116" minY="406" maxY="464" name="zoo-m"/>
+  <symbol minX="116" maxX="174" minY="406" maxY="464" name="taoist-m"/>
+  <symbol minX="174" maxX="232" minY="406" maxY="464" name="table-tennis-m"/>
   <symbol minX="232" maxX="290" minY="406" maxY="464" name="swimming-m"/>
-  <symbol minX="290" maxX="348" minY="406" maxY="464" name="speedcam-alert-l"/>
-  <symbol minX="348" maxX="406" minY="406" maxY="464" name="speech_therapist-m"/>
-  <symbol minX="406" maxX="464" minY="406" maxY="464" name="subway-tokyo-m"/>
-  <symbol minX="464" maxX="522" minY="406" maxY="464" name="soccer-m"/>
-  <symbol minX="522" maxX="580" minY="406" maxY="464" name="skiing-m"/>
-  <symbol minX="580" maxX="638" minY="406" maxY="464" name="skateboard-m"/>
-  <symbol minX="638" maxX="696" minY="406" maxY="464" name="subway-samara-m"/>
-  <symbol minX="696" maxX="754" minY="406" maxY="464" name="sports-m"/>
-  <symbol minX="754" maxX="812" minY="406" maxY="464" name="subway-tianjin-m"/>
-  <symbol minX="812" maxX="870" minY="406" maxY="464" name="subway-tashkent-m"/>
-  <symbol minX="870" maxX="928" minY="406" maxY="464" name="subway-santodomingo-m"/>
-  <symbol minX="928" maxX="986" minY="406" maxY="464" name="shop-m"/>
-  <symbol minX="986" maxX="1044" minY="406" maxY="464" name="shop-bicycle-m"/>
-  <symbol minX="1044" maxX="1102" minY="406" maxY="464" name="shoes-m"/>
-  <symbol minX="1102" maxX="1160" minY="406" maxY="464" name="subway-saopaulo-m"/>
-  <symbol minX="1160" maxX="1218" minY="406" maxY="464" name="subway-lisboa-m"/>
-  <symbol minX="1218" maxX="1276" minY="406" maxY="464" name="subway-lausanne-m"/>
-  <symbol minX="1276" maxX="1334" minY="406" maxY="464" name="volleyball-m"/>
-  <symbol minX="1334" maxX="1392" minY="406" maxY="464" name="subway-lille-m"/>
-  <symbol minX="1392" maxX="1450" minY="406" maxY="464" name="subway-foshan-m"/>
+  <symbol minX="290" maxX="348" minY="406" maxY="464" name="sweets-m"/>
+  <symbol minX="348" maxX="406" minY="406" maxY="464" name="survey_point-m"/>
+  <symbol minX="406" maxX="464" minY="406" maxY="464" name="subway-yokohama-m"/>
+  <symbol minX="464" maxX="522" minY="406" maxY="464" name="subway-wuhan-m"/>
+  <symbol minX="522" maxX="580" minY="406" maxY="464" name="subway-washington-m"/>
+  <symbol minX="580" maxX="638" minY="406" maxY="464" name="tennis-m"/>
+  <symbol minX="638" maxX="696" minY="406" maxY="464" name="subway-volgograd-m"/>
+  <symbol minX="696" maxX="754" minY="406" maxY="464" name="subway-vienna-m"/>
+  <symbol minX="754" maxX="812" minY="406" maxY="464" name="subway-valencia-m"/>
+  <symbol minX="812" maxX="870" minY="406" maxY="464" name="subway-tyneandwear-m"/>
+  <symbol minX="870" maxX="928" minY="406" maxY="464" name="subway-tokyo-m"/>
+  <symbol minX="928" maxX="986" minY="406" maxY="464" name="subway-tianjin-m"/>
+  <symbol minX="986" maxX="1044" minY="406" maxY="464" name="subway-tashkent-m"/>
+  <symbol minX="1044" maxX="1102" minY="406" maxY="464" name="subway-stockholm-m"/>
+  <symbol minX="1102" maxX="1160" minY="406" maxY="464" name="subway-stlouis-m"/>
+  <symbol minX="1160" maxX="1218" minY="406" maxY="464" name="subway-southkorea-m"/>
+  <symbol minX="1218" maxX="1276" minY="406" maxY="464" name="tourism-m"/>
+  <symbol minX="1276" maxX="1334" minY="406" maxY="464" name="vending-m"/>
+  <symbol minX="1334" maxX="1392" minY="406" maxY="464" name="veterinary-m"/>
+  <symbol minX="1392" maxX="1450" minY="406" maxY="464" name="video-games-m"/>
   <symbol minX="1450" maxX="1508" minY="406" maxY="464" name="viewpoint-m"/>
-  <symbol minX="1508" maxX="1566" minY="406" maxY="464" name="subway-ekb-m"/>
-  <symbol minX="1566" maxX="1624" minY="406" maxY="464" name="subway-lima-m"/>
-  <symbol minX="1624" maxX="1682" minY="406" maxY="464" name="video-games-m"/>
-  <symbol minX="1682" maxX="1740" minY="406" maxY="464" name="subway-glasgow-m"/>
-  <symbol minX="1740" maxX="1798" minY="406" maxY="464" name="veterinary-m"/>
-  <symbol minX="1798" maxX="1856" minY="406" maxY="464" name="vending-m"/>
-  <symbol minX="1856" maxX="1914" minY="406" maxY="464" name="subway-dubai-m"/>
-  <symbol minX="1914" maxX="1972" minY="406" maxY="464" name="travel_agency_shop-m"/>
-  <symbol minX="1972" maxX="2030" minY="406" maxY="464" name="subway-losangeles-m"/>
-  <symbol minX="0" maxX="56" minY="464" maxY="522" name="subway-delhi-m"/>
-  <symbol minX="56" maxX="114" minY="464" maxY="522" name="tram-m"/>
-  <symbol minX="114" maxX="172" minY="464" maxY="522" name="train-m"/>
-  <symbol minX="172" maxX="230" minY="464" maxY="522" name="subway-helsinki-m"/>
-  <symbol minX="230" maxX="288" minY="464" maxY="522" name="zoo-m"/>
-  <symbol minX="288" maxX="346" minY="464" maxY="522" name="yoga-m"/>
-  <symbol minX="346" maxX="404" minY="464" maxY="522" name="subway-kazan-m"/>
-  <symbol minX="404" maxX="451" minY="464" maxY="522" name="subway-istanbul-m"/>
-  <symbol minX="451" maxX="509" minY="464" maxY="522" name="windmill-m"/>
-  <symbol minX="509" maxX="567" minY="464" maxY="522" name="subway-isfahan-m"/>
-  <symbol minX="567" maxX="625" minY="464" maxY="522" name="subway-hirosima-m"/>
-  <symbol minX="625" maxX="683" minY="464" maxY="522" name="wayside_shrine-m"/>
-  <symbol minX="683" maxX="741" minY="464" maxY="522" name="toys-m"/>
-  <symbol minX="741" maxX="799" minY="464" maxY="522" name="subway-kunming-m"/>
-  <symbol minX="799" maxX="857" minY="464" maxY="522" name="airport-m"/>
-  <symbol minX="857" maxX="915" minY="464" maxY="522" name="subway-guangzhou-m"/>
-  <symbol minX="915" maxX="973" minY="464" maxY="522" name="waterfall-m"/>
-  <symbol minX="973" maxX="1031" minY="464" maxY="522" name="subway-guadalajara-m"/>
-  <symbol minX="1031" maxX="1089" minY="464" maxY="522" name="subway-kyoto-m"/>
-  <symbol minX="1089" maxX="1147" minY="464" maxY="522" name="waste-basket-m"/>
-  <symbol minX="1147" maxX="1205" minY="464" maxY="522" name="subway-medellin-m"/>
-  <symbol minX="1205" maxX="1263" minY="464" maxY="522" name="subway-buenosaires-m"/>
-  <symbol minX="1263" maxX="1319" minY="464" maxY="522" name="subway-mashhad-m"/>
-  <symbol minX="1319" maxX="1377" minY="464" maxY="522" name="subway-budapest-m"/>
-  <symbol minX="1377" maxX="1435" minY="464" maxY="522" name="subway-massachusetts-m"/>
-  <symbol minX="1435" maxX="1493" minY="464" maxY="522" name="tennis-m"/>
-  <symbol minX="1493" maxX="1551" minY="464" maxY="522" name="subway-mecca-m"/>
-  <symbol minX="1551" maxX="1609" minY="464" maxY="522" name="taxi-m"/>
-  <symbol minX="1609" maxX="1662" minY="464" maxY="522" name="subway-brescia-m"/>
-  <symbol minX="1662" maxX="1720" minY="464" maxY="522" name="subway-marseille-s"/>
-  <symbol minX="1720" maxX="1778" minY="464" maxY="522" name="subway-brasilia-m"/>
-  <symbol minX="1778" maxX="1834" minY="464" maxY="522" name="subway-mexico-m"/>
-  <symbol minX="1834" maxX="1892" minY="464" maxY="522" name="taoist-m"/>
-  <symbol minX="1892" maxX="1950" minY="464" maxY="522" name="subway-milan-m"/>
-  <symbol minX="1950" maxX="2008" minY="464" maxY="522" name="table-tennis-m"/>
-  <symbol minX="0" maxX="58" minY="522" maxY="580" name="subway-minatomirai-m"/>
-  <symbol minX="58" maxX="116" minY="522" maxY="580" name="subway-bengaluru-m"/>
-  <symbol minX="116" maxX="174" minY="522" maxY="580" name="subway-catania-m"/>
-  <symbol minX="174" maxX="232" minY="522" maxY="580" name="tourism-m"/>
-  <symbol minX="232" maxX="290" minY="522" maxY="580" name="subway-chicago-m"/>
-  <symbol minX="290" maxX="348" minY="522" maxY="580" name="subway-m"/>
-  <symbol minX="348" maxX="406" minY="522" maxY="580" name="subway-chengdu-m"/>
-  <symbol minX="406" maxX="464" minY="522" maxY="580" name="tomb-m"/>
-  <symbol minX="464" maxX="522" minY="522" maxY="580" name="toll_booth-m"/>
-  <symbol minX="522" maxX="580" minY="522" maxY="580" name="subway-changchun-m"/>
-  <symbol minX="580" maxX="638" minY="522" maxY="580" name="toilets-m"/>
-  <symbol minX="638" maxX="696" minY="522" maxY="580" name="subway-kobe-m"/>
-  <symbol minX="696" maxX="754" minY="522" maxY="580" name="tire-repair-m"/>
-  <symbol minX="754" maxX="812" minY="522" maxY="580" name="ticket-shop-m"/>
-  <symbol minX="812" maxX="870" minY="522" maxY="580" name="subway-caracas-m"/>
-  <symbol minX="870" maxX="928" minY="522" maxY="580" name="theme_park-m"/>
-  <symbol minX="928" maxX="986" minY="522" maxY="580" name="subway-cairo-m"/>
-  <symbol minX="986" maxX="1044" minY="522" maxY="580" name="theatre-m"/>
-  <symbol minX="1044" maxX="1102" minY="522" maxY="580" name="subway-bursaray-m"/>
-  <symbol minX="1102" maxX="1160" minY="522" maxY="580" name="clothes-m"/>
-  <symbol minX="1160" maxX="1218" minY="522" maxY="580" name="doityourself-m"/>
-  <symbol minX="1218" maxX="1276" minY="522" maxY="580" name="dog_park-m"/>
-  <symbol minX="1276" maxX="1334" minY="522" maxY="580" name="diving-m"/>
-  <symbol minX="1334" maxX="1392" minY="522" maxY="580" name="department_store-m"/>
-  <symbol minX="1392" maxX="1450" minY="522" maxY="580" name="dentist-m"/>
-  <symbol minX="1450" maxX="1508" minY="522" maxY="580" name="defibrillator-m"/>
-  <symbol minX="1508" maxX="1566" minY="522" maxY="580" name="curling-m"/>
-  <symbol minX="1566" maxX="1624" minY="522" maxY="580" name="cross-m"/>
-  <symbol minX="1624" maxX="1682" minY="522" maxY="580" name="cricket-m"/>
-  <symbol minX="1682" maxX="1740" minY="522" maxY="580" name="copyshop-m"/>
-  <symbol minX="1740" maxX="1798" minY="522" maxY="580" name="computer-m"/>
-  <symbol minX="1798" maxX="1856" minY="522" maxY="580" name="college-m"/>
-  <symbol minX="1856" maxX="1914" minY="522" maxY="580" name="drinking-water-m"/>
-  <symbol minX="1914" maxX="1972" minY="522" maxY="580" name="climbing-m"/>
-  <symbol minX="1972" maxX="2030" minY="522" maxY="580" name="cinema-m"/>
-  <symbol minX="0" maxX="58" minY="580" maxY="638" name="christian-m"/>
-  <symbol minX="58" maxX="116" minY="580" maxY="638" name="chimney-m"/>
-  <symbol minX="116" maxX="174" minY="580" maxY="638" name="chess-m"/>
-  <symbol minX="174" maxX="232" minY="580" maxY="638" name="chemist-m"/>
-  <symbol minX="232" maxX="290" minY="580" maxY="638" name="cheese-m"/>
-  <symbol minX="290" maxX="348" minY="580" maxY="638" name="charity_shop-m"/>
-  <symbol minX="348" maxX="406" minY="580" maxY="638" name="charging-station-m"/>
-  <symbol minX="406" maxX="464" minY="580" maxY="638" name="cemetery-m"/>
-  <symbol minX="464" maxX="522" minY="580" maxY="638" name="casino-m"/>
-  <symbol minX="522" maxX="580" minY="580" maxY="638" name="florist-m"/>
-  <symbol minX="580" maxX="638" minY="580" maxY="638" name="geyser-l"/>
-  <symbol minX="638" maxX="696" minY="580" maxY="638" name="garden_center-m"/>
-  <symbol minX="696" maxX="754" minY="580" maxY="638" name="garden-outline-m"/>
-  <symbol minX="754" maxX="812" minY="580" maxY="638" name="garden-m"/>
-  <symbol minX="812" maxX="870" minY="580" maxY="638" name="gallery-m"/>
-  <symbol minX="870" maxX="928" minY="580" maxY="638" name="furniture-m"/>
-  <symbol minX="928" maxX="986" minY="580" maxY="638" name="funicular-m"/>
-  <symbol minX="986" maxX="1044" minY="580" maxY="638" name="funeral_directors-m"/>
-  <symbol minX="1044" maxX="1102" minY="580" maxY="638" name="fuel-m"/>
-  <symbol minX="1102" maxX="1160" minY="580" maxY="638" name="fuel-dispenser-m"/>
-  <symbol minX="1160" maxX="1218" minY="580" maxY="638" name="fountain-s"/>
-  <symbol minX="1218" maxX="1276" minY="580" maxY="638" name="fountain-m"/>
-  <symbol minX="1276" maxX="1334" minY="580" maxY="638" name="carpenter-m"/>
-  <symbol minX="1334" maxX="1392" minY="580" maxY="638" name="firehydrant-m"/>
-  <symbol minX="1392" maxX="1450" minY="580" maxY="638" name="fire_station-m"/>
-  <symbol minX="1450" maxX="1508" minY="580" maxY="638" name="fastfood-m"/>
-  <symbol minX="1508" maxX="1566" minY="580" maxY="638" name="erotic-m"/>
-  <symbol minX="1566" maxX="1624" minY="580" maxY="638" name="equestrian-m"/>
-  <symbol minX="1624" maxX="1682" minY="580" maxY="638" name="emergency-phone-m"/>
-  <symbol minX="1682" maxX="1740" minY="580" maxY="638" name="embassy-m"/>
-  <symbol minX="1740" maxX="1798" minY="580" maxY="638" name="electronics-m"/>
-  <symbol minX="1798" maxX="1856" minY="580" maxY="638" name="electrician-m"/>
-  <symbol minX="1856" maxX="1914" minY="580" maxY="638" name="dump-station-m"/>
-  <symbol minX="1914" maxX="1972" minY="580" maxY="638" name="driving_school-m"/>
-  <symbol minX="1972" maxX="2030" minY="580" maxY="638" name="audiologist-m"/>
-  <symbol minX="0" maxX="58" minY="638" maxY="696" name="beauty-m"/>
-  <symbol minX="58" maxX="116" minY="638" maxY="696" name="beach-m"/>
-  <symbol minX="116" maxX="174" minY="638" maxY="696" name="bcontrol-m"/>
-  <symbol minX="174" maxX="232" minY="638" maxY="696" name="bbq-m"/>
-  <symbol minX="232" maxX="290" minY="638" maxY="696" name="basketball-m"/>
-  <symbol minX="290" maxX="348" minY="638" maxY="696" name="baseball-m"/>
-  <symbol minX="348" maxX="406" minY="638" maxY="696" name="bar-m"/>
-  <symbol minX="406" maxX="464" minY="638" maxY="696" name="banknote-m"/>
-  <symbol minX="464" maxX="522" minY="638" maxY="696" name="bank-m"/>
-  <symbol minX="522" maxX="580" minY="638" maxY="696" name="bakery-m"/>
-  <symbol minX="580" maxX="638" minY="638" maxY="696" name="badminton-m"/>
-  <symbol minX="638" maxX="696" minY="638" maxY="696" name="australian-football-m"/>
-  <symbol minX="696" maxX="754" minY="638" maxY="696" name="beekeeper-m"/>
-  <symbol minX="754" maxX="812" minY="638" maxY="696" name="atm-m"/>
-  <symbol minX="812" maxX="870" minY="638" maxY="696" name="art-m"/>
-  <symbol minX="870" maxX="928" minY="638" maxY="696" name="archery-m"/>
-  <symbol minX="928" maxX="986" minY="638" maxY="696" name="archaeological-site-m"/>
-  <symbol minX="986" maxX="1044" minY="638" maxY="696" name="apartment-m"/>
-  <symbol minX="1044" maxX="1102" minY="638" maxY="696" name="antiques-m"/>
-  <symbol minX="1102" maxX="1160" minY="638" maxY="696" name="america-football-m"/>
-  <symbol minX="1160" maxX="1218" minY="638" maxY="696" name="alternative-m"/>
-  <symbol minX="1218" maxX="1276" minY="638" maxY="696" name="alpine_hut-m"/>
-  <symbol minX="1276" maxX="1334" minY="638" maxY="696" name="alcohol-m"/>
-  <symbol minX="1334" maxX="1392" minY="638" maxY="696" name="airport_gate-m"/>
-  <symbol minX="1392" maxX="1450" minY="638" maxY="696" name="bus-m"/>
-  <symbol minX="1450" maxX="1508" minY="638" maxY="696" name="caravan_site-m"/>
-  <symbol minX="1508" maxX="1566" minY="638" maxY="696" name="caravan-shop-m"/>
-  <symbol minX="1566" maxX="1624" minY="638" maxY="696" name="car_shop-m"/>
-  <symbol minX="1624" maxX="1682" minY="638" maxY="696" name="car_sharing-m"/>
-  <symbol minX="1682" maxX="1740" minY="638" maxY="696" name="car-wash-m"/>
-  <symbol minX="1740" maxX="1798" minY="638" maxY="696" name="car-repair-m"/>
-  <symbol minX="1798" maxX="1856" minY="638" maxY="696" name="car-part-m"/>
-  <symbol minX="1856" maxX="1914" minY="638" maxY="696" name="campsite-m"/>
-  <symbol minX="1914" maxX="1972" minY="638" maxY="696" name="cafe-m"/>
-  <symbol minX="1972" maxX="2030" minY="638" maxY="696" name="cable-car-m"/>
-  <symbol minX="0" maxX="58" minY="696" maxY="754" name="butcher-m"/>
-  <symbol minX="58" maxX="116" minY="696" maxY="754" name="psychotherapist-m"/>
-  <symbol minX="116" maxX="174" minY="696" maxY="754" name="buddhist-m"/>
-  <symbol minX="174" maxX="232" minY="696" maxY="754" name="brewery-m"/>
-  <symbol minX="232" maxX="290" minY="696" maxY="754" name="bowling_alley-m"/>
-  <symbol minX="290" maxX="348" minY="696" maxY="754" name="bowling-m"/>
-  <symbol minX="348" maxX="406" minY="696" maxY="754" name="bookmaker-m"/>
-  <symbol minX="406" maxX="464" minY="696" maxY="754" name="book-shop-m"/>
-  <symbol minX="464" maxX="522" minY="696" maxY="754" name="blood_donation-m"/>
-  <symbol minX="522" maxX="580" minY="696" maxY="754" name="blacksmith-m"/>
-  <symbol minX="580" maxX="638" minY="696" maxY="754" name="bicycle-repair-station"/>
-  <symbol minX="638" maxX="696" minY="696" maxY="754" name="bicycle-m"/>
-  <symbol minX="696" maxX="754" minY="696" maxY="754" name="beer-m"/>
-  <symbol minX="754" maxX="812" minY="696" maxY="754" name="military-m"/>
-  <symbol minX="812" maxX="870" minY="696" maxY="754" name="music_school-m"/>
-  <symbol minX="870" maxX="928" minY="696" maxY="754" name="music-m"/>
-  <symbol minX="928" maxX="986" minY="696" maxY="754" name="museum-m"/>
-  <symbol minX="986" maxX="1044" minY="696" maxY="754" name="motorcycle_shop-m"/>
-  <symbol minX="1044" maxX="1102" minY="696" maxY="754" name="photo-shop-m"/>
-  <symbol minX="1102" maxX="1160" minY="696" maxY="754" name="motel-m"/>
-  <symbol minX="1160" maxX="1218" minY="696" maxY="754" name="physiotherapist-m"/>
-  <symbol minX="1218" maxX="1276" minY="696" maxY="754" name="picnic-m"/>
-  <symbol minX="1276" maxX="1334" minY="696" maxY="754" name="monument-m"/>
-  <symbol minX="1334" maxX="1392" minY="696" maxY="754" name="mobile_phone-m"/>
-  <symbol minX="1392" maxX="1450" minY="696" maxY="754" name="phone-m"/>
-  <symbol minX="1450" maxX="1508" minY="696" maxY="754" name="metal_construction-m"/>
-  <symbol minX="1508" maxX="1566" minY="696" maxY="754" name="media_shop-m"/>
-  <symbol minX="1566" maxX="1624" minY="696" maxY="754" name="media-m"/>
-  <symbol minX="1624" maxX="1682" minY="696" maxY="754" name="marketplace-m"/>
-  <symbol minX="1682" maxX="1740" minY="696" maxY="754" name="marina-m"/>
-  <symbol minX="1740" maxX="1798" minY="696" maxY="754" name="mail-m"/>
-  <symbol minX="1798" maxX="1856" minY="696" maxY="754" name="picnic_table-m"/>
-  <symbol minX="1856" maxX="1914" minY="696" maxY="754" name="lighthouse-m"/>
-  <symbol minX="1914" maxX="1972" minY="696" maxY="754" name="lift_gate-m"/>
-  <symbol minX="1972" maxX="2030" minY="696" maxY="754" name="library-m"/>
-  <symbol minX="0" maxX="58" minY="754" maxY="812" name="park-outline-m"/>
-  <symbol minX="58" maxX="116" minY="754" maxY="812" name="painter-m"/>
-  <symbol minX="116" maxX="174" minY="754" maxY="812" name="park-m"/>
-  <symbol minX="174" maxX="232" minY="754" maxY="812" name="padel-m"/>
-  <symbol minX="232" maxX="290" minY="754" maxY="812" name="outdoor-shop-m"/>
-  <symbol minX="290" maxX="348" minY="754" maxY="812" name="optometrist-m"/>
-  <symbol minX="348" maxX="406" minY="754" maxY="812" name="optician-m"/>
-  <symbol minX="406" maxX="464" minY="754" maxY="812" name="office-m"/>
-  <symbol minX="464" maxX="522" minY="754" maxY="812" name="nparkf-outline-m"/>
-  <symbol minX="522" maxX="580" minY="754" maxY="812" name="nparkf-m"/>
-  <symbol minX="580" maxX="638" minY="754" maxY="812" name="npark-m"/>
-  <symbol minX="638" maxX="696" minY="754" maxY="812" name="lawyer-m"/>
-  <symbol minX="696" maxX="754" minY="754" maxY="812" name="nightclub-m"/>
-  <symbol minX="754" maxX="812" minY="754" maxY="812" name="newsagent_shop-m"/>
-  <symbol minX="812" maxX="870" minY="754" maxY="812" name="needle_and_thread-m"/>
-  <symbol minX="870" maxX="928" minY="754" maxY="812" name="parking-meter-m"/>
-  <symbol minX="928" maxX="986" minY="754" maxY="812" name="pelota-m"/>
-  <symbol minX="986" maxX="1044" minY="754" maxY="812" name="muslim-m"/>
-  <symbol minX="1044" maxX="1102" minY="754" maxY="812" name="musical-instrument-m"/>
-  <symbol minX="1102" maxX="1160" minY="754" maxY="812" name="petshop-m"/>
-  <symbol minX="1160" maxX="1218" minY="754" maxY="812" name="pharmacy-m"/>
-  <symbol minX="1218" maxX="1276" minY="754" maxY="812" name="helipad-m"/>
-  <symbol minX="1276" maxX="1334" minY="754" maxY="812" name="geyser-m"/>
-  <symbol minX="1334" maxX="1392" minY="754" maxY="812" name="hospital-m"/>
-  <symbol minX="1392" maxX="1450" minY="754" maxY="812" name="laundry-m"/>
-  <symbol minX="1450" maxX="1508" minY="754" maxY="812" name="postbox-m"/>
-  <symbol minX="1508" maxX="1566" minY="754" maxY="812" name="home-m"/>
-  <symbol minX="1566" maxX="1624" minY="754" maxY="812" name="hockey-m"/>
-  <symbol minX="1624" maxX="1682" minY="754" maxY="812" name="historic-ship-m"/>
-  <symbol minX="1682" maxX="1740" minY="754" maxY="812" name="hindu-m"/>
-  <symbol minX="1740" maxX="1798" minY="754" maxY="812" name="power-m"/>
-  <symbol minX="1798" maxX="1856" minY="754" maxY="812" name="heliport-m"/>
-  <symbol minX="1856" maxX="1914" minY="754" maxY="812" name="hostel-m"/>
-  <symbol minX="1914" maxX="1972" minY="754" maxY="812" name="handball-m"/>
-  <symbol minX="1972" maxX="2030" minY="754" maxY="812" name="public-building-m"/>
-  <symbol minX="0" maxX="58" minY="812" maxY="870" name="hand-m"/>
-  <symbol minX="58" maxX="116" minY="812" maxY="870" name="hairdresser-m"/>
-  <symbol minX="116" maxX="174" minY="812" maxY="870" name="prison-m"/>
-  <symbol minX="174" maxX="232" minY="812" maxY="870" name="gym-m"/>
-  <symbol minX="232" maxX="290" minY="812" maxY="870" name="guidepost"/>
-  <symbol minX="290" maxX="348" minY="812" maxY="870" name="greengrocer-m"/>
-  <symbol minX="348" maxX="406" minY="812" maxY="870" name="grocery-m"/>
-  <symbol minX="406" maxX="464" minY="812" maxY="870" name="interior_decoration-m"/>
-  <symbol minX="464" maxX="522" minY="812" maxY="870" name="gift-m"/>
-  <symbol minX="522" maxX="580" minY="812" maxY="870" name="pitch-m"/>
-  <symbol minX="580" maxX="638" minY="812" maxY="870" name="place-of-worship-m"/>
-  <symbol minX="638" maxX="696" minY="812" maxY="870" name="language_school-m"/>
-  <symbol minX="696" maxX="754" minY="812" maxY="870" name="kiosk-m"/>
-  <symbol minX="754" maxX="812" minY="812" maxY="870" name="kindergarten-m"/>
-  <symbol minX="812" maxX="870" minY="812" maxY="870" name="jewish-m"/>
-  <symbol minX="870" maxX="928" minY="812" maxY="870" name="jewelry-m"/>
-  <symbol minX="928" maxX="986" minY="812" maxY="870" name="internet_cafe-m"/>
-  <symbol minX="986" maxX="1044" minY="812" maxY="870" name="information-m"/>
-  <symbol minX="1044" maxX="1102" minY="812" maxY="870" name="ice_cream-m"/>
-  <symbol minX="1102" maxX="1160" minY="812" maxY="870" name="playground-m"/>
-  <symbol minX="1160" maxX="1218" minY="812" maxY="870" name="hunting-tower-m"/>
-  <symbol minX="1218" maxX="1276" minY="812" maxY="870" name="plumber-m"/>
-  <symbol minX="1276" maxX="1334" minY="812" maxY="870" name="hotel-m"/>
-  <symbol minX="1334" maxX="1392" minY="812" maxY="870" name="podiatrist-m"/>
-  <symbol minX="1392" maxX="1450" minY="812" maxY="870" name="golf-m"/>
-  <symbol minX="1450" maxX="1508" minY="812" maxY="870" name="police-m"/>
-  <symbol minX="1508" maxX="1560" minY="812" maxY="869" name="shield-us-hw-thin"/>
-  <symbol minX="1560" maxX="1622" minY="812" maxY="869" name="shield-us-hw-wide"/>
-  <symbol minX="1622" maxX="1678" minY="812" maxY="868" name="subway-spb-m"/>
-  <symbol minX="1678" maxX="1736" minY="812" maxY="868" name="subway-shanghai-m"/>
-  <symbol minX="1736" maxX="1794" minY="812" maxY="868" name="subway-sapporo-m"/>
-  <symbol minX="1794" maxX="1850" minY="812" maxY="868" name="subway-southkorea-s"/>
-  <symbol minX="1850" maxX="1906" minY="812" maxY="868" name="subway-ekb-s"/>
-  <symbol minX="1906" maxX="1964" minY="812" maxY="868" name="subway-dalian-m"/>
-  <symbol minX="1964" maxX="2022" minY="812" maxY="868" name="subway-maracaibo-m"/>
-  <symbol minX="0" maxX="56" minY="870" maxY="926" name="subway-montreal-m"/>
-  <symbol minX="56" maxX="114" minY="870" maxY="925" name="subway-marseille-m"/>
-  <symbol minX="114" maxX="168" minY="870" maxY="924" name="subway-entrance-m"/>
-  <symbol minX="168" maxX="207" minY="870" maxY="924" name="bookmark-default-s"/>
-  <symbol minX="207" maxX="261" minY="870" maxY="924" name="subway-stlouis-s"/>
-  <symbol minX="261" maxX="315" minY="870" maxY="924" name="subway-algeria-s"/>
-  <symbol minX="315" maxX="366" minY="870" maxY="924" name="subway-warsaw-m"/>
-  <symbol minX="366" maxX="405" minY="870" maxY="924" name="bookmark-bg-s"/>
-  <symbol minX="405" maxX="463" minY="870" maxY="923" name="subway-izmir-m"/>
-  <symbol minX="463" maxX="515" minY="870" maxY="922" name="track_marker_deselected"/>
-  <symbol minX="515" maxX="567" minY="870" maxY="922" name="current-position"/>
-  <symbol minX="567" maxX="618" minY="870" maxY="921" name="subway-pittsburgh-s"/>
-  <symbol minX="618" maxX="669" minY="870" maxY="921" name="lightrail-berlin-m"/>
-  <symbol minX="669" maxX="714" minY="870" maxY="921" name="subway-istanbul-s"/>
-  <symbol minX="714" maxX="772" minY="870" maxY="920" name="subway-taoyuan-m"/>
-  <symbol minX="772" maxX="830" minY="870" maxY="919" name="subway-tbilisi-m"/>
-  <symbol minX="830" maxX="879" minY="870" maxY="919" name="subway-cairo-s"/>
-  <symbol minX="879" maxX="930" minY="870" maxY="919" name="subway-izmir-s"/>
-  <symbol minX="930" maxX="975" minY="870" maxY="919" name="subway-brescia-s"/>
-  <symbol minX="975" maxX="1033" minY="870" maxY="919" name="subway-rotterdam-m"/>
-  <symbol minX="1033" maxX="1082" minY="870" maxY="919" name="subway-sapporo-s"/>
-  <symbol minX="1082" maxX="1131" minY="870" maxY="919" name="motorcycle-parking-m"/>
-  <symbol minX="1131" maxX="1180" minY="870" maxY="919" name="subway-isfahan-s"/>
-  <symbol minX="1180" maxX="1229" minY="870" maxY="919" name="bike-parking-m"/>
-  <symbol minX="1229" maxX="1278" minY="870" maxY="919" name="parking_entrance-m"/>
-  <symbol minX="1278" maxX="1327" minY="870" maxY="919" name="subway-panama-s"/>
-  <symbol minX="1327" maxX="1376" minY="870" maxY="919" name="parking-m"/>
-  <symbol minX="1376" maxX="1423" minY="870" maxY="919" name="subway-mashhad-s"/>
-  <symbol minX="1423" maxX="1472" minY="870" maxY="919" name="bicycle-rental"/>
-  <symbol minX="1472" maxX="1521" minY="870" maxY="919" name="parking-disabled-m"/>
-  <symbol minX="1521" maxX="1570" minY="870" maxY="919" name="subway-medellin-s"/>
-  <symbol minX="1570" maxX="1619" minY="870" maxY="919" name="speedcam-m"/>
-  <symbol minX="1619" maxX="1668" minY="870" maxY="919" name="parking_pay-m"/>
-  <symbol minX="1668" maxX="1726" minY="870" maxY="918" name="subway-almaty-m"/>
-  <symbol minX="1726" maxX="1777" minY="870" maxY="917" name="subway-seattle-m"/>
-  <symbol minX="1777" maxX="1835" minY="870" maxY="917" name="subway-yerevan-m"/>
-  <symbol minX="1835" maxX="1882" minY="870" maxY="917" name="subway-warszawa-s"/>
-  <symbol minX="1882" maxX="1929" minY="870" maxY="917" name="subway-hirosima-s"/>
-  <symbol minX="1929" maxX="1974" minY="870" maxY="917" name="subway-delhi-s"/>
-  <symbol minX="1974" maxX="2028" minY="870" maxY="917" name="subway-moscow-m"/>
-  <symbol minX="0" maxX="58" minY="926" maxY="973" name="subway-santiago-m"/>
-  <symbol minX="58" maxX="105" minY="926" maxY="973" name="subway-ubahn-m"/>
-  <symbol minX="105" maxX="150" minY="926" maxY="973" name="subway-tianjin-s"/>
-  <symbol minX="150" maxX="197" minY="926" maxY="973" name="subway-paris-m"/>
-  <symbol minX="197" maxX="242" minY="926" maxY="973" name="subway-porto-s"/>
-  <symbol minX="242" maxX="287" minY="926" maxY="973" name="subway-pyongyang-s"/>
-  <symbol minX="287" maxX="334" minY="926" maxY="973" name="subway-rome-m"/>
-  <symbol minX="334" maxX="379" minY="926" maxY="973" name="subway-athens-s"/>
-  <symbol minX="379" maxX="426" minY="926" maxY="973" name="subway-rennes-s"/>
-  <symbol minX="426" maxX="484" minY="926" maxY="973" name="subway-lyon-m"/>
-  <symbol minX="484" maxX="529" minY="926" maxY="971" name="subway-tyneandwear-s"/>
-  <symbol minX="529" maxX="574" minY="926" maxY="971" name="subway-valencia-s"/>
-  <symbol minX="574" maxX="619" minY="926" maxY="971" name="subway-yokohama-s"/>
-  <symbol minX="619" maxX="675" minY="926" maxY="971" name="subway-yerevan-s"/>
-  <symbol minX="675" maxX="720" minY="926" maxY="971" name="subway-wuhan-s"/>
-  <symbol minX="720" maxX="765" minY="926" maxY="971" name="subway-stockholm-s"/>
-  <symbol minX="765" maxX="823" minY="926" maxY="971" name="subway-tabriz-m"/>
-  <symbol minX="823" maxX="868" minY="926" maxY="971" name="subway-vienna-s"/>
-  <symbol minX="868" maxX="913" minY="926" maxY="971" name="subway-washington-s"/>
-  <symbol minX="913" maxX="958" minY="926" maxY="971" name="subway-guangzhou-s"/>
-  <symbol minX="958" maxX="1003" minY="926" maxY="971" name="subway-tokyo-s"/>
-  <symbol minX="1003" maxX="1054" minY="926" maxY="971" name="subway-taoyuan-s"/>
-  <symbol minX="1054" maxX="1094" minY="926" maxY="971" name="subway-warsaw-s"/>
-  <symbol minX="1094" maxX="1139" minY="926" maxY="971" name="subway-tashkent-s"/>
-  <symbol minX="1139" maxX="1184" minY="926" maxY="971" name="subway-volgograd-s"/>
-  <symbol minX="1184" maxX="1229" minY="926" maxY="971" name="subway-helsinki-s"/>
-  <symbol minX="1229" maxX="1274" minY="926" maxY="971" name="subway-oslo-s"/>
-  <symbol minX="1274" maxX="1319" minY="926" maxY="971" name="subway-chicago-s"/>
-  <symbol minX="1319" maxX="1377" minY="926" maxY="971" name="subway-omsk-s"/>
-  <symbol minX="1377" maxX="1435" minY="926" maxY="971" name="subway-omsk-m"/>
-  <symbol minX="1435" maxX="1480" minY="926" maxY="971" name="subway-dalian-s"/>
-  <symbol minX="1480" maxX="1538" minY="926" maxY="971" name="subway-dnepro-m"/>
-  <symbol minX="1538" maxX="1583" minY="926" maxY="971" name="subway-nnov-s"/>
-  <symbol minX="1583" maxX="1628" minY="926" maxY="971" name="subway-dubai-s"/>
-  <symbol minX="1628" maxX="1673" minY="926" maxY="971" name="subway-foshan-s"/>
-  <symbol minX="1673" maxX="1729" minY="926" maxY="971" name="subway-fukuoka-s"/>
-  <symbol minX="1729" maxX="1774" minY="926" maxY="971" name="subway-nagoya-s"/>
-  <symbol minX="1774" maxX="1821" minY="926" maxY="971" name="subway-glasgow-s"/>
-  <symbol minX="1821" maxX="1866" minY="926" maxY="971" name="subway-montreal-s"/>
-  <symbol minX="1866" maxX="1911" minY="926" maxY="971" name="subway-guadalajara-s"/>
-  <symbol minX="1911" maxX="1956" minY="926" maxY="971" name="subway-sofia-s"/>
-  <symbol minX="1956" maxX="2001" minY="926" maxY="971" name="subway-minatomirai-s"/>
-  <symbol minX="2001" maxX="2046" minY="926" maxY="971" name="subway-milan-s"/>
-  <symbol minX="0" maxX="45" minY="973" maxY="1018" name="subway-kazan-s"/>
-  <symbol minX="45" maxX="90" minY="973" maxY="1018" name="subway-kobe-s"/>
-  <symbol minX="90" maxX="135" minY="973" maxY="1018" name="subway-mecca-s"/>
-  <symbol minX="135" maxX="180" minY="973" maxY="1018" name="subway-massachusetts-s"/>
-  <symbol minX="180" maxX="238" minY="973" maxY="1018" name="subway-kryvyirih-m"/>
-  <symbol minX="238" maxX="283" minY="973" maxY="1018" name="subway-kunming-s"/>
-  <symbol minX="283" maxX="328" minY="973" maxY="1018" name="subway-kyoto-s"/>
-  <symbol minX="328" maxX="373" minY="973" maxY="1018" name="subway-lille-s"/>
-  <symbol minX="373" maxX="418" minY="973" maxY="1018" name="subway-lima-s"/>
-  <symbol minX="418" maxX="463" minY="973" maxY="1018" name="subway-lisboa-s"/>
-  <symbol minX="463" maxX="508" minY="973" maxY="1018" name="subway-losangeles-s"/>
-  <symbol minX="508" maxX="553" minY="973" maxY="1018" name="subway-samara-s"/>
-  <symbol minX="553" maxX="598" minY="973" maxY="1018" name="subway-shanghai-s"/>
-  <symbol minX="598" maxX="643" minY="973" maxY="1018" name="subway-shiraz-s"/>
-  <symbol minX="643" maxX="701" minY="973" maxY="1018" name="subway-alicante-m"/>
-  <symbol minX="701" maxX="746" minY="973" maxY="1018" name="subway-bangkok-s"/>
-  <symbol minX="746" maxX="791" minY="973" maxY="1018" name="subway-saopaulo-s"/>
-  <symbol minX="791" maxX="836" minY="973" maxY="1018" name="subway-santodomingo-s"/>
-  <symbol minX="836" maxX="892" minY="973" maxY="1018" name="subway-santiago-s"/>
-  <symbol minX="892" maxX="937" minY="973" maxY="1018" name="subway-chengdu-s"/>
-  <symbol minX="937" maxX="982" minY="973" maxY="1018" name="subway-beijing-s"/>
-  <symbol minX="982" maxX="1027" minY="973" maxY="1018" name="subway-bengaluru-s"/>
-  <symbol minX="1027" maxX="1072" minY="973" maxY="1018" name="subway-brasilia-s"/>
-  <symbol minX="1072" maxX="1117" minY="973" maxY="1018" name="subway-budapest-s"/>
-  <symbol minX="1117" maxX="1162" minY="973" maxY="1018" name="subway-buenosaires-s"/>
-  <symbol minX="1162" maxX="1207" minY="973" maxY="1018" name="subway-riodejaneiro-s"/>
-  <symbol minX="1207" maxX="1252" minY="973" maxY="1018" name="subway-reseau-paris-s"/>
-  <symbol minX="1252" maxX="1297" minY="973" maxY="1018" name="subway-bursaray-s"/>
-  <symbol minX="1297" maxX="1342" minY="973" maxY="1018" name="subway-caracas-s"/>
-  <symbol minX="1342" maxX="1387" minY="973" maxY="1018" name="subway-perugia-s"/>
-  <symbol minX="1387" maxX="1432" minY="973" maxY="1018" name="subway-catania-s"/>
-  <symbol minX="1432" maxX="1477" minY="973" maxY="1018" name="subway-changchun-s"/>
-  <symbol minX="1477" maxX="1535" minY="973" maxY="1017" name="subway-philadelphia-m"/>
-  <symbol minX="1535" maxX="1593" minY="973" maxY="1016" name="subway-osaka-m"/>
-  <symbol minX="1593" maxX="1651" minY="973" maxY="1015" name="subway-lucknow-s"/>
-  <symbol minX="1651" maxX="1693" minY="973" maxY="1015" name="subway-spb-s"/>
-  <symbol minX="1693" maxX="1749" minY="973" maxY="1015" name="subway-london-m"/>
-  <symbol minX="1749" maxX="1791" minY="973" maxY="1015" name="cave-m"/>
-  <symbol minX="1791" maxX="1833" minY="973" maxY="1015" name="subway-lausanne-s"/>
-  <symbol minX="1833" maxX="1875" minY="973" maxY="1015" name="search-result"/>
-  <symbol minX="1875" maxX="1929" minY="973" maxY="1015" name="subway-almaty-s"/>
-  <symbol minX="1929" maxX="1969" minY="973" maxY="1015" name="subway-amsterdam-s"/>
-  <symbol minX="1969" maxX="2027" minY="973" maxY="1015" name="subway-barcelona-m"/>
-  <symbol minX="0" maxX="58" minY="1018" maxY="1060" name="subway-madrid-m"/>
-  <symbol minX="58" maxX="103" minY="1018" maxY="1060" name="subway-maracaibo-s"/>
-  <symbol minX="103" maxX="143" minY="1018" maxY="1060" name="subway-mexico-s"/>
-  <symbol minX="143" maxX="199" minY="1018" maxY="1060" name="subway-tabriz-s"/>
-  <symbol minX="199" maxX="257" minY="1018" maxY="1059" name="subway-lucknow-m"/>
-  <symbol minX="257" maxX="335" minY="1018" maxY="1058" name="coloredmark-default-s"/>
-  <symbol minX="335" maxX="375" minY="1018" maxY="1058" name="place-of-worship-s"/>
-  <symbol minX="375" maxX="415" minY="1018" maxY="1058" name="remains-s"/>
-  <symbol minX="415" maxX="455" minY="1018" maxY="1058" name="shinto-s"/>
-  <symbol minX="455" maxX="495" minY="1018" maxY="1058" name="ship-s"/>
-  <symbol minX="495" maxX="535" minY="1018" maxY="1058" name="shop-s"/>
-  <symbol minX="535" maxX="575" minY="1018" maxY="1058" name="stadium-s"/>
-  <symbol minX="575" maxX="620" minY="1018" maxY="1058" name="subway-tbilisi-s"/>
-  <symbol minX="620" maxX="678" minY="1018" maxY="1058" name="subway-bilbao-m"/>
-  <symbol minX="678" maxX="718" minY="1018" maxY="1058" name="non-found-search-result"/>
-  <symbol minX="718" maxX="758" minY="1018" maxY="1058" name="subway-s"/>
-  <symbol minX="758" maxX="798" minY="1018" maxY="1058" name="park-outline-s"/>
-  <symbol minX="798" maxX="876" minY="1018" maxY="1058" name="coloredmark-bg-s"/>
-  <symbol minX="876" maxX="921" minY="1018" maxY="1058" name="subway-rotterdam-s"/>
-  <symbol minX="921" maxX="972" minY="1018" maxY="1058" name="subway-philadelphia-s"/>
-  <symbol minX="972" maxX="1028" minY="1018" maxY="1058" name="subway-palma-s"/>
-  <symbol minX="1028" maxX="1086" minY="1018" maxY="1058" name="subway-palma-m"/>
-  <symbol minX="1086" maxX="1135" minY="1018" maxY="1058" name="subway-osaka-s"/>
-  <symbol minX="1135" maxX="1189" minY="1018" maxY="1058" name="subway-dnepro-s"/>
-  <symbol minX="1189" maxX="1229" minY="1018" maxY="1058" name="subway-entrance-s"/>
-  <symbol minX="1229" maxX="1269" minY="1018" maxY="1058" name="hindu-s"/>
-  <symbol minX="1269" maxX="1309" minY="1018" maxY="1058" name="airport-s"/>
-  <symbol minX="1309" maxX="1349" minY="1018" maxY="1058" name="buddhist-s"/>
-  <symbol minX="1349" maxX="1389" minY="1018" maxY="1058" name="bus-s"/>
-  <symbol minX="1389" maxX="1429" minY="1018" maxY="1058" name="cable-car-s"/>
-  <symbol minX="1429" maxX="1469" minY="1018" maxY="1058" name="car-repair-s"/>
-  <symbol minX="1469" maxX="1509" minY="1018" maxY="1058" name="charging-station-s"/>
-  <symbol minX="1509" maxX="1549" minY="1018" maxY="1058" name="christian-s"/>
-  <symbol minX="1549" maxX="1589" minY="1018" maxY="1058" name="college-s"/>
-  <symbol minX="1589" maxX="1629" minY="1018" maxY="1058" name="drinking-water-s"/>
-  <symbol minX="1629" maxX="1669" minY="1018" maxY="1058" name="fuel-s"/>
-  <symbol minX="1669" maxX="1709" minY="1018" maxY="1058" name="geyser-s"/>
-  <symbol minX="1709" maxX="1749" minY="1018" maxY="1058" name="park-s"/>
-  <symbol minX="1749" maxX="1789" minY="1018" maxY="1058" name="hospital-s"/>
-  <symbol minX="1789" maxX="1829" minY="1018" maxY="1058" name="hotel-s"/>
-  <symbol minX="1829" maxX="1869" minY="1018" maxY="1058" name="jewish-s"/>
-  <symbol minX="1869" maxX="1909" minY="1018" maxY="1058" name="lighthouse-s"/>
-  <symbol minX="1909" maxX="1949" minY="1018" maxY="1058" name="monument-s"/>
-  <symbol minX="1949" maxX="1989" minY="1018" maxY="1058" name="museum-s"/>
-  <symbol minX="1989" maxX="2029" minY="1018" maxY="1058" name="muslim-s"/>
-  <symbol minX="0" maxX="40" minY="1060" maxY="1100" name="nparkf-outline-s"/>
-  <symbol minX="40" maxX="80" minY="1060" maxY="1100" name="nparkf-s"/>
-  <symbol minX="80" maxX="120" minY="1060" maxY="1100" name="tourism-s"/>
-  <symbol minX="120" maxX="151" minY="1060" maxY="1100" name="transit_light_rail-m"/>
-  <symbol minX="151" maxX="191" minY="1060" maxY="1100" name="waste-basket-s"/>
-  <symbol minX="191" maxX="231" minY="1060" maxY="1100" name="theme_park-s"/>
-  <symbol minX="231" maxX="271" minY="1060" maxY="1100" name="viewpoint-s"/>
-  <symbol minX="271" maxX="311" minY="1060" maxY="1100" name="theatre-s"/>
-  <symbol minX="311" maxX="342" minY="1060" maxY="1100" name="transit_train-m"/>
-  <symbol minX="342" maxX="382" minY="1060" maxY="1100" name="waterfall-s"/>
-  <symbol minX="382" maxX="440" minY="1060" maxY="1100" name="subway-kolkata-m"/>
-  <symbol minX="440" maxX="480" minY="1060" maxY="1100" name="zoo-s"/>
-  <symbol minX="480" maxX="525" minY="1060" maxY="1100" name="transfer_arrow"/>
-  <symbol minX="525" maxX="565" minY="1060" maxY="1100" name="tram-s"/>
-  <symbol minX="565" maxX="605" minY="1060" maxY="1100" name="toll_booth-s"/>
-  <symbol minX="605" maxX="645" minY="1060" maxY="1100" name="train-s"/>
-  <symbol minX="645" maxX="685" minY="1060" maxY="1100" name="subway-newyork-s"/>
-  <symbol minX="685" maxX="725" minY="1060" maxY="1100" name="taoist-s"/>
-  <symbol minX="725" maxX="783" minY="1060" maxY="1099" name="subway-sanfrancisco-m"/>
-  <symbol minX="783" maxX="841" minY="1060" maxY="1099" name="subway-fukuoka-m"/>
-  <symbol minX="841" maxX="899" minY="1060" maxY="1099" name="subway-bucharest-m"/>
-  <symbol minX="899" maxX="926" minY="1060" maxY="1099" name="bookmark-bg-xs"/>
-  <symbol minX="926" maxX="953" minY="1060" maxY="1099" name="bookmark-default-xs"/>
-  <symbol minX="953" maxX="1011" minY="1060" maxY="1099" name="subway-novosibirsk-m"/>
-  <symbol minX="1011" maxX="1049" minY="1060" maxY="1098" name="lightrail-berlin-s"/>
-  <symbol minX="1049" maxX="1100" minY="1060" maxY="1098" name="subway-madrid-s"/>
-  <symbol minX="1100" maxX="1149" minY="1060" maxY="1098" name="subway-kryvyirih-s"/>
-  <symbol minX="1149" maxX="1187" minY="1060" maxY="1098" name="elevator"/>
-  <symbol minX="1187" maxX="1218" minY="1060" maxY="1098" name="transit_monorail-m"/>
-  <symbol minX="1218" maxX="1276" minY="1060" maxY="1098" name="subway-sanfrancisco-s"/>
-  <symbol minX="1276" maxX="1327" minY="1060" maxY="1098" name="subway-barcelona-s"/>
-  <symbol minX="1327" maxX="1385" minY="1060" maxY="1098" name="subway-sendai-m"/>
-  <symbol minX="1385" maxX="1430" minY="1060" maxY="1098" name="subway-lyon-s"/>
-  <symbol minX="1430" maxX="1486" minY="1060" maxY="1098" name="subway-kiev-m"/>
-  <symbol minX="1486" maxX="1544" minY="1060" maxY="1098" name="subway-kharkiv-s"/>
-  <symbol minX="1544" maxX="1582" minY="1060" maxY="1098" name="subway-paris-s"/>
-  <symbol minX="1582" maxX="1640" minY="1060" maxY="1098" name="subway-brussel-s"/>
-  <symbol minX="1640" maxX="1696" minY="1060" maxY="1098" name="subway-novosibirsk-s"/>
-  <symbol minX="1696" maxX="1732" minY="1060" maxY="1096" name="board"/>
-  <symbol minX="1732" maxX="1768" minY="1060" maxY="1096" name="map"/>
-  <symbol minX="1768" maxX="1826" minY="1060" maxY="1096" name="subway-kharkiv-m"/>
-  <symbol minX="1826" maxX="1882" minY="1060" maxY="1096" name="subway-bucharest-s"/>
-  <symbol minX="1882" maxX="1940" minY="1060" maxY="1096" name="subway-haagse-s"/>
-  <symbol minX="1940" maxX="1967" minY="1060" maxY="1096" name="transit_train-s"/>
-  <symbol minX="1967" maxX="2003" minY="1060" maxY="1096" name="transit_subway-m"/>
-  <symbol minX="2003" maxX="2039" minY="1060" maxY="1096" name="storage-tank"/>
-  <symbol minX="0" maxX="47" minY="1100" maxY="1136" name="subway-alicante-s"/>
-  <symbol minX="47" maxX="105" minY="1100" maxY="1136" name="subway-sendai-s"/>
-  <symbol minX="105" maxX="143" minY="1100" maxY="1136" name="subway-moscow-s"/>
-  <symbol minX="143" maxX="201" minY="1100" maxY="1136" name="subway-brussel-m"/>
-  <symbol minX="201" maxX="259" minY="1100" maxY="1135" name="subway-manila-m"/>
-  <symbol minX="259" maxX="317" minY="1100" maxY="1133" name="subway-haagse-m"/>
-  <symbol minX="317" maxX="359" minY="1100" maxY="1133" name="subway-london-s"/>
-  <symbol minX="359" maxX="392" minY="1100" maxY="1133" name="cave-s"/>
-  <symbol minX="392" maxX="450" minY="1100" maxY="1133" name="subway-edmonton-s"/>
-  <symbol minX="450" maxX="499" minY="1100" maxY="1133" name="subway-bilbao-s"/>
-  <symbol minX="499" maxX="532" minY="1100" maxY="1133" name="subway-ubahn-s"/>
-  <symbol minX="532" maxX="588" minY="1100" maxY="1133" name="subway-manila-s"/>
-  <symbol minX="588" maxX="624" minY="1100" maxY="1133" name="subway-seattle-s"/>
-  <symbol minX="624" maxX="657" minY="1100" maxY="1133" name="subway-rome-s"/>
-  <symbol minX="657" maxX="715" minY="1100" maxY="1133" name="subway-taipei-s"/>
-  <symbol minX="715" maxX="746" minY="1100" maxY="1131" name="subway-xs"/>
-  <symbol minX="746" maxX="773" minY="1100" maxY="1131" name="transit_light_rail-s"/>
-  <symbol minX="773" maxX="804" minY="1100" maxY="1131" name="subway-newyork-xs"/>
-  <symbol minX="804" maxX="831" minY="1100" maxY="1131" name="transit_monorail-s"/>
-  <symbol minX="831" maxX="851" minY="1100" maxY="1131" name="entrance-s"/>
-  <symbol minX="851" maxX="882" minY="1100" maxY="1131" name="gate-s"/>
-  <symbol minX="882" maxX="913" minY="1100" maxY="1131" name="transit_subway-s"/>
-  <symbol minX="913" maxX="944" minY="1100" maxY="1131" name="star-l"/>
-  <symbol minX="944" maxX="975" minY="1100" maxY="1131" name="speedcam-s"/>
-  <symbol minX="975" maxX="1024" minY="1100" maxY="1131" name="railway-crossing-l"/>
-  <symbol minX="1024" maxX="1055" minY="1100" maxY="1131" name="parking-s"/>
-  <symbol minX="1055" maxX="1088" minY="1100" maxY="1131" name="main_entrance-s"/>
-  <symbol minX="1088" maxX="1126" minY="1100" maxY="1131" name="bench"/>
-  <symbol minX="1126" maxX="1184" minY="1100" maxY="1130" name="subway-edmonton-m"/>
-  <symbol minX="1184" maxX="1226" minY="1100" maxY="1129" name="subway-kolkata-s"/>
-  <symbol minX="1226" maxX="1282" minY="1100" maxY="1129" name="subway-malaga-s"/>
-  <symbol minX="1282" maxX="1329" minY="1100" maxY="1129" name="subway-kiev-s"/>
-  <symbol minX="1329" maxX="1358" minY="1100" maxY="1129" name="star-m"/>
-  <symbol minX="1358" maxX="1391" minY="1100" maxY="1129" name="volcano-m"/>
-  <symbol minX="1391" maxX="1449" minY="1100" maxY="1128" name="subway-malaga-m"/>
-  <symbol minX="1449" maxX="1507" minY="1100" maxY="1128" name="subway-taipei-m"/>
-  <symbol minX="1507" maxX="1563" minY="1100" maxY="1127" name="subway-baku-s"/>
-  <symbol minX="1563" maxX="1610" minY="1100" maxY="1127" name="subway-minsk-m"/>
-  <symbol minX="1610" maxX="1641" minY="1100" maxY="1127" name="plaque"/>
-  <symbol minX="1641" maxX="1683" minY="1100" maxY="1127" name="railway-crossing-m"/>
-  <symbol minX="1683" maxX="1741" minY="1100" maxY="1126" name="subway-baku-m"/>
-  <symbol minX="1741" maxX="1799" minY="1100" maxY="1125" name="subway-chongqing-s"/>
-  <symbol minX="1799" maxX="1823" minY="1100" maxY="1124" name="star-s"/>
-  <symbol minX="1823" maxX="1865" minY="1100" maxY="1124" name="subway-minsk-s"/>
-  <symbol minX="1865" maxX="1923" minY="1100" maxY="1123" name="subway-chongqing-m"/>
-  <symbol minX="1923" maxX="1963" minY="1100" maxY="1122" name="mountain-pass"/>
-  <symbol minX="1963" maxX="1987" minY="1100" maxY="1122" name="volcano-s"/>
-  <symbol minX="1987" maxX="2038" minY="1100" maxY="1122" name="arrow-m"/>
-  <symbol minX="0" maxX="24" minY="1136" maxY="1158" name="peakt-m"/>
-  <symbol minX="24" maxX="44" minY="1136" maxY="1156" name="zero-icon"/>
-  <symbol minX="44" maxX="64" minY="1136" maxY="1154" name="peakt-s"/>
-  <symbol minX="64" maxX="79" minY="1136" maxY="1151" name="dot-m"/>
-  <symbol minX="79" maxX="117" minY="1136" maxY="1151" name="arrow-s"/>
-  <symbol minX="117" maxX="141" minY="1136" maxY="1147" name="arrow-xs"/>
+  <symbol minX="1508" maxX="1566" minY="406" maxY="464" name="volleyball-m"/>
+  <symbol minX="1566" maxX="1624" minY="406" maxY="464" name="waste-basket-m"/>
+  <symbol minX="1624" maxX="1682" minY="406" maxY="464" name="tram-m"/>
+  <symbol minX="1682" maxX="1740" minY="406" maxY="464" name="waterfall-m"/>
+  <symbol minX="1740" maxX="1798" minY="406" maxY="464" name="train-m"/>
+  <symbol minX="1798" maxX="1856" minY="406" maxY="464" name="toys-m"/>
+  <symbol minX="1856" maxX="1914" minY="406" maxY="464" name="subway-sofia-m"/>
+  <symbol minX="1914" maxX="1972" minY="406" maxY="464" name="tomb-m"/>
+  <symbol minX="1972" maxX="2030" minY="406" maxY="464" name="wayside_shrine-m"/>
+  <symbol minX="0" maxX="58" minY="464" maxY="522" name="toll_booth-m"/>
+  <symbol minX="58" maxX="116" minY="464" maxY="522" name="toilets-m"/>
+  <symbol minX="116" maxX="174" minY="464" maxY="522" name="tire-repair-m"/>
+  <symbol minX="174" maxX="232" minY="464" maxY="522" name="ticket-shop-m"/>
+  <symbol minX="232" maxX="290" minY="464" maxY="522" name="windmill-m"/>
+  <symbol minX="290" maxX="348" minY="464" maxY="522" name="theme_park-m"/>
+  <symbol minX="348" maxX="406" minY="464" maxY="522" name="yoga-m"/>
+  <symbol minX="406" maxX="464" minY="464" maxY="522" name="theatre-m"/>
+  <symbol minX="464" maxX="522" minY="464" maxY="522" name="subway-kunming-m"/>
+  <symbol minX="522" maxX="578" minY="464" maxY="522" name="subway-mashhad-m"/>
+  <symbol minX="578" maxX="636" minY="464" maxY="522" name="subway-marseille-s"/>
+  <symbol minX="636" maxX="694" minY="464" maxY="522" name="subway-m"/>
+  <symbol minX="694" maxX="752" minY="464" maxY="522" name="subway-lyon-m"/>
+  <symbol minX="752" maxX="810" minY="464" maxY="522" name="subway-losangeles-m"/>
+  <symbol minX="810" maxX="868" minY="464" maxY="522" name="subway-lisboa-m"/>
+  <symbol minX="868" maxX="926" minY="464" maxY="522" name="subway-lima-m"/>
+  <symbol minX="926" maxX="984" minY="464" maxY="522" name="travel_agency_shop-m"/>
+  <symbol minX="984" maxX="1042" minY="464" maxY="522" name="subway-lausanne-m"/>
+  <symbol minX="1042" maxX="1100" minY="464" maxY="522" name="subway-kyoto-m"/>
+  <symbol minX="1100" maxX="1158" minY="464" maxY="522" name="subway-massachusetts-m"/>
+  <symbol minX="1158" maxX="1216" minY="464" maxY="522" name="subway-kobe-m"/>
+  <symbol minX="1216" maxX="1274" minY="464" maxY="522" name="subway-kazan-m"/>
+  <symbol minX="1274" maxX="1321" minY="464" maxY="522" name="subway-istanbul-m"/>
+  <symbol minX="1321" maxX="1379" minY="464" maxY="522" name="subway-isfahan-m"/>
+  <symbol minX="1379" maxX="1437" minY="464" maxY="522" name="subway-hirosima-m"/>
+  <symbol minX="1437" maxX="1495" minY="464" maxY="522" name="subway-helsinki-m"/>
+  <symbol minX="1495" maxX="1553" minY="464" maxY="522" name="subway-guangzhou-m"/>
+  <symbol minX="1553" maxX="1611" minY="464" maxY="522" name="subway-guadalajara-m"/>
+  <symbol minX="1611" maxX="1669" minY="464" maxY="522" name="subway-glasgow-m"/>
+  <symbol minX="1669" maxX="1727" minY="464" maxY="522" name="subway-foshan-m"/>
+  <symbol minX="1727" maxX="1785" minY="464" maxY="522" name="subway-perugia-m"/>
+  <symbol minX="1785" maxX="1843" minY="464" maxY="522" name="subway-shiraz-m"/>
+  <symbol minX="1843" maxX="1901" minY="464" maxY="522" name="subway-saopaulo-m"/>
+  <symbol minX="1901" maxX="1959" minY="464" maxY="522" name="subway-santodomingo-m"/>
+  <symbol minX="1959" maxX="2017" minY="464" maxY="522" name="subway-samara-m"/>
+  <symbol minX="0" maxX="58" minY="522" maxY="580" name="subway-riodejaneiro-m"/>
+  <symbol minX="58" maxX="116" minY="522" maxY="580" name="subway-reseau-paris-m"/>
+  <symbol minX="116" maxX="174" minY="522" maxY="580" name="subway-rennes-m"/>
+  <symbol minX="174" maxX="232" minY="522" maxY="580" name="subway-pyongyang-m"/>
+  <symbol minX="232" maxX="288" minY="522" maxY="580" name="subway-porto-m"/>
+  <symbol minX="288" maxX="346" minY="522" maxY="580" name="subway-pittsburgh-m"/>
+  <symbol minX="346" maxX="404" minY="522" maxY="580" name="subway-ekb-m"/>
+  <symbol minX="404" maxX="462" minY="522" maxY="580" name="subway-panama-m"/>
+  <symbol minX="462" maxX="520" minY="522" maxY="580" name="subway-oslo-m"/>
+  <symbol minX="520" maxX="576" minY="522" maxY="580" name="subway-nnov-m"/>
+  <symbol minX="576" maxX="634" minY="522" maxY="580" name="subway-newyork-m"/>
+  <symbol minX="634" maxX="692" minY="522" maxY="580" name="subway-nagoya-m"/>
+  <symbol minX="692" maxX="750" minY="522" maxY="580" name="subway-minatomirai-m"/>
+  <symbol minX="750" maxX="808" minY="522" maxY="580" name="subway-milan-m"/>
+  <symbol minX="808" maxX="864" minY="522" maxY="580" name="subway-mexico-m"/>
+  <symbol minX="864" maxX="922" minY="522" maxY="580" name="subway-medellin-m"/>
+  <symbol minX="922" maxX="980" minY="522" maxY="580" name="subway-mecca-m"/>
+  <symbol minX="980" maxX="1038" minY="522" maxY="580" name="australian-football-m"/>
+  <symbol minX="1038" maxX="1096" minY="522" maxY="580" name="audiologist-m"/>
+  <symbol minX="1096" maxX="1154" minY="522" maxY="580" name="funeral_directors-m"/>
+  <symbol minX="1154" maxX="1212" minY="522" maxY="580" name="fuel-m"/>
+  <symbol minX="1212" maxX="1270" minY="522" maxY="580" name="fuel-dispenser-m"/>
+  <symbol minX="1270" maxX="1328" minY="522" maxY="580" name="fountain-s"/>
+  <symbol minX="1328" maxX="1386" minY="522" maxY="580" name="fountain-m"/>
+  <symbol minX="1386" maxX="1444" minY="522" maxY="580" name="remains-m"/>
+  <symbol minX="1444" maxX="1502" minY="522" maxY="580" name="florist-m"/>
+  <symbol minX="1502" maxX="1560" minY="522" maxY="580" name="firehydrant-m"/>
+  <symbol minX="1560" maxX="1618" minY="522" maxY="580" name="fire_station-m"/>
+  <symbol minX="1618" maxX="1676" minY="522" maxY="580" name="fastfood-m"/>
+  <symbol minX="1676" maxX="1734" minY="522" maxY="580" name="erotic-m"/>
+  <symbol minX="1734" maxX="1792" minY="522" maxY="580" name="equestrian-m"/>
+  <symbol minX="1792" maxX="1850" minY="522" maxY="580" name="funicular-m"/>
+  <symbol minX="1850" maxX="1908" minY="522" maxY="580" name="emergency-phone-m"/>
+  <symbol minX="1908" maxX="1966" minY="522" maxY="580" name="embassy-m"/>
+  <symbol minX="1966" maxX="2024" minY="522" maxY="580" name="electronics-m"/>
+  <symbol minX="0" maxX="58" minY="580" maxY="638" name="electrician-m"/>
+  <symbol minX="58" maxX="116" minY="580" maxY="638" name="dump-station-m"/>
+  <symbol minX="116" maxX="174" minY="580" maxY="638" name="driving_school-m"/>
+  <symbol minX="174" maxX="232" minY="580" maxY="638" name="drinking-water-m"/>
+  <symbol minX="232" maxX="290" minY="580" maxY="638" name="doityourself-m"/>
+  <symbol minX="290" maxX="348" minY="580" maxY="638" name="dog_park-m"/>
+  <symbol minX="348" maxX="406" minY="580" maxY="638" name="diving-m"/>
+  <symbol minX="406" maxX="464" minY="580" maxY="638" name="department_store-m"/>
+  <symbol minX="464" maxX="522" minY="580" maxY="638" name="dentist-m"/>
+  <symbol minX="522" maxX="580" minY="580" maxY="638" name="apartment-m"/>
+  <symbol minX="580" maxX="638" minY="580" maxY="638" name="hockey-m"/>
+  <symbol minX="638" maxX="696" minY="580" maxY="638" name="historic-ship-m"/>
+  <symbol minX="696" maxX="754" minY="580" maxY="638" name="hindu-m"/>
+  <symbol minX="754" maxX="812" minY="580" maxY="638" name="heliport-m"/>
+  <symbol minX="812" maxX="870" minY="580" maxY="638" name="helipad-m"/>
+  <symbol minX="870" maxX="928" minY="580" maxY="638" name="handball-m"/>
+  <symbol minX="928" maxX="986" minY="580" maxY="638" name="hand-m"/>
+  <symbol minX="986" maxX="1044" minY="580" maxY="638" name="hairdresser-m"/>
+  <symbol minX="1044" maxX="1102" minY="580" maxY="638" name="gym-m"/>
+  <symbol minX="1102" maxX="1160" minY="580" maxY="638" name="guidepost"/>
+  <symbol minX="1160" maxX="1218" minY="580" maxY="638" name="america-football-m"/>
+  <symbol minX="1218" maxX="1276" minY="580" maxY="638" name="grocery-m"/>
+  <symbol minX="1276" maxX="1334" minY="580" maxY="638" name="greengrocer-m"/>
+  <symbol minX="1334" maxX="1392" minY="580" maxY="638" name="defibrillator-m"/>
+  <symbol minX="1392" maxX="1450" minY="580" maxY="638" name="golf-m"/>
+  <symbol minX="1450" maxX="1508" minY="580" maxY="638" name="gift-m"/>
+  <symbol minX="1508" maxX="1566" minY="580" maxY="638" name="geyser-m"/>
+  <symbol minX="1566" maxX="1624" minY="580" maxY="638" name="geyser-l"/>
+  <symbol minX="1624" maxX="1682" minY="580" maxY="638" name="archaeological-site-m"/>
+  <symbol minX="1682" maxX="1740" minY="580" maxY="638" name="gate-m"/>
+  <symbol minX="1740" maxX="1798" minY="580" maxY="638" name="garden_center-m"/>
+  <symbol minX="1798" maxX="1856" minY="580" maxY="638" name="garden-outline-m"/>
+  <symbol minX="1856" maxX="1914" minY="580" maxY="638" name="archery-m"/>
+  <symbol minX="1914" maxX="1972" minY="580" maxY="638" name="garden-m"/>
+  <symbol minX="1972" maxX="2030" minY="580" maxY="638" name="gallery-m"/>
+  <symbol minX="0" maxX="58" minY="638" maxY="696" name="atm-m"/>
+  <symbol minX="58" maxX="116" minY="638" maxY="696" name="blood_donation-m"/>
+  <symbol minX="116" maxX="174" minY="638" maxY="696" name="car-part-m"/>
+  <symbol minX="174" maxX="232" minY="638" maxY="696" name="banknote-m"/>
+  <symbol minX="232" maxX="290" minY="638" maxY="696" name="campsite-m"/>
+  <symbol minX="290" maxX="348" minY="638" maxY="696" name="cafe-m"/>
+  <symbol minX="348" maxX="406" minY="638" maxY="696" name="cable-car-m"/>
+  <symbol minX="406" maxX="464" minY="638" maxY="696" name="butcher-m"/>
+  <symbol minX="464" maxX="522" minY="638" maxY="696" name="bus-m"/>
+  <symbol minX="522" maxX="580" minY="638" maxY="696" name="buddhist-m"/>
+  <symbol minX="580" maxX="638" minY="638" maxY="696" name="brewery-m"/>
+  <symbol minX="638" maxX="696" minY="638" maxY="696" name="bowling_alley-m"/>
+  <symbol minX="696" maxX="754" minY="638" maxY="696" name="bowling-m"/>
+  <symbol minX="754" maxX="812" minY="638" maxY="696" name="bookmaker-m"/>
+  <symbol minX="812" maxX="870" minY="638" maxY="696" name="book-shop-m"/>
+  <symbol minX="870" maxX="928" minY="638" maxY="696" name="car-repair-m"/>
+  <symbol minX="928" maxX="986" minY="638" maxY="696" name="bar-m"/>
+  <symbol minX="986" maxX="1044" minY="638" maxY="696" name="blacksmith-m"/>
+  <symbol minX="1044" maxX="1102" minY="638" maxY="696" name="bicycle-repair-station"/>
+  <symbol minX="1102" maxX="1160" minY="638" maxY="696" name="bicycle-m"/>
+  <symbol minX="1160" maxX="1218" minY="638" maxY="696" name="beer-m"/>
+  <symbol minX="1218" maxX="1276" minY="638" maxY="696" name="beekeeper-m"/>
+  <symbol minX="1276" maxX="1334" minY="638" maxY="696" name="beauty-m"/>
+  <symbol minX="1334" maxX="1392" minY="638" maxY="696" name="beach-m"/>
+  <symbol minX="1392" maxX="1450" minY="638" maxY="696" name="bcontrol-m"/>
+  <symbol minX="1450" maxX="1508" minY="638" maxY="696" name="bbq-m"/>
+  <symbol minX="1508" maxX="1566" minY="638" maxY="696" name="basketball-m"/>
+  <symbol minX="1566" maxX="1624" minY="638" maxY="696" name="baseball-m"/>
+  <symbol minX="1624" maxX="1682" minY="638" maxY="696" name="chemist-m"/>
+  <symbol minX="1682" maxX="1740" minY="638" maxY="696" name="curling-m"/>
+  <symbol minX="1740" maxX="1798" minY="638" maxY="696" name="cross-m"/>
+  <symbol minX="1798" maxX="1856" minY="638" maxY="696" name="cricket-m"/>
+  <symbol minX="1856" maxX="1914" minY="638" maxY="696" name="copyshop-m"/>
+  <symbol minX="1914" maxX="1972" minY="638" maxY="696" name="computer-m"/>
+  <symbol minX="1972" maxX="2030" minY="638" maxY="696" name="college-m"/>
+  <symbol minX="0" maxX="58" minY="696" maxY="754" name="clothes-m"/>
+  <symbol minX="58" maxX="116" minY="696" maxY="754" name="climbing-m"/>
+  <symbol minX="116" maxX="174" minY="696" maxY="754" name="cinema-m"/>
+  <symbol minX="174" maxX="232" minY="696" maxY="754" name="badminton-m"/>
+  <symbol minX="232" maxX="290" minY="696" maxY="754" name="christian-m"/>
+  <symbol minX="290" maxX="348" minY="696" maxY="754" name="chimney-m"/>
+  <symbol minX="348" maxX="406" minY="696" maxY="754" name="chess-m"/>
+  <symbol minX="406" maxX="464" minY="696" maxY="754" name="furniture-m"/>
+  <symbol minX="464" maxX="522" minY="696" maxY="754" name="charity_shop-m"/>
+  <symbol minX="522" maxX="580" minY="696" maxY="754" name="charging-station-m"/>
+  <symbol minX="580" maxX="638" minY="696" maxY="754" name="cemetery-m"/>
+  <symbol minX="638" maxX="696" minY="696" maxY="754" name="bakery-m"/>
+  <symbol minX="696" maxX="754" minY="696" maxY="754" name="casino-m"/>
+  <symbol minX="754" maxX="812" minY="696" maxY="754" name="carpenter-m"/>
+  <symbol minX="812" maxX="870" minY="696" maxY="754" name="caravan_site-m"/>
+  <symbol minX="870" maxX="928" minY="696" maxY="754" name="caravan-shop-m"/>
+  <symbol minX="928" maxX="986" minY="696" maxY="754" name="car_shop-m"/>
+  <symbol minX="986" maxX="1044" minY="696" maxY="754" name="car_sharing-m"/>
+  <symbol minX="1044" maxX="1102" minY="696" maxY="754" name="car-wash-m"/>
+  <symbol minX="1102" maxX="1160" minY="696" maxY="754" name="bank-m"/>
+  <symbol minX="1160" maxX="1218" minY="696" maxY="754" name="alpine_hut-m"/>
+  <symbol minX="1218" maxX="1276" minY="696" maxY="754" name="office-m"/>
+  <symbol minX="1276" maxX="1334" minY="696" maxY="754" name="nparkf-outline-m"/>
+  <symbol minX="1334" maxX="1392" minY="696" maxY="754" name="nparkf-m"/>
+  <symbol minX="1392" maxX="1450" minY="696" maxY="754" name="npark-m"/>
+  <symbol minX="1450" maxX="1508" minY="696" maxY="754" name="airport-m"/>
+  <symbol minX="1508" maxX="1566" minY="696" maxY="754" name="nightclub-m"/>
+  <symbol minX="1566" maxX="1624" minY="696" maxY="754" name="alcohol-m"/>
+  <symbol minX="1624" maxX="1682" minY="696" maxY="754" name="newsagent_shop-m"/>
+  <symbol minX="1682" maxX="1740" minY="696" maxY="754" name="needle_and_thread-m"/>
+  <symbol minX="1740" maxX="1798" minY="696" maxY="754" name="muslim-m"/>
+  <symbol minX="1798" maxX="1856" minY="696" maxY="754" name="home-m"/>
+  <symbol minX="1856" maxX="1914" minY="696" maxY="754" name="music_school-m"/>
+  <symbol minX="1914" maxX="1972" minY="696" maxY="754" name="music-m"/>
+  <symbol minX="1972" maxX="2030" minY="696" maxY="754" name="optician-m"/>
+  <symbol minX="0" maxX="58" minY="754" maxY="812" name="museum-m"/>
+  <symbol minX="58" maxX="116" minY="754" maxY="812" name="motorcycle_shop-m"/>
+  <symbol minX="116" maxX="174" minY="754" maxY="812" name="motel-m"/>
+  <symbol minX="174" maxX="232" minY="754" maxY="812" name="monument-m"/>
+  <symbol minX="232" maxX="290" minY="754" maxY="812" name="mobile_phone-m"/>
+  <symbol minX="290" maxX="348" minY="754" maxY="812" name="military-m"/>
+  <symbol minX="348" maxX="406" minY="754" maxY="812" name="metal_construction-m"/>
+  <symbol minX="406" maxX="464" minY="754" maxY="812" name="media_shop-m"/>
+  <symbol minX="464" maxX="522" minY="754" maxY="812" name="media-m"/>
+  <symbol minX="522" maxX="580" minY="754" maxY="812" name="marketplace-m"/>
+  <symbol minX="580" maxX="638" minY="754" maxY="812" name="marina-m"/>
+  <symbol minX="638" maxX="696" minY="754" maxY="812" name="mail-m"/>
+  <symbol minX="696" maxX="754" minY="754" maxY="812" name="lighthouse-m"/>
+  <symbol minX="754" maxX="812" minY="754" maxY="812" name="picnic-m"/>
+  <symbol minX="812" maxX="870" minY="754" maxY="812" name="recycling-m"/>
+  <symbol minX="870" maxX="928" minY="754" maxY="812" name="public-building-m"/>
+  <symbol minX="928" maxX="986" minY="754" maxY="812" name="psychotherapist-m"/>
+  <symbol minX="986" maxX="1044" minY="754" maxY="812" name="prison-m"/>
+  <symbol minX="1044" maxX="1102" minY="754" maxY="812" name="power-m"/>
+  <symbol minX="1102" maxX="1160" minY="754" maxY="812" name="postbox-m"/>
+  <symbol minX="1160" maxX="1218" minY="754" maxY="812" name="police-m"/>
+  <symbol minX="1218" maxX="1276" minY="754" maxY="812" name="podiatrist-m"/>
+  <symbol minX="1276" maxX="1334" minY="754" maxY="812" name="plumber-m"/>
+  <symbol minX="1334" maxX="1392" minY="754" maxY="812" name="playground-m"/>
+  <symbol minX="1392" maxX="1450" minY="754" maxY="812" name="place-of-worship-m"/>
+  <symbol minX="1450" maxX="1508" minY="754" maxY="812" name="pitch-m"/>
+  <symbol minX="1508" maxX="1566" minY="754" maxY="812" name="picnic_table-m"/>
+  <symbol minX="1566" maxX="1624" minY="754" maxY="812" name="musical-instrument-m"/>
+  <symbol minX="1624" maxX="1682" minY="754" maxY="812" name="physiotherapist-m"/>
+  <symbol minX="1682" maxX="1740" minY="754" maxY="812" name="photo-shop-m"/>
+  <symbol minX="1740" maxX="1798" minY="754" maxY="812" name="phone-m"/>
+  <symbol minX="1798" maxX="1856" minY="754" maxY="812" name="pharmacy-m"/>
+  <symbol minX="1856" maxX="1914" minY="754" maxY="812" name="petshop-m"/>
+  <symbol minX="1914" maxX="1972" minY="754" maxY="812" name="pelota-m"/>
+  <symbol minX="1972" maxX="2030" minY="754" maxY="812" name="parking-meter-m"/>
+  <symbol minX="0" maxX="58" minY="812" maxY="870" name="park-outline-m"/>
+  <symbol minX="58" maxX="116" minY="812" maxY="870" name="park-m"/>
+  <symbol minX="116" maxX="174" minY="812" maxY="870" name="painter-m"/>
+  <symbol minX="174" maxX="232" minY="812" maxY="870" name="padel-m"/>
+  <symbol minX="232" maxX="290" minY="812" maxY="870" name="outdoor-shop-m"/>
+  <symbol minX="290" maxX="348" minY="812" maxY="870" name="optometrist-m"/>
+  <symbol minX="348" maxX="406" minY="812" maxY="870" name="hunting-tower-m"/>
+  <symbol minX="406" maxX="464" minY="812" maxY="870" name="laundry-m"/>
+  <symbol minX="464" maxX="522" minY="812" maxY="870" name="internet_cafe-m"/>
+  <symbol minX="522" maxX="580" minY="812" maxY="870" name="hotel-m"/>
+  <symbol minX="580" maxX="638" minY="812" maxY="870" name="ice_cream-m"/>
+  <symbol minX="638" maxX="696" minY="812" maxY="870" name="hostel-m"/>
+  <symbol minX="696" maxX="754" minY="812" maxY="870" name="jewelry-m"/>
+  <symbol minX="754" maxX="812" minY="812" maxY="870" name="language_school-m"/>
+  <symbol minX="812" maxX="870" minY="812" maxY="870" name="lawyer-m"/>
+  <symbol minX="870" maxX="928" minY="812" maxY="870" name="library-m"/>
+  <symbol minX="928" maxX="986" minY="812" maxY="870" name="alternative-m"/>
+  <symbol minX="986" maxX="1044" minY="812" maxY="870" name="kiosk-m"/>
+  <symbol minX="1044" maxX="1102" minY="812" maxY="870" name="information-m"/>
+  <symbol minX="1102" maxX="1160" minY="812" maxY="870" name="jewish-m"/>
+  <symbol minX="1160" maxX="1218" minY="812" maxY="870" name="hospital-m"/>
+  <symbol minX="1218" maxX="1276" minY="812" maxY="870" name="lift_gate-m"/>
+  <symbol minX="1276" maxX="1334" minY="812" maxY="870" name="kindergarten-m"/>
+  <symbol minX="1334" maxX="1396" minY="812" maxY="869" name="shield-us-hw-wide"/>
+  <symbol minX="1396" maxX="1448" minY="812" maxY="869" name="shield-us-hw-thin"/>
+  <symbol minX="1448" maxX="1504" minY="812" maxY="868" name="subway-montreal-m"/>
+  <symbol minX="1504" maxX="1562" minY="812" maxY="868" name="subway-maracaibo-m"/>
+  <symbol minX="1562" maxX="1620" minY="812" maxY="868" name="subway-shanghai-m"/>
+  <symbol minX="1620" maxX="1676" minY="812" maxY="868" name="subway-ekb-s"/>
+  <symbol minX="1676" maxX="1734" minY="812" maxY="868" name="subway-dalian-m"/>
+  <symbol minX="1734" maxX="1792" minY="812" maxY="868" name="subway-sapporo-m"/>
+  <symbol minX="1792" maxX="1848" minY="812" maxY="868" name="subway-southkorea-s"/>
+  <symbol minX="1848" maxX="1904" minY="812" maxY="868" name="subway-spb-m"/>
+  <symbol minX="1904" maxX="1962" minY="812" maxY="867" name="subway-marseille-m"/>
+  <symbol minX="1962" maxX="2016" minY="812" maxY="866" name="subway-entrance-m"/>
+  <symbol minX="0" maxX="54" minY="870" maxY="924" name="subway-algeria-s"/>
+  <symbol minX="54" maxX="93" minY="870" maxY="924" name="bookmark-bg-s"/>
+  <symbol minX="93" maxX="132" minY="870" maxY="924" name="bookmark-default-s"/>
+  <symbol minX="132" maxX="183" minY="870" maxY="924" name="subway-warsaw-m"/>
+  <symbol minX="183" maxX="237" minY="870" maxY="924" name="subway-stlouis-s"/>
+  <symbol minX="237" maxX="295" minY="870" maxY="923" name="subway-izmir-m"/>
+  <symbol minX="295" maxX="347" minY="870" maxY="922" name="track_marker_deselected"/>
+  <symbol minX="347" maxX="399" minY="870" maxY="922" name="current-position"/>
+  <symbol minX="399" maxX="450" minY="870" maxY="921" name="subway-pittsburgh-s"/>
+  <symbol minX="450" maxX="501" minY="870" maxY="921" name="lightrail-berlin-m"/>
+  <symbol minX="501" maxX="546" minY="870" maxY="921" name="subway-istanbul-s"/>
+  <symbol minX="546" maxX="604" minY="870" maxY="920" name="subway-taoyuan-m"/>
+  <symbol minX="604" maxX="653" minY="870" maxY="919" name="parking-disabled-m"/>
+  <symbol minX="653" maxX="700" minY="870" maxY="919" name="subway-mashhad-s"/>
+  <symbol minX="700" maxX="749" minY="870" maxY="919" name="parking_pay-m"/>
+  <symbol minX="749" maxX="807" minY="870" maxY="919" name="subway-rotterdam-m"/>
+  <symbol minX="807" maxX="856" minY="870" maxY="919" name="subway-cairo-s"/>
+  <symbol minX="856" maxX="905" minY="870" maxY="919" name="parking_entrance-m"/>
+  <symbol minX="905" maxX="954" minY="870" maxY="919" name="subway-isfahan-s"/>
+  <symbol minX="954" maxX="1003" minY="870" maxY="919" name="subway-medellin-s"/>
+  <symbol minX="1003" maxX="1052" minY="870" maxY="919" name="parking-m"/>
+  <symbol minX="1052" maxX="1101" minY="870" maxY="919" name="motorcycle-parking-m"/>
+  <symbol minX="1101" maxX="1146" minY="870" maxY="919" name="subway-brescia-s"/>
+  <symbol minX="1146" maxX="1195" minY="870" maxY="919" name="subway-sapporo-s"/>
+  <symbol minX="1195" maxX="1244" minY="870" maxY="919" name="speedcam-m"/>
+  <symbol minX="1244" maxX="1293" minY="870" maxY="919" name="subway-panama-s"/>
+  <symbol minX="1293" maxX="1342" minY="870" maxY="919" name="bicycle-rental"/>
+  <symbol minX="1342" maxX="1400" minY="870" maxY="919" name="subway-tbilisi-m"/>
+  <symbol minX="1400" maxX="1451" minY="870" maxY="919" name="subway-izmir-s"/>
+  <symbol minX="1451" maxX="1500" minY="870" maxY="919" name="bike-parking-m"/>
+  <symbol minX="1500" maxX="1558" minY="870" maxY="918" name="subway-almaty-m"/>
+  <symbol minX="1558" maxX="1603" minY="870" maxY="917" name="subway-athens-s"/>
+  <symbol minX="1603" maxX="1661" minY="870" maxY="917" name="subway-santiago-m"/>
+  <symbol minX="1661" maxX="1712" minY="870" maxY="917" name="subway-seattle-m"/>
+  <symbol minX="1712" maxX="1757" minY="870" maxY="917" name="subway-tianjin-s"/>
+  <symbol minX="1757" maxX="1802" minY="870" maxY="917" name="subway-delhi-s"/>
+  <symbol minX="1802" maxX="1849" minY="870" maxY="917" name="subway-rome-m"/>
+  <symbol minX="1849" maxX="1907" minY="870" maxY="917" name="subway-yerevan-m"/>
+  <symbol minX="1907" maxX="1954" minY="870" maxY="917" name="subway-warszawa-s"/>
+  <symbol minX="1954" maxX="2008" minY="870" maxY="917" name="subway-moscow-m"/>
+  <symbol minX="0" maxX="47" minY="924" maxY="971" name="subway-paris-m"/>
+  <symbol minX="47" maxX="94" minY="924" maxY="971" name="subway-hirosima-s"/>
+  <symbol minX="94" maxX="139" minY="924" maxY="971" name="subway-porto-s"/>
+  <symbol minX="139" maxX="184" minY="924" maxY="971" name="subway-pyongyang-s"/>
+  <symbol minX="184" maxX="231" minY="924" maxY="971" name="subway-rennes-s"/>
+  <symbol minX="231" maxX="278" minY="924" maxY="971" name="subway-ubahn-m"/>
+  <symbol minX="278" maxX="323" minY="924" maxY="969" name="subway-guangzhou-s"/>
+  <symbol minX="323" maxX="379" minY="924" maxY="969" name="subway-fukuoka-s"/>
+  <symbol minX="379" maxX="424" minY="924" maxY="969" name="subway-helsinki-s"/>
+  <symbol minX="424" maxX="469" minY="924" maxY="969" name="subway-foshan-s"/>
+  <symbol minX="469" maxX="514" minY="924" maxY="969" name="subway-yokohama-s"/>
+  <symbol minX="514" maxX="561" minY="924" maxY="969" name="subway-glasgow-s"/>
+  <symbol minX="561" maxX="617" minY="924" maxY="969" name="subway-yerevan-s"/>
+  <symbol minX="617" maxX="675" minY="924" maxY="969" name="subway-tabriz-m"/>
+  <symbol minX="675" maxX="726" minY="924" maxY="969" name="subway-taoyuan-s"/>
+  <symbol minX="726" maxX="771" minY="924" maxY="969" name="subway-wuhan-s"/>
+  <symbol minX="771" maxX="816" minY="924" maxY="969" name="subway-washington-s"/>
+  <symbol minX="816" maxX="861" minY="924" maxY="969" name="subway-tashkent-s"/>
+  <symbol minX="861" maxX="901" minY="924" maxY="969" name="subway-warsaw-s"/>
+  <symbol minX="901" maxX="946" minY="924" maxY="969" name="subway-volgograd-s"/>
+  <symbol minX="946" maxX="991" minY="924" maxY="969" name="subway-vienna-s"/>
+  <symbol minX="991" maxX="1036" minY="924" maxY="969" name="subway-kazan-s"/>
+  <symbol minX="1036" maxX="1081" minY="924" maxY="969" name="subway-guadalajara-s"/>
+  <symbol minX="1081" maxX="1126" minY="924" maxY="969" name="subway-valencia-s"/>
+  <symbol minX="1126" maxX="1171" minY="924" maxY="969" name="subway-tyneandwear-s"/>
+  <symbol minX="1171" maxX="1216" minY="924" maxY="969" name="subway-tokyo-s"/>
+  <symbol minX="1216" maxX="1261" minY="924" maxY="969" name="subway-brasilia-s"/>
+  <symbol minX="1261" maxX="1306" minY="924" maxY="969" name="subway-stockholm-s"/>
+  <symbol minX="1306" maxX="1351" minY="924" maxY="969" name="subway-chengdu-s"/>
+  <symbol minX="1351" maxX="1396" minY="924" maxY="969" name="subway-oslo-s"/>
+  <symbol minX="1396" maxX="1441" minY="924" maxY="969" name="subway-losangeles-s"/>
+  <symbol minX="1441" maxX="1499" minY="924" maxY="969" name="subway-omsk-s"/>
+  <symbol minX="1499" maxX="1557" minY="924" maxY="969" name="subway-omsk-m"/>
+  <symbol minX="1557" maxX="1602" minY="924" maxY="969" name="subway-beijing-s"/>
+  <symbol minX="1602" maxX="1647" minY="924" maxY="969" name="subway-nnov-s"/>
+  <symbol minX="1647" maxX="1692" minY="924" maxY="969" name="subway-bengaluru-s"/>
+  <symbol minX="1692" maxX="1737" minY="924" maxY="969" name="subway-lyon-s"/>
+  <symbol minX="1737" maxX="1782" minY="924" maxY="969" name="subway-nagoya-s"/>
+  <symbol minX="1782" maxX="1827" minY="924" maxY="969" name="subway-bangkok-s"/>
+  <symbol minX="1827" maxX="1872" minY="924" maxY="969" name="subway-changchun-s"/>
+  <symbol minX="1872" maxX="1917" minY="924" maxY="969" name="subway-montreal-s"/>
+  <symbol minX="1917" maxX="1962" minY="924" maxY="969" name="subway-minatomirai-s"/>
+  <symbol minX="1962" maxX="2007" minY="924" maxY="969" name="subway-catania-s"/>
+  <symbol minX="0" maxX="45" minY="971" maxY="1016" name="subway-milan-s"/>
+  <symbol minX="45" maxX="90" minY="971" maxY="1016" name="subway-caracas-s"/>
+  <symbol minX="90" maxX="135" minY="971" maxY="1016" name="subway-budapest-s"/>
+  <symbol minX="135" maxX="180" minY="971" maxY="1016" name="subway-mecca-s"/>
+  <symbol minX="180" maxX="225" minY="971" maxY="1016" name="subway-massachusetts-s"/>
+  <symbol minX="225" maxX="270" minY="971" maxY="1016" name="subway-buenosaires-s"/>
+  <symbol minX="270" maxX="315" minY="971" maxY="1016" name="subway-bursaray-s"/>
+  <symbol minX="315" maxX="360" minY="971" maxY="1016" name="subway-samara-s"/>
+  <symbol minX="360" maxX="405" minY="971" maxY="1016" name="subway-kobe-s"/>
+  <symbol minX="405" maxX="450" minY="971" maxY="1016" name="subway-dubai-s"/>
+  <symbol minX="450" maxX="495" minY="971" maxY="1016" name="subway-sofia-s"/>
+  <symbol minX="495" maxX="540" minY="971" maxY="1016" name="subway-shiraz-s"/>
+  <symbol minX="540" maxX="598" minY="971" maxY="1016" name="subway-kryvyirih-m"/>
+  <symbol minX="598" maxX="643" minY="971" maxY="1016" name="subway-shanghai-s"/>
+  <symbol minX="643" maxX="701" minY="971" maxY="1016" name="subway-dnepro-m"/>
+  <symbol minX="701" maxX="746" minY="971" maxY="1016" name="subway-kunming-s"/>
+  <symbol minX="746" maxX="791" minY="971" maxY="1016" name="subway-saopaulo-s"/>
+  <symbol minX="791" maxX="836" minY="971" maxY="1016" name="subway-santodomingo-s"/>
+  <symbol minX="836" maxX="881" minY="971" maxY="1016" name="subway-kyoto-s"/>
+  <symbol minX="881" maxX="937" minY="971" maxY="1016" name="subway-santiago-s"/>
+  <symbol minX="937" maxX="982" minY="971" maxY="1016" name="subway-chicago-s"/>
+  <symbol minX="982" maxX="1040" minY="971" maxY="1016" name="subway-alicante-m"/>
+  <symbol minX="1040" maxX="1085" minY="971" maxY="1016" name="subway-riodejaneiro-s"/>
+  <symbol minX="1085" maxX="1130" minY="971" maxY="1016" name="subway-dalian-s"/>
+  <symbol minX="1130" maxX="1175" minY="971" maxY="1016" name="subway-reseau-paris-s"/>
+  <symbol minX="1175" maxX="1220" minY="971" maxY="1016" name="subway-lille-s"/>
+  <symbol minX="1220" maxX="1265" minY="971" maxY="1016" name="subway-lima-s"/>
+  <symbol minX="1265" maxX="1310" minY="971" maxY="1016" name="subway-perugia-s"/>
+  <symbol minX="1310" maxX="1355" minY="971" maxY="1016" name="subway-lisboa-s"/>
+  <symbol minX="1355" maxX="1413" minY="971" maxY="1015" name="subway-philadelphia-m"/>
+  <symbol minX="1413" maxX="1471" minY="971" maxY="1014" name="subway-osaka-m"/>
+  <symbol minX="1471" maxX="1516" minY="971" maxY="1013" name="subway-maracaibo-s"/>
+  <symbol minX="1516" maxX="1572" minY="971" maxY="1013" name="subway-tabriz-s"/>
+  <symbol minX="1572" maxX="1626" minY="971" maxY="1013" name="subway-almaty-s"/>
+  <symbol minX="1626" maxX="1666" minY="971" maxY="1013" name="subway-amsterdam-s"/>
+  <symbol minX="1666" maxX="1724" minY="971" maxY="1013" name="subway-barcelona-m"/>
+  <symbol minX="1724" maxX="1766" minY="971" maxY="1013" name="subway-lausanne-s"/>
+  <symbol minX="1766" maxX="1822" minY="971" maxY="1013" name="subway-london-m"/>
+  <symbol minX="1822" maxX="1880" minY="971" maxY="1013" name="subway-lucknow-s"/>
+  <symbol minX="1880" maxX="1938" minY="971" maxY="1013" name="subway-madrid-m"/>
+  <symbol minX="1938" maxX="1978" minY="971" maxY="1013" name="subway-mexico-s"/>
+  <symbol minX="1978" maxX="2020" minY="971" maxY="1013" name="search-result"/>
+  <symbol minX="0" maxX="42" minY="1016" maxY="1058" name="cave-m"/>
+  <symbol minX="42" maxX="84" minY="1016" maxY="1058" name="subway-spb-s"/>
+  <symbol minX="84" maxX="142" minY="1016" maxY="1057" name="subway-lucknow-m"/>
+  <symbol minX="142" maxX="182" minY="1016" maxY="1056" name="waterfall-s"/>
+  <symbol minX="182" maxX="222" minY="1016" maxY="1056" name="waste-basket-s"/>
+  <symbol minX="222" maxX="300" minY="1016" maxY="1056" name="coloredmark-bg-s"/>
+  <symbol minX="300" maxX="378" minY="1016" maxY="1056" name="coloredmark-default-s"/>
+  <symbol minX="378" maxX="418" minY="1016" maxY="1056" name="viewpoint-s"/>
+  <symbol minX="418" maxX="458" minY="1016" maxY="1056" name="non-found-search-result"/>
+  <symbol minX="458" maxX="498" minY="1016" maxY="1056" name="zoo-s"/>
+  <symbol minX="498" maxX="538" minY="1016" maxY="1056" name="airport-s"/>
+  <symbol minX="538" maxX="578" minY="1016" maxY="1056" name="shop-s"/>
+  <symbol minX="578" maxX="618" minY="1016" maxY="1056" name="nparkf-outline-s"/>
+  <symbol minX="618" maxX="658" minY="1016" maxY="1056" name="nparkf-s"/>
+  <symbol minX="658" maxX="698" minY="1016" maxY="1056" name="park-outline-s"/>
+  <symbol minX="698" maxX="738" minY="1016" maxY="1056" name="park-s"/>
+  <symbol minX="738" maxX="778" minY="1016" maxY="1056" name="place-of-worship-s"/>
+  <symbol minX="778" maxX="818" minY="1016" maxY="1056" name="remains-s"/>
+  <symbol minX="818" maxX="858" minY="1016" maxY="1056" name="shinto-s"/>
+  <symbol minX="858" maxX="898" minY="1016" maxY="1056" name="ship-s"/>
+  <symbol minX="898" maxX="938" minY="1016" maxY="1056" name="muslim-s"/>
+  <symbol minX="938" maxX="978" minY="1016" maxY="1056" name="stadium-s"/>
+  <symbol minX="978" maxX="1036" minY="1016" maxY="1056" name="subway-bilbao-m"/>
+  <symbol minX="1036" maxX="1090" minY="1016" maxY="1056" name="subway-dnepro-s"/>
+  <symbol minX="1090" maxX="1130" minY="1016" maxY="1056" name="subway-entrance-s"/>
+  <symbol minX="1130" maxX="1188" minY="1016" maxY="1056" name="subway-kolkata-m"/>
+  <symbol minX="1188" maxX="1228" minY="1016" maxY="1056" name="subway-newyork-s"/>
+  <symbol minX="1228" maxX="1277" minY="1016" maxY="1056" name="subway-osaka-s"/>
+  <symbol minX="1277" maxX="1335" minY="1016" maxY="1056" name="subway-palma-m"/>
+  <symbol minX="1335" maxX="1375" minY="1016" maxY="1056" name="fuel-s"/>
+  <symbol minX="1375" maxX="1415" minY="1016" maxY="1056" name="buddhist-s"/>
+  <symbol minX="1415" maxX="1455" minY="1016" maxY="1056" name="bus-s"/>
+  <symbol minX="1455" maxX="1495" minY="1016" maxY="1056" name="cable-car-s"/>
+  <symbol minX="1495" maxX="1535" minY="1016" maxY="1056" name="car-repair-s"/>
+  <symbol minX="1535" maxX="1575" minY="1016" maxY="1056" name="charging-station-s"/>
+  <symbol minX="1575" maxX="1615" minY="1016" maxY="1056" name="christian-s"/>
+  <symbol minX="1615" maxX="1655" minY="1016" maxY="1056" name="college-s"/>
+  <symbol minX="1655" maxX="1695" minY="1016" maxY="1056" name="drinking-water-s"/>
+  <symbol minX="1695" maxX="1726" minY="1016" maxY="1056" name="transit_train-m"/>
+  <symbol minX="1726" maxX="1766" minY="1016" maxY="1056" name="geyser-s"/>
+  <symbol minX="1766" maxX="1806" minY="1016" maxY="1056" name="hindu-s"/>
+  <symbol minX="1806" maxX="1846" minY="1016" maxY="1056" name="hospital-s"/>
+  <symbol minX="1846" maxX="1886" minY="1016" maxY="1056" name="hotel-s"/>
+  <symbol minX="1886" maxX="1926" minY="1016" maxY="1056" name="jewish-s"/>
+  <symbol minX="1926" maxX="1966" minY="1016" maxY="1056" name="lighthouse-s"/>
+  <symbol minX="1966" maxX="2006" minY="1016" maxY="1056" name="monument-s"/>
+  <symbol minX="2006" maxX="2046" minY="1016" maxY="1056" name="museum-s"/>
+  <symbol minX="0" maxX="40" minY="1058" maxY="1098" name="taoist-s"/>
+  <symbol minX="40" maxX="80" minY="1058" maxY="1098" name="subway-s"/>
+  <symbol minX="80" maxX="125" minY="1058" maxY="1098" name="subway-rotterdam-s"/>
+  <symbol minX="125" maxX="156" minY="1058" maxY="1098" name="transit_light_rail-m"/>
+  <symbol minX="156" maxX="201" minY="1058" maxY="1098" name="transfer_arrow"/>
+  <symbol minX="201" maxX="241" minY="1058" maxY="1098" name="tram-s"/>
+  <symbol minX="241" maxX="281" minY="1058" maxY="1098" name="train-s"/>
+  <symbol minX="281" maxX="337" minY="1058" maxY="1098" name="subway-palma-s"/>
+  <symbol minX="337" maxX="377" minY="1058" maxY="1098" name="tourism-s"/>
+  <symbol minX="377" maxX="417" minY="1058" maxY="1098" name="toll_booth-s"/>
+  <symbol minX="417" maxX="457" minY="1058" maxY="1098" name="theme_park-s"/>
+  <symbol minX="457" maxX="497" minY="1058" maxY="1098" name="theatre-s"/>
+  <symbol minX="497" maxX="542" minY="1058" maxY="1098" name="subway-tbilisi-s"/>
+  <symbol minX="542" maxX="593" minY="1058" maxY="1098" name="subway-philadelphia-s"/>
+  <symbol minX="593" maxX="620" minY="1058" maxY="1097" name="bookmark-bg-xs"/>
+  <symbol minX="620" maxX="678" minY="1058" maxY="1097" name="subway-fukuoka-m"/>
+  <symbol minX="678" maxX="705" minY="1058" maxY="1097" name="bookmark-default-xs"/>
+  <symbol minX="705" maxX="763" minY="1058" maxY="1097" name="subway-bucharest-m"/>
+  <symbol minX="763" maxX="821" minY="1058" maxY="1097" name="subway-sanfrancisco-m"/>
+  <symbol minX="821" maxX="879" minY="1058" maxY="1097" name="subway-novosibirsk-m"/>
+  <symbol minX="879" maxX="930" minY="1058" maxY="1096" name="subway-barcelona-s"/>
+  <symbol minX="930" maxX="988" minY="1058" maxY="1096" name="subway-brussel-s"/>
+  <symbol minX="988" maxX="1026" minY="1058" maxY="1096" name="lightrail-berlin-s"/>
+  <symbol minX="1026" maxX="1084" minY="1058" maxY="1096" name="subway-sanfrancisco-s"/>
+  <symbol minX="1084" maxX="1115" minY="1058" maxY="1096" name="transit_monorail-m"/>
+  <symbol minX="1115" maxX="1173" minY="1058" maxY="1096" name="subway-sendai-m"/>
+  <symbol minX="1173" maxX="1211" minY="1058" maxY="1096" name="elevator"/>
+  <symbol minX="1211" maxX="1262" minY="1058" maxY="1096" name="subway-madrid-s"/>
+  <symbol minX="1262" maxX="1300" minY="1058" maxY="1096" name="subway-paris-s"/>
+  <symbol minX="1300" maxX="1356" minY="1058" maxY="1096" name="subway-novosibirsk-s"/>
+  <symbol minX="1356" maxX="1405" minY="1058" maxY="1096" name="subway-kryvyirih-s"/>
+  <symbol minX="1405" maxX="1461" minY="1058" maxY="1096" name="subway-kiev-m"/>
+  <symbol minX="1461" maxX="1519" minY="1058" maxY="1096" name="subway-kharkiv-s"/>
+  <symbol minX="1519" maxX="1555" minY="1058" maxY="1094" name="storage-tank"/>
+  <symbol minX="1555" maxX="1613" minY="1058" maxY="1094" name="subway-sendai-s"/>
+  <symbol minX="1613" maxX="1640" minY="1058" maxY="1094" name="transit_train-s"/>
+  <symbol minX="1640" maxX="1676" minY="1058" maxY="1094" name="transit_subway-m"/>
+  <symbol minX="1676" maxX="1712" minY="1058" maxY="1094" name="board"/>
+  <symbol minX="1712" maxX="1750" minY="1058" maxY="1094" name="subway-moscow-s"/>
+  <symbol minX="1750" maxX="1797" minY="1058" maxY="1094" name="subway-alicante-s"/>
+  <symbol minX="1797" maxX="1833" minY="1058" maxY="1094" name="map"/>
+  <symbol minX="1833" maxX="1891" minY="1058" maxY="1094" name="subway-haagse-s"/>
+  <symbol minX="1891" maxX="1949" minY="1058" maxY="1094" name="subway-kharkiv-m"/>
+  <symbol minX="1949" maxX="2007" minY="1058" maxY="1094" name="subway-brussel-m"/>
+  <symbol minX="0" maxX="56" minY="1098" maxY="1134" name="subway-bucharest-s"/>
+  <symbol minX="56" maxX="114" minY="1098" maxY="1133" name="subway-manila-m"/>
+  <symbol minX="114" maxX="172" minY="1098" maxY="1131" name="subway-taipei-s"/>
+  <symbol minX="172" maxX="230" minY="1098" maxY="1131" name="subway-haagse-m"/>
+  <symbol minX="230" maxX="263" minY="1098" maxY="1131" name="subway-rome-s"/>
+  <symbol minX="263" maxX="296" minY="1098" maxY="1131" name="subway-ubahn-s"/>
+  <symbol minX="296" maxX="352" minY="1098" maxY="1131" name="subway-manila-s"/>
+  <symbol minX="352" maxX="388" minY="1098" maxY="1131" name="subway-seattle-s"/>
+  <symbol minX="388" maxX="446" minY="1098" maxY="1131" name="subway-edmonton-s"/>
+  <symbol minX="446" maxX="488" minY="1098" maxY="1131" name="subway-london-s"/>
+  <symbol minX="488" maxX="521" minY="1098" maxY="1131" name="cave-s"/>
+  <symbol minX="521" maxX="570" minY="1098" maxY="1131" name="subway-bilbao-s"/>
+  <symbol minX="570" maxX="601" minY="1098" maxY="1129" name="transit_subway-s"/>
+  <symbol minX="601" maxX="628" minY="1098" maxY="1129" name="transit_light_rail-s"/>
+  <symbol minX="628" maxX="661" minY="1098" maxY="1129" name="main_entrance-s"/>
+  <symbol minX="661" maxX="688" minY="1098" maxY="1129" name="transit_monorail-s"/>
+  <symbol minX="688" maxX="726" minY="1098" maxY="1129" name="bench"/>
+  <symbol minX="726" maxX="746" minY="1098" maxY="1129" name="entrance-s"/>
+  <symbol minX="746" maxX="777" minY="1098" maxY="1129" name="speedcam-s"/>
+  <symbol minX="777" maxX="808" minY="1098" maxY="1129" name="subway-xs"/>
+  <symbol minX="808" maxX="839" minY="1098" maxY="1129" name="subway-newyork-xs"/>
+  <symbol minX="839" maxX="870" minY="1098" maxY="1129" name="parking-s"/>
+  <symbol minX="870" maxX="919" minY="1098" maxY="1129" name="railway-crossing-l"/>
+  <symbol minX="919" maxX="950" minY="1098" maxY="1129" name="star-l"/>
+  <symbol minX="950" maxX="1008" minY="1098" maxY="1128" name="subway-edmonton-m"/>
+  <symbol minX="1008" maxX="1050" minY="1098" maxY="1127" name="subway-kolkata-s"/>
+  <symbol minX="1050" maxX="1097" minY="1098" maxY="1127" name="subway-kiev-s"/>
+  <symbol minX="1097" maxX="1130" minY="1098" maxY="1127" name="volcano-m"/>
+  <symbol minX="1130" maxX="1186" minY="1098" maxY="1127" name="subway-malaga-s"/>
+  <symbol minX="1186" maxX="1215" minY="1098" maxY="1127" name="star-m"/>
+  <symbol minX="1215" maxX="1273" minY="1098" maxY="1126" name="subway-malaga-m"/>
+  <symbol minX="1273" maxX="1331" minY="1098" maxY="1126" name="subway-taipei-m"/>
+  <symbol minX="1331" maxX="1373" minY="1098" maxY="1125" name="railway-crossing-m"/>
+  <symbol minX="1373" maxX="1429" minY="1098" maxY="1125" name="subway-baku-s"/>
+  <symbol minX="1429" maxX="1460" minY="1098" maxY="1125" name="plaque"/>
+  <symbol minX="1460" maxX="1507" minY="1098" maxY="1125" name="subway-minsk-m"/>
+  <symbol minX="1507" maxX="1565" minY="1098" maxY="1124" name="subway-baku-m"/>
+  <symbol minX="1565" maxX="1623" minY="1098" maxY="1123" name="subway-chongqing-s"/>
+  <symbol minX="1623" maxX="1647" minY="1098" maxY="1122" name="star-s"/>
+  <symbol minX="1647" maxX="1689" minY="1098" maxY="1122" name="subway-minsk-s"/>
+  <symbol minX="1689" maxX="1747" minY="1098" maxY="1121" name="subway-chongqing-m"/>
+  <symbol minX="1747" maxX="1798" minY="1098" maxY="1120" name="arrow-m"/>
+  <symbol minX="1798" maxX="1822" minY="1098" maxY="1120" name="volcano-s"/>
+  <symbol minX="1822" maxX="1846" minY="1098" maxY="1120" name="peakt-m"/>
+  <symbol minX="1846" maxX="1886" minY="1098" maxY="1120" name="mountain-pass"/>
+  <symbol minX="1886" maxX="1906" minY="1098" maxY="1118" name="zero-icon"/>
+  <symbol minX="1906" maxX="1926" minY="1098" maxY="1116" name="peakt-s"/>
+  <symbol minX="1926" maxX="1941" minY="1098" maxY="1113" name="dot-m"/>
+  <symbol minX="1941" maxX="1979" minY="1098" maxY="1113" name="arrow-s"/>
+  <symbol minX="1979" maxX="2003" minY="1098" maxY="1109" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index c06161f2c5..2051e10801 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 9d08814d9d..2ccff2e44a 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -3,700 +3,695 @@
  <file width="1024" height="1024">
   <symbol minX="0" maxX="115" minY="0" maxY="70" name="route-arrow"/>
   <symbol minX="115" maxX="179" minY="0" maxY="64" name="compass-image"/>
-  <symbol minX="179" maxX="240" minY="0" maxY="61" name="cross_geoposition"/>
-  <symbol minX="240" maxX="304" minY="0" maxY="61" name="route-point-finish"/>
-  <symbol minX="304" maxX="365" minY="0" maxY="61" name="shield-us-i-wide-scaled"/>
-  <symbol minX="365" maxX="417" minY="0" maxY="61" name="shield-us-i-thin-scaled"/>
+  <symbol minX="179" maxX="231" minY="0" maxY="61" name="shield-us-i-thin-scaled"/>
+  <symbol minX="231" maxX="292" minY="0" maxY="61" name="shield-us-i-wide-scaled"/>
+  <symbol minX="292" maxX="353" minY="0" maxY="61" name="cross_geoposition"/>
+  <symbol minX="353" maxX="417" minY="0" maxY="61" name="route-point-finish"/>
   <symbol minX="417" maxX="475" minY="0" maxY="58" name="search-result-shop-department_store"/>
-  <symbol minX="475" maxX="533" minY="0" maxY="58" name="search-result-marketplace"/>
-  <symbol minX="533" maxX="591" minY="0" maxY="58" name="search-result-shop-cosmetics"/>
-  <symbol minX="591" maxX="649" minY="0" maxY="58" name="search-result-shop-convenience"/>
-  <symbol minX="649" maxX="707" minY="0" maxY="58" name="search-result-shop-confectionery"/>
-  <symbol minX="707" maxX="765" minY="0" maxY="58" name="search-result-shop-clothes"/>
-  <symbol minX="765" maxX="823" minY="0" maxY="58" name="search-result-shop-butcher"/>
-  <symbol minX="823" maxX="881" minY="0" maxY="58" name="search-result-shop-alcohol"/>
-  <symbol minX="881" maxX="939" minY="0" maxY="58" name="search-result-restaurant"/>
-  <symbol minX="939" maxX="997" minY="0" maxY="58" name="search-result-pub"/>
-  <symbol minX="0" maxX="58" minY="70" maxY="128" name="search-result-playground"/>
-  <symbol minX="58" maxX="116" minY="70" maxY="128" name="search-result-nightclub"/>
-  <symbol minX="116" maxX="174" minY="70" maxY="128" name="search-result-fastfood"/>
-  <symbol minX="174" maxX="232" minY="70" maxY="128" name="search-result-cinema"/>
-  <symbol minX="232" maxX="290" minY="70" maxY="128" name="search-result-casino"/>
-  <symbol minX="290" maxX="348" minY="70" maxY="128" name="search-result-cafe"/>
-  <symbol minX="348" maxX="406" minY="70" maxY="128" name="search-result-bar"/>
-  <symbol minX="406" maxX="464" minY="70" maxY="128" name="search-result-bakery"/>
-  <symbol minX="464" maxX="522" minY="70" maxY="128" name="search-result-shop-greengrocer"/>
-  <symbol minX="522" maxX="583" minY="70" maxY="128" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="583" maxX="641" minY="70" maxY="128" name="search-result-zoo"/>
-  <symbol minX="641" maxX="699" minY="70" maxY="128" name="search-result-shop-gift"/>
-  <symbol minX="699" maxX="757" minY="70" maxY="128" name="search-result-water-park"/>
-  <symbol minX="757" maxX="815" minY="70" maxY="128" name="search-result-theme-park"/>
-  <symbol minX="815" maxX="873" minY="70" maxY="128" name="search-result-shop-toys"/>
-  <symbol minX="873" maxX="931" minY="70" maxY="128" name="search-result-shop-supermarket"/>
-  <symbol minX="931" maxX="989" minY="70" maxY="128" name="search-result-shop-sports"/>
-  <symbol minX="0" maxX="58" minY="128" maxY="186" name="search-result-shop-shoes"/>
-  <symbol minX="58" maxX="116" minY="128" maxY="186" name="search-result-shop-seafood"/>
-  <symbol minX="116" maxX="174" minY="128" maxY="186" name="search-result-shop-mall"/>
-  <symbol minX="174" maxX="232" minY="128" maxY="186" name="search-result-shop-jewelry"/>
-  <symbol minX="232" maxX="284" minY="128" maxY="183" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="284" maxX="327" minY="128" maxY="182" name="ferry"/>
-  <symbol minX="327" maxX="370" minY="128" maxY="182" name="unpaved_road"/>
-  <symbol minX="370" maxX="413" minY="128" maxY="182" name="paid_road"/>
-  <symbol minX="413" maxX="465" minY="128" maxY="180" name="infosign"/>
-  <symbol minX="465" maxX="517" minY="128" maxY="180" name="track_marker_selected"/>
-  <symbol minX="517" maxX="552" minY="128" maxY="178" name="bookmark-parking-m"/>
-  <symbol minX="552" maxX="587" minY="128" maxY="178" name="bookmark-museum-m"/>
-  <symbol minX="587" maxX="622" minY="128" maxY="178" name="bookmark-building-m"/>
-  <symbol minX="622" maxX="657" minY="128" maxY="178" name="bookmark-water-m"/>
-  <symbol minX="657" maxX="692" minY="128" maxY="178" name="bookmark-buddhism-m"/>
-  <symbol minX="692" maxX="727" minY="128" maxY="178" name="bookmark-animals-m"/>
-  <symbol minX="727" maxX="762" minY="128" maxY="178" name="bookmark-viewpoint-m"/>
-  <symbol minX="762" maxX="797" minY="128" maxY="178" name="bookmark-transport-m"/>
-  <symbol minX="797" maxX="832" minY="128" maxY="178" name="bookmark-swim-m"/>
-  <symbol minX="832" maxX="867" minY="128" maxY="178" name="bookmark-start-m"/>
-  <symbol minX="867" maxX="902" minY="128" maxY="178" name="bookmark-sport-m"/>
-  <symbol minX="902" maxX="937" minY="128" maxY="178" name="bookmark-sights-m"/>
-  <symbol minX="937" maxX="972" minY="128" maxY="178" name="bookmark-shop-m"/>
-  <symbol minX="972" maxX="1007" minY="128" maxY="178" name="bookmark-bg-m"/>
-  <symbol minX="0" maxX="35" minY="186" maxY="236" name="bookmark-park-m"/>
-  <symbol minX="35" maxX="70" minY="186" maxY="236" name="bookmark-mountain-m"/>
-  <symbol minX="70" maxX="105" minY="186" maxY="236" name="bookmark-medicine-m"/>
-  <symbol minX="105" maxX="140" minY="186" maxY="236" name="bookmark-judaism-m"/>
-  <symbol minX="140" maxX="175" minY="186" maxY="236" name="bookmark-islam-m"/>
-  <symbol minX="175" maxX="210" minY="186" maxY="236" name="bookmark-hotel-m"/>
-  <symbol minX="210" maxX="245" minY="186" maxY="236" name="bookmark-gas-m"/>
-  <symbol minX="245" maxX="280" minY="186" maxY="236" name="bookmark-food-m"/>
-  <symbol minX="280" maxX="315" minY="186" maxY="236" name="bookmark-finish-m"/>
-  <symbol minX="315" maxX="350" minY="186" maxY="236" name="bookmark-exchange-m"/>
-  <symbol minX="350" maxX="385" minY="186" maxY="236" name="bookmark-entertainment-m"/>
-  <symbol minX="385" maxX="420" minY="186" maxY="236" name="bookmark-default-m"/>
-  <symbol minX="420" maxX="455" minY="186" maxY="236" name="bookmark-bar-m"/>
-  <symbol minX="455" maxX="490" minY="186" maxY="236" name="bookmark-christianity-m"/>
-  <symbol minX="490" maxX="554" minY="186" maxY="232" name="norating-bg-l"/>
-  <symbol minX="554" maxX="600" minY="186" maxY="232" name="route-point-start"/>
-  <symbol minX="600" maxX="646" minY="186" maxY="232" name="route-point-9"/>
-  <symbol minX="646" maxX="692" minY="186" maxY="232" name="route-point-8"/>
-  <symbol minX="692" maxX="738" minY="186" maxY="232" name="route-point-7"/>
-  <symbol minX="738" maxX="784" minY="186" maxY="232" name="route-point-6"/>
-  <symbol minX="784" maxX="830" minY="186" maxY="232" name="route-point-5"/>
-  <symbol minX="830" maxX="876" minY="186" maxY="232" name="route-point-4"/>
-  <symbol minX="876" maxX="922" minY="186" maxY="232" name="route-point-3"/>
-  <symbol minX="922" maxX="968" minY="186" maxY="232" name="route-point-20"/>
-  <symbol minX="968" maxX="1014" minY="186" maxY="232" name="route-point-2"/>
-  <symbol minX="0" maxX="46" minY="236" maxY="282" name="route-point-19"/>
-  <symbol minX="46" maxX="92" minY="236" maxY="282" name="route-point-18"/>
-  <symbol minX="92" maxX="138" minY="236" maxY="282" name="route-point-17"/>
-  <symbol minX="138" maxX="184" minY="236" maxY="282" name="route-point-16"/>
-  <symbol minX="184" maxX="230" minY="236" maxY="282" name="route-point-15"/>
-  <symbol minX="230" maxX="276" minY="236" maxY="282" name="route-point-14"/>
-  <symbol minX="276" maxX="322" minY="236" maxY="282" name="route-point-13"/>
-  <symbol minX="322" maxX="368" minY="236" maxY="282" name="route-point-12"/>
-  <symbol minX="368" maxX="414" minY="236" maxY="282" name="route-point-11"/>
-  <symbol minX="414" maxX="460" minY="236" maxY="282" name="route-point-10"/>
-  <symbol minX="460" maxX="506" minY="236" maxY="282" name="route-point-1"/>
-  <symbol minX="506" maxX="570" minY="236" maxY="282" name="norating-default-l"/>
-  <symbol minX="570" maxX="634" minY="236" maxY="282" name="coloredmark-bg-l"/>
-  <symbol minX="634" maxX="698" minY="236" maxY="282" name="coloredmark-default-l"/>
-  <symbol minX="698" maxX="732" minY="236" maxY="276" name="shield-us-i-thin"/>
-  <symbol minX="732" maxX="775" minY="236" maxY="276" name="shield-us-i-wide"/>
-  <symbol minX="775" maxX="812" minY="236" maxY="273" name="shield-us-hw-thin"/>
-  <symbol minX="812" maxX="855" minY="236" maxY="273" name="shield-us-hw-wide"/>
-  <symbol minX="855" maxX="881" minY="236" maxY="271" name="bookmark-default-s"/>
-  <symbol minX="881" maxX="907" minY="236" maxY="271" name="bookmark-bg-s"/>
-  <symbol minX="907" maxX="941" minY="236" maxY="270" name="track_marker_deselected"/>
-  <symbol minX="941" maxX="975" minY="236" maxY="270" name="current-position"/>
-  <symbol minX="975" maxX="1006" minY="236" maxY="267" name="subway-chengdu-m"/>
-  <symbol minX="0" maxX="31" minY="282" maxY="313" name="subway-guadalajara-m"/>
-  <symbol minX="31" maxX="62" minY="282" maxY="313" name="subway-glasgow-m"/>
-  <symbol minX="62" maxX="93" minY="282" maxY="313" name="subway-foshan-m"/>
-  <symbol minX="93" maxX="124" minY="282" maxY="313" name="subway-ekb-m"/>
-  <symbol minX="124" maxX="155" minY="282" maxY="313" name="subway-dubai-m"/>
-  <symbol minX="155" maxX="185" minY="282" maxY="313" name="subway-delhi-m"/>
-  <symbol minX="185" maxX="216" minY="282" maxY="313" name="subway-chicago-m"/>
-  <symbol minX="216" maxX="247" minY="282" maxY="313" name="airport-m"/>
-  <symbol minX="247" maxX="278" minY="282" maxY="313" name="subway-changchun-m"/>
-  <symbol minX="278" maxX="309" minY="282" maxY="313" name="subway-catania-m"/>
-  <symbol minX="309" maxX="340" minY="282" maxY="313" name="subway-caracas-m"/>
-  <symbol minX="340" maxX="371" minY="282" maxY="313" name="subway-cairo-m"/>
-  <symbol minX="371" maxX="402" minY="282" maxY="313" name="subway-bursaray-m"/>
-  <symbol minX="402" maxX="433" minY="282" maxY="313" name="subway-buenosaires-m"/>
-  <symbol minX="433" maxX="464" minY="282" maxY="313" name="subway-budapest-m"/>
-  <symbol minX="464" maxX="493" minY="282" maxY="313" name="subway-brescia-m"/>
-  <symbol minX="493" maxX="524" minY="282" maxY="313" name="subway-helsinki-m"/>
-  <symbol minX="524" maxX="555" minY="282" maxY="313" name="subway-hirosima-m"/>
-  <symbol minX="555" maxX="586" minY="282" maxY="313" name="subway-isfahan-m"/>
-  <symbol minX="586" maxX="612" minY="282" maxY="313" name="subway-istanbul-m"/>
-  <symbol minX="612" maxX="643" minY="282" maxY="313" name="subway-kazan-m"/>
-  <symbol minX="643" maxX="674" minY="282" maxY="313" name="subway-kobe-m"/>
-  <symbol minX="674" maxX="705" minY="282" maxY="313" name="subway-kunming-m"/>
-  <symbol minX="705" maxX="736" minY="282" maxY="313" name="subway-kyoto-m"/>
-  <symbol minX="736" maxX="767" minY="282" maxY="313" name="subway-lausanne-m"/>
-  <symbol minX="767" maxX="798" minY="282" maxY="313" name="subway-lille-m"/>
-  <symbol minX="798" maxX="829" minY="282" maxY="313" name="subway-lima-m"/>
-  <symbol minX="829" maxX="860" minY="282" maxY="313" name="subway-lisboa-m"/>
-  <symbol minX="860" maxX="891" minY="282" maxY="313" name="subway-losangeles-m"/>
-  <symbol minX="891" maxX="922" minY="282" maxY="313" name="subway-m"/>
-  <symbol minX="922" maxX="953" minY="282" maxY="313" name="subway-marseille-s"/>
-  <symbol minX="953" maxX="984" minY="282" maxY="313" name="subway-mashhad-m"/>
-  <symbol minX="984" maxX="1015" minY="282" maxY="313" name="second_hand_shop-m"/>
-  <symbol minX="0" maxX="31" minY="313" maxY="344" name="skateboard-m"/>
-  <symbol minX="31" maxX="62" minY="313" maxY="344" name="shower-m"/>
-  <symbol minX="62" maxX="93" minY="313" maxY="344" name="shop-m"/>
-  <symbol minX="93" maxX="124" minY="313" maxY="344" name="shop-bicycle-m"/>
-  <symbol minX="124" maxX="155" minY="313" maxY="344" name="shoes-m"/>
-  <symbol minX="155" maxX="186" minY="313" maxY="344" name="ship-m"/>
-  <symbol minX="186" maxX="217" minY="313" maxY="344" name="shinto-m"/>
-  <symbol minX="217" maxX="248" minY="313" maxY="344" name="shelter-m"/>
-  <symbol minX="248" maxX="279" minY="313" maxY="344" name="skiing-m"/>
-  <symbol minX="279" maxX="310" minY="313" maxY="344" name="seafood-shop-m"/>
-  <symbol minX="310" maxX="341" minY="313" maxY="344" name="school-m"/>
-  <symbol minX="341" maxX="372" minY="313" maxY="344" name="sawmill-m"/>
-  <symbol minX="372" maxX="403" minY="313" maxY="344" name="sauna-m"/>
-  <symbol minX="403" maxX="434" minY="313" maxY="344" name="sample_collection-m"/>
-  <symbol minX="434" maxX="465" minY="313" maxY="344" name="subway-guangzhou-m"/>
-  <symbol minX="465" maxX="496" minY="313" maxY="344" name="restaurant-m"/>
-  <symbol minX="496" maxX="527" minY="313" maxY="344" name="subway-adana-s"/>
-  <symbol minX="527" maxX="558" minY="313" maxY="344" name="subway-bengaluru-m"/>
-  <symbol minX="558" maxX="589" minY="313" maxY="344" name="subway-beijing-m"/>
-  <symbol minX="589" maxX="620" minY="313" maxY="344" name="subway-bangkok-m"/>
-  <symbol minX="620" maxX="650" minY="313" maxY="344" name="subway-athens-m"/>
-  <symbol minX="650" maxX="681" minY="313" maxY="344" name="subway-ankara-s"/>
-  <symbol minX="681" maxX="712" minY="313" maxY="344" name="subway-ankara-m"/>
-  <symbol minX="712" maxX="740" minY="313" maxY="344" name="subway-amsterdam-m"/>
-  <symbol minX="740" maxX="771" minY="313" maxY="344" name="subway-algeria-m"/>
-  <symbol minX="771" maxX="802" minY="313" maxY="344" name="subway-brasilia-m"/>
-  <symbol minX="802" maxX="833" minY="313" maxY="344" name="subway-adana-m"/>
-  <symbol minX="833" maxX="864" minY="313" maxY="344" name="stationery_shop-m"/>
-  <symbol minX="864" maxX="895" minY="313" maxY="344" name="stadium-m"/>
-  <symbol minX="895" maxX="926" minY="313" maxY="344" name="sports-m"/>
-  <symbol minX="926" maxX="957" minY="313" maxY="344" name="speedcam-alert-l"/>
-  <symbol minX="957" maxX="988" minY="313" maxY="344" name="speech_therapist-m"/>
-  <symbol minX="988" maxX="1019" minY="313" maxY="344" name="soccer-m"/>
-  <symbol minX="0" maxX="31" minY="344" maxY="375" name="taoist-m"/>
-  <symbol minX="31" maxX="62" minY="344" maxY="375" name="toll_booth-m"/>
-  <symbol minX="62" maxX="93" minY="344" maxY="375" name="toilets-m"/>
-  <symbol minX="93" maxX="124" minY="344" maxY="375" name="tire-repair-m"/>
-  <symbol minX="124" maxX="155" minY="344" maxY="375" name="ticket-shop-m"/>
-  <symbol minX="155" maxX="186" minY="344" maxY="375" name="theme_park-m"/>
-  <symbol minX="186" maxX="217" minY="344" maxY="375" name="theatre-m"/>
-  <symbol minX="217" maxX="248" minY="344" maxY="375" name="tennis-m"/>
-  <symbol minX="248" maxX="279" minY="344" maxY="375" name="taxi-m"/>
-  <symbol minX="279" maxX="310" minY="344" maxY="375" name="tomb-m"/>
-  <symbol minX="310" maxX="341" minY="344" maxY="375" name="table-tennis-m"/>
-  <symbol minX="341" maxX="372" minY="344" maxY="375" name="swimming-m"/>
-  <symbol minX="372" maxX="403" minY="344" maxY="375" name="sweets-m"/>
-  <symbol minX="403" maxX="434" minY="344" maxY="375" name="survey_point-m"/>
-  <symbol minX="434" maxX="465" minY="344" maxY="375" name="subway-yokohama-m"/>
-  <symbol minX="465" maxX="496" minY="344" maxY="375" name="subway-wuhan-m"/>
-  <symbol minX="496" maxX="527" minY="344" maxY="375" name="subway-washington-m"/>
-  <symbol minX="527" maxX="558" minY="344" maxY="375" name="video-games-m"/>
-  <symbol minX="558" maxX="589" minY="344" maxY="375" name="zoo-m"/>
-  <symbol minX="589" maxX="620" minY="344" maxY="375" name="yoga-m"/>
-  <symbol minX="620" maxX="651" minY="344" maxY="375" name="windmill-m"/>
-  <symbol minX="651" maxX="682" minY="344" maxY="375" name="wayside_shrine-m"/>
-  <symbol minX="682" maxX="713" minY="344" maxY="375" name="waterfall-m"/>
-  <symbol minX="713" maxX="744" minY="344" maxY="375" name="waste-basket-m"/>
-  <symbol minX="744" maxX="775" minY="344" maxY="375" name="volleyball-m"/>
-  <symbol minX="775" maxX="806" minY="344" maxY="375" name="viewpoint-m"/>
-  <symbol minX="806" maxX="837" minY="344" maxY="375" name="subway-warszawa-m"/>
-  <symbol minX="837" maxX="868" minY="344" maxY="375" name="veterinary-m"/>
-  <symbol minX="868" maxX="899" minY="344" maxY="375" name="vending-m"/>
-  <symbol minX="899" maxX="930" minY="344" maxY="375" name="travel_agency_shop-m"/>
-  <symbol minX="930" maxX="961" minY="344" maxY="375" name="tram-m"/>
-  <symbol minX="961" maxX="992" minY="344" maxY="375" name="train-m"/>
-  <symbol minX="992" maxX="1023" minY="344" maxY="375" name="toys-m"/>
-  <symbol minX="0" maxX="31" minY="375" maxY="406" name="tourism-m"/>
-  <symbol minX="31" maxX="61" minY="375" maxY="406" name="subway-nnov-m"/>
-  <symbol minX="61" maxX="92" minY="375" maxY="406" name="subway-reseau-paris-m"/>
-  <symbol minX="92" maxX="123" minY="375" maxY="406" name="subway-rennes-m"/>
-  <symbol minX="123" maxX="154" minY="375" maxY="406" name="subway-pyongyang-m"/>
-  <symbol minX="154" maxX="184" minY="375" maxY="406" name="subway-porto-m"/>
-  <symbol minX="184" maxX="215" minY="375" maxY="406" name="subway-pittsburgh-m"/>
-  <symbol minX="215" maxX="246" minY="375" maxY="406" name="subway-perugia-m"/>
-  <symbol minX="246" maxX="277" minY="375" maxY="406" name="subway-panama-m"/>
-  <symbol minX="277" maxX="308" minY="375" maxY="406" name="subway-oslo-m"/>
-  <symbol minX="308" maxX="339" minY="375" maxY="406" name="subway-riodejaneiro-m"/>
-  <symbol minX="339" maxX="370" minY="375" maxY="406" name="subway-newyork-m"/>
-  <symbol minX="370" maxX="401" minY="375" maxY="406" name="subway-nagoya-m"/>
-  <symbol minX="401" maxX="432" minY="375" maxY="406" name="subway-minatomirai-m"/>
-  <symbol minX="432" maxX="463" minY="375" maxY="406" name="subway-milan-m"/>
-  <symbol minX="463" maxX="493" minY="375" maxY="406" name="subway-mexico-m"/>
-  <symbol minX="493" maxX="524" minY="375" maxY="406" name="subway-medellin-m"/>
-  <symbol minX="524" maxX="555" minY="375" maxY="406" name="subway-mecca-m"/>
-  <symbol minX="555" maxX="586" minY="375" maxY="406" name="subway-massachusetts-m"/>
-  <symbol minX="586" maxX="617" minY="375" maxY="406" name="subway-samara-m"/>
-  <symbol minX="617" maxX="648" minY="375" maxY="406" name="subway-santodomingo-m"/>
-  <symbol minX="648" maxX="679" minY="375" maxY="406" name="subway-saopaulo-m"/>
-  <symbol minX="679" maxX="710" minY="375" maxY="406" name="subway-shiraz-m"/>
-  <symbol minX="710" maxX="741" minY="375" maxY="406" name="subway-sofia-m"/>
-  <symbol minX="741" maxX="772" minY="375" maxY="406" name="subway-southkorea-m"/>
-  <symbol minX="772" maxX="803" minY="375" maxY="406" name="subway-stlouis-m"/>
-  <symbol minX="803" maxX="834" minY="375" maxY="406" name="subway-stockholm-m"/>
-  <symbol minX="834" maxX="865" minY="375" maxY="406" name="subway-tashkent-m"/>
-  <symbol minX="865" maxX="896" minY="375" maxY="406" name="subway-tianjin-m"/>
-  <symbol minX="896" maxX="927" minY="375" maxY="406" name="subway-tokyo-m"/>
-  <symbol minX="927" maxX="958" minY="375" maxY="406" name="subway-tyneandwear-m"/>
-  <symbol minX="958" maxX="989" minY="375" maxY="406" name="subway-valencia-m"/>
-  <symbol minX="989" maxX="1020" minY="375" maxY="406" name="subway-vienna-m"/>
-  <symbol minX="0" maxX="31" minY="406" maxY="437" name="subway-volgograd-m"/>
-  <symbol minX="31" maxX="62" minY="406" maxY="437" name="lawyer-m"/>
-  <symbol minX="62" maxX="93" minY="406" maxY="437" name="cemetery-m"/>
-  <symbol minX="93" maxX="124" minY="406" maxY="437" name="mail-m"/>
-  <symbol minX="124" maxX="155" minY="406" maxY="437" name="charging-station-m"/>
-  <symbol minX="155" maxX="186" minY="406" maxY="437" name="charity_shop-m"/>
-  <symbol minX="186" maxX="217" minY="406" maxY="437" name="cheese-m"/>
-  <symbol minX="217" maxX="248" minY="406" maxY="437" name="chemist-m"/>
-  <symbol minX="248" maxX="279" minY="406" maxY="437" name="chess-m"/>
-  <symbol minX="279" maxX="310" minY="406" maxY="437" name="lighthouse-m"/>
-  <symbol minX="310" maxX="341" minY="406" maxY="437" name="chimney-m"/>
-  <symbol minX="341" maxX="372" minY="406" maxY="437" name="christian-m"/>
-  <symbol minX="372" maxX="403" minY="406" maxY="437" name="lift_gate-m"/>
-  <symbol minX="403" maxX="434" minY="406" maxY="437" name="cinema-m"/>
-  <symbol minX="434" maxX="465" minY="406" maxY="437" name="library-m"/>
-  <symbol minX="465" maxX="496" minY="406" maxY="437" name="climbing-m"/>
-  <symbol minX="496" maxX="527" minY="406" maxY="437" name="marina-m"/>
-  <symbol minX="527" maxX="558" minY="406" maxY="437" name="clothes-m"/>
-  <symbol minX="558" maxX="589" minY="406" maxY="437" name="laundry-m"/>
-  <symbol minX="589" maxX="620" minY="406" maxY="437" name="language_school-m"/>
-  <symbol minX="620" maxX="651" minY="406" maxY="437" name="kiosk-m"/>
-  <symbol minX="651" maxX="682" minY="406" maxY="437" name="kindergarten-m"/>
-  <symbol minX="682" maxX="713" minY="406" maxY="437" name="college-m"/>
-  <symbol minX="713" maxX="744" minY="406" maxY="437" name="jewish-m"/>
+  <symbol minX="475" maxX="533" minY="0" maxY="58" name="search-result-shop-supermarket"/>
+  <symbol minX="533" maxX="591" minY="0" maxY="58" name="search-result-shop-shoes"/>
+  <symbol minX="591" maxX="649" minY="0" maxY="58" name="search-result-shop-cosmetics"/>
+  <symbol minX="649" maxX="707" minY="0" maxY="58" name="search-result-shop-convenience"/>
+  <symbol minX="707" maxX="765" minY="0" maxY="58" name="search-result-shop-alcohol"/>
+  <symbol minX="765" maxX="823" minY="0" maxY="58" name="search-result-pub"/>
+  <symbol minX="823" maxX="881" minY="0" maxY="58" name="search-result-restaurant"/>
+  <symbol minX="881" maxX="939" minY="0" maxY="58" name="search-result-cinema"/>
+  <symbol minX="939" maxX="997" minY="0" maxY="58" name="search-result-fastfood"/>
+  <symbol minX="0" maxX="58" minY="70" maxY="128" name="search-result-shop-sports"/>
+  <symbol minX="58" maxX="116" minY="70" maxY="128" name="search-result-shop-confectionery"/>
+  <symbol minX="116" maxX="174" minY="70" maxY="128" name="search-result-marketplace"/>
+  <symbol minX="174" maxX="232" minY="70" maxY="128" name="search-result-water-park"/>
+  <symbol minX="232" maxX="290" minY="70" maxY="128" name="search-result-theme-park"/>
+  <symbol minX="290" maxX="348" minY="70" maxY="128" name="search-result-shop-butcher"/>
+  <symbol minX="348" maxX="406" minY="70" maxY="128" name="search-result-nightclub"/>
+  <symbol minX="406" maxX="464" minY="70" maxY="128" name="search-result-playground"/>
+  <symbol minX="464" maxX="522" minY="70" maxY="128" name="search-result-shop-gift"/>
+  <symbol minX="522" maxX="580" minY="70" maxY="128" name="search-result-shop-toys"/>
+  <symbol minX="580" maxX="638" minY="70" maxY="128" name="search-result-shop-greengrocer"/>
+  <symbol minX="638" maxX="696" minY="70" maxY="128" name="search-result-shop-jewelry"/>
+  <symbol minX="696" maxX="754" minY="70" maxY="128" name="search-result-bakery"/>
+  <symbol minX="754" maxX="812" minY="70" maxY="128" name="search-result-bar"/>
+  <symbol minX="812" maxX="870" minY="70" maxY="128" name="search-result-shop-mall"/>
+  <symbol minX="870" maxX="928" minY="70" maxY="128" name="search-result-shop-seafood"/>
+  <symbol minX="928" maxX="986" minY="70" maxY="128" name="search-result-shop-clothes"/>
+  <symbol minX="0" maxX="61" minY="128" maxY="186" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="61" maxX="119" minY="128" maxY="186" name="search-result-cafe"/>
+  <symbol minX="119" maxX="177" minY="128" maxY="186" name="search-result-casino"/>
+  <symbol minX="177" maxX="235" minY="128" maxY="186" name="search-result-zoo"/>
+  <symbol minX="235" maxX="287" minY="128" maxY="183" name="shield-us-hw-thin-scaled"/>
+  <symbol minX="287" maxX="330" minY="128" maxY="182" name="ferry"/>
+  <symbol minX="330" maxX="373" minY="128" maxY="182" name="unpaved_road"/>
+  <symbol minX="373" maxX="416" minY="128" maxY="182" name="paid_road"/>
+  <symbol minX="416" maxX="468" minY="128" maxY="180" name="track_marker_selected"/>
+  <symbol minX="468" maxX="520" minY="128" maxY="180" name="infosign"/>
+  <symbol minX="520" maxX="555" minY="128" maxY="178" name="bookmark-building-m"/>
+  <symbol minX="555" maxX="590" minY="128" maxY="178" name="bookmark-parking-m"/>
+  <symbol minX="590" maxX="625" minY="128" maxY="178" name="bookmark-buddhism-m"/>
+  <symbol minX="625" maxX="660" minY="128" maxY="178" name="bookmark-mountain-m"/>
+  <symbol minX="660" maxX="695" minY="128" maxY="178" name="bookmark-christianity-m"/>
+  <symbol minX="695" maxX="730" minY="128" maxY="178" name="bookmark-default-m"/>
+  <symbol minX="730" maxX="765" minY="128" maxY="178" name="bookmark-medicine-m"/>
+  <symbol minX="765" maxX="800" minY="128" maxY="178" name="bookmark-judaism-m"/>
+  <symbol minX="800" maxX="835" minY="128" maxY="178" name="bookmark-islam-m"/>
+  <symbol minX="835" maxX="870" minY="128" maxY="178" name="bookmark-hotel-m"/>
+  <symbol minX="870" maxX="905" minY="128" maxY="178" name="bookmark-entertainment-m"/>
+  <symbol minX="905" maxX="940" minY="128" maxY="178" name="bookmark-gas-m"/>
+  <symbol minX="940" maxX="975" minY="128" maxY="178" name="bookmark-exchange-m"/>
+  <symbol minX="975" maxX="1010" minY="128" maxY="178" name="bookmark-finish-m"/>
+  <symbol minX="0" maxX="35" minY="186" maxY="236" name="bookmark-food-m"/>
+  <symbol minX="35" maxX="70" minY="186" maxY="236" name="bookmark-park-m"/>
+  <symbol minX="70" maxX="105" minY="186" maxY="236" name="bookmark-water-m"/>
+  <symbol minX="105" maxX="140" minY="186" maxY="236" name="bookmark-viewpoint-m"/>
+  <symbol minX="140" maxX="175" minY="186" maxY="236" name="bookmark-transport-m"/>
+  <symbol minX="175" maxX="210" minY="186" maxY="236" name="bookmark-swim-m"/>
+  <symbol minX="210" maxX="245" minY="186" maxY="236" name="bookmark-start-m"/>
+  <symbol minX="245" maxX="280" minY="186" maxY="236" name="bookmark-sport-m"/>
+  <symbol minX="280" maxX="315" minY="186" maxY="236" name="bookmark-sights-m"/>
+  <symbol minX="315" maxX="350" minY="186" maxY="236" name="bookmark-shop-m"/>
+  <symbol minX="350" maxX="385" minY="186" maxY="236" name="bookmark-animals-m"/>
+  <symbol minX="385" maxX="420" minY="186" maxY="236" name="bookmark-bar-m"/>
+  <symbol minX="420" maxX="455" minY="186" maxY="236" name="bookmark-bg-m"/>
+  <symbol minX="455" maxX="490" minY="186" maxY="236" name="bookmark-museum-m"/>
+  <symbol minX="490" maxX="536" minY="186" maxY="232" name="route-point-16"/>
+  <symbol minX="536" maxX="582" minY="186" maxY="232" name="route-point-10"/>
+  <symbol minX="582" maxX="628" minY="186" maxY="232" name="route-point-11"/>
+  <symbol minX="628" maxX="674" minY="186" maxY="232" name="route-point-12"/>
+  <symbol minX="674" maxX="720" minY="186" maxY="232" name="route-point-14"/>
+  <symbol minX="720" maxX="766" minY="186" maxY="232" name="route-point-13"/>
+  <symbol minX="766" maxX="830" minY="186" maxY="232" name="coloredmark-bg-l"/>
+  <symbol minX="830" maxX="894" minY="186" maxY="232" name="coloredmark-default-l"/>
+  <symbol minX="894" maxX="940" minY="186" maxY="232" name="route-point-1"/>
+  <symbol minX="940" maxX="986" minY="186" maxY="232" name="route-point-15"/>
+  <symbol minX="0" maxX="64" minY="236" maxY="282" name="norating-default-l"/>
+  <symbol minX="64" maxX="128" minY="236" maxY="282" name="norating-bg-l"/>
+  <symbol minX="128" maxX="174" minY="236" maxY="282" name="route-point-6"/>
+  <symbol minX="174" maxX="220" minY="236" maxY="282" name="route-point-17"/>
+  <symbol minX="220" maxX="266" minY="236" maxY="282" name="route-point-start"/>
+  <symbol minX="266" maxX="312" minY="236" maxY="282" name="route-point-18"/>
+  <symbol minX="312" maxX="358" minY="236" maxY="282" name="route-point-19"/>
+  <symbol minX="358" maxX="404" minY="236" maxY="282" name="route-point-20"/>
+  <symbol minX="404" maxX="450" minY="236" maxY="282" name="route-point-5"/>
+  <symbol minX="450" maxX="496" minY="236" maxY="282" name="route-point-3"/>
+  <symbol minX="496" maxX="542" minY="236" maxY="282" name="route-point-8"/>
+  <symbol minX="542" maxX="588" minY="236" maxY="282" name="route-point-9"/>
+  <symbol minX="588" maxX="634" minY="236" maxY="282" name="route-point-4"/>
+  <symbol minX="634" maxX="680" minY="236" maxY="282" name="route-point-7"/>
+  <symbol minX="680" maxX="726" minY="236" maxY="282" name="route-point-2"/>
+  <symbol minX="726" maxX="760" minY="236" maxY="276" name="shield-us-i-thin"/>
+  <symbol minX="760" maxX="803" minY="236" maxY="276" name="shield-us-i-wide"/>
+  <symbol minX="803" maxX="846" minY="236" maxY="273" name="shield-us-hw-wide"/>
+  <symbol minX="846" maxX="883" minY="236" maxY="273" name="shield-us-hw-thin"/>
+  <symbol minX="883" maxX="909" minY="236" maxY="271" name="bookmark-bg-s"/>
+  <symbol minX="909" maxX="935" minY="236" maxY="271" name="bookmark-default-s"/>
+  <symbol minX="935" maxX="969" minY="236" maxY="270" name="current-position"/>
+  <symbol minX="969" maxX="1003" minY="236" maxY="270" name="track_marker_deselected"/>
+  <symbol minX="0" maxX="31" minY="282" maxY="313" name="subway-chengdu-m"/>
+  <symbol minX="31" maxX="62" minY="282" maxY="313" name="shinto-m"/>
+  <symbol minX="62" maxX="93" minY="282" maxY="313" name="shoes-m"/>
+  <symbol minX="93" maxX="124" minY="282" maxY="313" name="shop-bicycle-m"/>
+  <symbol minX="124" maxX="155" minY="282" maxY="313" name="shop-m"/>
+  <symbol minX="155" maxX="186" minY="282" maxY="313" name="subway-changchun-m"/>
+  <symbol minX="186" maxX="217" minY="282" maxY="313" name="shower-m"/>
+  <symbol minX="217" maxX="248" minY="282" maxY="313" name="skateboard-m"/>
+  <symbol minX="248" maxX="279" minY="282" maxY="313" name="subway-catania-m"/>
+  <symbol minX="279" maxX="310" minY="282" maxY="313" name="subway-chicago-m"/>
+  <symbol minX="310" maxX="341" minY="282" maxY="313" name="ship-m"/>
+  <symbol minX="341" maxX="372" minY="282" maxY="313" name="subway-bursaray-m"/>
+  <symbol minX="372" maxX="402" minY="282" maxY="313" name="subway-delhi-m"/>
+  <symbol minX="402" maxX="433" minY="282" maxY="313" name="shelter-m"/>
+  <symbol minX="433" maxX="464" minY="282" maxY="313" name="second_hand_shop-m"/>
+  <symbol minX="464" maxX="495" minY="282" maxY="313" name="subway-dubai-m"/>
+  <symbol minX="495" maxX="526" minY="282" maxY="313" name="seafood-shop-m"/>
+  <symbol minX="526" maxX="557" minY="282" maxY="313" name="school-m"/>
+  <symbol minX="557" maxX="588" minY="282" maxY="313" name="sawmill-m"/>
+  <symbol minX="588" maxX="619" minY="282" maxY="313" name="airport-m"/>
+  <symbol minX="619" maxX="650" minY="282" maxY="313" name="subway-adana-m"/>
+  <symbol minX="650" maxX="681" minY="282" maxY="313" name="subway-beijing-m"/>
+  <symbol minX="681" maxX="712" minY="282" maxY="313" name="sauna-m"/>
+  <symbol minX="712" maxX="743" minY="282" maxY="313" name="subway-bangkok-m"/>
+  <symbol minX="743" maxX="773" minY="282" maxY="313" name="subway-athens-m"/>
+  <symbol minX="773" maxX="804" minY="282" maxY="313" name="subway-brasilia-m"/>
+  <symbol minX="804" maxX="835" minY="282" maxY="313" name="subway-ankara-s"/>
+  <symbol minX="835" maxX="866" minY="282" maxY="313" name="subway-ankara-m"/>
+  <symbol minX="866" maxX="894" minY="282" maxY="313" name="subway-amsterdam-m"/>
+  <symbol minX="894" maxX="923" minY="282" maxY="313" name="subway-brescia-m"/>
+  <symbol minX="923" maxX="954" minY="282" maxY="313" name="subway-algeria-m"/>
+  <symbol minX="954" maxX="985" minY="282" maxY="313" name="subway-adana-s"/>
+  <symbol minX="985" maxX="1016" minY="282" maxY="313" name="skiing-m"/>
+  <symbol minX="0" maxX="31" minY="313" maxY="344" name="subway-budapest-m"/>
+  <symbol minX="31" maxX="62" minY="313" maxY="344" name="stationery_shop-m"/>
+  <symbol minX="62" maxX="93" minY="313" maxY="344" name="stadium-m"/>
+  <symbol minX="93" maxX="124" minY="313" maxY="344" name="sports-m"/>
+  <symbol minX="124" maxX="155" minY="313" maxY="344" name="subway-buenosaires-m"/>
+  <symbol minX="155" maxX="186" minY="313" maxY="344" name="subway-bengaluru-m"/>
+  <symbol minX="186" maxX="217" minY="313" maxY="344" name="subway-cairo-m"/>
+  <symbol minX="217" maxX="248" minY="313" maxY="344" name="speedcam-alert-l"/>
+  <symbol minX="248" maxX="279" minY="313" maxY="344" name="speech_therapist-m"/>
+  <symbol minX="279" maxX="310" minY="313" maxY="344" name="subway-caracas-m"/>
+  <symbol minX="310" maxX="341" minY="313" maxY="344" name="soccer-m"/>
+  <symbol minX="341" maxX="372" minY="313" maxY="344" name="subway-warszawa-m"/>
+  <symbol minX="372" maxX="403" minY="313" maxY="344" name="taxi-m"/>
+  <symbol minX="403" maxX="434" minY="313" maxY="344" name="yoga-m"/>
+  <symbol minX="434" maxX="465" minY="313" maxY="344" name="taoist-m"/>
+  <symbol minX="465" maxX="496" minY="313" maxY="344" name="table-tennis-m"/>
+  <symbol minX="496" maxX="527" minY="313" maxY="344" name="swimming-m"/>
+  <symbol minX="527" maxX="558" minY="313" maxY="344" name="sweets-m"/>
+  <symbol minX="558" maxX="589" minY="313" maxY="344" name="survey_point-m"/>
+  <symbol minX="589" maxX="620" minY="313" maxY="344" name="subway-yokohama-m"/>
+  <symbol minX="620" maxX="651" minY="313" maxY="344" name="zoo-m"/>
+  <symbol minX="651" maxX="682" minY="313" maxY="344" name="subway-wuhan-m"/>
+  <symbol minX="682" maxX="713" minY="313" maxY="344" name="subway-washington-m"/>
+  <symbol minX="713" maxX="744" minY="313" maxY="344" name="tennis-m"/>
+  <symbol minX="744" maxX="775" minY="313" maxY="344" name="subway-volgograd-m"/>
+  <symbol minX="775" maxX="806" minY="313" maxY="344" name="subway-vienna-m"/>
+  <symbol minX="806" maxX="837" minY="313" maxY="344" name="subway-valencia-m"/>
+  <symbol minX="837" maxX="868" minY="313" maxY="344" name="subway-tyneandwear-m"/>
+  <symbol minX="868" maxX="899" minY="313" maxY="344" name="subway-tokyo-m"/>
+  <symbol minX="899" maxX="930" minY="313" maxY="344" name="subway-tianjin-m"/>
+  <symbol minX="930" maxX="961" minY="313" maxY="344" name="subway-tashkent-m"/>
+  <symbol minX="961" maxX="992" minY="313" maxY="344" name="subway-stockholm-m"/>
+  <symbol minX="992" maxX="1023" minY="313" maxY="344" name="subway-stlouis-m"/>
+  <symbol minX="0" maxX="31" minY="344" maxY="375" name="subway-southkorea-m"/>
+  <symbol minX="31" maxX="62" minY="344" maxY="375" name="waterfall-m"/>
+  <symbol minX="62" maxX="93" minY="344" maxY="375" name="travel_agency_shop-m"/>
+  <symbol minX="93" maxX="124" minY="344" maxY="375" name="vending-m"/>
+  <symbol minX="124" maxX="155" minY="344" maxY="375" name="veterinary-m"/>
+  <symbol minX="155" maxX="186" minY="344" maxY="375" name="video-games-m"/>
+  <symbol minX="186" maxX="217" minY="344" maxY="375" name="viewpoint-m"/>
+  <symbol minX="217" maxX="248" minY="344" maxY="375" name="volleyball-m"/>
+  <symbol minX="248" maxX="279" minY="344" maxY="375" name="waste-basket-m"/>
+  <symbol minX="279" maxX="310" minY="344" maxY="375" name="tram-m"/>
+  <symbol minX="310" maxX="341" minY="344" maxY="375" name="train-m"/>
+  <symbol minX="341" maxX="372" minY="344" maxY="375" name="toys-m"/>
+  <symbol minX="372" maxX="403" minY="344" maxY="375" name="subway-sofia-m"/>
+  <symbol minX="403" maxX="434" minY="344" maxY="375" name="tourism-m"/>
+  <symbol minX="434" maxX="465" minY="344" maxY="375" name="tomb-m"/>
+  <symbol minX="465" maxX="496" minY="344" maxY="375" name="toll_booth-m"/>
+  <symbol minX="496" maxX="527" minY="344" maxY="375" name="toilets-m"/>
+  <symbol minX="527" maxX="558" minY="344" maxY="375" name="tire-repair-m"/>
+  <symbol minX="558" maxX="589" minY="344" maxY="375" name="ticket-shop-m"/>
+  <symbol minX="589" maxX="620" minY="344" maxY="375" name="wayside_shrine-m"/>
+  <symbol minX="620" maxX="651" minY="344" maxY="375" name="theme_park-m"/>
+  <symbol minX="651" maxX="682" minY="344" maxY="375" name="windmill-m"/>
+  <symbol minX="682" maxX="713" minY="344" maxY="375" name="theatre-m"/>
+  <symbol minX="713" maxX="744" minY="344" maxY="375" name="subway-kunming-m"/>
+  <symbol minX="744" maxX="775" minY="344" maxY="375" name="subway-mashhad-m"/>
+  <symbol minX="775" maxX="806" minY="344" maxY="375" name="subway-marseille-s"/>
+  <symbol minX="806" maxX="837" minY="344" maxY="375" name="subway-m"/>
+  <symbol minX="837" maxX="868" minY="344" maxY="375" name="subway-lyon-m"/>
+  <symbol minX="868" maxX="899" minY="344" maxY="375" name="subway-losangeles-m"/>
+  <symbol minX="899" maxX="930" minY="344" maxY="375" name="subway-lisboa-m"/>
+  <symbol minX="930" maxX="961" minY="344" maxY="375" name="subway-lima-m"/>
+  <symbol minX="961" maxX="992" minY="344" maxY="375" name="subway-lille-m"/>
+  <symbol minX="992" maxX="1023" minY="344" maxY="375" name="subway-lausanne-m"/>
+  <symbol minX="0" maxX="31" minY="375" maxY="406" name="subway-kyoto-m"/>
+  <symbol minX="31" maxX="62" minY="375" maxY="406" name="subway-massachusetts-m"/>
+  <symbol minX="62" maxX="93" minY="375" maxY="406" name="subway-kobe-m"/>
+  <symbol minX="93" maxX="124" minY="375" maxY="406" name="subway-kazan-m"/>
+  <symbol minX="124" maxX="150" minY="375" maxY="406" name="subway-istanbul-m"/>
+  <symbol minX="150" maxX="181" minY="375" maxY="406" name="subway-isfahan-m"/>
+  <symbol minX="181" maxX="212" minY="375" maxY="406" name="subway-hirosima-m"/>
+  <symbol minX="212" maxX="243" minY="375" maxY="406" name="subway-helsinki-m"/>
+  <symbol minX="243" maxX="274" minY="375" maxY="406" name="subway-guangzhou-m"/>
+  <symbol minX="274" maxX="305" minY="375" maxY="406" name="subway-guadalajara-m"/>
+  <symbol minX="305" maxX="336" minY="375" maxY="406" name="subway-glasgow-m"/>
+  <symbol minX="336" maxX="367" minY="375" maxY="406" name="subway-foshan-m"/>
+  <symbol minX="367" maxX="398" minY="375" maxY="406" name="subway-perugia-m"/>
+  <symbol minX="398" maxX="429" minY="375" maxY="406" name="subway-shiraz-m"/>
+  <symbol minX="429" maxX="460" minY="375" maxY="406" name="subway-saopaulo-m"/>
+  <symbol minX="460" maxX="491" minY="375" maxY="406" name="subway-santodomingo-m"/>
+  <symbol minX="491" maxX="522" minY="375" maxY="406" name="subway-samara-m"/>
+  <symbol minX="522" maxX="553" minY="375" maxY="406" name="subway-riodejaneiro-m"/>
+  <symbol minX="553" maxX="584" minY="375" maxY="406" name="subway-reseau-paris-m"/>
+  <symbol minX="584" maxX="615" minY="375" maxY="406" name="subway-rennes-m"/>
+  <symbol minX="615" maxX="646" minY="375" maxY="406" name="subway-pyongyang-m"/>
+  <symbol minX="646" maxX="676" minY="375" maxY="406" name="subway-porto-m"/>
+  <symbol minX="676" maxX="707" minY="375" maxY="406" name="subway-pittsburgh-m"/>
+  <symbol minX="707" maxX="738" minY="375" maxY="406" name="subway-ekb-m"/>
+  <symbol minX="738" maxX="769" minY="375" maxY="406" name="subway-panama-m"/>
+  <symbol minX="769" maxX="800" minY="375" maxY="406" name="subway-oslo-m"/>
+  <symbol minX="800" maxX="830" minY="375" maxY="406" name="subway-nnov-m"/>
+  <symbol minX="830" maxX="861" minY="375" maxY="406" name="subway-newyork-m"/>
+  <symbol minX="861" maxX="892" minY="375" maxY="406" name="subway-nagoya-m"/>
+  <symbol minX="892" maxX="923" minY="375" maxY="406" name="subway-minatomirai-m"/>
+  <symbol minX="923" maxX="954" minY="375" maxY="406" name="subway-milan-m"/>
+  <symbol minX="954" maxX="984" minY="375" maxY="406" name="subway-mexico-m"/>
+  <symbol minX="984" maxX="1015" minY="375" maxY="406" name="subway-medellin-m"/>
+  <symbol minX="0" maxX="31" minY="406" maxY="437" name="subway-mecca-m"/>
+  <symbol minX="31" maxX="62" minY="406" maxY="437" name="diving-m"/>
+  <symbol minX="62" maxX="93" minY="406" maxY="437" name="fire_station-m"/>
+  <symbol minX="93" maxX="124" minY="406" maxY="437" name="fastfood-m"/>
+  <symbol minX="124" maxX="155" minY="406" maxY="437" name="erotic-m"/>
+  <symbol minX="155" maxX="186" minY="406" maxY="437" name="equestrian-m"/>
+  <symbol minX="186" maxX="217" minY="406" maxY="437" name="emergency-phone-m"/>
+  <symbol minX="217" maxX="248" minY="406" maxY="437" name="embassy-m"/>
+  <symbol minX="248" maxX="279" minY="406" maxY="437" name="electronics-m"/>
+  <symbol minX="279" maxX="310" minY="406" maxY="437" name="electrician-m"/>
+  <symbol minX="310" maxX="341" minY="406" maxY="437" name="dump-station-m"/>
+  <symbol minX="341" maxX="372" minY="406" maxY="437" name="driving_school-m"/>
+  <symbol minX="372" maxX="403" minY="406" maxY="437" name="drinking-water-m"/>
+  <symbol minX="403" maxX="434" minY="406" maxY="437" name="doityourself-m"/>
+  <symbol minX="434" maxX="465" minY="406" maxY="437" name="dog_park-m"/>
+  <symbol minX="465" maxX="496" minY="406" maxY="437" name="firehydrant-m"/>
+  <symbol minX="496" maxX="527" minY="406" maxY="437" name="department_store-m"/>
+  <symbol minX="527" maxX="558" minY="406" maxY="437" name="dentist-m"/>
+  <symbol minX="558" maxX="589" minY="406" maxY="437" name="defibrillator-m"/>
+  <symbol minX="589" maxX="620" minY="406" maxY="437" name="curling-m"/>
+  <symbol minX="620" maxX="651" minY="406" maxY="437" name="cross-m"/>
+  <symbol minX="651" maxX="682" minY="406" maxY="437" name="cricket-m"/>
+  <symbol minX="682" maxX="713" minY="406" maxY="437" name="copyshop-m"/>
+  <symbol minX="713" maxX="744" minY="406" maxY="437" name="convenience-m"/>
   <symbol minX="744" maxX="775" minY="406" maxY="437" name="computer-m"/>
-  <symbol minX="775" maxX="806" minY="406" maxY="437" name="convenience-m"/>
-  <symbol minX="806" maxX="837" minY="406" maxY="437" name="jewelry-m"/>
-  <symbol minX="837" maxX="868" minY="406" maxY="437" name="copyshop-m"/>
-  <symbol minX="868" maxX="899" minY="406" maxY="437" name="cricket-m"/>
-  <symbol minX="899" maxX="930" minY="406" maxY="437" name="internet_cafe-m"/>
-  <symbol minX="930" maxX="961" minY="406" maxY="437" name="motorcycle_shop-m"/>
-  <symbol minX="961" maxX="992" minY="406" maxY="437" name="brewery-m"/>
-  <symbol minX="992" maxX="1023" minY="406" maxY="437" name="buddhist-m"/>
-  <symbol minX="0" maxX="31" minY="437" maxY="468" name="muslim-m"/>
-  <symbol minX="31" maxX="62" minY="437" maxY="468" name="musical-instrument-m"/>
-  <symbol minX="62" maxX="93" minY="437" maxY="468" name="music_school-m"/>
-  <symbol minX="93" maxX="124" minY="437" maxY="468" name="music-m"/>
-  <symbol minX="124" maxX="155" minY="437" maxY="468" name="bus-m"/>
-  <symbol minX="155" maxX="186" minY="437" maxY="468" name="butcher-m"/>
-  <symbol minX="186" maxX="217" minY="437" maxY="468" name="cable-car-m"/>
-  <symbol minX="217" maxX="248" minY="437" maxY="468" name="cafe-m"/>
-  <symbol minX="248" maxX="279" minY="437" maxY="468" name="campsite-m"/>
-  <symbol minX="279" maxX="310" minY="437" maxY="468" name="museum-m"/>
-  <symbol minX="310" maxX="341" minY="437" maxY="468" name="car-part-m"/>
-  <symbol minX="341" maxX="372" minY="437" maxY="468" name="interior_decoration-m"/>
-  <symbol minX="372" maxX="403" minY="437" maxY="468" name="car-repair-m"/>
-  <symbol minX="403" maxX="434" minY="437" maxY="468" name="monument-m"/>
-  <symbol minX="434" maxX="465" minY="437" maxY="468" name="mobile_phone-m"/>
-  <symbol minX="465" maxX="496" minY="437" maxY="468" name="car-wash-m"/>
-  <symbol minX="496" maxX="527" minY="437" maxY="468" name="car_sharing-m"/>
-  <symbol minX="527" maxX="558" minY="437" maxY="468" name="military-m"/>
-  <symbol minX="558" maxX="589" minY="437" maxY="468" name="car_shop-m"/>
-  <symbol minX="589" maxX="620" minY="437" maxY="468" name="caravan-shop-m"/>
-  <symbol minX="620" maxX="651" minY="437" maxY="468" name="caravan_site-m"/>
-  <symbol minX="651" maxX="682" minY="437" maxY="468" name="carpenter-m"/>
-  <symbol minX="682" maxX="713" minY="437" maxY="468" name="casino-m"/>
-  <symbol minX="713" maxX="744" minY="437" maxY="468" name="metal_construction-m"/>
-  <symbol minX="744" maxX="775" minY="437" maxY="468" name="marketplace-m"/>
-  <symbol minX="775" maxX="806" minY="437" maxY="468" name="gallery-m"/>
-  <symbol minX="806" maxX="837" minY="437" maxY="468" name="greengrocer-m"/>
-  <symbol minX="837" maxX="868" minY="437" maxY="468" name="golf-m"/>
-  <symbol minX="868" maxX="899" minY="437" maxY="468" name="gift-m"/>
-  <symbol minX="899" maxX="930" minY="437" maxY="468" name="dump-station-m"/>
-  <symbol minX="930" maxX="961" minY="437" maxY="468" name="electrician-m"/>
-  <symbol minX="961" maxX="992" minY="437" maxY="468" name="electronics-m"/>
-  <symbol minX="992" maxX="1023" minY="437" maxY="468" name="geyser-m"/>
-  <symbol minX="0" maxX="31" minY="468" maxY="499" name="geyser-l"/>
-  <symbol minX="31" maxX="62" minY="468" maxY="499" name="garden_center-m"/>
-  <symbol minX="62" maxX="93" minY="468" maxY="499" name="embassy-m"/>
-  <symbol minX="93" maxX="124" minY="468" maxY="499" name="garden-outline-m"/>
-  <symbol minX="124" maxX="155" minY="468" maxY="499" name="garden-m"/>
-  <symbol minX="155" maxX="186" minY="468" maxY="499" name="emergency-phone-m"/>
-  <symbol minX="186" maxX="217" minY="468" maxY="499" name="driving_school-m"/>
-  <symbol minX="217" maxX="248" minY="468" maxY="499" name="furniture-m"/>
-  <symbol minX="248" maxX="279" minY="468" maxY="499" name="funicular-m"/>
-  <symbol minX="279" maxX="310" minY="468" maxY="499" name="equestrian-m"/>
-  <symbol minX="310" maxX="341" minY="468" maxY="499" name="erotic-m"/>
-  <symbol minX="341" maxX="372" minY="468" maxY="499" name="fastfood-m"/>
-  <symbol minX="372" maxX="403" minY="468" maxY="499" name="fire_station-m"/>
-  <symbol minX="403" maxX="434" minY="468" maxY="499" name="firehydrant-m"/>
-  <symbol minX="434" maxX="465" minY="468" maxY="499" name="florist-m"/>
-  <symbol minX="465" maxX="496" minY="468" maxY="499" name="fountain-m"/>
-  <symbol minX="496" maxX="527" minY="468" maxY="499" name="funeral_directors-m"/>
-  <symbol minX="527" maxX="558" minY="468" maxY="499" name="fountain-s"/>
-  <symbol minX="558" maxX="589" minY="468" maxY="499" name="fuel-m"/>
-  <symbol minX="589" maxX="620" minY="468" maxY="499" name="fuel-dispenser-m"/>
-  <symbol minX="620" maxX="651" minY="468" maxY="499" name="hospital-m"/>
-  <symbol minX="651" maxX="682" minY="468" maxY="499" name="cross-m"/>
-  <symbol minX="682" maxX="713" minY="468" maxY="499" name="curling-m"/>
-  <symbol minX="713" maxX="744" minY="468" maxY="499" name="defibrillator-m"/>
-  <symbol minX="744" maxX="775" minY="468" maxY="499" name="information-m"/>
-  <symbol minX="775" maxX="806" minY="468" maxY="499" name="ice_cream-m"/>
-  <symbol minX="806" maxX="837" minY="468" maxY="499" name="hunting-tower-m"/>
-  <symbol minX="837" maxX="868" minY="468" maxY="499" name="dentist-m"/>
-  <symbol minX="868" maxX="899" minY="468" maxY="499" name="hotel-m"/>
-  <symbol minX="899" maxX="930" minY="468" maxY="499" name="department_store-m"/>
-  <symbol minX="930" maxX="961" minY="468" maxY="499" name="diving-m"/>
-  <symbol minX="961" maxX="992" minY="468" maxY="499" name="hostel-m"/>
-  <symbol minX="992" maxX="1023" minY="468" maxY="499" name="dog_park-m"/>
-  <symbol minX="0" maxX="31" minY="499" maxY="530" name="doityourself-m"/>
-  <symbol minX="31" maxX="62" minY="499" maxY="530" name="media-m"/>
-  <symbol minX="62" maxX="93" minY="499" maxY="530" name="home-m"/>
-  <symbol minX="93" maxX="124" minY="499" maxY="530" name="drinking-water-m"/>
-  <symbol minX="124" maxX="155" minY="499" maxY="530" name="hockey-m"/>
-  <symbol minX="155" maxX="186" minY="499" maxY="530" name="historic-ship-m"/>
-  <symbol minX="186" maxX="217" minY="499" maxY="530" name="hindu-m"/>
-  <symbol minX="217" maxX="248" minY="499" maxY="530" name="heliport-m"/>
-  <symbol minX="248" maxX="279" minY="499" maxY="530" name="helipad-m"/>
-  <symbol minX="279" maxX="310" minY="499" maxY="530" name="handball-m"/>
-  <symbol minX="310" maxX="341" minY="499" maxY="530" name="hand-m"/>
-  <symbol minX="341" maxX="372" minY="499" maxY="530" name="hairdresser-m"/>
-  <symbol minX="372" maxX="403" minY="499" maxY="530" name="gym-m"/>
-  <symbol minX="403" maxX="434" minY="499" maxY="530" name="guidepost"/>
-  <symbol minX="434" maxX="465" minY="499" maxY="530" name="grocery-m"/>
-  <symbol minX="465" maxX="496" minY="499" maxY="530" name="art-m"/>
-  <symbol minX="496" maxX="527" minY="499" maxY="530" name="australian-football-m"/>
-  <symbol minX="527" maxX="558" minY="499" maxY="530" name="outdoor-shop-m"/>
-  <symbol minX="558" maxX="589" minY="499" maxY="530" name="pelota-m"/>
-  <symbol minX="589" maxX="620" minY="499" maxY="530" name="optometrist-m"/>
-  <symbol minX="620" maxX="651" minY="499" maxY="530" name="optician-m"/>
-  <symbol minX="651" maxX="682" minY="499" maxY="530" name="petshop-m"/>
-  <symbol minX="682" maxX="713" minY="499" maxY="530" name="audiologist-m"/>
-  <symbol minX="713" maxX="744" minY="499" maxY="530" name="pharmacy-m"/>
-  <symbol minX="744" maxX="775" minY="499" maxY="530" name="office-m"/>
-  <symbol minX="775" maxX="806" minY="499" maxY="530" name="atm-m"/>
-  <symbol minX="806" maxX="837" minY="499" maxY="530" name="padel-m"/>
-  <symbol minX="837" maxX="868" minY="499" maxY="530" name="bicycle-m"/>
-  <symbol minX="868" maxX="899" minY="499" maxY="530" name="archery-m"/>
-  <symbol minX="899" maxX="930" minY="499" maxY="530" name="phone-m"/>
-  <symbol minX="930" maxX="961" minY="499" maxY="530" name="photo-shop-m"/>
-  <symbol minX="961" maxX="992" minY="499" maxY="530" name="archaeological-site-m"/>
-  <symbol minX="992" maxX="1023" minY="499" maxY="530" name="bicycle-repair-station"/>
-  <symbol minX="0" maxX="31" minY="530" maxY="561" name="physiotherapist-m"/>
-  <symbol minX="31" maxX="62" minY="530" maxY="561" name="picnic-m"/>
-  <symbol minX="62" maxX="93" minY="530" maxY="561" name="blacksmith-m"/>
-  <symbol minX="93" maxX="124" minY="530" maxY="561" name="bcontrol-m"/>
-  <symbol minX="124" maxX="155" minY="530" maxY="561" name="bank-l"/>
-  <symbol minX="155" maxX="186" minY="530" maxY="561" name="bank-m"/>
-  <symbol minX="186" maxX="217" minY="530" maxY="561" name="banknote-l"/>
-  <symbol minX="217" maxX="248" minY="530" maxY="561" name="parking-meter-m"/>
-  <symbol minX="248" maxX="279" minY="530" maxY="561" name="banknote-m"/>
-  <symbol minX="279" maxX="310" minY="530" maxY="561" name="bar-m"/>
-  <symbol minX="310" maxX="341" minY="530" maxY="561" name="bakery-m"/>
-  <symbol minX="341" maxX="372" minY="530" maxY="561" name="baseball-m"/>
-  <symbol minX="372" maxX="403" minY="530" maxY="561" name="basketball-m"/>
-  <symbol minX="403" maxX="434" minY="530" maxY="561" name="bbq-m"/>
-  <symbol minX="434" maxX="465" minY="530" maxY="561" name="remains-m"/>
-  <symbol minX="465" maxX="496" minY="530" maxY="561" name="badminton-m"/>
-  <symbol minX="496" maxX="527" minY="530" maxY="561" name="bowling_alley-m"/>
-  <symbol minX="527" maxX="558" minY="530" maxY="561" name="beach-m"/>
-  <symbol minX="558" maxX="589" minY="530" maxY="561" name="beauty-m"/>
-  <symbol minX="589" maxX="620" minY="530" maxY="561" name="beekeeper-m"/>
-  <symbol minX="620" maxX="651" minY="530" maxY="561" name="beer-m"/>
-  <symbol minX="651" maxX="682" minY="530" maxY="561" name="park-outline-m"/>
-  <symbol minX="682" maxX="713" minY="530" maxY="561" name="park-m"/>
-  <symbol minX="713" maxX="744" minY="530" maxY="561" name="painter-m"/>
-  <symbol minX="744" maxX="775" minY="530" maxY="561" name="alternative-m"/>
-  <symbol minX="775" maxX="806" minY="530" maxY="561" name="book-shop-m"/>
-  <symbol minX="806" maxX="837" minY="530" maxY="561" name="public-building-m"/>
-  <symbol minX="837" maxX="868" minY="530" maxY="561" name="alpine_hut-m"/>
-  <symbol minX="868" maxX="899" minY="530" maxY="561" name="america-football-m"/>
-  <symbol minX="899" maxX="930" minY="530" maxY="561" name="playground-m"/>
-  <symbol minX="930" maxX="961" minY="530" maxY="561" name="psychotherapist-m"/>
-  <symbol minX="961" maxX="992" minY="530" maxY="561" name="plumber-m"/>
-  <symbol minX="992" maxX="1023" minY="530" maxY="561" name="needle_and_thread-m"/>
-  <symbol minX="0" maxX="31" minY="561" maxY="592" name="nparkf-m"/>
-  <symbol minX="31" maxX="62" minY="561" maxY="592" name="bowling-m"/>
-  <symbol minX="62" maxX="93" minY="561" maxY="592" name="nightclub-m"/>
-  <symbol minX="93" maxX="124" minY="561" maxY="592" name="podiatrist-m"/>
-  <symbol minX="124" maxX="155" minY="561" maxY="592" name="bookmaker-m"/>
+  <symbol minX="775" maxX="806" minY="406" maxY="437" name="college-m"/>
+  <symbol minX="806" maxX="837" minY="406" maxY="437" name="clothes-m"/>
+  <symbol minX="837" maxX="868" minY="406" maxY="437" name="climbing-m"/>
+  <symbol minX="868" maxX="899" minY="406" maxY="437" name="cinema-m"/>
+  <symbol minX="899" maxX="930" minY="406" maxY="437" name="geyser-l"/>
+  <symbol minX="930" maxX="961" minY="406" maxY="437" name="hindu-m"/>
+  <symbol minX="961" maxX="992" minY="406" maxY="437" name="heliport-m"/>
+  <symbol minX="992" maxX="1023" minY="406" maxY="437" name="helipad-m"/>
+  <symbol minX="0" maxX="31" minY="437" maxY="468" name="handball-m"/>
+  <symbol minX="31" maxX="62" minY="437" maxY="468" name="hand-m"/>
+  <symbol minX="62" maxX="93" minY="437" maxY="468" name="hairdresser-m"/>
+  <symbol minX="93" maxX="124" minY="437" maxY="468" name="gym-m"/>
+  <symbol minX="124" maxX="155" minY="437" maxY="468" name="guidepost"/>
+  <symbol minX="155" maxX="186" minY="437" maxY="468" name="grocery-m"/>
+  <symbol minX="186" maxX="217" minY="437" maxY="468" name="greengrocer-m"/>
+  <symbol minX="217" maxX="248" minY="437" maxY="468" name="golf-m"/>
+  <symbol minX="248" maxX="279" minY="437" maxY="468" name="gift-m"/>
+  <symbol minX="279" maxX="310" minY="437" maxY="468" name="geyser-m"/>
+  <symbol minX="310" maxX="341" minY="437" maxY="468" name="christian-m"/>
+  <symbol minX="341" maxX="372" minY="437" maxY="468" name="gate-m"/>
+  <symbol minX="372" maxX="403" minY="437" maxY="468" name="garden_center-m"/>
+  <symbol minX="403" maxX="434" minY="437" maxY="468" name="garden-outline-m"/>
+  <symbol minX="434" maxX="465" minY="437" maxY="468" name="garden-m"/>
+  <symbol minX="465" maxX="496" minY="437" maxY="468" name="gallery-m"/>
+  <symbol minX="496" maxX="527" minY="437" maxY="468" name="furniture-m"/>
+  <symbol minX="527" maxX="558" minY="437" maxY="468" name="funicular-m"/>
+  <symbol minX="558" maxX="589" minY="437" maxY="468" name="funeral_directors-m"/>
+  <symbol minX="589" maxX="620" minY="437" maxY="468" name="fuel-m"/>
+  <symbol minX="620" maxX="651" minY="437" maxY="468" name="fuel-dispenser-m"/>
+  <symbol minX="651" maxX="682" minY="437" maxY="468" name="fountain-s"/>
+  <symbol minX="682" maxX="713" minY="437" maxY="468" name="fountain-m"/>
+  <symbol minX="713" maxX="744" minY="437" maxY="468" name="florist-m"/>
+  <symbol minX="744" maxX="775" minY="437" maxY="468" name="bank-m"/>
+  <symbol minX="775" maxX="806" minY="437" maxY="468" name="bicycle-repair-station"/>
+  <symbol minX="806" maxX="837" minY="437" maxY="468" name="bicycle-m"/>
+  <symbol minX="837" maxX="868" minY="437" maxY="468" name="beer-m"/>
+  <symbol minX="868" maxX="899" minY="437" maxY="468" name="beekeeper-m"/>
+  <symbol minX="899" maxX="930" minY="437" maxY="468" name="beauty-m"/>
+  <symbol minX="930" maxX="961" minY="437" maxY="468" name="beach-m"/>
+  <symbol minX="961" maxX="992" minY="437" maxY="468" name="bcontrol-m"/>
+  <symbol minX="992" maxX="1023" minY="437" maxY="468" name="bbq-m"/>
+  <symbol minX="0" maxX="31" minY="468" maxY="499" name="basketball-m"/>
+  <symbol minX="31" maxX="62" minY="468" maxY="499" name="baseball-m"/>
+  <symbol minX="62" maxX="93" minY="468" maxY="499" name="bar-m"/>
+  <symbol minX="93" maxX="124" minY="468" maxY="499" name="banknote-m"/>
+  <symbol minX="124" maxX="155" minY="468" maxY="499" name="banknote-l"/>
+  <symbol minX="155" maxX="186" minY="468" maxY="499" name="blacksmith-m"/>
+  <symbol minX="186" maxX="217" minY="468" maxY="499" name="bank-l"/>
+  <symbol minX="217" maxX="248" minY="468" maxY="499" name="bakery-m"/>
+  <symbol minX="248" maxX="279" minY="468" maxY="499" name="badminton-m"/>
+  <symbol minX="279" maxX="310" minY="468" maxY="499" name="australian-football-m"/>
+  <symbol minX="310" maxX="341" minY="468" maxY="499" name="audiologist-m"/>
+  <symbol minX="341" maxX="372" minY="468" maxY="499" name="atm-m"/>
+  <symbol minX="372" maxX="403" minY="468" maxY="499" name="archery-m"/>
+  <symbol minX="403" maxX="434" minY="468" maxY="499" name="archaeological-site-m"/>
+  <symbol minX="434" maxX="465" minY="468" maxY="499" name="apartment-m"/>
+  <symbol minX="465" maxX="496" minY="468" maxY="499" name="america-football-m"/>
+  <symbol minX="496" maxX="527" minY="468" maxY="499" name="alternative-m"/>
+  <symbol minX="527" maxX="558" minY="468" maxY="499" name="alpine_hut-m"/>
+  <symbol minX="558" maxX="589" minY="468" maxY="499" name="alcohol-m"/>
+  <symbol minX="589" maxX="620" minY="468" maxY="499" name="car-repair-m"/>
+  <symbol minX="620" maxX="651" minY="468" maxY="499" name="chimney-m"/>
+  <symbol minX="651" maxX="682" minY="468" maxY="499" name="chess-m"/>
+  <symbol minX="682" maxX="713" minY="468" maxY="499" name="chemist-m"/>
+  <symbol minX="713" maxX="744" minY="468" maxY="499" name="charity_shop-m"/>
+  <symbol minX="744" maxX="775" minY="468" maxY="499" name="charging-station-m"/>
+  <symbol minX="775" maxX="806" minY="468" maxY="499" name="cemetery-m"/>
+  <symbol minX="806" maxX="837" minY="468" maxY="499" name="casino-m"/>
+  <symbol minX="837" maxX="868" minY="468" maxY="499" name="carpenter-m"/>
+  <symbol minX="868" maxX="899" minY="468" maxY="499" name="caravan_site-m"/>
+  <symbol minX="899" maxX="930" minY="468" maxY="499" name="caravan-shop-m"/>
+  <symbol minX="930" maxX="961" minY="468" maxY="499" name="car_shop-m"/>
+  <symbol minX="961" maxX="992" minY="468" maxY="499" name="car_sharing-m"/>
+  <symbol minX="992" maxX="1023" minY="468" maxY="499" name="car-wash-m"/>
+  <symbol minX="0" maxX="31" minY="499" maxY="530" name="restaurant-m"/>
+  <symbol minX="31" maxX="62" minY="499" maxY="530" name="car-part-m"/>
+  <symbol minX="62" maxX="93" minY="499" maxY="530" name="campsite-m"/>
+  <symbol minX="93" maxX="124" minY="499" maxY="530" name="cafe-m"/>
+  <symbol minX="124" maxX="155" minY="499" maxY="530" name="cable-car-m"/>
+  <symbol minX="155" maxX="186" minY="499" maxY="530" name="butcher-m"/>
+  <symbol minX="186" maxX="217" minY="499" maxY="530" name="bus-m"/>
+  <symbol minX="217" maxX="248" minY="499" maxY="530" name="buddhist-m"/>
+  <symbol minX="248" maxX="279" minY="499" maxY="530" name="brewery-m"/>
+  <symbol minX="279" maxX="310" minY="499" maxY="530" name="bowling_alley-m"/>
+  <symbol minX="310" maxX="341" minY="499" maxY="530" name="bowling-m"/>
+  <symbol minX="341" maxX="372" minY="499" maxY="530" name="bookmaker-m"/>
+  <symbol minX="372" maxX="403" minY="499" maxY="530" name="book-shop-m"/>
+  <symbol minX="403" maxX="434" minY="499" maxY="530" name="blood_donation-m"/>
+  <symbol minX="434" maxX="465" minY="499" maxY="530" name="library-m"/>
+  <symbol minX="465" maxX="496" minY="499" maxY="530" name="outdoor-shop-m"/>
+  <symbol minX="496" maxX="527" minY="499" maxY="530" name="marketplace-m"/>
+  <symbol minX="527" maxX="558" minY="499" maxY="530" name="marina-m"/>
+  <symbol minX="558" maxX="589" minY="499" maxY="530" name="mail-m"/>
+  <symbol minX="589" maxX="620" minY="499" maxY="530" name="padel-m"/>
+  <symbol minX="620" maxX="651" minY="499" maxY="530" name="painter-m"/>
+  <symbol minX="651" maxX="682" minY="499" maxY="530" name="park-m"/>
+  <symbol minX="682" maxX="713" minY="499" maxY="530" name="lighthouse-m"/>
+  <symbol minX="713" maxX="744" minY="499" maxY="530" name="park-outline-m"/>
+  <symbol minX="744" maxX="775" minY="499" maxY="530" name="lift_gate-m"/>
+  <symbol minX="775" maxX="806" minY="499" maxY="530" name="optometrist-m"/>
+  <symbol minX="806" maxX="837" minY="499" maxY="530" name="parking-meter-m"/>
+  <symbol minX="837" maxX="868" minY="499" maxY="530" name="lawyer-m"/>
+  <symbol minX="868" maxX="899" minY="499" maxY="530" name="laundry-m"/>
+  <symbol minX="899" maxX="930" minY="499" maxY="530" name="pelota-m"/>
+  <symbol minX="930" maxX="961" minY="499" maxY="530" name="language_school-m"/>
+  <symbol minX="961" maxX="992" minY="499" maxY="530" name="petshop-m"/>
+  <symbol minX="992" maxX="1023" minY="499" maxY="530" name="pharmacy-m"/>
+  <symbol minX="0" maxX="31" minY="530" maxY="561" name="kiosk-m"/>
+  <symbol minX="31" maxX="62" minY="530" maxY="561" name="kindergarten-m"/>
+  <symbol minX="62" maxX="93" minY="530" maxY="561" name="museum-m"/>
+  <symbol minX="93" maxX="124" minY="530" maxY="561" name="needle_and_thread-m"/>
+  <symbol minX="124" maxX="155" minY="530" maxY="561" name="muslim-m"/>
+  <symbol minX="155" maxX="186" minY="530" maxY="561" name="newsagent_shop-m"/>
+  <symbol minX="186" maxX="217" minY="530" maxY="561" name="musical-instrument-m"/>
+  <symbol minX="217" maxX="248" minY="530" maxY="561" name="music_school-m"/>
+  <symbol minX="248" maxX="279" minY="530" maxY="561" name="nightclub-m"/>
+  <symbol minX="279" maxX="310" minY="530" maxY="561" name="npark-m"/>
+  <symbol minX="310" maxX="341" minY="530" maxY="561" name="music-m"/>
+  <symbol minX="341" maxX="372" minY="530" maxY="561" name="nparkf-m"/>
+  <symbol minX="372" maxX="403" minY="530" maxY="561" name="historic-ship-m"/>
+  <symbol minX="403" maxX="434" minY="530" maxY="561" name="motorcycle_shop-m"/>
+  <symbol minX="434" maxX="465" minY="530" maxY="561" name="nparkf-outline-m"/>
+  <symbol minX="465" maxX="496" minY="530" maxY="561" name="office-m"/>
+  <symbol minX="496" maxX="527" minY="530" maxY="561" name="monument-m"/>
+  <symbol minX="527" maxX="558" minY="530" maxY="561" name="mobile_phone-m"/>
+  <symbol minX="558" maxX="589" minY="530" maxY="561" name="optician-m"/>
+  <symbol minX="589" maxX="620" minY="530" maxY="561" name="military-m"/>
+  <symbol minX="620" maxX="651" minY="530" maxY="561" name="metal_construction-m"/>
+  <symbol minX="651" maxX="682" minY="530" maxY="561" name="media-m"/>
+  <symbol minX="682" maxX="713" minY="530" maxY="561" name="postbox-m"/>
+  <symbol minX="713" maxX="744" minY="530" maxY="561" name="remains-m"/>
+  <symbol minX="744" maxX="775" minY="530" maxY="561" name="hospital-m"/>
+  <symbol minX="775" maxX="806" minY="530" maxY="561" name="pitch-m"/>
+  <symbol minX="806" maxX="837" minY="530" maxY="561" name="information-m"/>
+  <symbol minX="837" maxX="868" minY="530" maxY="561" name="place-of-worship-m"/>
+  <symbol minX="868" maxX="899" minY="530" maxY="561" name="playground-m"/>
+  <symbol minX="899" maxX="930" minY="530" maxY="561" name="plumber-m"/>
+  <symbol minX="930" maxX="961" minY="530" maxY="561" name="ice_cream-m"/>
+  <symbol minX="961" maxX="992" minY="530" maxY="561" name="podiatrist-m"/>
+  <symbol minX="992" maxX="1023" minY="530" maxY="561" name="police-m"/>
+  <symbol minX="0" maxX="31" minY="561" maxY="592" name="jewish-m"/>
+  <symbol minX="31" maxX="62" minY="561" maxY="592" name="sample_collection-m"/>
+  <symbol minX="62" maxX="93" minY="561" maxY="592" name="hunting-tower-m"/>
+  <symbol minX="93" maxX="124" minY="561" maxY="592" name="power-m"/>
+  <symbol minX="124" maxX="155" minY="561" maxY="592" name="recycling-m"/>
   <symbol minX="155" maxX="186" minY="561" maxY="592" name="prison-m"/>
-  <symbol minX="186" maxX="217" minY="561" maxY="592" name="npark-m"/>
-  <symbol minX="217" maxX="248" minY="561" maxY="592" name="power-m"/>
-  <symbol minX="248" maxX="279" minY="561" maxY="592" name="airport_gate-m"/>
-  <symbol minX="279" maxX="310" minY="561" maxY="592" name="apartment-m"/>
-  <symbol minX="310" maxX="341" minY="561" maxY="592" name="police-m"/>
-  <symbol minX="341" maxX="372" minY="561" maxY="592" name="nparkf-outline-m"/>
-  <symbol minX="372" maxX="403" minY="561" maxY="592" name="recycling-m"/>
-  <symbol minX="403" maxX="434" minY="561" maxY="592" name="picnic_table-m"/>
-  <symbol minX="434" maxX="465" minY="561" maxY="592" name="pitch-m"/>
-  <symbol minX="465" maxX="496" minY="561" maxY="592" name="postbox-m"/>
-  <symbol minX="496" maxX="527" minY="561" maxY="592" name="newsagent_shop-m"/>
-  <symbol minX="527" maxX="558" minY="561" maxY="592" name="antiques-m"/>
-  <symbol minX="558" maxX="589" minY="561" maxY="592" name="alcohol-m"/>
-  <symbol minX="589" maxX="620" minY="561" maxY="592" name="place-of-worship-m"/>
-  <symbol minX="620" maxX="651" minY="561" maxY="592" name="blood_donation-m"/>
-  <symbol minX="651" maxX="681" minY="561" maxY="591" name="subway-montreal-m"/>
-  <symbol minX="681" maxX="711" minY="561" maxY="591" name="subway-ekb-s"/>
-  <symbol minX="711" maxX="742" minY="561" maxY="591" name="subway-marseille-m"/>
-  <symbol minX="742" maxX="773" minY="561" maxY="591" name="subway-maracaibo-m"/>
-  <symbol minX="773" maxX="803" minY="561" maxY="591" name="subway-spb-m"/>
+  <symbol minX="186" maxX="217" minY="561" maxY="592" name="hotel-m"/>
+  <symbol minX="217" maxX="248" minY="561" maxY="592" name="psychotherapist-m"/>
+  <symbol minX="248" maxX="279" minY="561" maxY="592" name="public-building-m"/>
+  <symbol minX="279" maxX="310" minY="561" maxY="592" name="hostel-m"/>
+  <symbol minX="310" maxX="341" minY="561" maxY="592" name="home-m"/>
+  <symbol minX="341" maxX="372" minY="561" maxY="592" name="jewelry-m"/>
+  <symbol minX="372" maxX="403" minY="561" maxY="592" name="photo-shop-m"/>
+  <symbol minX="403" maxX="434" minY="561" maxY="592" name="internet_cafe-m"/>
+  <symbol minX="434" maxX="465" minY="561" maxY="592" name="physiotherapist-m"/>
+  <symbol minX="465" maxX="496" minY="561" maxY="592" name="hockey-m"/>
+  <symbol minX="496" maxX="527" minY="561" maxY="592" name="phone-m"/>
+  <symbol minX="527" maxX="558" minY="561" maxY="592" name="picnic-m"/>
+  <symbol minX="558" maxX="589" minY="561" maxY="592" name="picnic_table-m"/>
+  <symbol minX="589" maxX="619" minY="561" maxY="591" name="subway-spb-m"/>
+  <symbol minX="619" maxX="650" minY="561" maxY="591" name="subway-maracaibo-m"/>
+  <symbol minX="650" maxX="681" minY="561" maxY="591" name="subway-marseille-m"/>
+  <symbol minX="681" maxX="711" minY="561" maxY="591" name="subway-montreal-m"/>
+  <symbol minX="711" maxX="742" minY="561" maxY="591" name="subway-dalian-m"/>
+  <symbol minX="742" maxX="773" minY="561" maxY="591" name="subway-shanghai-m"/>
+  <symbol minX="773" maxX="803" minY="561" maxY="591" name="subway-ekb-s"/>
   <symbol minX="803" maxX="833" minY="561" maxY="591" name="subway-southkorea-s"/>
-  <symbol minX="833" maxX="864" minY="561" maxY="591" name="subway-dalian-m"/>
-  <symbol minX="864" maxX="895" minY="561" maxY="591" name="subway-sapporo-m"/>
-  <symbol minX="895" maxX="926" minY="561" maxY="591" name="subway-shanghai-m"/>
-  <symbol minX="926" maxX="955" minY="561" maxY="590" name="subway-entrance-m"/>
-  <symbol minX="955" maxX="984" minY="561" maxY="590" name="subway-algeria-s"/>
-  <symbol minX="984" maxX="1015" minY="561" maxY="590" name="subway-izmir-m"/>
-  <symbol minX="0" maxX="28" minY="592" maxY="621" name="subway-warsaw-m"/>
-  <symbol minX="28" maxX="57" minY="592" maxY="621" name="subway-stlouis-s"/>
-  <symbol minX="57" maxX="81" minY="592" maxY="620" name="subway-istanbul-s"/>
-  <symbol minX="81" maxX="109" minY="592" maxY="620" name="subway-pittsburgh-s"/>
-  <symbol minX="109" maxX="137" minY="592" maxY="620" name="lightrail-berlin-m"/>
-  <symbol minX="137" maxX="165" minY="592" maxY="620" name="search-result"/>
-  <symbol minX="165" maxX="192" minY="592" maxY="619" name="subway-sapporo-s"/>
-  <symbol minX="192" maxX="216" minY="592" maxY="619" name="subway-brescia-s"/>
-  <symbol minX="216" maxX="243" minY="592" maxY="619" name="parking-disabled-m"/>
-  <symbol minX="243" maxX="274" minY="592" maxY="619" name="subway-rotterdam-m"/>
-  <symbol minX="274" maxX="302" minY="592" maxY="619" name="subway-izmir-s"/>
-  <symbol minX="302" maxX="353" minY="592" maxY="619" name="coloredmark-bg-s"/>
-  <symbol minX="353" maxX="380" minY="592" maxY="619" name="parking_pay-m"/>
-  <symbol minX="380" maxX="407" minY="592" maxY="619" name="bike-parking-m"/>
-  <symbol minX="407" maxX="434" minY="592" maxY="619" name="bicycle-rental"/>
-  <symbol minX="434" maxX="461" minY="592" maxY="619" name="subway-medellin-s"/>
-  <symbol minX="461" maxX="488" minY="592" maxY="619" name="non-found-search-result"/>
-  <symbol minX="488" maxX="515" minY="592" maxY="619" name="motorcycle-parking-m"/>
-  <symbol minX="515" maxX="540" minY="592" maxY="619" name="subway-mashhad-s"/>
-  <symbol minX="540" maxX="591" minY="592" maxY="619" name="coloredmark-default-s"/>
-  <symbol minX="591" maxX="618" minY="592" maxY="619" name="speedcam-m"/>
-  <symbol minX="618" maxX="645" minY="592" maxY="619" name="parking_entrance-m"/>
-  <symbol minX="645" maxX="672" minY="592" maxY="619" name="subway-cairo-s"/>
-  <symbol minX="672" maxX="703" minY="592" maxY="619" name="subway-tbilisi-m"/>
-  <symbol minX="703" maxX="730" minY="592" maxY="619" name="subway-panama-s"/>
-  <symbol minX="730" maxX="757" minY="592" maxY="619" name="subway-isfahan-s"/>
-  <symbol minX="757" maxX="784" minY="592" maxY="619" name="parking-m"/>
-  <symbol minX="784" maxX="802" minY="592" maxY="618" name="bookmark-default-xs"/>
-  <symbol minX="802" maxX="820" minY="592" maxY="618" name="bookmark-bg-xs"/>
-  <symbol minX="820" maxX="851" minY="592" maxY="618" name="subway-lyon-m"/>
-  <symbol minX="851" maxX="882" minY="592" maxY="618" name="subway-taoyuan-m"/>
-  <symbol minX="882" maxX="906" minY="592" maxY="617" name="subway-tianjin-s"/>
-  <symbol minX="906" maxX="930" minY="592" maxY="617" name="subway-athens-s"/>
-  <symbol minX="930" maxX="961" minY="592" maxY="617" name="subway-santiago-m"/>
-  <symbol minX="961" maxX="986" minY="592" maxY="617" name="subway-hirosima-s"/>
-  <symbol minX="986" maxX="1014" minY="592" maxY="617" name="subway-seattle-m"/>
-  <symbol minX="0" maxX="31" minY="621" maxY="646" name="subway-dnepro-m"/>
-  <symbol minX="31" maxX="62" minY="621" maxY="646" name="subway-almaty-m"/>
-  <symbol minX="62" maxX="87" minY="621" maxY="646" name="subway-rome-m"/>
-  <symbol minX="87" maxX="111" minY="621" maxY="646" name="subway-delhi-s"/>
-  <symbol minX="111" maxX="136" minY="621" maxY="646" name="subway-rennes-s"/>
-  <symbol minX="136" maxX="160" minY="621" maxY="646" name="subway-pyongyang-s"/>
-  <symbol minX="160" maxX="184" minY="621" maxY="646" name="subway-porto-s"/>
-  <symbol minX="184" maxX="209" minY="621" maxY="646" name="subway-warszawa-s"/>
-  <symbol minX="209" maxX="238" minY="621" maxY="646" name="subway-moscow-m"/>
-  <symbol minX="238" maxX="269" minY="621" maxY="646" name="subway-yerevan-m"/>
-  <symbol minX="269" maxX="294" minY="621" maxY="646" name="subway-paris-m"/>
-  <symbol minX="294" maxX="319" minY="621" maxY="646" name="subway-ubahn-m"/>
-  <symbol minX="319" maxX="350" minY="621" maxY="646" name="subway-kryvyirih-m"/>
-  <symbol minX="350" maxX="374" minY="621" maxY="645" name="subway-wuhan-s"/>
-  <symbol minX="374" maxX="396" minY="621" maxY="645" name="subway-warsaw-s"/>
-  <symbol minX="396" maxX="426" minY="621" maxY="645" name="subway-yerevan-s"/>
-  <symbol minX="426" maxX="450" minY="621" maxY="645" name="subway-yokohama-s"/>
-  <symbol minX="450" maxX="474" minY="621" maxY="645" name="subway-riodejaneiro-s"/>
-  <symbol minX="474" maxX="498" minY="621" maxY="645" name="subway-washington-s"/>
-  <symbol minX="498" maxX="526" minY="621" maxY="645" name="subway-taoyuan-s"/>
-  <symbol minX="526" maxX="550" minY="621" maxY="645" name="subway-tashkent-s"/>
-  <symbol minX="550" maxX="574" minY="621" maxY="645" name="subway-volgograd-s"/>
-  <symbol minX="574" maxX="598" minY="621" maxY="645" name="subway-vienna-s"/>
-  <symbol minX="598" maxX="629" minY="621" maxY="645" name="subway-alicante-m"/>
-  <symbol minX="629" maxX="653" minY="621" maxY="645" name="subway-valencia-s"/>
-  <symbol minX="653" maxX="677" minY="621" maxY="645" name="subway-tokyo-s"/>
-  <symbol minX="677" maxX="701" minY="621" maxY="645" name="subway-tyneandwear-s"/>
-  <symbol minX="701" maxX="725" minY="621" maxY="645" name="subway-losangeles-s"/>
-  <symbol minX="725" maxX="749" minY="621" maxY="645" name="subway-nnov-s"/>
-  <symbol minX="749" maxX="773" minY="621" maxY="645" name="subway-caracas-s"/>
-  <symbol minX="773" maxX="797" minY="621" maxY="645" name="subway-catania-s"/>
-  <symbol minX="797" maxX="821" minY="621" maxY="645" name="subway-nagoya-s"/>
-  <symbol minX="821" maxX="845" minY="621" maxY="645" name="subway-montreal-s"/>
-  <symbol minX="845" maxX="869" minY="621" maxY="645" name="subway-changchun-s"/>
-  <symbol minX="869" maxX="893" minY="621" maxY="645" name="subway-milan-s"/>
-  <symbol minX="893" maxX="917" minY="621" maxY="645" name="subway-chengdu-s"/>
-  <symbol minX="917" maxX="941" minY="621" maxY="645" name="subway-mecca-s"/>
-  <symbol minX="941" maxX="965" minY="621" maxY="645" name="subway-chicago-s"/>
-  <symbol minX="965" maxX="989" minY="621" maxY="645" name="subway-massachusetts-s"/>
-  <symbol minX="989" maxX="1013" minY="621" maxY="645" name="subway-dalian-s"/>
-  <symbol minX="0" maxX="24" minY="646" maxY="670" name="subway-dubai-s"/>
-  <symbol minX="24" maxX="48" minY="646" maxY="670" name="subway-minatomirai-s"/>
-  <symbol minX="48" maxX="72" minY="646" maxY="670" name="subway-lisboa-s"/>
-  <symbol minX="72" maxX="96" minY="646" maxY="670" name="subway-lima-s"/>
-  <symbol minX="96" maxX="120" minY="646" maxY="670" name="subway-lille-s"/>
-  <symbol minX="120" maxX="144" minY="646" maxY="670" name="subway-kyoto-s"/>
-  <symbol minX="144" maxX="168" minY="646" maxY="670" name="subway-kunming-s"/>
-  <symbol minX="168" maxX="192" minY="646" maxY="670" name="subway-foshan-s"/>
-  <symbol minX="192" maxX="216" minY="646" maxY="670" name="subway-kobe-s"/>
-  <symbol minX="216" maxX="246" minY="646" maxY="670" name="subway-fukuoka-s"/>
-  <symbol minX="246" maxX="270" minY="646" maxY="670" name="subway-kazan-s"/>
-  <symbol minX="270" maxX="295" minY="646" maxY="670" name="subway-glasgow-s"/>
-  <symbol minX="295" maxX="319" minY="646" maxY="670" name="subway-guadalajara-s"/>
-  <symbol minX="319" maxX="343" minY="646" maxY="670" name="subway-helsinki-s"/>
-  <symbol minX="343" maxX="367" minY="646" maxY="670" name="subway-guangzhou-s"/>
-  <symbol minX="367" maxX="398" minY="646" maxY="670" name="subway-omsk-s"/>
-  <symbol minX="398" maxX="429" minY="646" maxY="670" name="subway-tabriz-m"/>
-  <symbol minX="429" maxX="453" minY="646" maxY="670" name="subway-stockholm-s"/>
-  <symbol minX="453" maxX="477" minY="646" maxY="670" name="subway-sofia-s"/>
-  <symbol minX="477" maxX="501" minY="646" maxY="670" name="subway-bangkok-s"/>
-  <symbol minX="501" maxX="525" minY="646" maxY="670" name="subway-shiraz-s"/>
-  <symbol minX="525" maxX="549" minY="646" maxY="670" name="subway-shanghai-s"/>
-  <symbol minX="549" maxX="573" minY="646" maxY="670" name="subway-beijing-s"/>
-  <symbol minX="573" maxX="597" minY="646" maxY="670" name="subway-saopaulo-s"/>
-  <symbol minX="597" maxX="621" minY="646" maxY="670" name="subway-santodomingo-s"/>
-  <symbol minX="621" maxX="645" minY="646" maxY="670" name="subway-bengaluru-s"/>
-  <symbol minX="645" maxX="675" minY="646" maxY="670" name="subway-santiago-s"/>
-  <symbol minX="675" maxX="699" minY="646" maxY="670" name="subway-samara-s"/>
-  <symbol minX="699" maxX="723" minY="646" maxY="670" name="subway-brasilia-s"/>
-  <symbol minX="723" maxX="754" minY="646" maxY="670" name="subway-omsk-m"/>
-  <symbol minX="754" maxX="778" minY="646" maxY="670" name="subway-oslo-s"/>
-  <symbol minX="778" maxX="802" minY="646" maxY="670" name="subway-bursaray-s"/>
-  <symbol minX="802" maxX="826" minY="646" maxY="670" name="subway-buenosaires-s"/>
-  <symbol minX="826" maxX="850" minY="646" maxY="670" name="subway-reseau-paris-s"/>
-  <symbol minX="850" maxX="874" minY="646" maxY="670" name="subway-perugia-s"/>
-  <symbol minX="874" maxX="905" minY="646" maxY="670" name="subway-philadelphia-m"/>
-  <symbol minX="905" maxX="929" minY="646" maxY="670" name="subway-budapest-s"/>
-  <symbol minX="929" maxX="960" minY="646" maxY="670" name="subway-osaka-m"/>
-  <symbol minX="960" maxX="991" minY="646" maxY="669" name="subway-lucknow-s"/>
-  <symbol minX="991" maxX="1014" minY="646" maxY="669" name="subway-spb-s"/>
-  <symbol minX="0" maxX="30" minY="670" maxY="693" name="subway-london-m"/>
-  <symbol minX="30" maxX="59" minY="670" maxY="693" name="subway-almaty-s"/>
-  <symbol minX="59" maxX="89" minY="670" maxY="693" name="subway-tabriz-s"/>
-  <symbol minX="89" maxX="112" minY="670" maxY="693" name="subway-lausanne-s"/>
-  <symbol minX="112" maxX="134" minY="670" maxY="693" name="subway-mexico-s"/>
-  <symbol minX="134" maxX="157" minY="670" maxY="693" name="cave-m"/>
-  <symbol minX="157" maxX="179" minY="670" maxY="693" name="subway-amsterdam-s"/>
-  <symbol minX="179" maxX="203" minY="670" maxY="693" name="subway-maracaibo-s"/>
-  <symbol minX="203" maxX="225" minY="670" maxY="692" name="waste-basket-s"/>
-  <symbol minX="225" maxX="247" minY="670" maxY="692" name="buddhist-s"/>
-  <symbol minX="247" maxX="269" minY="670" maxY="692" name="zoo-s"/>
-  <symbol minX="269" maxX="291" minY="670" maxY="692" name="viewpoint-s"/>
-  <symbol minX="291" maxX="313" minY="670" maxY="692" name="drinking-water-s"/>
-  <symbol minX="313" maxX="335" minY="670" maxY="692" name="bus-s"/>
-  <symbol minX="335" maxX="357" minY="670" maxY="692" name="waterfall-s"/>
-  <symbol minX="357" maxX="379" minY="670" maxY="692" name="christian-s"/>
-  <symbol minX="379" maxX="401" minY="670" maxY="692" name="cable-car-s"/>
-  <symbol minX="401" maxX="423" minY="670" maxY="692" name="charging-station-s"/>
-  <symbol minX="423" maxX="445" minY="670" maxY="692" name="car-repair-s"/>
-  <symbol minX="445" maxX="467" minY="670" maxY="692" name="airport-s"/>
-  <symbol minX="467" maxX="489" minY="670" maxY="692" name="college-s"/>
-  <symbol minX="489" maxX="519" minY="670" maxY="692" name="subway-palma-s"/>
-  <symbol minX="519" maxX="550" minY="670" maxY="692" name="subway-bilbao-m"/>
-  <symbol minX="550" maxX="572" minY="670" maxY="692" name="park-s"/>
-  <symbol minX="572" maxX="594" minY="670" maxY="692" name="hospital-s"/>
-  <symbol minX="594" maxX="618" minY="670" maxY="692" name="subway-tbilisi-s"/>
-  <symbol minX="618" maxX="640" minY="670" maxY="692" name="park-outline-s"/>
-  <symbol minX="640" maxX="662" minY="670" maxY="692" name="hotel-s"/>
-  <symbol minX="662" maxX="684" minY="670" maxY="692" name="nparkf-s"/>
-  <symbol minX="684" maxX="706" minY="670" maxY="692" name="subway-s"/>
-  <symbol minX="706" maxX="730" minY="670" maxY="692" name="subway-rotterdam-s"/>
-  <symbol minX="730" maxX="752" minY="670" maxY="692" name="nparkf-outline-s"/>
-  <symbol minX="752" maxX="774" minY="670" maxY="692" name="jewish-s"/>
-  <symbol minX="774" maxX="802" minY="670" maxY="692" name="subway-philadelphia-s"/>
-  <symbol minX="802" maxX="824" minY="670" maxY="692" name="fuel-s"/>
-  <symbol minX="824" maxX="851" minY="670" maxY="692" name="subway-osaka-s"/>
-  <symbol minX="851" maxX="880" minY="670" maxY="692" name="subway-dnepro-s"/>
-  <symbol minX="880" maxX="902" minY="670" maxY="692" name="subway-newyork-s"/>
-  <symbol minX="902" maxX="924" minY="670" maxY="692" name="lighthouse-s"/>
-  <symbol minX="924" maxX="946" minY="670" maxY="692" name="subway-entrance-s"/>
-  <symbol minX="946" maxX="968" minY="670" maxY="692" name="muslim-s"/>
-  <symbol minX="968" maxX="990" minY="670" maxY="692" name="museum-s"/>
-  <symbol minX="990" maxX="1021" minY="670" maxY="692" name="subway-kolkata-m"/>
-  <symbol minX="0" maxX="31" minY="693" maxY="715" name="subway-madrid-m"/>
-  <symbol minX="31" maxX="62" minY="693" maxY="715" name="subway-lucknow-m"/>
-  <symbol minX="62" maxX="84" minY="693" maxY="715" name="monument-s"/>
-  <symbol minX="84" maxX="106" minY="693" maxY="715" name="toll_booth-s"/>
-  <symbol minX="106" maxX="128" minY="693" maxY="715" name="place-of-worship-s"/>
-  <symbol minX="128" maxX="150" minY="693" maxY="715" name="stadium-s"/>
-  <symbol minX="150" maxX="168" minY="693" maxY="715" name="transit_light_rail-m"/>
-  <symbol minX="168" maxX="192" minY="693" maxY="715" name="transfer_arrow"/>
-  <symbol minX="192" maxX="214" minY="693" maxY="715" name="shop-s"/>
-  <symbol minX="214" maxX="236" minY="693" maxY="715" name="tram-s"/>
-  <symbol minX="236" maxX="258" minY="693" maxY="715" name="train-s"/>
-  <symbol minX="258" maxX="280" minY="693" maxY="715" name="ship-s"/>
-  <symbol minX="280" maxX="302" minY="693" maxY="715" name="tourism-s"/>
-  <symbol minX="302" maxX="320" minY="693" maxY="715" name="transit_train-m"/>
-  <symbol minX="320" maxX="342" minY="693" maxY="715" name="shinto-s"/>
-  <symbol minX="342" maxX="373" minY="693" maxY="715" name="subway-barcelona-m"/>
-  <symbol minX="373" maxX="395" minY="693" maxY="715" name="remains-s"/>
-  <symbol minX="395" maxX="417" minY="693" maxY="715" name="theme_park-s"/>
-  <symbol minX="417" maxX="439" minY="693" maxY="715" name="geyser-s"/>
-  <symbol minX="439" maxX="461" minY="693" maxY="715" name="theatre-s"/>
-  <symbol minX="461" maxX="483" minY="693" maxY="715" name="taoist-s"/>
-  <symbol minX="483" maxX="505" minY="693" maxY="715" name="hindu-s"/>
-  <symbol minX="505" maxX="532" minY="693" maxY="714" name="subway-kryvyirih-s"/>
-  <symbol minX="532" maxX="560" minY="693" maxY="714" name="subway-madrid-s"/>
-  <symbol minX="560" maxX="588" minY="693" maxY="714" name="subway-barcelona-s"/>
-  <symbol minX="588" maxX="612" minY="693" maxY="714" name="subway-lyon-s"/>
-  <symbol minX="612" maxX="642" minY="693" maxY="714" name="subway-kiev-m"/>
-  <symbol minX="642" maxX="673" minY="693" maxY="714" name="subway-kharkiv-s"/>
-  <symbol minX="673" maxX="694" minY="693" maxY="714" name="lightrail-berlin-s"/>
-  <symbol minX="694" maxX="725" minY="693" maxY="714" name="subway-fukuoka-m"/>
-  <symbol minX="725" maxX="743" minY="693" maxY="714" name="transit_monorail-m"/>
-  <symbol minX="743" maxX="774" minY="693" maxY="714" name="subway-novosibirsk-m"/>
-  <symbol minX="774" maxX="804" minY="693" maxY="714" name="subway-novosibirsk-s"/>
-  <symbol minX="804" maxX="835" minY="693" maxY="714" name="subway-palma-m"/>
-  <symbol minX="835" maxX="856" minY="693" maxY="714" name="subway-paris-s"/>
-  <symbol minX="856" maxX="887" minY="693" maxY="714" name="subway-sanfrancisco-m"/>
-  <symbol minX="887" maxX="918" minY="693" maxY="714" name="subway-sanfrancisco-s"/>
-  <symbol minX="918" maxX="939" minY="693" maxY="714" name="elevator"/>
-  <symbol minX="939" maxX="970" minY="693" maxY="714" name="subway-brussel-s"/>
-  <symbol minX="970" maxX="990" minY="693" maxY="713" name="board"/>
-  <symbol minX="990" maxX="1021" minY="693" maxY="713" name="subway-haagse-s"/>
-  <symbol minX="0" maxX="20" minY="715" maxY="735" name="storage-tank"/>
-  <symbol minX="20" maxX="45" minY="715" maxY="735" name="subway-alicante-s"/>
-  <symbol minX="45" maxX="75" minY="715" maxY="735" name="subway-bucharest-s"/>
-  <symbol minX="75" maxX="106" minY="715" maxY="735" name="subway-bucharest-m"/>
-  <symbol minX="106" maxX="121" minY="715" maxY="735" name="transit_train-s"/>
-  <symbol minX="121" maxX="152" minY="715" maxY="735" name="subway-sendai-m"/>
-  <symbol minX="152" maxX="172" minY="715" maxY="735" name="transit_subway-m"/>
-  <symbol minX="172" maxX="203" minY="715" maxY="735" name="subway-manila-m"/>
-  <symbol minX="203" maxX="234" minY="715" maxY="735" name="subway-sendai-s"/>
-  <symbol minX="234" maxX="255" minY="715" maxY="735" name="subway-moscow-s"/>
-  <symbol minX="255" maxX="275" minY="715" maxY="735" name="map"/>
-  <symbol minX="275" maxX="298" minY="715" maxY="734" name="subway-london-s"/>
-  <symbol minX="298" maxX="318" minY="715" maxY="734" name="subway-seattle-s"/>
-  <symbol minX="318" maxX="337" minY="715" maxY="734" name="subway-rome-s"/>
-  <symbol minX="337" maxX="368" minY="715" maxY="734" name="subway-edmonton-s"/>
-  <symbol minX="368" maxX="399" minY="715" maxY="734" name="subway-brussel-m"/>
-  <symbol minX="399" maxX="430" minY="715" maxY="734" name="subway-taipei-s"/>
-  <symbol minX="430" maxX="461" minY="715" maxY="734" name="subway-kharkiv-m"/>
-  <symbol minX="461" maxX="480" minY="715" maxY="734" name="cave-s"/>
-  <symbol minX="480" maxX="510" minY="715" maxY="734" name="subway-manila-s"/>
-  <symbol minX="510" maxX="537" minY="715" maxY="734" name="subway-bilbao-s"/>
-  <symbol minX="537" maxX="556" minY="715" maxY="734" name="subway-ubahn-s"/>
-  <symbol minX="556" maxX="574" minY="715" maxY="733" name="parking-s"/>
-  <symbol minX="574" maxX="586" minY="715" maxY="733" name="entrance-s"/>
-  <symbol minX="586" maxX="604" minY="715" maxY="733" name="subway-xs"/>
-  <symbol minX="604" maxX="625" minY="715" maxY="733" name="bench"/>
-  <symbol minX="625" maxX="643" minY="715" maxY="733" name="gate-s"/>
-  <symbol minX="643" maxX="661" minY="715" maxY="733" name="star-l"/>
-  <symbol minX="661" maxX="679" minY="715" maxY="733" name="subway-newyork-xs"/>
-  <symbol minX="679" maxX="694" minY="715" maxY="733" name="transit_light_rail-s"/>
-  <symbol minX="694" maxX="712" minY="715" maxY="733" name="speedcam-s"/>
-  <symbol minX="712" maxX="743" minY="715" maxY="733" name="subway-haagse-m"/>
-  <symbol minX="743" maxX="762" minY="715" maxY="733" name="main_entrance-s"/>
-  <symbol minX="762" maxX="777" minY="715" maxY="733" name="transit_monorail-s"/>
-  <symbol minX="777" maxX="795" minY="715" maxY="733" name="transit_subway-s"/>
-  <symbol minX="795" maxX="822" minY="715" maxY="733" name="railway-crossing-l"/>
-  <symbol minX="822" maxX="853" minY="715" maxY="732" name="subway-edmonton-m"/>
-  <symbol minX="853" maxX="869" minY="715" maxY="731" name="star-m"/>
-  <symbol minX="869" maxX="888" minY="715" maxY="731" name="volcano-m"/>
-  <symbol minX="888" maxX="919" minY="715" maxY="731" name="subway-malaga-m"/>
-  <symbol minX="919" maxX="950" minY="715" maxY="731" name="subway-taipei-m"/>
-  <symbol minX="950" maxX="973" minY="715" maxY="731" name="subway-kolkata-s"/>
-  <symbol minX="973" maxX="1003" minY="715" maxY="731" name="subway-malaga-s"/>
-  <symbol minX="0" maxX="25" minY="735" maxY="751" name="subway-kiev-s"/>
-  <symbol minX="25" maxX="56" minY="735" maxY="750" name="subway-baku-m"/>
-  <symbol minX="56" maxX="79" minY="735" maxY="750" name="railway-crossing-m"/>
-  <symbol minX="79" maxX="97" minY="735" maxY="750" name="plaque"/>
-  <symbol minX="97" maxX="122" minY="735" maxY="750" name="subway-minsk-m"/>
-  <symbol minX="122" maxX="152" minY="735" maxY="750" name="subway-baku-s"/>
-  <symbol minX="152" maxX="183" minY="735" maxY="749" name="subway-chongqing-s"/>
-  <symbol minX="183" maxX="206" minY="735" maxY="749" name="subway-minsk-s"/>
-  <symbol minX="206" maxX="220" minY="735" maxY="749" name="star-s"/>
-  <symbol minX="220" maxX="248" minY="735" maxY="748" name="arrow-m"/>
-  <symbol minX="248" maxX="279" minY="735" maxY="748" name="subway-chongqing-m"/>
-  <symbol minX="279" maxX="293" minY="735" maxY="748" name="volcano-s"/>
-  <symbol minX="293" maxX="307" minY="735" maxY="748" name="peakt-m"/>
-  <symbol minX="307" maxX="329" minY="735" maxY="748" name="mountain-pass"/>
-  <symbol minX="329" maxX="341" minY="735" maxY="747" name="zero-icon"/>
-  <symbol minX="341" maxX="353" minY="735" maxY="746" name="peakt-s"/>
-  <symbol minX="353" maxX="374" minY="735" maxY="745" name="arrow-s"/>
-  <symbol minX="374" maxX="384" minY="735" maxY="745" name="dot-m"/>
-  <symbol minX="384" maxX="398" minY="735" maxY="742" name="arrow-xs"/>
+  <symbol minX="833" maxX="864" minY="561" maxY="591" name="subway-sapporo-m"/>
+  <symbol minX="864" maxX="893" minY="561" maxY="590" name="subway-algeria-s"/>
+  <symbol minX="893" maxX="922" minY="561" maxY="590" name="subway-entrance-m"/>
+  <symbol minX="922" maxX="950" minY="561" maxY="590" name="subway-warsaw-m"/>
+  <symbol minX="950" maxX="981" minY="561" maxY="590" name="subway-izmir-m"/>
+  <symbol minX="981" maxX="1010" minY="561" maxY="590" name="subway-stlouis-s"/>
+  <symbol minX="0" maxX="28" minY="592" maxY="620" name="lightrail-berlin-m"/>
+  <symbol minX="28" maxX="56" minY="592" maxY="620" name="subway-pittsburgh-s"/>
+  <symbol minX="56" maxX="84" minY="592" maxY="620" name="search-result"/>
+  <symbol minX="84" maxX="108" minY="592" maxY="620" name="subway-istanbul-s"/>
+  <symbol minX="108" maxX="135" minY="592" maxY="619" name="subway-sapporo-s"/>
+  <symbol minX="135" maxX="162" minY="592" maxY="619" name="motorcycle-parking-m"/>
+  <symbol minX="162" maxX="186" minY="592" maxY="619" name="subway-brescia-s"/>
+  <symbol minX="186" maxX="213" minY="592" maxY="619" name="subway-isfahan-s"/>
+  <symbol minX="213" maxX="244" minY="592" maxY="619" name="subway-rotterdam-m"/>
+  <symbol minX="244" maxX="272" minY="592" maxY="619" name="subway-izmir-s"/>
+  <symbol minX="272" maxX="323" minY="592" maxY="619" name="coloredmark-bg-s"/>
+  <symbol minX="323" maxX="350" minY="592" maxY="619" name="parking_pay-m"/>
+  <symbol minX="350" maxX="375" minY="592" maxY="619" name="subway-mashhad-s"/>
+  <symbol minX="375" maxX="402" minY="592" maxY="619" name="parking_entrance-m"/>
+  <symbol minX="402" maxX="429" minY="592" maxY="619" name="bicycle-rental"/>
+  <symbol minX="429" maxX="456" minY="592" maxY="619" name="subway-medellin-s"/>
+  <symbol minX="456" maxX="483" minY="592" maxY="619" name="parking-m"/>
+  <symbol minX="483" maxX="510" minY="592" maxY="619" name="bike-parking-m"/>
+  <symbol minX="510" maxX="537" minY="592" maxY="619" name="speedcam-m"/>
+  <symbol minX="537" maxX="564" minY="592" maxY="619" name="non-found-search-result"/>
+  <symbol minX="564" maxX="591" minY="592" maxY="619" name="parking-disabled-m"/>
+  <symbol minX="591" maxX="618" minY="592" maxY="619" name="subway-cairo-s"/>
+  <symbol minX="618" maxX="649" minY="592" maxY="619" name="subway-tbilisi-m"/>
+  <symbol minX="649" maxX="676" minY="592" maxY="619" name="subway-panama-s"/>
+  <symbol minX="676" maxX="727" minY="592" maxY="619" name="coloredmark-default-s"/>
+  <symbol minX="727" maxX="745" minY="592" maxY="618" name="bookmark-default-xs"/>
+  <symbol minX="745" maxX="776" minY="592" maxY="618" name="subway-taoyuan-m"/>
+  <symbol minX="776" maxX="794" minY="592" maxY="618" name="bookmark-bg-xs"/>
+  <symbol minX="794" maxX="819" minY="592" maxY="617" name="subway-hirosima-s"/>
+  <symbol minX="819" maxX="847" minY="592" maxY="617" name="subway-seattle-m"/>
+  <symbol minX="847" maxX="871" minY="592" maxY="617" name="subway-athens-s"/>
+  <symbol minX="871" maxX="895" minY="592" maxY="617" name="subway-tianjin-s"/>
+  <symbol minX="895" maxX="926" minY="592" maxY="617" name="subway-almaty-m"/>
+  <symbol minX="926" maxX="951" minY="592" maxY="617" name="subway-ubahn-m"/>
+  <symbol minX="951" maxX="976" minY="592" maxY="617" name="subway-warszawa-s"/>
+  <symbol minX="976" maxX="1007" minY="592" maxY="617" name="subway-yerevan-m"/>
+  <symbol minX="0" maxX="24" minY="620" maxY="645" name="subway-pyongyang-s"/>
+  <symbol minX="24" maxX="49" minY="620" maxY="645" name="subway-paris-m"/>
+  <symbol minX="49" maxX="73" minY="620" maxY="645" name="subway-delhi-s"/>
+  <symbol minX="73" maxX="104" minY="620" maxY="645" name="subway-santiago-m"/>
+  <symbol minX="104" maxX="135" minY="620" maxY="645" name="subway-dnepro-m"/>
+  <symbol minX="135" maxX="164" minY="620" maxY="645" name="subway-moscow-m"/>
+  <symbol minX="164" maxX="195" minY="620" maxY="645" name="subway-kryvyirih-m"/>
+  <symbol minX="195" maxX="220" minY="620" maxY="645" name="subway-rennes-s"/>
+  <symbol minX="220" maxX="245" minY="620" maxY="645" name="subway-rome-m"/>
+  <symbol minX="245" maxX="269" minY="620" maxY="645" name="subway-porto-s"/>
+  <symbol minX="269" maxX="293" minY="620" maxY="644" name="subway-mecca-s"/>
+  <symbol minX="293" maxX="323" minY="620" maxY="644" name="subway-yerevan-s"/>
+  <symbol minX="323" maxX="347" minY="620" maxY="644" name="subway-chengdu-s"/>
+  <symbol minX="347" maxX="371" minY="620" maxY="644" name="subway-yokohama-s"/>
+  <symbol minX="371" maxX="395" minY="620" maxY="644" name="subway-chicago-s"/>
+  <symbol minX="395" maxX="419" minY="620" maxY="644" name="subway-minatomirai-s"/>
+  <symbol minX="419" maxX="443" minY="620" maxY="644" name="subway-massachusetts-s"/>
+  <symbol minX="443" maxX="467" minY="620" maxY="644" name="subway-milan-s"/>
+  <symbol minX="467" maxX="491" minY="620" maxY="644" name="subway-dubai-s"/>
+  <symbol minX="491" maxX="515" minY="620" maxY="644" name="subway-wuhan-s"/>
+  <symbol minX="515" maxX="539" minY="620" maxY="644" name="subway-changchun-s"/>
+  <symbol minX="539" maxX="563" minY="620" maxY="644" name="subway-washington-s"/>
+  <symbol minX="563" maxX="587" minY="620" maxY="644" name="subway-montreal-s"/>
+  <symbol minX="587" maxX="611" minY="620" maxY="644" name="subway-catania-s"/>
+  <symbol minX="611" maxX="633" minY="620" maxY="644" name="subway-warsaw-s"/>
+  <symbol minX="633" maxX="657" minY="620" maxY="644" name="subway-nagoya-s"/>
+  <symbol minX="657" maxX="681" minY="620" maxY="644" name="subway-volgograd-s"/>
+  <symbol minX="681" maxX="705" minY="620" maxY="644" name="subway-kyoto-s"/>
+  <symbol minX="705" maxX="729" minY="620" maxY="644" name="subway-helsinki-s"/>
+  <symbol minX="729" maxX="753" minY="620" maxY="644" name="subway-kazan-s"/>
+  <symbol minX="753" maxX="777" minY="620" maxY="644" name="subway-guangzhou-s"/>
+  <symbol minX="777" maxX="801" minY="620" maxY="644" name="subway-guadalajara-s"/>
+  <symbol minX="801" maxX="825" minY="620" maxY="644" name="subway-kobe-s"/>
+  <symbol minX="825" maxX="850" minY="620" maxY="644" name="subway-glasgow-s"/>
+  <symbol minX="850" maxX="874" minY="620" maxY="644" name="subway-kunming-s"/>
+  <symbol minX="874" maxX="904" minY="620" maxY="644" name="subway-fukuoka-s"/>
+  <symbol minX="904" maxX="928" minY="620" maxY="644" name="subway-dalian-s"/>
+  <symbol minX="928" maxX="952" minY="620" maxY="644" name="subway-foshan-s"/>
+  <symbol minX="952" maxX="976" minY="620" maxY="644" name="subway-lille-s"/>
+  <symbol minX="976" maxX="1000" minY="620" maxY="644" name="subway-lima-s"/>
+  <symbol minX="1000" maxX="1024" minY="620" maxY="644" name="subway-lisboa-s"/>
+  <symbol minX="0" maxX="24" minY="645" maxY="669" name="subway-losangeles-s"/>
+  <symbol minX="24" maxX="48" minY="645" maxY="669" name="subway-lyon-s"/>
+  <symbol minX="48" maxX="72" minY="645" maxY="669" name="subway-saopaulo-s"/>
+  <symbol minX="72" maxX="96" minY="645" maxY="669" name="subway-riodejaneiro-s"/>
+  <symbol minX="96" maxX="120" minY="645" maxY="669" name="subway-budapest-s"/>
+  <symbol minX="120" maxX="144" minY="645" maxY="669" name="subway-perugia-s"/>
+  <symbol minX="144" maxX="175" minY="645" maxY="669" name="subway-tabriz-m"/>
+  <symbol minX="175" maxX="199" minY="645" maxY="669" name="subway-stockholm-s"/>
+  <symbol minX="199" maxX="230" minY="645" maxY="669" name="subway-philadelphia-m"/>
+  <symbol minX="230" maxX="254" minY="645" maxY="669" name="subway-brasilia-s"/>
+  <symbol minX="254" maxX="278" minY="645" maxY="669" name="subway-reseau-paris-s"/>
+  <symbol minX="278" maxX="302" minY="645" maxY="669" name="subway-sofia-s"/>
+  <symbol minX="302" maxX="326" minY="645" maxY="669" name="subway-vienna-s"/>
+  <symbol minX="326" maxX="350" minY="645" maxY="669" name="subway-shiraz-s"/>
+  <symbol minX="350" maxX="374" minY="645" maxY="669" name="subway-shanghai-s"/>
+  <symbol minX="374" maxX="398" minY="645" maxY="669" name="subway-bengaluru-s"/>
+  <symbol minX="398" maxX="422" minY="645" maxY="669" name="subway-bangkok-s"/>
+  <symbol minX="422" maxX="446" minY="645" maxY="669" name="subway-samara-s"/>
+  <symbol minX="446" maxX="470" minY="645" maxY="669" name="subway-beijing-s"/>
+  <symbol minX="470" maxX="500" minY="645" maxY="669" name="subway-santiago-s"/>
+  <symbol minX="500" maxX="524" minY="645" maxY="669" name="subway-santodomingo-s"/>
+  <symbol minX="524" maxX="552" minY="645" maxY="669" name="subway-taoyuan-s"/>
+  <symbol minX="552" maxX="576" minY="645" maxY="669" name="subway-caracas-s"/>
+  <symbol minX="576" maxX="600" minY="645" maxY="669" name="subway-tashkent-s"/>
+  <symbol minX="600" maxX="624" minY="645" maxY="669" name="subway-nnov-s"/>
+  <symbol minX="624" maxX="648" minY="645" maxY="669" name="subway-oslo-s"/>
+  <symbol minX="648" maxX="672" minY="645" maxY="669" name="subway-valencia-s"/>
+  <symbol minX="672" maxX="696" minY="645" maxY="669" name="subway-buenosaires-s"/>
+  <symbol minX="696" maxX="727" minY="645" maxY="669" name="subway-alicante-m"/>
+  <symbol minX="727" maxX="751" minY="645" maxY="669" name="subway-bursaray-s"/>
+  <symbol minX="751" maxX="775" minY="645" maxY="669" name="subway-tyneandwear-s"/>
+  <symbol minX="775" maxX="806" minY="645" maxY="669" name="subway-osaka-m"/>
+  <symbol minX="806" maxX="837" minY="645" maxY="669" name="subway-omsk-m"/>
+  <symbol minX="837" maxX="868" minY="645" maxY="669" name="subway-omsk-s"/>
+  <symbol minX="868" maxX="892" minY="645" maxY="669" name="subway-tokyo-s"/>
+  <symbol minX="892" maxX="914" minY="645" maxY="668" name="subway-amsterdam-s"/>
+  <symbol minX="914" maxX="937" minY="645" maxY="668" name="cave-m"/>
+  <symbol minX="937" maxX="960" minY="645" maxY="668" name="subway-lausanne-s"/>
+  <symbol minX="960" maxX="983" minY="645" maxY="668" name="subway-spb-s"/>
+  <symbol minX="983" maxX="1012" minY="645" maxY="668" name="subway-almaty-s"/>
+  <symbol minX="0" maxX="30" minY="669" maxY="692" name="subway-london-m"/>
+  <symbol minX="30" maxX="61" minY="669" maxY="692" name="subway-lucknow-s"/>
+  <symbol minX="61" maxX="83" minY="669" maxY="692" name="subway-mexico-s"/>
+  <symbol minX="83" maxX="113" minY="669" maxY="692" name="subway-tabriz-s"/>
+  <symbol minX="113" maxX="137" minY="669" maxY="692" name="subway-maracaibo-s"/>
+  <symbol minX="137" maxX="159" minY="669" maxY="691" name="waterfall-s"/>
+  <symbol minX="159" maxX="181" minY="669" maxY="691" name="waste-basket-s"/>
+  <symbol minX="181" maxX="203" minY="669" maxY="691" name="zoo-s"/>
+  <symbol minX="203" maxX="225" minY="669" maxY="691" name="viewpoint-s"/>
+  <symbol minX="225" maxX="247" minY="669" maxY="691" name="airport-s"/>
+  <symbol minX="247" maxX="269" minY="669" maxY="691" name="nparkf-s"/>
+  <symbol minX="269" maxX="291" minY="669" maxY="691" name="subway-s"/>
+  <symbol minX="291" maxX="315" minY="669" maxY="691" name="subway-rotterdam-s"/>
+  <symbol minX="315" maxX="337" minY="669" maxY="691" name="hotel-s"/>
+  <symbol minX="337" maxX="365" minY="669" maxY="691" name="subway-philadelphia-s"/>
+  <symbol minX="365" maxX="395" minY="669" maxY="691" name="subway-palma-s"/>
+  <symbol minX="395" maxX="417" minY="669" maxY="691" name="jewish-s"/>
+  <symbol minX="417" maxX="439" minY="669" maxY="691" name="subway-newyork-s"/>
+  <symbol minX="439" maxX="461" minY="669" maxY="691" name="lighthouse-s"/>
+  <symbol minX="461" maxX="483" minY="669" maxY="691" name="monument-s"/>
+  <symbol minX="483" maxX="505" minY="669" maxY="691" name="museum-s"/>
+  <symbol minX="505" maxX="527" minY="669" maxY="691" name="muslim-s"/>
+  <symbol minX="527" maxX="549" minY="669" maxY="691" name="nparkf-outline-s"/>
+  <symbol minX="549" maxX="580" minY="669" maxY="691" name="subway-madrid-m"/>
+  <symbol minX="580" maxX="611" minY="669" maxY="691" name="subway-lucknow-m"/>
+  <symbol minX="611" maxX="638" minY="669" maxY="691" name="subway-osaka-s"/>
+  <symbol minX="638" maxX="660" minY="669" maxY="691" name="park-outline-s"/>
+  <symbol minX="660" maxX="691" minY="669" maxY="691" name="subway-kolkata-m"/>
+  <symbol minX="691" maxX="713" minY="669" maxY="691" name="park-s"/>
+  <symbol minX="713" maxX="735" minY="669" maxY="691" name="place-of-worship-s"/>
+  <symbol minX="735" maxX="757" minY="669" maxY="691" name="remains-s"/>
+  <symbol minX="757" maxX="779" minY="669" maxY="691" name="shinto-s"/>
+  <symbol minX="779" maxX="801" minY="669" maxY="691" name="subway-entrance-s"/>
+  <symbol minX="801" maxX="823" minY="669" maxY="691" name="ship-s"/>
+  <symbol minX="823" maxX="845" minY="669" maxY="691" name="shop-s"/>
+  <symbol minX="845" maxX="874" minY="669" maxY="691" name="subway-dnepro-s"/>
+  <symbol minX="874" maxX="896" minY="669" maxY="691" name="stadium-s"/>
+  <symbol minX="896" maxX="927" minY="669" maxY="691" name="subway-barcelona-m"/>
+  <symbol minX="927" maxX="958" minY="669" maxY="691" name="subway-bilbao-m"/>
+  <symbol minX="958" maxX="980" minY="669" maxY="691" name="toll_booth-s"/>
+  <symbol minX="980" maxX="998" minY="669" maxY="691" name="transit_train-m"/>
+  <symbol minX="998" maxX="1020" minY="669" maxY="691" name="buddhist-s"/>
+  <symbol minX="0" maxX="22" minY="692" maxY="714" name="bus-s"/>
+  <symbol minX="22" maxX="44" minY="692" maxY="714" name="cable-car-s"/>
+  <symbol minX="44" maxX="62" minY="692" maxY="714" name="transit_light_rail-m"/>
+  <symbol minX="62" maxX="84" minY="692" maxY="714" name="car-repair-s"/>
+  <symbol minX="84" maxX="106" minY="692" maxY="714" name="charging-station-s"/>
+  <symbol minX="106" maxX="130" minY="692" maxY="714" name="transfer_arrow"/>
+  <symbol minX="130" maxX="152" minY="692" maxY="714" name="tram-s"/>
+  <symbol minX="152" maxX="174" minY="692" maxY="714" name="train-s"/>
+  <symbol minX="174" maxX="196" minY="692" maxY="714" name="tourism-s"/>
+  <symbol minX="196" maxX="218" minY="692" maxY="714" name="theme_park-s"/>
+  <symbol minX="218" maxX="240" minY="692" maxY="714" name="theatre-s"/>
+  <symbol minX="240" maxX="262" minY="692" maxY="714" name="taoist-s"/>
+  <symbol minX="262" maxX="284" minY="692" maxY="714" name="christian-s"/>
+  <symbol minX="284" maxX="306" minY="692" maxY="714" name="drinking-water-s"/>
+  <symbol minX="306" maxX="328" minY="692" maxY="714" name="college-s"/>
+  <symbol minX="328" maxX="352" minY="692" maxY="714" name="subway-tbilisi-s"/>
+  <symbol minX="352" maxX="374" minY="692" maxY="714" name="hospital-s"/>
+  <symbol minX="374" maxX="396" minY="692" maxY="714" name="hindu-s"/>
+  <symbol minX="396" maxX="418" minY="692" maxY="714" name="fuel-s"/>
+  <symbol minX="418" maxX="440" minY="692" maxY="714" name="geyser-s"/>
+  <symbol minX="440" maxX="471" minY="692" maxY="713" name="subway-sanfrancisco-s"/>
+  <symbol minX="471" maxX="499" minY="692" maxY="713" name="subway-barcelona-s"/>
+  <symbol minX="499" maxX="530" minY="692" maxY="713" name="subway-brussel-s"/>
+  <symbol minX="530" maxX="548" minY="692" maxY="713" name="transit_monorail-m"/>
+  <symbol minX="548" maxX="569" minY="692" maxY="713" name="subway-paris-s"/>
+  <symbol minX="569" maxX="600" minY="692" maxY="713" name="subway-fukuoka-m"/>
+  <symbol minX="600" maxX="631" minY="692" maxY="713" name="subway-palma-m"/>
+  <symbol minX="631" maxX="661" minY="692" maxY="713" name="subway-novosibirsk-s"/>
+  <symbol minX="661" maxX="692" minY="692" maxY="713" name="subway-kharkiv-s"/>
+  <symbol minX="692" maxX="722" minY="692" maxY="713" name="subway-kiev-m"/>
+  <symbol minX="722" maxX="753" minY="692" maxY="713" name="subway-novosibirsk-m"/>
+  <symbol minX="753" maxX="774" minY="692" maxY="713" name="elevator"/>
+  <symbol minX="774" maxX="801" minY="692" maxY="713" name="subway-kryvyirih-s"/>
+  <symbol minX="801" maxX="832" minY="692" maxY="713" name="subway-sanfrancisco-m"/>
+  <symbol minX="832" maxX="853" minY="692" maxY="713" name="lightrail-berlin-s"/>
+  <symbol minX="853" maxX="881" minY="692" maxY="713" name="subway-madrid-s"/>
+  <symbol minX="881" maxX="896" minY="692" maxY="712" name="transit_train-s"/>
+  <symbol minX="896" maxX="916" minY="692" maxY="712" name="storage-tank"/>
+  <symbol minX="916" maxX="941" minY="692" maxY="712" name="subway-alicante-s"/>
+  <symbol minX="941" maxX="961" minY="692" maxY="712" name="board"/>
+  <symbol minX="961" maxX="981" minY="692" maxY="712" name="map"/>
+  <symbol minX="981" maxX="1012" minY="692" maxY="712" name="subway-bucharest-m"/>
+  <symbol minX="0" maxX="31" minY="714" maxY="734" name="subway-haagse-s"/>
+  <symbol minX="31" maxX="61" minY="714" maxY="734" name="subway-bucharest-s"/>
+  <symbol minX="61" maxX="92" minY="714" maxY="734" name="subway-sendai-s"/>
+  <symbol minX="92" maxX="123" minY="714" maxY="734" name="subway-sendai-m"/>
+  <symbol minX="123" maxX="154" minY="714" maxY="734" name="subway-manila-m"/>
+  <symbol minX="154" maxX="174" minY="714" maxY="734" name="transit_subway-m"/>
+  <symbol minX="174" maxX="195" minY="714" maxY="734" name="subway-moscow-s"/>
+  <symbol minX="195" maxX="215" minY="714" maxY="733" name="subway-seattle-s"/>
+  <symbol minX="215" maxX="246" minY="714" maxY="733" name="subway-kharkiv-m"/>
+  <symbol minX="246" maxX="269" minY="714" maxY="733" name="subway-london-s"/>
+  <symbol minX="269" maxX="299" minY="714" maxY="733" name="subway-manila-s"/>
+  <symbol minX="299" maxX="318" minY="714" maxY="733" name="subway-rome-s"/>
+  <symbol minX="318" maxX="349" minY="714" maxY="733" name="subway-brussel-m"/>
+  <symbol minX="349" maxX="380" minY="714" maxY="733" name="subway-taipei-s"/>
+  <symbol minX="380" maxX="399" minY="714" maxY="733" name="subway-ubahn-s"/>
+  <symbol minX="399" maxX="418" minY="714" maxY="733" name="cave-s"/>
+  <symbol minX="418" maxX="445" minY="714" maxY="733" name="subway-bilbao-s"/>
+  <symbol minX="445" maxX="476" minY="714" maxY="733" name="subway-edmonton-s"/>
+  <symbol minX="476" maxX="494" minY="714" maxY="732" name="subway-xs"/>
+  <symbol minX="494" maxX="506" minY="714" maxY="732" name="entrance-s"/>
+  <symbol minX="506" maxX="521" minY="714" maxY="732" name="transit_light_rail-s"/>
+  <symbol minX="521" maxX="539" minY="714" maxY="732" name="star-l"/>
+  <symbol minX="539" maxX="557" minY="714" maxY="732" name="subway-newyork-xs"/>
+  <symbol minX="557" maxX="584" minY="714" maxY="732" name="railway-crossing-l"/>
+  <symbol minX="584" maxX="603" minY="714" maxY="732" name="main_entrance-s"/>
+  <symbol minX="603" maxX="621" minY="714" maxY="732" name="speedcam-s"/>
+  <symbol minX="621" maxX="652" minY="714" maxY="732" name="subway-haagse-m"/>
+  <symbol minX="652" maxX="670" minY="714" maxY="732" name="parking-s"/>
+  <symbol minX="670" maxX="688" minY="714" maxY="732" name="transit_subway-s"/>
+  <symbol minX="688" maxX="709" minY="714" maxY="732" name="bench"/>
+  <symbol minX="709" maxX="724" minY="714" maxY="732" name="transit_monorail-s"/>
+  <symbol minX="724" maxX="755" minY="714" maxY="731" name="subway-edmonton-m"/>
+  <symbol minX="755" maxX="785" minY="714" maxY="730" name="subway-malaga-s"/>
+  <symbol minX="785" maxX="816" minY="714" maxY="730" name="subway-malaga-m"/>
+  <symbol minX="816" maxX="839" minY="714" maxY="730" name="subway-kolkata-s"/>
+  <symbol minX="839" maxX="864" minY="714" maxY="730" name="subway-kiev-s"/>
+  <symbol minX="864" maxX="883" minY="714" maxY="730" name="volcano-m"/>
+  <symbol minX="883" maxX="899" minY="714" maxY="730" name="star-m"/>
+  <symbol minX="899" maxX="930" minY="714" maxY="730" name="subway-taipei-m"/>
+  <symbol minX="930" maxX="960" minY="714" maxY="729" name="subway-baku-s"/>
+  <symbol minX="960" maxX="985" minY="714" maxY="729" name="subway-minsk-m"/>
+  <symbol minX="985" maxX="1016" minY="714" maxY="729" name="subway-baku-m"/>
+  <symbol minX="0" maxX="23" minY="734" maxY="749" name="railway-crossing-m"/>
+  <symbol minX="23" maxX="41" minY="734" maxY="749" name="plaque"/>
+  <symbol minX="41" maxX="64" minY="734" maxY="748" name="subway-minsk-s"/>
+  <symbol minX="64" maxX="78" minY="734" maxY="748" name="star-s"/>
+  <symbol minX="78" maxX="109" minY="734" maxY="748" name="subway-chongqing-s"/>
+  <symbol minX="109" maxX="137" minY="734" maxY="747" name="arrow-m"/>
+  <symbol minX="137" maxX="151" minY="734" maxY="747" name="volcano-s"/>
+  <symbol minX="151" maxX="173" minY="734" maxY="747" name="mountain-pass"/>
+  <symbol minX="173" maxX="187" minY="734" maxY="747" name="peakt-m"/>
+  <symbol minX="187" maxX="218" minY="734" maxY="747" name="subway-chongqing-m"/>
+  <symbol minX="218" maxX="230" minY="734" maxY="746" name="zero-icon"/>
+  <symbol minX="230" maxX="242" minY="734" maxY="745" name="peakt-s"/>
+  <symbol minX="242" maxX="252" minY="734" maxY="744" name="dot-m"/>
+  <symbol minX="252" maxX="273" minY="734" maxY="744" name="arrow-s"/>
+  <symbol minX="273" maxX="287" minY="734" maxY="741" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 60deeaf10a..c92d360af0 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index d8f30302b5..4e5cf9b6d5 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -3,699 +3,694 @@
  <file width="1024" height="1024">
   <symbol minX="0" maxX="115" minY="0" maxY="70" name="route-arrow"/>
   <symbol minX="115" maxX="179" minY="0" maxY="64" name="compass-image"/>
-  <symbol minX="179" maxX="231" minY="0" maxY="61" name="shield-us-i-thin-scaled"/>
-  <symbol minX="231" maxX="292" minY="0" maxY="61" name="cross_geoposition"/>
-  <symbol minX="292" maxX="356" minY="0" maxY="61" name="route-point-finish"/>
-  <symbol minX="356" maxX="417" minY="0" maxY="61" name="shield-us-i-wide-scaled"/>
-  <symbol minX="417" maxX="475" minY="0" maxY="58" name="search-result-playground"/>
-  <symbol minX="475" maxX="533" minY="0" maxY="58" name="search-result-shop-sports"/>
-  <symbol minX="533" maxX="591" minY="0" maxY="58" name="search-result-nightclub"/>
-  <symbol minX="591" maxX="649" minY="0" maxY="58" name="search-result-water-park"/>
-  <symbol minX="649" maxX="707" minY="0" maxY="58" name="search-result-marketplace"/>
-  <symbol minX="707" maxX="765" minY="0" maxY="58" name="search-result-fastfood"/>
-  <symbol minX="765" maxX="823" minY="0" maxY="58" name="search-result-cinema"/>
-  <symbol minX="823" maxX="881" minY="0" maxY="58" name="search-result-casino"/>
-  <symbol minX="881" maxX="939" minY="0" maxY="58" name="search-result-cafe"/>
-  <symbol minX="939" maxX="997" minY="0" maxY="58" name="search-result-bar"/>
-  <symbol minX="0" maxX="58" minY="70" maxY="128" name="search-result-zoo"/>
-  <symbol minX="58" maxX="116" minY="70" maxY="128" name="search-result-bakery"/>
-  <symbol minX="116" maxX="177" minY="70" maxY="128" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="177" maxX="235" minY="70" maxY="128" name="search-result-restaurant"/>
-  <symbol minX="235" maxX="293" minY="70" maxY="128" name="search-result-shop-shoes"/>
-  <symbol minX="293" maxX="351" minY="70" maxY="128" name="search-result-shop-supermarket"/>
-  <symbol minX="351" maxX="409" minY="70" maxY="128" name="search-result-shop-seafood"/>
-  <symbol minX="409" maxX="467" minY="70" maxY="128" name="search-result-shop-toys"/>
-  <symbol minX="467" maxX="525" minY="70" maxY="128" name="search-result-shop-mall"/>
-  <symbol minX="525" maxX="583" minY="70" maxY="128" name="search-result-shop-jewelry"/>
-  <symbol minX="583" maxX="641" minY="70" maxY="128" name="search-result-shop-greengrocer"/>
-  <symbol minX="641" maxX="699" minY="70" maxY="128" name="search-result-shop-gift"/>
-  <symbol minX="699" maxX="757" minY="70" maxY="128" name="search-result-shop-department_store"/>
-  <symbol minX="757" maxX="815" minY="70" maxY="128" name="search-result-shop-cosmetics"/>
-  <symbol minX="815" maxX="873" minY="70" maxY="128" name="search-result-shop-convenience"/>
-  <symbol minX="873" maxX="931" minY="70" maxY="128" name="search-result-shop-confectionery"/>
-  <symbol minX="931" maxX="989" minY="70" maxY="128" name="search-result-shop-clothes"/>
-  <symbol minX="0" maxX="58" minY="128" maxY="186" name="search-result-shop-butcher"/>
-  <symbol minX="58" maxX="116" minY="128" maxY="186" name="search-result-shop-alcohol"/>
-  <symbol minX="116" maxX="174" minY="128" maxY="186" name="search-result-theme-park"/>
-  <symbol minX="174" maxX="232" minY="128" maxY="186" name="search-result-pub"/>
+  <symbol minX="179" maxX="240" minY="0" maxY="61" name="cross_geoposition"/>
+  <symbol minX="240" maxX="292" minY="0" maxY="61" name="shield-us-i-thin-scaled"/>
+  <symbol minX="292" maxX="353" minY="0" maxY="61" name="shield-us-i-wide-scaled"/>
+  <symbol minX="353" maxX="417" minY="0" maxY="61" name="route-point-finish"/>
+  <symbol minX="417" maxX="475" minY="0" maxY="58" name="search-result-shop-cosmetics"/>
+  <symbol minX="475" maxX="533" minY="0" maxY="58" name="search-result-shop-shoes"/>
+  <symbol minX="533" maxX="591" minY="0" maxY="58" name="search-result-shop-convenience"/>
+  <symbol minX="591" maxX="649" minY="0" maxY="58" name="search-result-zoo"/>
+  <symbol minX="649" maxX="707" minY="0" maxY="58" name="search-result-water-park"/>
+  <symbol minX="707" maxX="765" minY="0" maxY="58" name="search-result-cinema"/>
+  <symbol minX="765" maxX="823" minY="0" maxY="58" name="search-result-fastfood"/>
+  <symbol minX="823" maxX="881" minY="0" maxY="58" name="search-result-theme-park"/>
+  <symbol minX="881" maxX="939" minY="0" maxY="58" name="search-result-marketplace"/>
+  <symbol minX="939" maxX="997" minY="0" maxY="58" name="search-result-shop-sports"/>
+  <symbol minX="0" maxX="58" minY="70" maxY="128" name="search-result-restaurant"/>
+  <symbol minX="58" maxX="116" minY="70" maxY="128" name="search-result-nightclub"/>
+  <symbol minX="116" maxX="174" minY="70" maxY="128" name="search-result-playground"/>
+  <symbol minX="174" maxX="232" minY="70" maxY="128" name="search-result-shop-confectionery"/>
+  <symbol minX="232" maxX="290" minY="70" maxY="128" name="search-result-pub"/>
+  <symbol minX="290" maxX="348" minY="70" maxY="128" name="search-result-shop-butcher"/>
+  <symbol minX="348" maxX="409" minY="70" maxY="128" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="409" maxX="467" minY="70" maxY="128" name="search-result-shop-clothes"/>
+  <symbol minX="467" maxX="525" minY="70" maxY="128" name="search-result-shop-supermarket"/>
+  <symbol minX="525" maxX="583" minY="70" maxY="128" name="search-result-shop-toys"/>
+  <symbol minX="583" maxX="641" minY="70" maxY="128" name="search-result-shop-alcohol"/>
+  <symbol minX="641" maxX="699" minY="70" maxY="128" name="search-result-shop-greengrocer"/>
+  <symbol minX="699" maxX="757" minY="70" maxY="128" name="search-result-bakery"/>
+  <symbol minX="757" maxX="815" minY="70" maxY="128" name="search-result-bar"/>
+  <symbol minX="815" maxX="873" minY="70" maxY="128" name="search-result-shop-jewelry"/>
+  <symbol minX="873" maxX="931" minY="70" maxY="128" name="search-result-shop-mall"/>
+  <symbol minX="931" maxX="989" minY="70" maxY="128" name="search-result-shop-gift"/>
+  <symbol minX="0" maxX="58" minY="128" maxY="186" name="search-result-shop-seafood"/>
+  <symbol minX="58" maxX="116" minY="128" maxY="186" name="search-result-casino"/>
+  <symbol minX="116" maxX="174" minY="128" maxY="186" name="search-result-cafe"/>
+  <symbol minX="174" maxX="232" minY="128" maxY="186" name="search-result-shop-department_store"/>
   <symbol minX="232" maxX="284" minY="128" maxY="183" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="284" maxX="327" minY="128" maxY="182" name="unpaved_road"/>
-  <symbol minX="327" maxX="370" minY="128" maxY="182" name="paid_road"/>
-  <symbol minX="370" maxX="413" minY="128" maxY="182" name="ferry"/>
+  <symbol minX="284" maxX="327" minY="128" maxY="182" name="ferry"/>
+  <symbol minX="327" maxX="370" minY="128" maxY="182" name="unpaved_road"/>
+  <symbol minX="370" maxX="413" minY="128" maxY="182" name="paid_road"/>
   <symbol minX="413" maxX="465" minY="128" maxY="180" name="infosign"/>
   <symbol minX="465" maxX="517" minY="128" maxY="180" name="track_marker_selected"/>
-  <symbol minX="517" maxX="552" minY="128" maxY="178" name="bookmark-shop-m"/>
-  <symbol minX="552" maxX="587" minY="128" maxY="178" name="bookmark-judaism-m"/>
-  <symbol minX="587" maxX="622" minY="128" maxY="178" name="bookmark-medicine-m"/>
-  <symbol minX="622" maxX="657" minY="128" maxY="178" name="bookmark-mountain-m"/>
-  <symbol minX="657" maxX="692" minY="128" maxY="178" name="bookmark-museum-m"/>
-  <symbol minX="692" maxX="727" minY="128" maxY="178" name="bookmark-park-m"/>
-  <symbol minX="727" maxX="762" minY="128" maxY="178" name="bookmark-parking-m"/>
-  <symbol minX="762" maxX="797" minY="128" maxY="178" name="bookmark-gas-m"/>
-  <symbol minX="797" maxX="832" minY="128" maxY="178" name="bookmark-water-m"/>
-  <symbol minX="832" maxX="867" minY="128" maxY="178" name="bookmark-viewpoint-m"/>
-  <symbol minX="867" maxX="902" minY="128" maxY="178" name="bookmark-transport-m"/>
-  <symbol minX="902" maxX="937" minY="128" maxY="178" name="bookmark-swim-m"/>
-  <symbol minX="937" maxX="972" minY="128" maxY="178" name="bookmark-start-m"/>
-  <symbol minX="972" maxX="1007" minY="128" maxY="178" name="bookmark-sport-m"/>
-  <symbol minX="0" maxX="35" minY="186" maxY="236" name="bookmark-sights-m"/>
-  <symbol minX="35" maxX="70" minY="186" maxY="236" name="bookmark-islam-m"/>
-  <symbol minX="70" maxX="105" minY="186" maxY="236" name="bookmark-hotel-m"/>
-  <symbol minX="105" maxX="140" minY="186" maxY="236" name="bookmark-food-m"/>
-  <symbol minX="140" maxX="175" minY="186" maxY="236" name="bookmark-finish-m"/>
-  <symbol minX="175" maxX="210" minY="186" maxY="236" name="bookmark-exchange-m"/>
-  <symbol minX="210" maxX="245" minY="186" maxY="236" name="bookmark-entertainment-m"/>
-  <symbol minX="245" maxX="280" minY="186" maxY="236" name="bookmark-default-m"/>
-  <symbol minX="280" maxX="315" minY="186" maxY="236" name="bookmark-christianity-m"/>
-  <symbol minX="315" maxX="350" minY="186" maxY="236" name="bookmark-building-m"/>
-  <symbol minX="350" maxX="385" minY="186" maxY="236" name="bookmark-buddhism-m"/>
-  <symbol minX="385" maxX="420" minY="186" maxY="236" name="bookmark-bg-m"/>
-  <symbol minX="420" maxX="455" minY="186" maxY="236" name="bookmark-bar-m"/>
-  <symbol minX="455" maxX="490" minY="186" maxY="236" name="bookmark-animals-m"/>
-  <symbol minX="490" maxX="536" minY="186" maxY="232" name="route-point-7"/>
-  <symbol minX="536" maxX="600" minY="186" maxY="232" name="norating-default-l"/>
-  <symbol minX="600" maxX="646" minY="186" maxY="232" name="route-point-19"/>
-  <symbol minX="646" maxX="710" minY="186" maxY="232" name="norating-bg-l"/>
-  <symbol minX="710" maxX="756" minY="186" maxY="232" name="route-point-1"/>
-  <symbol minX="756" maxX="802" minY="186" maxY="232" name="route-point-10"/>
-  <symbol minX="802" maxX="848" minY="186" maxY="232" name="route-point-11"/>
-  <symbol minX="848" maxX="894" minY="186" maxY="232" name="route-point-12"/>
-  <symbol minX="894" maxX="940" minY="186" maxY="232" name="route-point-13"/>
-  <symbol minX="940" maxX="986" minY="186" maxY="232" name="route-point-14"/>
-  <symbol minX="0" maxX="46" minY="236" maxY="282" name="route-point-15"/>
-  <symbol minX="46" maxX="92" minY="236" maxY="282" name="route-point-16"/>
-  <symbol minX="92" maxX="138" minY="236" maxY="282" name="route-point-17"/>
-  <symbol minX="138" maxX="184" minY="236" maxY="282" name="route-point-18"/>
-  <symbol minX="184" maxX="230" minY="236" maxY="282" name="route-point-start"/>
-  <symbol minX="230" maxX="276" minY="236" maxY="282" name="route-point-2"/>
-  <symbol minX="276" maxX="322" minY="236" maxY="282" name="route-point-20"/>
-  <symbol minX="322" maxX="368" minY="236" maxY="282" name="route-point-3"/>
-  <symbol minX="368" maxX="414" minY="236" maxY="282" name="route-point-4"/>
-  <symbol minX="414" maxX="460" minY="236" maxY="282" name="route-point-5"/>
-  <symbol minX="460" maxX="506" minY="236" maxY="282" name="route-point-6"/>
-  <symbol minX="506" maxX="552" minY="236" maxY="282" name="route-point-8"/>
-  <symbol minX="552" maxX="598" minY="236" maxY="282" name="route-point-9"/>
-  <symbol minX="598" maxX="662" minY="236" maxY="282" name="coloredmark-default-l"/>
-  <symbol minX="662" maxX="726" minY="236" maxY="282" name="coloredmark-bg-l"/>
-  <symbol minX="726" maxX="760" minY="236" maxY="276" name="shield-us-i-thin"/>
-  <symbol minX="760" maxX="803" minY="236" maxY="276" name="shield-us-i-wide"/>
-  <symbol minX="803" maxX="840" minY="236" maxY="273" name="shield-us-hw-thin"/>
-  <symbol minX="840" maxX="883" minY="236" maxY="273" name="shield-us-hw-wide"/>
-  <symbol minX="883" maxX="909" minY="236" maxY="271" name="bookmark-default-s"/>
-  <symbol minX="909" maxX="935" minY="236" maxY="271" name="bookmark-bg-s"/>
-  <symbol minX="935" maxX="969" minY="236" maxY="270" name="track_marker_deselected"/>
-  <symbol minX="969" maxX="1003" minY="236" maxY="270" name="current-position"/>
-  <symbol minX="0" maxX="30" minY="282" maxY="313" name="subway-delhi-m"/>
-  <symbol minX="30" maxX="61" minY="282" maxY="313" name="subway-foshan-m"/>
-  <symbol minX="61" maxX="92" minY="282" maxY="313" name="bank-m"/>
-  <symbol minX="92" maxX="123" minY="282" maxY="313" name="subway-ekb-m"/>
-  <symbol minX="123" maxX="154" minY="282" maxY="313" name="banknote-m"/>
-  <symbol minX="154" maxX="185" minY="282" maxY="313" name="bar-m"/>
-  <symbol minX="185" maxX="216" minY="282" maxY="313" name="baseball-m"/>
-  <symbol minX="216" maxX="247" minY="282" maxY="313" name="subway-dubai-m"/>
-  <symbol minX="247" maxX="278" minY="282" maxY="313" name="basketball-m"/>
-  <symbol minX="278" maxX="309" minY="282" maxY="313" name="subway-glasgow-m"/>
-  <symbol minX="309" maxX="340" minY="282" maxY="313" name="bbq-m"/>
-  <symbol minX="340" maxX="371" minY="282" maxY="313" name="bcontrol-m"/>
-  <symbol minX="371" maxX="402" minY="282" maxY="313" name="beach-m"/>
-  <symbol minX="402" maxX="433" minY="282" maxY="313" name="beauty-m"/>
-  <symbol minX="433" maxX="464" minY="282" maxY="313" name="subway-chicago-m"/>
-  <symbol minX="464" maxX="495" minY="282" maxY="313" name="beekeeper-m"/>
-  <symbol minX="495" maxX="526" minY="282" maxY="313" name="subway-chengdu-m"/>
-  <symbol minX="526" maxX="557" minY="282" maxY="313" name="beer-m"/>
-  <symbol minX="557" maxX="588" minY="282" maxY="313" name="art-m"/>
-  <symbol minX="588" maxX="619" minY="282" maxY="313" name="subway-kobe-m"/>
-  <symbol minX="619" maxX="650" minY="282" maxY="313" name="apartment-m"/>
-  <symbol minX="650" maxX="681" minY="282" maxY="313" name="archaeological-site-m"/>
-  <symbol minX="681" maxX="712" minY="282" maxY="313" name="archery-m"/>
-  <symbol minX="712" maxX="743" minY="282" maxY="313" name="subway-kazan-m"/>
-  <symbol minX="743" maxX="769" minY="282" maxY="313" name="subway-istanbul-m"/>
-  <symbol minX="769" maxX="800" minY="282" maxY="313" name="subway-isfahan-m"/>
-  <symbol minX="800" maxX="831" minY="282" maxY="313" name="subway-hirosima-m"/>
-  <symbol minX="831" maxX="862" minY="282" maxY="313" name="subway-helsinki-m"/>
-  <symbol minX="862" maxX="893" minY="282" maxY="313" name="bakery-m"/>
-  <symbol minX="893" maxX="924" minY="282" maxY="313" name="airport-m"/>
-  <symbol minX="924" maxX="955" minY="282" maxY="313" name="subway-guangzhou-m"/>
-  <symbol minX="955" maxX="986" minY="282" maxY="313" name="atm-m"/>
-  <symbol minX="986" maxX="1017" minY="282" maxY="313" name="subway-guadalajara-m"/>
-  <symbol minX="0" maxX="31" minY="313" maxY="344" name="audiologist-m"/>
-  <symbol minX="31" maxX="62" minY="313" maxY="344" name="subway-catania-m"/>
-  <symbol minX="62" maxX="93" minY="313" maxY="344" name="australian-football-m"/>
-  <symbol minX="93" maxX="124" minY="313" maxY="344" name="badminton-m"/>
-  <symbol minX="124" maxX="155" minY="313" maxY="344" name="campsite-m"/>
-  <symbol minX="155" maxX="186" minY="313" maxY="344" name="subway-bangkok-m"/>
-  <symbol minX="186" maxX="217" minY="313" maxY="344" name="bus-m"/>
-  <symbol minX="217" maxX="247" minY="313" maxY="344" name="subway-athens-m"/>
-  <symbol minX="247" maxX="278" minY="313" maxY="344" name="subway-ankara-s"/>
-  <symbol minX="278" maxX="309" minY="313" maxY="344" name="subway-ankara-m"/>
-  <symbol minX="309" maxX="340" minY="313" maxY="344" name="butcher-m"/>
-  <symbol minX="340" maxX="368" minY="313" maxY="344" name="subway-amsterdam-m"/>
-  <symbol minX="368" maxX="399" minY="313" maxY="344" name="cable-car-m"/>
-  <symbol minX="399" maxX="430" minY="313" maxY="344" name="cafe-m"/>
-  <symbol minX="430" maxX="461" minY="313" maxY="344" name="buddhist-m"/>
-  <symbol minX="461" maxX="492" minY="313" maxY="344" name="subway-algeria-m"/>
-  <symbol minX="492" maxX="523" minY="313" maxY="344" name="subway-adana-s"/>
-  <symbol minX="523" maxX="554" minY="313" maxY="344" name="subway-adana-m"/>
-  <symbol minX="554" maxX="585" minY="313" maxY="344" name="car-part-m"/>
-  <symbol minX="585" maxX="616" minY="313" maxY="344" name="stationery_shop-m"/>
-  <symbol minX="616" maxX="647" minY="313" maxY="344" name="car-repair-m"/>
-  <symbol minX="647" maxX="678" minY="313" maxY="344" name="car-wash-m"/>
-  <symbol minX="678" maxX="709" minY="313" maxY="344" name="car_sharing-m"/>
-  <symbol minX="709" maxX="740" minY="313" maxY="344" name="stadium-m"/>
-  <symbol minX="740" maxX="771" minY="313" maxY="344" name="blood_donation-m"/>
-  <symbol minX="771" maxX="802" minY="313" maxY="344" name="bicycle-m"/>
-  <symbol minX="802" maxX="833" minY="313" maxY="344" name="antiques-m"/>
-  <symbol minX="833" maxX="864" minY="313" maxY="344" name="subway-caracas-m"/>
-  <symbol minX="864" maxX="895" minY="313" maxY="344" name="subway-cairo-m"/>
-  <symbol minX="895" maxX="926" minY="313" maxY="344" name="subway-bursaray-m"/>
-  <symbol minX="926" maxX="957" minY="313" maxY="344" name="subway-buenosaires-m"/>
-  <symbol minX="957" maxX="988" minY="313" maxY="344" name="bicycle-repair-station"/>
-  <symbol minX="988" maxX="1019" minY="313" maxY="344" name="subway-budapest-m"/>
-  <symbol minX="0" maxX="31" minY="344" maxY="375" name="blacksmith-m"/>
-  <symbol minX="31" maxX="62" minY="344" maxY="375" name="subway-changchun-m"/>
-  <symbol minX="62" maxX="91" minY="344" maxY="375" name="subway-brescia-m"/>
-  <symbol minX="91" maxX="122" minY="344" maxY="375" name="subway-brasilia-m"/>
-  <symbol minX="122" maxX="153" minY="344" maxY="375" name="book-shop-m"/>
-  <symbol minX="153" maxX="184" minY="344" maxY="375" name="bookmaker-m"/>
-  <symbol minX="184" maxX="215" minY="344" maxY="375" name="subway-bengaluru-m"/>
-  <symbol minX="215" maxX="246" minY="344" maxY="375" name="bowling-m"/>
-  <symbol minX="246" maxX="277" minY="344" maxY="375" name="subway-beijing-m"/>
-  <symbol minX="277" maxX="308" minY="344" maxY="375" name="bowling_alley-m"/>
-  <symbol minX="308" maxX="339" minY="344" maxY="375" name="brewery-m"/>
-  <symbol minX="339" maxX="369" minY="344" maxY="375" name="subway-nnov-m"/>
-  <symbol minX="369" maxX="400" minY="344" maxY="375" name="subway-warszawa-m"/>
-  <symbol minX="400" maxX="431" minY="344" maxY="375" name="subway-perugia-m"/>
-  <symbol minX="431" maxX="462" minY="344" maxY="375" name="subway-washington-m"/>
-  <symbol minX="462" maxX="493" minY="344" maxY="375" name="subway-panama-m"/>
-  <symbol minX="493" maxX="524" minY="344" maxY="375" name="subway-wuhan-m"/>
-  <symbol minX="524" maxX="555" minY="344" maxY="375" name="subway-oslo-m"/>
-  <symbol minX="555" maxX="586" minY="344" maxY="375" name="subway-yokohama-m"/>
-  <symbol minX="586" maxX="617" minY="344" maxY="375" name="survey_point-m"/>
-  <symbol minX="617" maxX="648" minY="344" maxY="375" name="sweets-m"/>
-  <symbol minX="648" maxX="679" minY="344" maxY="375" name="swimming-m"/>
-  <symbol minX="679" maxX="710" minY="344" maxY="375" name="subway-pittsburgh-m"/>
-  <symbol minX="710" maxX="741" minY="344" maxY="375" name="table-tennis-m"/>
-  <symbol minX="741" maxX="772" minY="344" maxY="375" name="taoist-m"/>
-  <symbol minX="772" maxX="803" minY="344" maxY="375" name="subway-newyork-m"/>
-  <symbol minX="803" maxX="834" minY="344" maxY="375" name="taxi-m"/>
-  <symbol minX="834" maxX="865" minY="344" maxY="375" name="subway-nagoya-m"/>
-  <symbol minX="865" maxX="896" minY="344" maxY="375" name="tennis-m"/>
-  <symbol minX="896" maxX="927" minY="344" maxY="375" name="theatre-m"/>
-  <symbol minX="927" maxX="958" minY="344" maxY="375" name="theme_park-m"/>
-  <symbol minX="958" maxX="989" minY="344" maxY="375" name="ticket-shop-m"/>
-  <symbol minX="989" maxX="1020" minY="344" maxY="375" name="subway-santodomingo-m"/>
-  <symbol minX="0" maxX="31" minY="375" maxY="406" name="subway-stockholm-m"/>
-  <symbol minX="31" maxX="62" minY="375" maxY="406" name="subway-stlouis-m"/>
-  <symbol minX="62" maxX="93" minY="375" maxY="406" name="subway-southkorea-m"/>
-  <symbol minX="93" maxX="124" minY="375" maxY="406" name="subway-tashkent-m"/>
-  <symbol minX="124" maxX="155" minY="375" maxY="406" name="subway-sofia-m"/>
-  <symbol minX="155" maxX="186" minY="375" maxY="406" name="subway-shiraz-m"/>
-  <symbol minX="186" maxX="217" minY="375" maxY="406" name="subway-tianjin-m"/>
-  <symbol minX="217" maxX="248" minY="375" maxY="406" name="subway-tokyo-m"/>
-  <symbol minX="248" maxX="279" minY="375" maxY="406" name="subway-saopaulo-m"/>
-  <symbol minX="279" maxX="310" minY="375" maxY="406" name="subway-tyneandwear-m"/>
-  <symbol minX="310" maxX="341" minY="375" maxY="406" name="tire-repair-m"/>
-  <symbol minX="341" maxX="372" minY="375" maxY="406" name="subway-valencia-m"/>
-  <symbol minX="372" maxX="403" minY="375" maxY="406" name="subway-samara-m"/>
-  <symbol minX="403" maxX="434" minY="375" maxY="406" name="subway-vienna-m"/>
-  <symbol minX="434" maxX="465" minY="375" maxY="406" name="subway-volgograd-m"/>
-  <symbol minX="465" maxX="496" minY="375" maxY="406" name="subway-riodejaneiro-m"/>
-  <symbol minX="496" maxX="527" minY="375" maxY="406" name="subway-reseau-paris-m"/>
-  <symbol minX="527" maxX="558" minY="375" maxY="406" name="subway-rennes-m"/>
-  <symbol minX="558" maxX="589" minY="375" maxY="406" name="subway-pyongyang-m"/>
-  <symbol minX="589" maxX="619" minY="375" maxY="406" name="subway-porto-m"/>
-  <symbol minX="619" maxX="650" minY="375" maxY="406" name="subway-lima-m"/>
-  <symbol minX="650" maxX="681" minY="375" maxY="406" name="viewpoint-m"/>
-  <symbol minX="681" maxX="712" minY="375" maxY="406" name="volleyball-m"/>
-  <symbol minX="712" maxX="743" minY="375" maxY="406" name="waste-basket-m"/>
-  <symbol minX="743" maxX="774" minY="375" maxY="406" name="waterfall-m"/>
-  <symbol minX="774" maxX="805" minY="375" maxY="406" name="subway-losangeles-m"/>
-  <symbol minX="805" maxX="836" minY="375" maxY="406" name="wayside_shrine-m"/>
-  <symbol minX="836" maxX="867" minY="375" maxY="406" name="windmill-m"/>
-  <symbol minX="867" maxX="898" minY="375" maxY="406" name="yoga-m"/>
-  <symbol minX="898" maxX="929" minY="375" maxY="406" name="subway-lisboa-m"/>
-  <symbol minX="929" maxX="960" minY="375" maxY="406" name="zoo-m"/>
-  <symbol minX="960" maxX="991" minY="375" maxY="406" name="subway-m"/>
-  <symbol minX="991" maxX="1022" minY="375" maxY="406" name="airport_gate-m"/>
-  <symbol minX="0" maxX="31" minY="406" maxY="437" name="subway-lille-m"/>
-  <symbol minX="31" maxX="62" minY="406" maxY="437" name="alcohol-m"/>
-  <symbol minX="62" maxX="93" minY="406" maxY="437" name="subway-lausanne-m"/>
-  <symbol minX="93" maxX="124" minY="406" maxY="437" name="alpine_hut-m"/>
-  <symbol minX="124" maxX="155" minY="406" maxY="437" name="subway-kyoto-m"/>
-  <symbol minX="155" maxX="186" minY="406" maxY="437" name="subway-kunming-m"/>
-  <symbol minX="186" maxX="217" minY="406" maxY="437" name="alternative-m"/>
-  <symbol minX="217" maxX="248" minY="406" maxY="437" name="america-football-m"/>
-  <symbol minX="248" maxX="279" minY="406" maxY="437" name="subway-massachusetts-m"/>
-  <symbol minX="279" maxX="310" minY="406" maxY="437" name="subway-minatomirai-m"/>
-  <symbol minX="310" maxX="341" minY="406" maxY="437" name="toilets-m"/>
-  <symbol minX="341" maxX="372" minY="406" maxY="437" name="subway-milan-m"/>
-  <symbol minX="372" maxX="403" minY="406" maxY="437" name="toll_booth-m"/>
-  <symbol minX="403" maxX="433" minY="406" maxY="437" name="subway-mexico-m"/>
-  <symbol minX="433" maxX="464" minY="406" maxY="437" name="subway-medellin-m"/>
-  <symbol minX="464" maxX="495" minY="406" maxY="437" name="tomb-m"/>
-  <symbol minX="495" maxX="526" minY="406" maxY="437" name="subway-mecca-m"/>
-  <symbol minX="526" maxX="557" minY="406" maxY="437" name="tourism-m"/>
-  <symbol minX="557" maxX="588" minY="406" maxY="437" name="electronics-m"/>
-  <symbol minX="588" maxX="619" minY="406" maxY="437" name="subway-mashhad-m"/>
-  <symbol minX="619" maxX="650" minY="406" maxY="437" name="subway-marseille-s"/>
-  <symbol minX="650" maxX="681" minY="406" maxY="437" name="toys-m"/>
-  <symbol minX="681" maxX="712" minY="406" maxY="437" name="train-m"/>
-  <symbol minX="712" maxX="743" minY="406" maxY="437" name="tram-m"/>
-  <symbol minX="743" maxX="774" minY="406" maxY="437" name="travel_agency_shop-m"/>
-  <symbol minX="774" maxX="805" minY="406" maxY="437" name="vending-m"/>
-  <symbol minX="805" maxX="836" minY="406" maxY="437" name="veterinary-m"/>
-  <symbol minX="836" maxX="867" minY="406" maxY="437" name="video-games-m"/>
-  <symbol minX="867" maxX="898" minY="406" maxY="437" name="defibrillator-m"/>
-  <symbol minX="898" maxX="929" minY="406" maxY="437" name="mail-m"/>
-  <symbol minX="929" maxX="960" minY="406" maxY="437" name="cross-m"/>
-  <symbol minX="960" maxX="991" minY="406" maxY="437" name="curling-m"/>
-  <symbol minX="991" maxX="1022" minY="406" maxY="437" name="lighthouse-m"/>
-  <symbol minX="0" maxX="31" minY="437" maxY="468" name="lift_gate-m"/>
-  <symbol minX="31" maxX="62" minY="437" maxY="468" name="library-m"/>
-  <symbol minX="62" maxX="93" minY="437" maxY="468" name="lawyer-m"/>
-  <symbol minX="93" maxX="124" minY="437" maxY="468" name="laundry-m"/>
-  <symbol minX="124" maxX="155" minY="437" maxY="468" name="language_school-m"/>
-  <symbol minX="155" maxX="186" minY="437" maxY="468" name="kiosk-m"/>
-  <symbol minX="186" maxX="217" minY="437" maxY="468" name="kindergarten-m"/>
-  <symbol minX="217" maxX="248" minY="437" maxY="468" name="cricket-m"/>
-  <symbol minX="248" maxX="279" minY="437" maxY="468" name="jewish-m"/>
-  <symbol minX="279" maxX="310" minY="437" maxY="468" name="jewelry-m"/>
-  <symbol minX="310" maxX="341" minY="437" maxY="468" name="internet_cafe-m"/>
-  <symbol minX="341" maxX="372" minY="437" maxY="468" name="interior_decoration-m"/>
-  <symbol minX="372" maxX="403" minY="437" maxY="468" name="information-m"/>
-  <symbol minX="403" maxX="434" minY="437" maxY="468" name="ice_cream-m"/>
-  <symbol minX="434" maxX="465" minY="437" maxY="468" name="hunting-tower-m"/>
-  <symbol minX="465" maxX="496" minY="437" maxY="468" name="dentist-m"/>
-  <symbol minX="496" maxX="527" minY="437" maxY="468" name="hotel-m"/>
-  <symbol minX="527" maxX="558" minY="437" maxY="468" name="hostel-m"/>
-  <symbol minX="558" maxX="589" minY="437" maxY="468" name="motel-m"/>
-  <symbol minX="589" maxX="620" minY="437" maxY="468" name="newsagent_shop-m"/>
-  <symbol minX="620" maxX="651" minY="437" maxY="468" name="needle_and_thread-m"/>
-  <symbol minX="651" maxX="682" minY="437" maxY="468" name="climbing-m"/>
-  <symbol minX="682" maxX="713" minY="437" maxY="468" name="muslim-m"/>
-  <symbol minX="713" maxX="744" minY="437" maxY="468" name="musical-instrument-m"/>
-  <symbol minX="744" maxX="775" minY="437" maxY="468" name="music_school-m"/>
-  <symbol minX="775" maxX="806" minY="437" maxY="468" name="music-m"/>
-  <symbol minX="806" maxX="837" minY="437" maxY="468" name="clothes-m"/>
-  <symbol minX="837" maxX="868" minY="437" maxY="468" name="museum-m"/>
-  <symbol minX="868" maxX="899" minY="437" maxY="468" name="college-m"/>
-  <symbol minX="899" maxX="930" minY="437" maxY="468" name="motorcycle_shop-m"/>
-  <symbol minX="930" maxX="961" minY="437" maxY="468" name="department_store-m"/>
-  <symbol minX="961" maxX="992" minY="437" maxY="468" name="computer-m"/>
-  <symbol minX="992" maxX="1023" minY="437" maxY="468" name="monument-m"/>
-  <symbol minX="0" maxX="31" minY="468" maxY="499" name="mobile_phone-m"/>
-  <symbol minX="31" maxX="62" minY="468" maxY="499" name="military-m"/>
-  <symbol minX="62" maxX="93" minY="468" maxY="499" name="metal_construction-m"/>
-  <symbol minX="93" maxX="124" minY="468" maxY="499" name="media_shop-m"/>
-  <symbol minX="124" maxX="155" minY="468" maxY="499" name="media-m"/>
-  <symbol minX="155" maxX="186" minY="468" maxY="499" name="marketplace-m"/>
-  <symbol minX="186" maxX="217" minY="468" maxY="499" name="marina-m"/>
-  <symbol minX="217" maxX="248" minY="468" maxY="499" name="copyshop-m"/>
-  <symbol minX="248" maxX="279" minY="468" maxY="499" name="florist-m"/>
-  <symbol minX="279" maxX="310" minY="468" maxY="499" name="garden-outline-m"/>
-  <symbol minX="310" maxX="341" minY="468" maxY="499" name="garden-m"/>
-  <symbol minX="341" maxX="372" minY="468" maxY="499" name="gallery-m"/>
-  <symbol minX="372" maxX="403" minY="468" maxY="499" name="furniture-m"/>
-  <symbol minX="403" maxX="434" minY="468" maxY="499" name="funicular-m"/>
-  <symbol minX="434" maxX="465" minY="468" maxY="499" name="funeral_directors-m"/>
-  <symbol minX="465" maxX="496" minY="468" maxY="499" name="drinking-water-m"/>
-  <symbol minX="496" maxX="527" minY="468" maxY="499" name="fuel-m"/>
-  <symbol minX="527" maxX="558" minY="468" maxY="499" name="fuel-dispenser-m"/>
-  <symbol minX="558" maxX="589" minY="468" maxY="499" name="fountain-s"/>
-  <symbol minX="589" maxX="620" minY="468" maxY="499" name="fountain-m"/>
-  <symbol minX="620" maxX="651" minY="468" maxY="499" name="garden_center-m"/>
-  <symbol minX="651" maxX="682" minY="468" maxY="499" name="firehydrant-m"/>
-  <symbol minX="682" maxX="713" minY="468" maxY="499" name="fire_station-m"/>
-  <symbol minX="713" maxX="744" minY="468" maxY="499" name="fastfood-m"/>
-  <symbol minX="744" maxX="775" minY="468" maxY="499" name="erotic-m"/>
-  <symbol minX="775" maxX="806" minY="468" maxY="499" name="equestrian-m"/>
-  <symbol minX="806" maxX="837" minY="468" maxY="499" name="driving_school-m"/>
-  <symbol minX="837" maxX="868" minY="468" maxY="499" name="emergency-phone-m"/>
-  <symbol minX="868" maxX="899" minY="468" maxY="499" name="embassy-m"/>
-  <symbol minX="899" maxX="930" minY="468" maxY="499" name="dump-station-m"/>
-  <symbol minX="930" maxX="961" minY="468" maxY="499" name="electrician-m"/>
-  <symbol minX="961" maxX="992" minY="468" maxY="499" name="hairdresser-m"/>
-  <symbol minX="992" maxX="1023" minY="468" maxY="499" name="hospital-m"/>
-  <symbol minX="0" maxX="31" minY="499" maxY="530" name="home-m"/>
-  <symbol minX="31" maxX="62" minY="499" maxY="530" name="hockey-m"/>
-  <symbol minX="62" maxX="93" minY="499" maxY="530" name="historic-ship-m"/>
-  <symbol minX="93" maxX="124" minY="499" maxY="530" name="diving-m"/>
-  <symbol minX="124" maxX="155" minY="499" maxY="530" name="hindu-m"/>
-  <symbol minX="155" maxX="186" minY="499" maxY="530" name="heliport-m"/>
-  <symbol minX="186" maxX="217" minY="499" maxY="530" name="helipad-m"/>
-  <symbol minX="217" maxX="248" minY="499" maxY="530" name="handball-m"/>
-  <symbol minX="248" maxX="279" minY="499" maxY="530" name="hand-m"/>
-  <symbol minX="279" maxX="310" minY="499" maxY="530" name="car_shop-m"/>
-  <symbol minX="310" maxX="341" minY="499" maxY="530" name="gym-m"/>
-  <symbol minX="341" maxX="372" minY="499" maxY="530" name="guidepost"/>
-  <symbol minX="372" maxX="403" minY="499" maxY="530" name="grocery-m"/>
-  <symbol minX="403" maxX="434" minY="499" maxY="530" name="greengrocer-m"/>
-  <symbol minX="434" maxX="465" minY="499" maxY="530" name="golf-m"/>
-  <symbol minX="465" maxX="496" minY="499" maxY="530" name="gift-m"/>
-  <symbol minX="496" maxX="527" minY="499" maxY="530" name="dog_park-m"/>
-  <symbol minX="527" maxX="558" minY="499" maxY="530" name="geyser-m"/>
-  <symbol minX="558" maxX="589" minY="499" maxY="530" name="geyser-l"/>
-  <symbol minX="589" maxX="620" minY="499" maxY="530" name="doityourself-m"/>
-  <symbol minX="620" maxX="651" minY="499" maxY="530" name="charging-station-m"/>
-  <symbol minX="651" maxX="682" minY="499" maxY="530" name="shoes-m"/>
-  <symbol minX="682" maxX="713" minY="499" maxY="530" name="police-m"/>
-  <symbol minX="713" maxX="744" minY="499" maxY="530" name="podiatrist-m"/>
-  <symbol minX="744" maxX="775" minY="499" maxY="530" name="plumber-m"/>
-  <symbol minX="775" maxX="806" minY="499" maxY="530" name="shop-bicycle-m"/>
-  <symbol minX="806" maxX="837" minY="499" maxY="530" name="playground-m"/>
-  <symbol minX="837" maxX="868" minY="499" maxY="530" name="shop-m"/>
-  <symbol minX="868" maxX="899" minY="499" maxY="530" name="cemetery-m"/>
-  <symbol minX="899" maxX="930" minY="499" maxY="530" name="caravan-shop-m"/>
-  <symbol minX="930" maxX="961" minY="499" maxY="530" name="postbox-m"/>
-  <symbol minX="961" maxX="992" minY="499" maxY="530" name="place-of-worship-m"/>
-  <symbol minX="992" maxX="1023" minY="499" maxY="530" name="pitch-m"/>
-  <symbol minX="0" maxX="31" minY="530" maxY="561" name="picnic_table-m"/>
-  <symbol minX="31" maxX="62" minY="530" maxY="561" name="picnic-m"/>
-  <symbol minX="62" maxX="93" minY="530" maxY="561" name="physiotherapist-m"/>
-  <symbol minX="93" maxX="124" minY="530" maxY="561" name="photo-shop-m"/>
-  <symbol minX="124" maxX="155" minY="530" maxY="561" name="phone-m"/>
-  <symbol minX="155" maxX="186" minY="530" maxY="561" name="pharmacy-m"/>
-  <symbol minX="186" maxX="217" minY="530" maxY="561" name="petshop-m"/>
-  <symbol minX="217" maxX="248" minY="530" maxY="561" name="carpenter-m"/>
-  <symbol minX="248" maxX="279" minY="530" maxY="561" name="sawmill-m"/>
-  <symbol minX="279" maxX="310" minY="530" maxY="561" name="school-m"/>
-  <symbol minX="310" maxX="341" minY="530" maxY="561" name="seafood-shop-m"/>
-  <symbol minX="341" maxX="372" minY="530" maxY="561" name="sauna-m"/>
-  <symbol minX="372" maxX="403" minY="530" maxY="561" name="second_hand_shop-m"/>
-  <symbol minX="403" maxX="434" minY="530" maxY="561" name="sample_collection-m"/>
-  <symbol minX="434" maxX="465" minY="530" maxY="561" name="restaurant-m"/>
-  <symbol minX="465" maxX="496" minY="530" maxY="561" name="shelter-m"/>
-  <symbol minX="496" maxX="527" minY="530" maxY="561" name="shinto-m"/>
-  <symbol minX="527" maxX="558" minY="530" maxY="561" name="sports-m"/>
-  <symbol minX="558" maxX="589" minY="530" maxY="561" name="remains-m"/>
-  <symbol minX="589" maxX="620" minY="530" maxY="561" name="recycling-m"/>
-  <symbol minX="620" maxX="651" minY="530" maxY="561" name="casino-m"/>
+  <symbol minX="517" maxX="552" minY="128" maxY="178" name="bookmark-entertainment-m"/>
+  <symbol minX="552" maxX="587" minY="128" maxY="178" name="bookmark-food-m"/>
+  <symbol minX="587" maxX="622" minY="128" maxY="178" name="bookmark-finish-m"/>
+  <symbol minX="622" maxX="657" minY="128" maxY="178" name="bookmark-buddhism-m"/>
+  <symbol minX="657" maxX="692" minY="128" maxY="178" name="bookmark-mountain-m"/>
+  <symbol minX="692" maxX="727" minY="128" maxY="178" name="bookmark-gas-m"/>
+  <symbol minX="727" maxX="762" minY="128" maxY="178" name="bookmark-building-m"/>
+  <symbol minX="762" maxX="797" minY="128" maxY="178" name="bookmark-islam-m"/>
+  <symbol minX="797" maxX="832" minY="128" maxY="178" name="bookmark-christianity-m"/>
+  <symbol minX="832" maxX="867" minY="128" maxY="178" name="bookmark-default-m"/>
+  <symbol minX="867" maxX="902" minY="128" maxY="178" name="bookmark-exchange-m"/>
+  <symbol minX="902" maxX="937" minY="128" maxY="178" name="bookmark-hotel-m"/>
+  <symbol minX="937" maxX="972" minY="128" maxY="178" name="bookmark-medicine-m"/>
+  <symbol minX="972" maxX="1007" minY="128" maxY="178" name="bookmark-judaism-m"/>
+  <symbol minX="0" maxX="35" minY="186" maxY="236" name="bookmark-park-m"/>
+  <symbol minX="35" maxX="70" minY="186" maxY="236" name="bookmark-water-m"/>
+  <symbol minX="70" maxX="105" minY="186" maxY="236" name="bookmark-viewpoint-m"/>
+  <symbol minX="105" maxX="140" minY="186" maxY="236" name="bookmark-transport-m"/>
+  <symbol minX="140" maxX="175" minY="186" maxY="236" name="bookmark-swim-m"/>
+  <symbol minX="175" maxX="210" minY="186" maxY="236" name="bookmark-start-m"/>
+  <symbol minX="210" maxX="245" minY="186" maxY="236" name="bookmark-sport-m"/>
+  <symbol minX="245" maxX="280" minY="186" maxY="236" name="bookmark-sights-m"/>
+  <symbol minX="280" maxX="315" minY="186" maxY="236" name="bookmark-shop-m"/>
+  <symbol minX="315" maxX="350" minY="186" maxY="236" name="bookmark-parking-m"/>
+  <symbol minX="350" maxX="385" minY="186" maxY="236" name="bookmark-animals-m"/>
+  <symbol minX="385" maxX="420" minY="186" maxY="236" name="bookmark-bar-m"/>
+  <symbol minX="420" maxX="455" minY="186" maxY="236" name="bookmark-bg-m"/>
+  <symbol minX="455" maxX="490" minY="186" maxY="236" name="bookmark-museum-m"/>
+  <symbol minX="490" maxX="536" minY="186" maxY="232" name="route-point-16"/>
+  <symbol minX="536" maxX="600" minY="186" maxY="232" name="norating-bg-l"/>
+  <symbol minX="600" maxX="664" minY="186" maxY="232" name="norating-default-l"/>
+  <symbol minX="664" maxX="710" minY="186" maxY="232" name="route-point-1"/>
+  <symbol minX="710" maxX="774" minY="186" maxY="232" name="coloredmark-default-l"/>
+  <symbol minX="774" maxX="838" minY="186" maxY="232" name="coloredmark-bg-l"/>
+  <symbol minX="838" maxX="884" minY="186" maxY="232" name="route-point-13"/>
+  <symbol minX="884" maxX="930" minY="186" maxY="232" name="route-point-15"/>
+  <symbol minX="930" maxX="976" minY="186" maxY="232" name="route-point-12"/>
+  <symbol minX="976" maxX="1022" minY="186" maxY="232" name="route-point-11"/>
+  <symbol minX="0" maxX="46" minY="236" maxY="282" name="route-point-14"/>
+  <symbol minX="46" maxX="92" minY="236" maxY="282" name="route-point-10"/>
+  <symbol minX="92" maxX="138" minY="236" maxY="282" name="route-point-9"/>
+  <symbol minX="138" maxX="184" minY="236" maxY="282" name="route-point-20"/>
+  <symbol minX="184" maxX="230" minY="236" maxY="282" name="route-point-17"/>
+  <symbol minX="230" maxX="276" minY="236" maxY="282" name="route-point-start"/>
+  <symbol minX="276" maxX="322" minY="236" maxY="282" name="route-point-18"/>
+  <symbol minX="322" maxX="368" minY="236" maxY="282" name="route-point-19"/>
+  <symbol minX="368" maxX="414" minY="236" maxY="282" name="route-point-6"/>
+  <symbol minX="414" maxX="460" minY="236" maxY="282" name="route-point-7"/>
+  <symbol minX="460" maxX="506" minY="236" maxY="282" name="route-point-3"/>
+  <symbol minX="506" maxX="552" minY="236" maxY="282" name="route-point-5"/>
+  <symbol minX="552" maxX="598" minY="236" maxY="282" name="route-point-4"/>
+  <symbol minX="598" maxX="644" minY="236" maxY="282" name="route-point-2"/>
+  <symbol minX="644" maxX="690" minY="236" maxY="282" name="route-point-8"/>
+  <symbol minX="690" maxX="724" minY="236" maxY="276" name="shield-us-i-thin"/>
+  <symbol minX="724" maxX="767" minY="236" maxY="276" name="shield-us-i-wide"/>
+  <symbol minX="767" maxX="804" minY="236" maxY="273" name="shield-us-hw-thin"/>
+  <symbol minX="804" maxX="847" minY="236" maxY="273" name="shield-us-hw-wide"/>
+  <symbol minX="847" maxX="873" minY="236" maxY="271" name="bookmark-bg-s"/>
+  <symbol minX="873" maxX="899" minY="236" maxY="271" name="bookmark-default-s"/>
+  <symbol minX="899" maxX="933" minY="236" maxY="270" name="track_marker_deselected"/>
+  <symbol minX="933" maxX="967" minY="236" maxY="270" name="current-position"/>
+  <symbol minX="967" maxX="998" minY="236" maxY="267" name="shoes-m"/>
+  <symbol minX="0" maxX="31" minY="282" maxY="313" name="shop-m"/>
+  <symbol minX="31" maxX="62" minY="282" maxY="313" name="subway-chengdu-m"/>
+  <symbol minX="62" maxX="93" minY="282" maxY="313" name="shop-bicycle-m"/>
+  <symbol minX="93" maxX="124" minY="282" maxY="313" name="subway-changchun-m"/>
+  <symbol minX="124" maxX="155" minY="282" maxY="313" name="shower-m"/>
+  <symbol minX="155" maxX="186" minY="282" maxY="313" name="skateboard-m"/>
+  <symbol minX="186" maxX="217" minY="282" maxY="313" name="skiing-m"/>
+  <symbol minX="217" maxX="248" minY="282" maxY="313" name="sauna-m"/>
+  <symbol minX="248" maxX="279" minY="282" maxY="313" name="subway-chicago-m"/>
+  <symbol minX="279" maxX="310" minY="282" maxY="313" name="ship-m"/>
+  <symbol minX="310" maxX="341" minY="282" maxY="313" name="shinto-m"/>
+  <symbol minX="341" maxX="372" minY="282" maxY="313" name="shelter-m"/>
+  <symbol minX="372" maxX="403" minY="282" maxY="313" name="second_hand_shop-m"/>
+  <symbol minX="403" maxX="433" minY="282" maxY="313" name="subway-delhi-m"/>
+  <symbol minX="433" maxX="464" minY="282" maxY="313" name="seafood-shop-m"/>
+  <symbol minX="464" maxX="495" minY="282" maxY="313" name="subway-dubai-m"/>
+  <symbol minX="495" maxX="526" minY="282" maxY="313" name="school-m"/>
+  <symbol minX="526" maxX="557" minY="282" maxY="313" name="sawmill-m"/>
+  <symbol minX="557" maxX="588" minY="282" maxY="313" name="subway-bengaluru-m"/>
+  <symbol minX="588" maxX="619" minY="282" maxY="313" name="subway-adana-m"/>
+  <symbol minX="619" maxX="650" minY="282" maxY="313" name="subway-beijing-m"/>
+  <symbol minX="650" maxX="681" minY="282" maxY="313" name="subway-lisboa-m"/>
+  <symbol minX="681" maxX="712" minY="282" maxY="313" name="subway-bangkok-m"/>
+  <symbol minX="712" maxX="742" minY="282" maxY="313" name="subway-athens-m"/>
+  <symbol minX="742" maxX="773" minY="282" maxY="313" name="subway-ankara-s"/>
+  <symbol minX="773" maxX="804" minY="282" maxY="313" name="subway-ankara-m"/>
+  <symbol minX="804" maxX="832" minY="282" maxY="313" name="subway-amsterdam-m"/>
+  <symbol minX="832" maxX="863" minY="282" maxY="313" name="subway-brasilia-m"/>
+  <symbol minX="863" maxX="894" minY="282" maxY="313" name="subway-algeria-m"/>
+  <symbol minX="894" maxX="923" minY="282" maxY="313" name="subway-brescia-m"/>
+  <symbol minX="923" maxX="954" minY="282" maxY="313" name="subway-adana-s"/>
+  <symbol minX="954" maxX="985" minY="282" maxY="313" name="soccer-m"/>
+  <symbol minX="985" maxX="1016" minY="282" maxY="313" name="stationery_shop-m"/>
+  <symbol minX="0" maxX="31" minY="313" maxY="344" name="stadium-m"/>
+  <symbol minX="31" maxX="62" minY="313" maxY="344" name="sports-m"/>
+  <symbol minX="62" maxX="93" minY="313" maxY="344" name="subway-budapest-m"/>
+  <symbol minX="93" maxX="124" minY="313" maxY="344" name="subway-buenosaires-m"/>
+  <symbol minX="124" maxX="155" minY="313" maxY="344" name="subway-bursaray-m"/>
+  <symbol minX="155" maxX="186" minY="313" maxY="344" name="speedcam-alert-l"/>
+  <symbol minX="186" maxX="217" minY="313" maxY="344" name="subway-cairo-m"/>
+  <symbol minX="217" maxX="248" minY="313" maxY="344" name="subway-caracas-m"/>
+  <symbol minX="248" maxX="279" minY="313" maxY="344" name="subway-catania-m"/>
+  <symbol minX="279" maxX="310" minY="313" maxY="344" name="speech_therapist-m"/>
+  <symbol minX="310" maxX="341" minY="313" maxY="344" name="subway-warszawa-m"/>
+  <symbol minX="341" maxX="372" minY="313" maxY="344" name="yoga-m"/>
+  <symbol minX="372" maxX="403" minY="313" maxY="344" name="taoist-m"/>
+  <symbol minX="403" maxX="434" minY="313" maxY="344" name="table-tennis-m"/>
+  <symbol minX="434" maxX="465" minY="313" maxY="344" name="swimming-m"/>
+  <symbol minX="465" maxX="496" minY="313" maxY="344" name="sweets-m"/>
+  <symbol minX="496" maxX="527" minY="313" maxY="344" name="survey_point-m"/>
+  <symbol minX="527" maxX="558" minY="313" maxY="344" name="subway-yokohama-m"/>
+  <symbol minX="558" maxX="589" minY="313" maxY="344" name="zoo-m"/>
+  <symbol minX="589" maxX="620" minY="313" maxY="344" name="subway-wuhan-m"/>
+  <symbol minX="620" maxX="651" minY="313" maxY="344" name="subway-washington-m"/>
+  <symbol minX="651" maxX="682" minY="313" maxY="344" name="taxi-m"/>
+  <symbol minX="682" maxX="713" minY="313" maxY="344" name="subway-volgograd-m"/>
+  <symbol minX="713" maxX="744" minY="313" maxY="344" name="subway-vienna-m"/>
+  <symbol minX="744" maxX="775" minY="313" maxY="344" name="subway-valencia-m"/>
+  <symbol minX="775" maxX="806" minY="313" maxY="344" name="subway-tyneandwear-m"/>
+  <symbol minX="806" maxX="837" minY="313" maxY="344" name="subway-tokyo-m"/>
+  <symbol minX="837" maxX="868" minY="313" maxY="344" name="subway-tianjin-m"/>
+  <symbol minX="868" maxX="899" minY="313" maxY="344" name="subway-tashkent-m"/>
+  <symbol minX="899" maxX="930" minY="313" maxY="344" name="subway-stockholm-m"/>
+  <symbol minX="930" maxX="961" minY="313" maxY="344" name="subway-stlouis-m"/>
+  <symbol minX="961" maxX="992" minY="313" maxY="344" name="subway-southkorea-m"/>
+  <symbol minX="992" maxX="1023" minY="313" maxY="344" name="tourism-m"/>
+  <symbol minX="0" maxX="31" minY="344" maxY="375" name="vending-m"/>
+  <symbol minX="31" maxX="62" minY="344" maxY="375" name="veterinary-m"/>
+  <symbol minX="62" maxX="93" minY="344" maxY="375" name="video-games-m"/>
+  <symbol minX="93" maxX="124" minY="344" maxY="375" name="viewpoint-m"/>
+  <symbol minX="124" maxX="155" minY="344" maxY="375" name="volleyball-m"/>
+  <symbol minX="155" maxX="186" minY="344" maxY="375" name="waste-basket-m"/>
+  <symbol minX="186" maxX="217" minY="344" maxY="375" name="tram-m"/>
+  <symbol minX="217" maxX="248" minY="344" maxY="375" name="train-m"/>
+  <symbol minX="248" maxX="279" minY="344" maxY="375" name="toys-m"/>
+  <symbol minX="279" maxX="310" minY="344" maxY="375" name="waterfall-m"/>
+  <symbol minX="310" maxX="341" minY="344" maxY="375" name="subway-sofia-m"/>
+  <symbol minX="341" maxX="372" minY="344" maxY="375" name="tomb-m"/>
+  <symbol minX="372" maxX="403" minY="344" maxY="375" name="toll_booth-m"/>
+  <symbol minX="403" maxX="434" minY="344" maxY="375" name="toilets-m"/>
+  <symbol minX="434" maxX="465" minY="344" maxY="375" name="tire-repair-m"/>
+  <symbol minX="465" maxX="496" minY="344" maxY="375" name="ticket-shop-m"/>
+  <symbol minX="496" maxX="527" minY="344" maxY="375" name="wayside_shrine-m"/>
+  <symbol minX="527" maxX="558" minY="344" maxY="375" name="theme_park-m"/>
+  <symbol minX="558" maxX="589" minY="344" maxY="375" name="windmill-m"/>
+  <symbol minX="589" maxX="620" minY="344" maxY="375" name="theatre-m"/>
+  <symbol minX="620" maxX="651" minY="344" maxY="375" name="tennis-m"/>
+  <symbol minX="651" maxX="682" minY="344" maxY="375" name="subway-kunming-m"/>
+  <symbol minX="682" maxX="713" minY="344" maxY="375" name="subway-mashhad-m"/>
+  <symbol minX="713" maxX="744" minY="344" maxY="375" name="subway-marseille-s"/>
+  <symbol minX="744" maxX="775" minY="344" maxY="375" name="subway-m"/>
+  <symbol minX="775" maxX="806" minY="344" maxY="375" name="subway-lyon-m"/>
+  <symbol minX="806" maxX="837" minY="344" maxY="375" name="subway-losangeles-m"/>
+  <symbol minX="837" maxX="868" minY="344" maxY="375" name="travel_agency_shop-m"/>
+  <symbol minX="868" maxX="899" minY="344" maxY="375" name="subway-lima-m"/>
+  <symbol minX="899" maxX="930" minY="344" maxY="375" name="subway-lille-m"/>
+  <symbol minX="930" maxX="961" minY="344" maxY="375" name="subway-lausanne-m"/>
+  <symbol minX="961" maxX="992" minY="344" maxY="375" name="subway-kyoto-m"/>
+  <symbol minX="992" maxX="1023" minY="344" maxY="375" name="subway-massachusetts-m"/>
+  <symbol minX="0" maxX="31" minY="375" maxY="406" name="subway-kobe-m"/>
+  <symbol minX="31" maxX="62" minY="375" maxY="406" name="subway-kazan-m"/>
+  <symbol minX="62" maxX="88" minY="375" maxY="406" name="subway-istanbul-m"/>
+  <symbol minX="88" maxX="119" minY="375" maxY="406" name="subway-isfahan-m"/>
+  <symbol minX="119" maxX="150" minY="375" maxY="406" name="subway-hirosima-m"/>
+  <symbol minX="150" maxX="181" minY="375" maxY="406" name="subway-helsinki-m"/>
+  <symbol minX="181" maxX="212" minY="375" maxY="406" name="subway-guangzhou-m"/>
+  <symbol minX="212" maxX="243" minY="375" maxY="406" name="subway-guadalajara-m"/>
+  <symbol minX="243" maxX="274" minY="375" maxY="406" name="subway-glasgow-m"/>
+  <symbol minX="274" maxX="305" minY="375" maxY="406" name="subway-foshan-m"/>
+  <symbol minX="305" maxX="336" minY="375" maxY="406" name="subway-perugia-m"/>
+  <symbol minX="336" maxX="367" minY="375" maxY="406" name="subway-shiraz-m"/>
+  <symbol minX="367" maxX="398" minY="375" maxY="406" name="subway-saopaulo-m"/>
+  <symbol minX="398" maxX="429" minY="375" maxY="406" name="subway-santodomingo-m"/>
+  <symbol minX="429" maxX="460" minY="375" maxY="406" name="subway-samara-m"/>
+  <symbol minX="460" maxX="491" minY="375" maxY="406" name="subway-riodejaneiro-m"/>
+  <symbol minX="491" maxX="522" minY="375" maxY="406" name="subway-reseau-paris-m"/>
+  <symbol minX="522" maxX="553" minY="375" maxY="406" name="subway-rennes-m"/>
+  <symbol minX="553" maxX="584" minY="375" maxY="406" name="subway-pyongyang-m"/>
+  <symbol minX="584" maxX="614" minY="375" maxY="406" name="subway-porto-m"/>
+  <symbol minX="614" maxX="645" minY="375" maxY="406" name="subway-pittsburgh-m"/>
+  <symbol minX="645" maxX="676" minY="375" maxY="406" name="subway-ekb-m"/>
+  <symbol minX="676" maxX="707" minY="375" maxY="406" name="subway-panama-m"/>
+  <symbol minX="707" maxX="738" minY="375" maxY="406" name="subway-oslo-m"/>
+  <symbol minX="738" maxX="768" minY="375" maxY="406" name="subway-nnov-m"/>
+  <symbol minX="768" maxX="799" minY="375" maxY="406" name="subway-newyork-m"/>
+  <symbol minX="799" maxX="830" minY="375" maxY="406" name="subway-nagoya-m"/>
+  <symbol minX="830" maxX="861" minY="375" maxY="406" name="subway-minatomirai-m"/>
+  <symbol minX="861" maxX="892" minY="375" maxY="406" name="subway-milan-m"/>
+  <symbol minX="892" maxX="922" minY="375" maxY="406" name="subway-mexico-m"/>
+  <symbol minX="922" maxX="953" minY="375" maxY="406" name="subway-medellin-m"/>
+  <symbol minX="953" maxX="984" minY="375" maxY="406" name="subway-mecca-m"/>
+  <symbol minX="984" maxX="1015" minY="375" maxY="406" name="doityourself-m"/>
+  <symbol minX="0" maxX="31" minY="406" maxY="437" name="florist-m"/>
+  <symbol minX="31" maxX="62" minY="406" maxY="437" name="firehydrant-m"/>
+  <symbol minX="62" maxX="93" minY="406" maxY="437" name="fire_station-m"/>
+  <symbol minX="93" maxX="124" minY="406" maxY="437" name="fastfood-m"/>
+  <symbol minX="124" maxX="155" minY="406" maxY="437" name="erotic-m"/>
+  <symbol minX="155" maxX="186" minY="406" maxY="437" name="equestrian-m"/>
+  <symbol minX="186" maxX="217" minY="406" maxY="437" name="emergency-phone-m"/>
+  <symbol minX="217" maxX="248" minY="406" maxY="437" name="embassy-m"/>
+  <symbol minX="248" maxX="279" minY="406" maxY="437" name="electronics-m"/>
+  <symbol minX="279" maxX="310" minY="406" maxY="437" name="electrician-m"/>
+  <symbol minX="310" maxX="341" minY="406" maxY="437" name="dump-station-m"/>
+  <symbol minX="341" maxX="372" minY="406" maxY="437" name="driving_school-m"/>
+  <symbol minX="372" maxX="403" minY="406" maxY="437" name="drinking-water-m"/>
+  <symbol minX="403" maxX="434" minY="406" maxY="437" name="fountain-m"/>
+  <symbol minX="434" maxX="465" minY="406" maxY="437" name="dog_park-m"/>
+  <symbol minX="465" maxX="496" minY="406" maxY="437" name="diving-m"/>
+  <symbol minX="496" maxX="527" minY="406" maxY="437" name="department_store-m"/>
+  <symbol minX="527" maxX="558" minY="406" maxY="437" name="dentist-m"/>
+  <symbol minX="558" maxX="589" minY="406" maxY="437" name="defibrillator-m"/>
+  <symbol minX="589" maxX="620" minY="406" maxY="437" name="curling-m"/>
+  <symbol minX="620" maxX="651" minY="406" maxY="437" name="cross-m"/>
+  <symbol minX="651" maxX="682" minY="406" maxY="437" name="cricket-m"/>
+  <symbol minX="682" maxX="713" minY="406" maxY="437" name="copyshop-m"/>
+  <symbol minX="713" maxX="744" minY="406" maxY="437" name="computer-m"/>
+  <symbol minX="744" maxX="775" minY="406" maxY="437" name="college-m"/>
+  <symbol minX="775" maxX="806" minY="406" maxY="437" name="clothes-m"/>
+  <symbol minX="806" maxX="837" minY="406" maxY="437" name="climbing-m"/>
+  <symbol minX="837" maxX="868" minY="406" maxY="437" name="gift-m"/>
+  <symbol minX="868" maxX="899" minY="406" maxY="437" name="hockey-m"/>
+  <symbol minX="899" maxX="930" minY="406" maxY="437" name="historic-ship-m"/>
+  <symbol minX="930" maxX="961" minY="406" maxY="437" name="hindu-m"/>
+  <symbol minX="961" maxX="992" minY="406" maxY="437" name="heliport-m"/>
+  <symbol minX="992" maxX="1023" minY="406" maxY="437" name="helipad-m"/>
+  <symbol minX="0" maxX="31" minY="437" maxY="468" name="handball-m"/>
+  <symbol minX="31" maxX="62" minY="437" maxY="468" name="hand-m"/>
+  <symbol minX="62" maxX="93" minY="437" maxY="468" name="hairdresser-m"/>
+  <symbol minX="93" maxX="124" minY="437" maxY="468" name="gym-m"/>
+  <symbol minX="124" maxX="155" minY="437" maxY="468" name="guidepost"/>
+  <symbol minX="155" maxX="186" minY="437" maxY="468" name="grocery-m"/>
+  <symbol minX="186" maxX="217" minY="437" maxY="468" name="greengrocer-m"/>
+  <symbol minX="217" maxX="248" minY="437" maxY="468" name="golf-m"/>
+  <symbol minX="248" maxX="279" minY="437" maxY="468" name="cinema-m"/>
+  <symbol minX="279" maxX="310" minY="437" maxY="468" name="geyser-m"/>
+  <symbol minX="310" maxX="341" minY="437" maxY="468" name="geyser-l"/>
+  <symbol minX="341" maxX="372" minY="437" maxY="468" name="gate-m"/>
+  <symbol minX="372" maxX="403" minY="437" maxY="468" name="garden_center-m"/>
+  <symbol minX="403" maxX="434" minY="437" maxY="468" name="garden-outline-m"/>
+  <symbol minX="434" maxX="465" minY="437" maxY="468" name="garden-m"/>
+  <symbol minX="465" maxX="496" minY="437" maxY="468" name="gallery-m"/>
+  <symbol minX="496" maxX="527" minY="437" maxY="468" name="furniture-m"/>
+  <symbol minX="527" maxX="558" minY="437" maxY="468" name="funicular-m"/>
+  <symbol minX="558" maxX="589" minY="437" maxY="468" name="funeral_directors-m"/>
+  <symbol minX="589" maxX="620" minY="437" maxY="468" name="fuel-m"/>
+  <symbol minX="620" maxX="651" minY="437" maxY="468" name="fuel-dispenser-m"/>
+  <symbol minX="651" maxX="682" minY="437" maxY="468" name="fountain-s"/>
+  <symbol minX="682" maxX="713" minY="437" maxY="468" name="bank-m"/>
+  <symbol minX="713" maxX="744" minY="437" maxY="468" name="blacksmith-m"/>
+  <symbol minX="744" maxX="775" minY="437" maxY="468" name="bicycle-repair-station"/>
+  <symbol minX="775" maxX="806" minY="437" maxY="468" name="bicycle-m"/>
+  <symbol minX="806" maxX="837" minY="437" maxY="468" name="beer-m"/>
+  <symbol minX="837" maxX="868" minY="437" maxY="468" name="beekeeper-m"/>
+  <symbol minX="868" maxX="899" minY="437" maxY="468" name="beauty-m"/>
+  <symbol minX="899" maxX="930" minY="437" maxY="468" name="beach-m"/>
+  <symbol minX="930" maxX="961" minY="437" maxY="468" name="bcontrol-m"/>
+  <symbol minX="961" maxX="992" minY="437" maxY="468" name="bbq-m"/>
+  <symbol minX="992" maxX="1023" minY="437" maxY="468" name="basketball-m"/>
+  <symbol minX="0" maxX="31" minY="468" maxY="499" name="baseball-m"/>
+  <symbol minX="31" maxX="62" minY="468" maxY="499" name="bar-m"/>
+  <symbol minX="62" maxX="93" minY="468" maxY="499" name="banknote-m"/>
+  <symbol minX="93" maxX="124" minY="468" maxY="499" name="blood_donation-m"/>
+  <symbol minX="124" maxX="155" minY="468" maxY="499" name="bakery-m"/>
+  <symbol minX="155" maxX="186" minY="468" maxY="499" name="badminton-m"/>
+  <symbol minX="186" maxX="217" minY="468" maxY="499" name="australian-football-m"/>
+  <symbol minX="217" maxX="248" minY="468" maxY="499" name="audiologist-m"/>
+  <symbol minX="248" maxX="279" minY="468" maxY="499" name="atm-m"/>
+  <symbol minX="279" maxX="310" minY="468" maxY="499" name="archery-m"/>
+  <symbol minX="310" maxX="341" minY="468" maxY="499" name="archaeological-site-m"/>
+  <symbol minX="341" maxX="372" minY="468" maxY="499" name="apartment-m"/>
+  <symbol minX="372" maxX="403" minY="468" maxY="499" name="america-football-m"/>
+  <symbol minX="403" maxX="434" minY="468" maxY="499" name="alternative-m"/>
+  <symbol minX="434" maxX="465" minY="468" maxY="499" name="alpine_hut-m"/>
+  <symbol minX="465" maxX="496" minY="468" maxY="499" name="alcohol-m"/>
+  <symbol minX="496" maxX="527" minY="468" maxY="499" name="airport-m"/>
+  <symbol minX="527" maxX="558" minY="468" maxY="499" name="car-wash-m"/>
+  <symbol minX="558" maxX="589" minY="468" maxY="499" name="christian-m"/>
+  <symbol minX="589" maxX="620" minY="468" maxY="499" name="chimney-m"/>
+  <symbol minX="620" maxX="651" minY="468" maxY="499" name="chess-m"/>
+  <symbol minX="651" maxX="682" minY="468" maxY="499" name="chemist-m"/>
+  <symbol minX="682" maxX="713" minY="468" maxY="499" name="charity_shop-m"/>
+  <symbol minX="713" maxX="744" minY="468" maxY="499" name="charging-station-m"/>
+  <symbol minX="744" maxX="775" minY="468" maxY="499" name="cemetery-m"/>
+  <symbol minX="775" maxX="806" minY="468" maxY="499" name="casino-m"/>
+  <symbol minX="806" maxX="837" minY="468" maxY="499" name="carpenter-m"/>
+  <symbol minX="837" maxX="868" minY="468" maxY="499" name="caravan_site-m"/>
+  <symbol minX="868" maxX="899" minY="468" maxY="499" name="caravan-shop-m"/>
+  <symbol minX="899" maxX="930" minY="468" maxY="499" name="car_shop-m"/>
+  <symbol minX="930" maxX="961" minY="468" maxY="499" name="car_sharing-m"/>
+  <symbol minX="961" maxX="992" minY="468" maxY="499" name="restaurant-m"/>
+  <symbol minX="992" maxX="1023" minY="468" maxY="499" name="car-repair-m"/>
+  <symbol minX="0" maxX="31" minY="499" maxY="530" name="car-part-m"/>
+  <symbol minX="31" maxX="62" minY="499" maxY="530" name="campsite-m"/>
+  <symbol minX="62" maxX="93" minY="499" maxY="530" name="cafe-m"/>
+  <symbol minX="93" maxX="124" minY="499" maxY="530" name="cable-car-m"/>
+  <symbol minX="124" maxX="155" minY="499" maxY="530" name="butcher-m"/>
+  <symbol minX="155" maxX="186" minY="499" maxY="530" name="bus-m"/>
+  <symbol minX="186" maxX="217" minY="499" maxY="530" name="buddhist-m"/>
+  <symbol minX="217" maxX="248" minY="499" maxY="530" name="brewery-m"/>
+  <symbol minX="248" maxX="279" minY="499" maxY="530" name="bowling_alley-m"/>
+  <symbol minX="279" maxX="310" minY="499" maxY="530" name="bowling-m"/>
+  <symbol minX="310" maxX="341" minY="499" maxY="530" name="bookmaker-m"/>
+  <symbol minX="341" maxX="372" minY="499" maxY="530" name="book-shop-m"/>
+  <symbol minX="372" maxX="403" minY="499" maxY="530" name="lawyer-m"/>
+  <symbol minX="403" maxX="434" minY="499" maxY="530" name="motel-m"/>
+  <symbol minX="434" maxX="465" minY="499" maxY="530" name="lift_gate-m"/>
+  <symbol minX="465" maxX="496" minY="499" maxY="530" name="office-m"/>
+  <symbol minX="496" maxX="527" minY="499" maxY="530" name="library-m"/>
+  <symbol minX="527" maxX="558" minY="499" maxY="530" name="nparkf-outline-m"/>
+  <symbol minX="558" maxX="589" minY="499" maxY="530" name="motorcycle_shop-m"/>
+  <symbol minX="589" maxX="620" minY="499" maxY="530" name="museum-m"/>
+  <symbol minX="620" maxX="651" minY="499" maxY="530" name="pelota-m"/>
+  <symbol minX="651" maxX="682" minY="499" maxY="530" name="parking-meter-m"/>
+  <symbol minX="682" maxX="713" minY="499" maxY="530" name="petshop-m"/>
+  <symbol minX="713" maxX="744" minY="499" maxY="530" name="pharmacy-m"/>
+  <symbol minX="744" maxX="775" minY="499" maxY="530" name="laundry-m"/>
+  <symbol minX="775" maxX="806" minY="499" maxY="530" name="language_school-m"/>
+  <symbol minX="806" maxX="837" minY="499" maxY="530" name="nparkf-m"/>
+  <symbol minX="837" maxX="868" minY="499" maxY="530" name="kiosk-m"/>
+  <symbol minX="868" maxX="899" minY="499" maxY="530" name="phone-m"/>
+  <symbol minX="899" maxX="930" minY="499" maxY="530" name="kindergarten-m"/>
+  <symbol minX="930" maxX="961" minY="499" maxY="530" name="mail-m"/>
+  <symbol minX="961" maxX="992" minY="499" maxY="530" name="marketplace-m"/>
+  <symbol minX="992" maxX="1023" minY="499" maxY="530" name="padel-m"/>
+  <symbol minX="0" maxX="31" minY="530" maxY="561" name="media-m"/>
+  <symbol minX="31" maxX="62" minY="530" maxY="561" name="marina-m"/>
+  <symbol minX="62" maxX="93" minY="530" maxY="561" name="painter-m"/>
+  <symbol minX="93" maxX="124" minY="530" maxY="561" name="media_shop-m"/>
+  <symbol minX="124" maxX="155" minY="530" maxY="561" name="park-m"/>
+  <symbol minX="155" maxX="186" minY="530" maxY="561" name="outdoor-shop-m"/>
+  <symbol minX="186" maxX="217" minY="530" maxY="561" name="photo-shop-m"/>
+  <symbol minX="217" maxX="248" minY="530" maxY="561" name="park-outline-m"/>
+  <symbol minX="248" maxX="279" minY="530" maxY="561" name="optometrist-m"/>
+  <symbol minX="279" maxX="310" minY="530" maxY="561" name="metal_construction-m"/>
+  <symbol minX="310" maxX="341" minY="530" maxY="561" name="military-m"/>
+  <symbol minX="341" maxX="372" minY="530" maxY="561" name="mobile_phone-m"/>
+  <symbol minX="372" maxX="403" minY="530" maxY="561" name="optician-m"/>
+  <symbol minX="403" maxX="434" minY="530" maxY="561" name="lighthouse-m"/>
+  <symbol minX="434" maxX="465" minY="530" maxY="561" name="monument-m"/>
+  <symbol minX="465" maxX="496" minY="530" maxY="561" name="remains-m"/>
+  <symbol minX="496" maxX="527" minY="530" maxY="561" name="power-m"/>
+  <symbol minX="527" maxX="558" minY="530" maxY="561" name="prison-m"/>
+  <symbol minX="558" maxX="589" minY="530" maxY="561" name="ice_cream-m"/>
+  <symbol minX="589" maxX="620" minY="530" maxY="561" name="music_school-m"/>
+  <symbol minX="620" maxX="651" minY="530" maxY="561" name="psychotherapist-m"/>
   <symbol minX="651" maxX="682" minY="530" maxY="561" name="public-building-m"/>
-  <symbol minX="682" maxX="713" minY="530" maxY="561" name="ship-m"/>
-  <symbol minX="713" maxX="744" minY="530" maxY="561" name="psychotherapist-m"/>
-  <symbol minX="744" maxX="775" minY="530" maxY="561" name="caravan_site-m"/>
-  <symbol minX="775" maxX="806" minY="530" maxY="561" name="prison-m"/>
-  <symbol minX="806" maxX="837" minY="530" maxY="561" name="power-m"/>
-  <symbol minX="837" maxX="868" minY="530" maxY="561" name="parking-meter-m"/>
-  <symbol minX="868" maxX="899" minY="530" maxY="561" name="speedcam-alert-l"/>
-  <symbol minX="899" maxX="930" minY="530" maxY="561" name="padel-m"/>
-  <symbol minX="930" maxX="961" minY="530" maxY="561" name="painter-m"/>
-  <symbol minX="961" maxX="992" minY="530" maxY="561" name="park-m"/>
-  <symbol minX="992" maxX="1023" minY="530" maxY="561" name="park-outline-m"/>
-  <symbol minX="0" maxX="31" minY="561" maxY="592" name="chimney-m"/>
-  <symbol minX="31" maxX="62" minY="561" maxY="592" name="chess-m"/>
-  <symbol minX="62" maxX="93" minY="561" maxY="592" name="outdoor-shop-m"/>
-  <symbol minX="93" maxX="124" minY="561" maxY="592" name="optometrist-m"/>
-  <symbol minX="124" maxX="155" minY="561" maxY="592" name="speech_therapist-m"/>
-  <symbol minX="155" maxX="186" minY="561" maxY="592" name="soccer-m"/>
-  <symbol minX="186" maxX="217" minY="561" maxY="592" name="optician-m"/>
-  <symbol minX="217" maxX="248" minY="561" maxY="592" name="chemist-m"/>
-  <symbol minX="248" maxX="279" minY="561" maxY="592" name="office-m"/>
-  <symbol minX="279" maxX="310" minY="561" maxY="592" name="skiing-m"/>
-  <symbol minX="310" maxX="341" minY="561" maxY="592" name="christian-m"/>
-  <symbol minX="341" maxX="372" minY="561" maxY="592" name="cinema-m"/>
-  <symbol minX="372" maxX="403" minY="561" maxY="592" name="nparkf-outline-m"/>
-  <symbol minX="403" maxX="434" minY="561" maxY="592" name="nparkf-m"/>
-  <symbol minX="434" maxX="465" minY="561" maxY="592" name="npark-m"/>
-  <symbol minX="465" maxX="496" minY="561" maxY="592" name="skateboard-m"/>
-  <symbol minX="496" maxX="527" minY="561" maxY="592" name="nightclub-m"/>
-  <symbol minX="527" maxX="558" minY="561" maxY="592" name="shower-m"/>
-  <symbol minX="558" maxX="589" minY="561" maxY="592" name="cheese-m"/>
-  <symbol minX="589" maxX="620" minY="561" maxY="592" name="charity_shop-m"/>
-  <symbol minX="620" maxX="651" minY="561" maxY="592" name="pelota-m"/>
-  <symbol minX="651" maxX="682" minY="561" maxY="591" name="subway-dalian-m"/>
-  <symbol minX="682" maxX="712" minY="561" maxY="591" name="subway-spb-m"/>
-  <symbol minX="712" maxX="742" minY="561" maxY="591" name="subway-southkorea-s"/>
-  <symbol minX="742" maxX="772" minY="561" maxY="591" name="subway-montreal-m"/>
-  <symbol minX="772" maxX="802" minY="561" maxY="591" name="subway-ekb-s"/>
-  <symbol minX="802" maxX="833" minY="561" maxY="591" name="subway-marseille-m"/>
-  <symbol minX="833" maxX="864" minY="561" maxY="591" name="subway-shanghai-m"/>
-  <symbol minX="864" maxX="895" minY="561" maxY="591" name="subway-sapporo-m"/>
-  <symbol minX="895" maxX="926" minY="561" maxY="591" name="subway-maracaibo-m"/>
-  <symbol minX="926" maxX="957" minY="561" maxY="590" name="subway-izmir-m"/>
-  <symbol minX="957" maxX="986" minY="561" maxY="590" name="subway-stlouis-s"/>
-  <symbol minX="986" maxX="1014" minY="561" maxY="590" name="subway-warsaw-m"/>
-  <symbol minX="0" maxX="29" minY="592" maxY="621" name="subway-algeria-s"/>
-  <symbol minX="29" maxX="58" minY="592" maxY="621" name="subway-entrance-m"/>
-  <symbol minX="58" maxX="82" minY="592" maxY="620" name="subway-istanbul-s"/>
-  <symbol minX="82" maxX="110" minY="592" maxY="620" name="lightrail-berlin-m"/>
-  <symbol minX="110" maxX="138" minY="592" maxY="620" name="subway-pittsburgh-s"/>
-  <symbol minX="138" maxX="166" minY="592" maxY="620" name="search-result"/>
-  <symbol minX="166" maxX="197" minY="592" maxY="619" name="subway-rotterdam-m"/>
-  <symbol minX="197" maxX="224" minY="592" maxY="619" name="subway-isfahan-s"/>
-  <symbol minX="224" maxX="251" minY="592" maxY="619" name="speedcam-m"/>
-  <symbol minX="251" maxX="278" minY="592" maxY="619" name="subway-sapporo-s"/>
-  <symbol minX="278" maxX="309" minY="592" maxY="619" name="subway-tbilisi-m"/>
-  <symbol minX="309" maxX="336" minY="592" maxY="619" name="parking-disabled-m"/>
-  <symbol minX="336" maxX="360" minY="592" maxY="619" name="subway-brescia-s"/>
-  <symbol minX="360" maxX="387" minY="592" maxY="619" name="bike-parking-m"/>
-  <symbol minX="387" maxX="414" minY="592" maxY="619" name="non-found-search-result"/>
-  <symbol minX="414" maxX="439" minY="592" maxY="619" name="subway-mashhad-s"/>
-  <symbol minX="439" maxX="466" minY="592" maxY="619" name="parking_pay-m"/>
-  <symbol minX="466" maxX="493" minY="592" maxY="619" name="parking_entrance-m"/>
-  <symbol minX="493" maxX="520" minY="592" maxY="619" name="parking-m"/>
-  <symbol minX="520" maxX="547" minY="592" maxY="619" name="motorcycle-parking-m"/>
-  <symbol minX="547" maxX="598" minY="592" maxY="619" name="coloredmark-bg-s"/>
-  <symbol minX="598" maxX="649" minY="592" maxY="619" name="coloredmark-default-s"/>
-  <symbol minX="649" maxX="676" minY="592" maxY="619" name="subway-cairo-s"/>
-  <symbol minX="676" maxX="704" minY="592" maxY="619" name="subway-izmir-s"/>
-  <symbol minX="704" maxX="731" minY="592" maxY="619" name="subway-medellin-s"/>
-  <symbol minX="731" maxX="758" minY="592" maxY="619" name="subway-panama-s"/>
-  <symbol minX="758" maxX="785" minY="592" maxY="619" name="bicycle-rental"/>
-  <symbol minX="785" maxX="816" minY="592" maxY="618" name="subway-taoyuan-m"/>
-  <symbol minX="816" maxX="847" minY="592" maxY="618" name="subway-lyon-m"/>
-  <symbol minX="847" maxX="865" minY="592" maxY="618" name="bookmark-bg-xs"/>
-  <symbol minX="865" maxX="883" minY="592" maxY="618" name="bookmark-default-xs"/>
-  <symbol minX="883" maxX="907" minY="592" maxY="617" name="subway-tianjin-s"/>
-  <symbol minX="907" maxX="935" minY="592" maxY="617" name="subway-seattle-m"/>
-  <symbol minX="935" maxX="959" minY="592" maxY="617" name="subway-delhi-s"/>
-  <symbol minX="959" maxX="990" minY="592" maxY="617" name="subway-dnepro-m"/>
-  <symbol minX="990" maxX="1021" minY="592" maxY="617" name="subway-kryvyirih-m"/>
-  <symbol minX="0" maxX="25" minY="621" maxY="646" name="subway-hirosima-s"/>
-  <symbol minX="25" maxX="56" minY="621" maxY="646" name="subway-santiago-m"/>
-  <symbol minX="56" maxX="81" minY="621" maxY="646" name="subway-rennes-s"/>
-  <symbol minX="81" maxX="106" minY="621" maxY="646" name="subway-warszawa-s"/>
-  <symbol minX="106" maxX="130" minY="621" maxY="646" name="subway-athens-s"/>
-  <symbol minX="130" maxX="154" minY="621" maxY="646" name="subway-porto-s"/>
-  <symbol minX="154" maxX="185" minY="621" maxY="646" name="subway-yerevan-m"/>
-  <symbol minX="185" maxX="209" minY="621" maxY="646" name="subway-pyongyang-s"/>
-  <symbol minX="209" maxX="234" minY="621" maxY="646" name="subway-rome-m"/>
-  <symbol minX="234" maxX="265" minY="621" maxY="646" name="subway-almaty-m"/>
-  <symbol minX="265" maxX="290" minY="621" maxY="646" name="subway-paris-m"/>
-  <symbol minX="290" maxX="315" minY="621" maxY="646" name="subway-ubahn-m"/>
-  <symbol minX="315" maxX="344" minY="621" maxY="646" name="subway-moscow-m"/>
-  <symbol minX="344" maxX="368" minY="621" maxY="645" name="subway-guangzhou-s"/>
-  <symbol minX="368" maxX="392" minY="621" maxY="645" name="subway-tyneandwear-s"/>
-  <symbol minX="392" maxX="416" minY="621" maxY="645" name="subway-tashkent-s"/>
-  <symbol minX="416" maxX="446" minY="621" maxY="645" name="subway-yerevan-s"/>
-  <symbol minX="446" maxX="470" minY="621" maxY="645" name="subway-yokohama-s"/>
-  <symbol minX="470" maxX="494" minY="621" maxY="645" name="subway-valencia-s"/>
-  <symbol minX="494" maxX="518" minY="621" maxY="645" name="subway-tokyo-s"/>
-  <symbol minX="518" maxX="542" minY="621" maxY="645" name="subway-volgograd-s"/>
-  <symbol minX="542" maxX="570" minY="621" maxY="645" name="subway-taoyuan-s"/>
-  <symbol minX="570" maxX="594" minY="621" maxY="645" name="subway-wuhan-s"/>
-  <symbol minX="594" maxX="618" minY="621" maxY="645" name="subway-washington-s"/>
-  <symbol minX="618" maxX="640" minY="621" maxY="645" name="subway-warsaw-s"/>
-  <symbol minX="640" maxX="664" minY="621" maxY="645" name="subway-vienna-s"/>
-  <symbol minX="664" maxX="688" minY="621" maxY="645" name="subway-catania-s"/>
-  <symbol minX="688" maxX="712" minY="621" maxY="645" name="subway-losangeles-s"/>
-  <symbol minX="712" maxX="736" minY="621" maxY="645" name="subway-oslo-s"/>
-  <symbol minX="736" maxX="766" minY="621" maxY="645" name="subway-fukuoka-s"/>
-  <symbol minX="766" maxX="797" minY="621" maxY="645" name="subway-osaka-m"/>
-  <symbol minX="797" maxX="828" minY="621" maxY="645" name="subway-omsk-s"/>
-  <symbol minX="828" maxX="859" minY="621" maxY="645" name="subway-omsk-m"/>
-  <symbol minX="859" maxX="883" minY="621" maxY="645" name="subway-nnov-s"/>
-  <symbol minX="883" maxX="907" minY="621" maxY="645" name="subway-dubai-s"/>
-  <symbol minX="907" maxX="931" minY="621" maxY="645" name="subway-dalian-s"/>
-  <symbol minX="931" maxX="955" minY="621" maxY="645" name="subway-nagoya-s"/>
-  <symbol minX="955" maxX="979" minY="621" maxY="645" name="subway-chicago-s"/>
-  <symbol minX="979" maxX="1003" minY="621" maxY="645" name="subway-montreal-s"/>
-  <symbol minX="0" maxX="24" minY="646" maxY="670" name="subway-chengdu-s"/>
-  <symbol minX="24" maxX="48" minY="646" maxY="670" name="subway-changchun-s"/>
-  <symbol minX="48" maxX="72" minY="646" maxY="670" name="subway-foshan-s"/>
-  <symbol minX="72" maxX="96" minY="646" maxY="670" name="subway-caracas-s"/>
-  <symbol minX="96" maxX="120" minY="646" maxY="670" name="subway-minatomirai-s"/>
-  <symbol minX="120" maxX="144" minY="646" maxY="670" name="subway-milan-s"/>
-  <symbol minX="144" maxX="168" minY="646" maxY="670" name="subway-bursaray-s"/>
-  <symbol minX="168" maxX="192" minY="646" maxY="670" name="subway-mecca-s"/>
-  <symbol minX="192" maxX="216" minY="646" maxY="670" name="subway-massachusetts-s"/>
-  <symbol minX="216" maxX="240" minY="646" maxY="670" name="subway-buenosaires-s"/>
-  <symbol minX="240" maxX="271" minY="646" maxY="670" name="subway-alicante-m"/>
-  <symbol minX="271" maxX="295" minY="646" maxY="670" name="subway-bangkok-s"/>
-  <symbol minX="295" maxX="319" minY="646" maxY="670" name="subway-budapest-s"/>
-  <symbol minX="319" maxX="343" minY="646" maxY="670" name="subway-beijing-s"/>
-  <symbol minX="343" maxX="367" minY="646" maxY="670" name="subway-bengaluru-s"/>
-  <symbol minX="367" maxX="391" minY="646" maxY="670" name="subway-brasilia-s"/>
-  <symbol minX="391" maxX="415" minY="646" maxY="670" name="subway-guadalajara-s"/>
-  <symbol minX="415" maxX="446" minY="646" maxY="670" name="subway-tabriz-m"/>
-  <symbol minX="446" maxX="470" minY="646" maxY="670" name="subway-stockholm-s"/>
-  <symbol minX="470" maxX="494" minY="646" maxY="670" name="subway-sofia-s"/>
-  <symbol minX="494" maxX="518" minY="646" maxY="670" name="subway-shiraz-s"/>
-  <symbol minX="518" maxX="542" minY="646" maxY="670" name="subway-shanghai-s"/>
-  <symbol minX="542" maxX="566" minY="646" maxY="670" name="subway-kobe-s"/>
-  <symbol minX="566" maxX="590" minY="646" maxY="670" name="subway-kunming-s"/>
-  <symbol minX="590" maxX="614" minY="646" maxY="670" name="subway-kyoto-s"/>
-  <symbol minX="614" maxX="638" minY="646" maxY="670" name="subway-saopaulo-s"/>
-  <symbol minX="638" maxX="662" minY="646" maxY="670" name="subway-santodomingo-s"/>
-  <symbol minX="662" maxX="692" minY="646" maxY="670" name="subway-santiago-s"/>
-  <symbol minX="692" maxX="716" minY="646" maxY="670" name="subway-lille-s"/>
-  <symbol minX="716" maxX="740" minY="646" maxY="670" name="subway-kazan-s"/>
-  <symbol minX="740" maxX="764" minY="646" maxY="670" name="subway-lima-s"/>
-  <symbol minX="764" maxX="789" minY="646" maxY="670" name="subway-glasgow-s"/>
-  <symbol minX="789" maxX="813" minY="646" maxY="670" name="subway-perugia-s"/>
-  <symbol minX="813" maxX="844" minY="646" maxY="670" name="subway-philadelphia-m"/>
-  <symbol minX="844" maxX="868" minY="646" maxY="670" name="subway-reseau-paris-s"/>
-  <symbol minX="868" maxX="892" minY="646" maxY="670" name="subway-riodejaneiro-s"/>
-  <symbol minX="892" maxX="916" minY="646" maxY="670" name="subway-samara-s"/>
-  <symbol minX="916" maxX="940" minY="646" maxY="670" name="subway-lisboa-s"/>
-  <symbol minX="940" maxX="964" minY="646" maxY="670" name="subway-helsinki-s"/>
-  <symbol minX="964" maxX="988" minY="646" maxY="669" name="subway-maracaibo-s"/>
-  <symbol minX="988" maxX="1018" minY="646" maxY="669" name="subway-tabriz-s"/>
-  <symbol minX="0" maxX="23" minY="670" maxY="693" name="subway-spb-s"/>
-  <symbol minX="23" maxX="45" minY="670" maxY="693" name="subway-amsterdam-s"/>
-  <symbol minX="45" maxX="74" minY="670" maxY="693" name="subway-almaty-s"/>
-  <symbol minX="74" maxX="97" minY="670" maxY="693" name="subway-lausanne-s"/>
-  <symbol minX="97" maxX="127" minY="670" maxY="693" name="subway-london-m"/>
-  <symbol minX="127" maxX="149" minY="670" maxY="693" name="subway-mexico-s"/>
-  <symbol minX="149" maxX="180" minY="670" maxY="693" name="subway-lucknow-s"/>
-  <symbol minX="180" maxX="203" minY="670" maxY="693" name="cave-m"/>
-  <symbol minX="203" maxX="225" minY="670" maxY="692" name="subway-entrance-s"/>
-  <symbol minX="225" maxX="256" minY="670" maxY="692" name="subway-kolkata-m"/>
-  <symbol minX="256" maxX="285" minY="670" maxY="692" name="subway-dnepro-s"/>
-  <symbol minX="285" maxX="307" minY="670" maxY="692" name="airport-s"/>
-  <symbol minX="307" maxX="329" minY="670" maxY="692" name="lighthouse-s"/>
-  <symbol minX="329" maxX="351" minY="670" maxY="692" name="buddhist-s"/>
-  <symbol minX="351" maxX="373" minY="670" maxY="692" name="bus-s"/>
-  <symbol minX="373" maxX="395" minY="670" maxY="692" name="cable-car-s"/>
-  <symbol minX="395" maxX="417" minY="670" maxY="692" name="car-repair-s"/>
-  <symbol minX="417" maxX="439" minY="670" maxY="692" name="charging-station-s"/>
-  <symbol minX="439" maxX="461" minY="670" maxY="692" name="christian-s"/>
-  <symbol minX="461" maxX="483" minY="670" maxY="692" name="college-s"/>
-  <symbol minX="483" maxX="505" minY="670" maxY="692" name="drinking-water-s"/>
-  <symbol minX="505" maxX="527" minY="670" maxY="692" name="fuel-s"/>
-  <symbol minX="527" maxX="549" minY="670" maxY="692" name="geyser-s"/>
-  <symbol minX="549" maxX="571" minY="670" maxY="692" name="hindu-s"/>
-  <symbol minX="571" maxX="593" minY="670" maxY="692" name="hospital-s"/>
-  <symbol minX="593" maxX="615" minY="670" maxY="692" name="hotel-s"/>
-  <symbol minX="615" maxX="637" minY="670" maxY="692" name="jewish-s"/>
-  <symbol minX="637" maxX="668" minY="670" maxY="692" name="subway-bilbao-m"/>
-  <symbol minX="668" maxX="690" minY="670" maxY="692" name="monument-s"/>
-  <symbol minX="690" maxX="712" minY="670" maxY="692" name="museum-s"/>
-  <symbol minX="712" maxX="734" minY="670" maxY="692" name="muslim-s"/>
-  <symbol minX="734" maxX="756" minY="670" maxY="692" name="nparkf-outline-s"/>
-  <symbol minX="756" maxX="778" minY="670" maxY="692" name="nparkf-s"/>
-  <symbol minX="778" maxX="800" minY="670" maxY="692" name="park-outline-s"/>
-  <symbol minX="800" maxX="822" minY="670" maxY="692" name="park-s"/>
-  <symbol minX="822" maxX="844" minY="670" maxY="692" name="place-of-worship-s"/>
-  <symbol minX="844" maxX="866" minY="670" maxY="692" name="remains-s"/>
-  <symbol minX="866" maxX="888" minY="670" maxY="692" name="shinto-s"/>
-  <symbol minX="888" maxX="910" minY="670" maxY="692" name="ship-s"/>
-  <symbol minX="910" maxX="932" minY="670" maxY="692" name="shop-s"/>
-  <symbol minX="932" maxX="954" minY="670" maxY="692" name="stadium-s"/>
-  <symbol minX="954" maxX="985" minY="670" maxY="692" name="subway-barcelona-m"/>
-  <symbol minX="985" maxX="1007" minY="670" maxY="692" name="toll_booth-s"/>
-  <symbol minX="0" maxX="18" minY="693" maxY="715" name="transit_light_rail-m"/>
-  <symbol minX="18" maxX="42" minY="693" maxY="715" name="transfer_arrow"/>
-  <symbol minX="42" maxX="73" minY="693" maxY="715" name="subway-madrid-m"/>
-  <symbol minX="73" maxX="95" minY="693" maxY="715" name="tram-s"/>
-  <symbol minX="95" maxX="119" minY="693" maxY="715" name="subway-rotterdam-s"/>
-  <symbol minX="119" maxX="141" minY="693" maxY="715" name="train-s"/>
-  <symbol minX="141" maxX="163" minY="693" maxY="715" name="viewpoint-s"/>
-  <symbol minX="163" maxX="191" minY="693" maxY="715" name="subway-philadelphia-s"/>
-  <symbol minX="191" maxX="213" minY="693" maxY="715" name="tourism-s"/>
-  <symbol minX="213" maxX="231" minY="693" maxY="715" name="transit_train-m"/>
-  <symbol minX="231" maxX="255" minY="693" maxY="715" name="subway-tbilisi-s"/>
-  <symbol minX="255" maxX="286" minY="693" maxY="715" name="subway-lucknow-m"/>
-  <symbol minX="286" maxX="308" minY="693" maxY="715" name="waste-basket-s"/>
-  <symbol minX="308" maxX="330" minY="693" maxY="715" name="waterfall-s"/>
-  <symbol minX="330" maxX="360" minY="693" maxY="715" name="subway-palma-s"/>
-  <symbol minX="360" maxX="382" minY="693" maxY="715" name="theme_park-s"/>
-  <symbol minX="382" maxX="404" minY="693" maxY="715" name="subway-s"/>
-  <symbol minX="404" maxX="426" minY="693" maxY="715" name="zoo-s"/>
-  <symbol minX="426" maxX="448" minY="693" maxY="715" name="theatre-s"/>
-  <symbol minX="448" maxX="475" minY="693" maxY="715" name="subway-osaka-s"/>
-  <symbol minX="475" maxX="497" minY="693" maxY="715" name="taoist-s"/>
-  <symbol minX="497" maxX="519" minY="693" maxY="715" name="subway-newyork-s"/>
-  <symbol minX="519" maxX="550" minY="693" maxY="714" name="subway-brussel-s"/>
-  <symbol minX="550" maxX="568" minY="693" maxY="714" name="transit_monorail-m"/>
-  <symbol minX="568" maxX="599" minY="693" maxY="714" name="subway-novosibirsk-m"/>
-  <symbol minX="599" maxX="620" minY="693" maxY="714" name="elevator"/>
-  <symbol minX="620" maxX="648" minY="693" maxY="714" name="subway-barcelona-s"/>
-  <symbol minX="648" maxX="669" minY="693" maxY="714" name="subway-paris-s"/>
-  <symbol minX="669" maxX="700" minY="693" maxY="714" name="subway-palma-m"/>
-  <symbol minX="700" maxX="721" minY="693" maxY="714" name="lightrail-berlin-s"/>
-  <symbol minX="721" maxX="751" minY="693" maxY="714" name="subway-novosibirsk-s"/>
-  <symbol minX="751" maxX="782" minY="693" maxY="714" name="subway-fukuoka-m"/>
-  <symbol minX="782" maxX="809" minY="693" maxY="714" name="subway-kryvyirih-s"/>
-  <symbol minX="809" maxX="840" minY="693" maxY="714" name="subway-sanfrancisco-m"/>
-  <symbol minX="840" maxX="870" minY="693" maxY="714" name="subway-kiev-m"/>
-  <symbol minX="870" maxX="901" minY="693" maxY="714" name="subway-sanfrancisco-s"/>
-  <symbol minX="901" maxX="929" minY="693" maxY="714" name="subway-madrid-s"/>
-  <symbol minX="929" maxX="960" minY="693" maxY="714" name="subway-kharkiv-s"/>
-  <symbol minX="960" maxX="984" minY="693" maxY="714" name="subway-lyon-s"/>
-  <symbol minX="984" maxX="1014" minY="693" maxY="713" name="subway-bucharest-s"/>
-  <symbol minX="0" maxX="31" minY="715" maxY="735" name="subway-sendai-s"/>
-  <symbol minX="31" maxX="62" minY="715" maxY="735" name="subway-sendai-m"/>
-  <symbol minX="62" maxX="93" minY="715" maxY="735" name="subway-bucharest-m"/>
-  <symbol minX="93" maxX="124" minY="715" maxY="735" name="subway-haagse-s"/>
-  <symbol minX="124" maxX="144" minY="715" maxY="735" name="storage-tank"/>
-  <symbol minX="144" maxX="164" minY="715" maxY="735" name="board"/>
-  <symbol minX="164" maxX="189" minY="715" maxY="735" name="subway-alicante-s"/>
-  <symbol minX="189" maxX="220" minY="715" maxY="735" name="subway-manila-m"/>
-  <symbol minX="220" maxX="240" minY="715" maxY="735" name="map"/>
-  <symbol minX="240" maxX="255" minY="715" maxY="735" name="transit_train-s"/>
-  <symbol minX="255" maxX="276" minY="715" maxY="735" name="subway-moscow-s"/>
-  <symbol minX="276" maxX="296" minY="715" maxY="735" name="transit_subway-m"/>
-  <symbol minX="296" maxX="327" minY="715" maxY="734" name="subway-kharkiv-m"/>
-  <symbol minX="327" maxX="358" minY="715" maxY="734" name="subway-taipei-s"/>
-  <symbol minX="358" maxX="377" minY="715" maxY="734" name="subway-rome-s"/>
-  <symbol minX="377" maxX="400" minY="715" maxY="734" name="subway-london-s"/>
-  <symbol minX="400" maxX="431" minY="715" maxY="734" name="subway-edmonton-s"/>
-  <symbol minX="431" maxX="461" minY="715" maxY="734" name="subway-manila-s"/>
-  <symbol minX="461" maxX="481" minY="715" maxY="734" name="subway-seattle-s"/>
-  <symbol minX="481" maxX="500" minY="715" maxY="734" name="cave-s"/>
-  <symbol minX="500" maxX="519" minY="715" maxY="734" name="subway-ubahn-s"/>
-  <symbol minX="519" maxX="546" minY="715" maxY="734" name="subway-bilbao-s"/>
-  <symbol minX="546" maxX="577" minY="715" maxY="734" name="subway-brussel-m"/>
-  <symbol minX="577" maxX="595" minY="715" maxY="733" name="gate-s"/>
-  <symbol minX="595" maxX="613" minY="715" maxY="733" name="subway-xs"/>
-  <symbol minX="613" maxX="632" minY="715" maxY="733" name="main_entrance-s"/>
-  <symbol minX="632" maxX="644" minY="715" maxY="733" name="entrance-s"/>
-  <symbol minX="644" maxX="665" minY="715" maxY="733" name="bench"/>
-  <symbol minX="665" maxX="683" minY="715" maxY="733" name="star-l"/>
-  <symbol minX="683" maxX="701" minY="715" maxY="733" name="parking-s"/>
-  <symbol minX="701" maxX="732" minY="715" maxY="733" name="subway-haagse-m"/>
-  <symbol minX="732" maxX="750" minY="715" maxY="733" name="transit_subway-s"/>
-  <symbol minX="750" maxX="765" minY="715" maxY="733" name="transit_monorail-s"/>
-  <symbol minX="765" maxX="780" minY="715" maxY="733" name="transit_light_rail-s"/>
-  <symbol minX="780" maxX="798" minY="715" maxY="733" name="speedcam-s"/>
-  <symbol minX="798" maxX="816" minY="715" maxY="733" name="subway-newyork-xs"/>
-  <symbol minX="816" maxX="843" minY="715" maxY="733" name="railway-crossing-l"/>
-  <symbol minX="843" maxX="874" minY="715" maxY="732" name="subway-edmonton-m"/>
-  <symbol minX="874" maxX="904" minY="715" maxY="731" name="subway-malaga-s"/>
-  <symbol minX="904" maxX="935" minY="715" maxY="731" name="subway-taipei-m"/>
-  <symbol minX="935" maxX="960" minY="715" maxY="731" name="subway-kiev-s"/>
-  <symbol minX="960" maxX="979" minY="715" maxY="731" name="volcano-m"/>
-  <symbol minX="979" maxX="1010" minY="715" maxY="731" name="subway-malaga-m"/>
-  <symbol minX="0" maxX="23" minY="735" maxY="751" name="subway-kolkata-s"/>
-  <symbol minX="23" maxX="39" minY="735" maxY="751" name="star-m"/>
-  <symbol minX="39" maxX="62" minY="735" maxY="750" name="railway-crossing-m"/>
-  <symbol minX="62" maxX="93" minY="735" maxY="750" name="subway-baku-m"/>
-  <symbol minX="93" maxX="118" minY="735" maxY="750" name="subway-minsk-m"/>
-  <symbol minX="118" maxX="136" minY="735" maxY="750" name="plaque"/>
-  <symbol minX="136" maxX="166" minY="735" maxY="750" name="subway-baku-s"/>
-  <symbol minX="166" maxX="180" minY="735" maxY="749" name="star-s"/>
-  <symbol minX="180" maxX="211" minY="735" maxY="749" name="subway-chongqing-s"/>
-  <symbol minX="211" maxX="234" minY="735" maxY="749" name="subway-minsk-s"/>
-  <symbol minX="234" maxX="256" minY="735" maxY="748" name="mountain-pass"/>
-  <symbol minX="256" maxX="287" minY="735" maxY="748" name="subway-chongqing-m"/>
-  <symbol minX="287" maxX="301" minY="735" maxY="748" name="peakt-m"/>
-  <symbol minX="301" maxX="315" minY="735" maxY="748" name="volcano-s"/>
-  <symbol minX="315" maxX="343" minY="735" maxY="748" name="arrow-m"/>
-  <symbol minX="343" maxX="355" minY="735" maxY="747" name="zero-icon"/>
-  <symbol minX="355" maxX="367" minY="735" maxY="746" name="peakt-s"/>
-  <symbol minX="367" maxX="377" minY="735" maxY="745" name="dot-m"/>
-  <symbol minX="377" maxX="398" minY="735" maxY="745" name="arrow-s"/>
-  <symbol minX="398" maxX="412" minY="735" maxY="742" name="arrow-xs"/>
+  <symbol minX="682" maxX="713" minY="530" maxY="561" name="hunting-tower-m"/>
+  <symbol minX="713" maxX="744" minY="530" maxY="561" name="recycling-m"/>
+  <symbol minX="744" maxX="775" minY="530" maxY="561" name="hotel-m"/>
+  <symbol minX="775" maxX="806" minY="530" maxY="561" name="information-m"/>
+  <symbol minX="806" maxX="837" minY="530" maxY="561" name="hostel-m"/>
+  <symbol minX="837" maxX="868" minY="530" maxY="561" name="musical-instrument-m"/>
+  <symbol minX="868" maxX="899" minY="530" maxY="561" name="newsagent_shop-m"/>
+  <symbol minX="899" maxX="930" minY="530" maxY="561" name="muslim-m"/>
+  <symbol minX="930" maxX="961" minY="530" maxY="561" name="hospital-m"/>
+  <symbol minX="961" maxX="992" minY="530" maxY="561" name="needle_and_thread-m"/>
+  <symbol minX="992" maxX="1023" minY="530" maxY="561" name="sample_collection-m"/>
+  <symbol minX="0" maxX="31" minY="561" maxY="592" name="home-m"/>
+  <symbol minX="31" maxX="62" minY="561" maxY="592" name="postbox-m"/>
+  <symbol minX="62" maxX="93" minY="561" maxY="592" name="physiotherapist-m"/>
+  <symbol minX="93" maxX="124" minY="561" maxY="592" name="music-m"/>
+  <symbol minX="124" maxX="155" minY="561" maxY="592" name="npark-m"/>
+  <symbol minX="155" maxX="186" minY="561" maxY="592" name="picnic-m"/>
+  <symbol minX="186" maxX="217" minY="561" maxY="592" name="picnic_table-m"/>
+  <symbol minX="217" maxX="248" minY="561" maxY="592" name="nightclub-m"/>
+  <symbol minX="248" maxX="279" minY="561" maxY="592" name="pitch-m"/>
+  <symbol minX="279" maxX="310" minY="561" maxY="592" name="jewelry-m"/>
+  <symbol minX="310" maxX="341" minY="561" maxY="592" name="place-of-worship-m"/>
+  <symbol minX="341" maxX="372" minY="561" maxY="592" name="playground-m"/>
+  <symbol minX="372" maxX="403" minY="561" maxY="592" name="plumber-m"/>
+  <symbol minX="403" maxX="434" minY="561" maxY="592" name="internet_cafe-m"/>
+  <symbol minX="434" maxX="465" minY="561" maxY="592" name="podiatrist-m"/>
+  <symbol minX="465" maxX="496" minY="561" maxY="592" name="police-m"/>
+  <symbol minX="496" maxX="527" minY="561" maxY="592" name="jewish-m"/>
+  <symbol minX="527" maxX="557" minY="561" maxY="591" name="subway-southkorea-s"/>
+  <symbol minX="557" maxX="588" minY="561" maxY="591" name="subway-shanghai-m"/>
+  <symbol minX="588" maxX="618" minY="561" maxY="591" name="subway-spb-m"/>
+  <symbol minX="618" maxX="649" minY="561" maxY="591" name="subway-sapporo-m"/>
+  <symbol minX="649" maxX="679" minY="561" maxY="591" name="subway-ekb-s"/>
+  <symbol minX="679" maxX="710" minY="561" maxY="591" name="subway-maracaibo-m"/>
+  <symbol minX="710" maxX="740" minY="561" maxY="591" name="subway-montreal-m"/>
+  <symbol minX="740" maxX="771" minY="561" maxY="591" name="subway-marseille-m"/>
+  <symbol minX="771" maxX="802" minY="561" maxY="591" name="subway-dalian-m"/>
+  <symbol minX="802" maxX="830" minY="561" maxY="590" name="subway-warsaw-m"/>
+  <symbol minX="830" maxX="861" minY="561" maxY="590" name="subway-izmir-m"/>
+  <symbol minX="861" maxX="890" minY="561" maxY="590" name="subway-entrance-m"/>
+  <symbol minX="890" maxX="919" minY="561" maxY="590" name="subway-stlouis-s"/>
+  <symbol minX="919" maxX="948" minY="561" maxY="590" name="subway-algeria-s"/>
+  <symbol minX="948" maxX="976" minY="561" maxY="589" name="lightrail-berlin-m"/>
+  <symbol minX="976" maxX="1004" minY="561" maxY="589" name="search-result"/>
+  <symbol minX="0" maxX="24" minY="592" maxY="620" name="subway-istanbul-s"/>
+  <symbol minX="24" maxX="52" minY="592" maxY="620" name="subway-pittsburgh-s"/>
+  <symbol minX="52" maxX="83" minY="592" maxY="619" name="subway-tbilisi-m"/>
+  <symbol minX="83" maxX="111" minY="592" maxY="619" name="subway-izmir-s"/>
+  <symbol minX="111" maxX="162" minY="592" maxY="619" name="coloredmark-default-s"/>
+  <symbol minX="162" maxX="213" minY="592" maxY="619" name="coloredmark-bg-s"/>
+  <symbol minX="213" maxX="244" minY="592" maxY="619" name="subway-rotterdam-m"/>
+  <symbol minX="244" maxX="271" minY="592" maxY="619" name="non-found-search-result"/>
+  <symbol minX="271" maxX="298" minY="592" maxY="619" name="subway-cairo-s"/>
+  <symbol minX="298" maxX="325" minY="592" maxY="619" name="speedcam-m"/>
+  <symbol minX="325" maxX="352" minY="592" maxY="619" name="parking_pay-m"/>
+  <symbol minX="352" maxX="379" minY="592" maxY="619" name="subway-sapporo-s"/>
+  <symbol minX="379" maxX="406" minY="592" maxY="619" name="subway-isfahan-s"/>
+  <symbol minX="406" maxX="433" minY="592" maxY="619" name="parking-disabled-m"/>
+  <symbol minX="433" maxX="457" minY="592" maxY="619" name="subway-brescia-s"/>
+  <symbol minX="457" maxX="484" minY="592" maxY="619" name="motorcycle-parking-m"/>
+  <symbol minX="484" maxX="509" minY="592" maxY="619" name="subway-mashhad-s"/>
+  <symbol minX="509" maxX="536" minY="592" maxY="619" name="parking_entrance-m"/>
+  <symbol minX="536" maxX="563" minY="592" maxY="619" name="bicycle-rental"/>
+  <symbol minX="563" maxX="590" minY="592" maxY="619" name="subway-medellin-s"/>
+  <symbol minX="590" maxX="617" minY="592" maxY="619" name="bike-parking-m"/>
+  <symbol minX="617" maxX="644" minY="592" maxY="619" name="subway-panama-s"/>
+  <symbol minX="644" maxX="671" minY="592" maxY="619" name="parking-m"/>
+  <symbol minX="671" maxX="689" minY="592" maxY="618" name="bookmark-default-xs"/>
+  <symbol minX="689" maxX="720" minY="592" maxY="618" name="subway-taoyuan-m"/>
+  <symbol minX="720" maxX="738" minY="592" maxY="618" name="bookmark-bg-xs"/>
+  <symbol minX="738" maxX="766" minY="592" maxY="617" name="subway-seattle-m"/>
+  <symbol minX="766" maxX="791" minY="592" maxY="617" name="subway-hirosima-s"/>
+  <symbol minX="791" maxX="816" minY="592" maxY="617" name="subway-ubahn-m"/>
+  <symbol minX="816" maxX="841" minY="592" maxY="617" name="subway-warszawa-s"/>
+  <symbol minX="841" maxX="872" minY="592" maxY="617" name="subway-almaty-m"/>
+  <symbol minX="872" maxX="896" minY="592" maxY="617" name="subway-athens-s"/>
+  <symbol minX="896" maxX="920" minY="592" maxY="617" name="subway-tianjin-s"/>
+  <symbol minX="920" maxX="951" minY="592" maxY="617" name="subway-yerevan-m"/>
+  <symbol minX="951" maxX="975" minY="592" maxY="617" name="subway-pyongyang-s"/>
+  <symbol minX="975" maxX="1000" minY="592" maxY="617" name="subway-paris-m"/>
+  <symbol minX="1000" maxX="1024" minY="592" maxY="617" name="subway-delhi-s"/>
+  <symbol minX="0" maxX="31" minY="620" maxY="645" name="subway-santiago-m"/>
+  <symbol minX="31" maxX="62" minY="620" maxY="645" name="subway-dnepro-m"/>
+  <symbol minX="62" maxX="91" minY="620" maxY="645" name="subway-moscow-m"/>
+  <symbol minX="91" maxX="122" minY="620" maxY="645" name="subway-kryvyirih-m"/>
+  <symbol minX="122" maxX="147" minY="620" maxY="645" name="subway-rennes-s"/>
+  <symbol minX="147" maxX="172" minY="620" maxY="645" name="subway-rome-m"/>
+  <symbol minX="172" maxX="196" minY="620" maxY="645" name="subway-porto-s"/>
+  <symbol minX="196" maxX="220" minY="620" maxY="644" name="subway-mecca-s"/>
+  <symbol minX="220" maxX="250" minY="620" maxY="644" name="subway-yerevan-s"/>
+  <symbol minX="250" maxX="274" minY="620" maxY="644" name="subway-chengdu-s"/>
+  <symbol minX="274" maxX="298" minY="620" maxY="644" name="subway-yokohama-s"/>
+  <symbol minX="298" maxX="322" minY="620" maxY="644" name="subway-chicago-s"/>
+  <symbol minX="322" maxX="346" minY="620" maxY="644" name="subway-minatomirai-s"/>
+  <symbol minX="346" maxX="370" minY="620" maxY="644" name="subway-massachusetts-s"/>
+  <symbol minX="370" maxX="394" minY="620" maxY="644" name="subway-milan-s"/>
+  <symbol minX="394" maxX="418" minY="620" maxY="644" name="subway-dubai-s"/>
+  <symbol minX="418" maxX="442" minY="620" maxY="644" name="subway-wuhan-s"/>
+  <symbol minX="442" maxX="466" minY="620" maxY="644" name="subway-changchun-s"/>
+  <symbol minX="466" maxX="490" minY="620" maxY="644" name="subway-washington-s"/>
+  <symbol minX="490" maxX="514" minY="620" maxY="644" name="subway-montreal-s"/>
+  <symbol minX="514" maxX="538" minY="620" maxY="644" name="subway-catania-s"/>
+  <symbol minX="538" maxX="560" minY="620" maxY="644" name="subway-warsaw-s"/>
+  <symbol minX="560" maxX="584" minY="620" maxY="644" name="subway-nagoya-s"/>
+  <symbol minX="584" maxX="608" minY="620" maxY="644" name="subway-volgograd-s"/>
+  <symbol minX="608" maxX="632" minY="620" maxY="644" name="subway-kyoto-s"/>
+  <symbol minX="632" maxX="656" minY="620" maxY="644" name="subway-helsinki-s"/>
+  <symbol minX="656" maxX="680" minY="620" maxY="644" name="subway-kazan-s"/>
+  <symbol minX="680" maxX="704" minY="620" maxY="644" name="subway-guangzhou-s"/>
+  <symbol minX="704" maxX="728" minY="620" maxY="644" name="subway-guadalajara-s"/>
+  <symbol minX="728" maxX="752" minY="620" maxY="644" name="subway-kobe-s"/>
+  <symbol minX="752" maxX="777" minY="620" maxY="644" name="subway-glasgow-s"/>
+  <symbol minX="777" maxX="801" minY="620" maxY="644" name="subway-kunming-s"/>
+  <symbol minX="801" maxX="831" minY="620" maxY="644" name="subway-fukuoka-s"/>
+  <symbol minX="831" maxX="855" minY="620" maxY="644" name="subway-dalian-s"/>
+  <symbol minX="855" maxX="879" minY="620" maxY="644" name="subway-foshan-s"/>
+  <symbol minX="879" maxX="903" minY="620" maxY="644" name="subway-lille-s"/>
+  <symbol minX="903" maxX="927" minY="620" maxY="644" name="subway-lima-s"/>
+  <symbol minX="927" maxX="951" minY="620" maxY="644" name="subway-lisboa-s"/>
+  <symbol minX="951" maxX="975" minY="620" maxY="644" name="subway-losangeles-s"/>
+  <symbol minX="975" maxX="999" minY="620" maxY="644" name="subway-lyon-s"/>
+  <symbol minX="999" maxX="1023" minY="620" maxY="644" name="subway-saopaulo-s"/>
+  <symbol minX="0" maxX="24" minY="645" maxY="669" name="subway-riodejaneiro-s"/>
+  <symbol minX="24" maxX="48" minY="645" maxY="669" name="subway-budapest-s"/>
+  <symbol minX="48" maxX="72" minY="645" maxY="669" name="subway-perugia-s"/>
+  <symbol minX="72" maxX="103" minY="645" maxY="669" name="subway-tabriz-m"/>
+  <symbol minX="103" maxX="127" minY="645" maxY="669" name="subway-stockholm-s"/>
+  <symbol minX="127" maxX="158" minY="645" maxY="669" name="subway-philadelphia-m"/>
+  <symbol minX="158" maxX="182" minY="645" maxY="669" name="subway-brasilia-s"/>
+  <symbol minX="182" maxX="206" minY="645" maxY="669" name="subway-reseau-paris-s"/>
+  <symbol minX="206" maxX="230" minY="645" maxY="669" name="subway-sofia-s"/>
+  <symbol minX="230" maxX="254" minY="645" maxY="669" name="subway-vienna-s"/>
+  <symbol minX="254" maxX="278" minY="645" maxY="669" name="subway-shiraz-s"/>
+  <symbol minX="278" maxX="302" minY="645" maxY="669" name="subway-shanghai-s"/>
+  <symbol minX="302" maxX="326" minY="645" maxY="669" name="subway-bengaluru-s"/>
+  <symbol minX="326" maxX="350" minY="645" maxY="669" name="subway-bangkok-s"/>
+  <symbol minX="350" maxX="374" minY="645" maxY="669" name="subway-samara-s"/>
+  <symbol minX="374" maxX="398" minY="645" maxY="669" name="subway-beijing-s"/>
+  <symbol minX="398" maxX="428" minY="645" maxY="669" name="subway-santiago-s"/>
+  <symbol minX="428" maxX="452" minY="645" maxY="669" name="subway-santodomingo-s"/>
+  <symbol minX="452" maxX="480" minY="645" maxY="669" name="subway-taoyuan-s"/>
+  <symbol minX="480" maxX="504" minY="645" maxY="669" name="subway-tashkent-s"/>
+  <symbol minX="504" maxX="528" minY="645" maxY="669" name="subway-caracas-s"/>
+  <symbol minX="528" maxX="552" minY="645" maxY="669" name="subway-nnov-s"/>
+  <symbol minX="552" maxX="576" minY="645" maxY="669" name="subway-oslo-s"/>
+  <symbol minX="576" maxX="600" minY="645" maxY="669" name="subway-valencia-s"/>
+  <symbol minX="600" maxX="624" minY="645" maxY="669" name="subway-buenosaires-s"/>
+  <symbol minX="624" maxX="655" minY="645" maxY="669" name="subway-alicante-m"/>
+  <symbol minX="655" maxX="679" minY="645" maxY="669" name="subway-bursaray-s"/>
+  <symbol minX="679" maxX="703" minY="645" maxY="669" name="subway-tyneandwear-s"/>
+  <symbol minX="703" maxX="734" minY="645" maxY="669" name="subway-osaka-m"/>
+  <symbol minX="734" maxX="765" minY="645" maxY="669" name="subway-omsk-m"/>
+  <symbol minX="765" maxX="796" minY="645" maxY="669" name="subway-omsk-s"/>
+  <symbol minX="796" maxX="820" minY="645" maxY="669" name="subway-tokyo-s"/>
+  <symbol minX="820" maxX="842" minY="645" maxY="668" name="subway-amsterdam-s"/>
+  <symbol minX="842" maxX="865" minY="645" maxY="668" name="cave-m"/>
+  <symbol minX="865" maxX="888" minY="645" maxY="668" name="subway-lausanne-s"/>
+  <symbol minX="888" maxX="911" minY="645" maxY="668" name="subway-spb-s"/>
+  <symbol minX="911" maxX="940" minY="645" maxY="668" name="subway-almaty-s"/>
+  <symbol minX="940" maxX="970" minY="645" maxY="668" name="subway-london-m"/>
+  <symbol minX="970" maxX="1001" minY="645" maxY="668" name="subway-lucknow-s"/>
+  <symbol minX="1001" maxX="1023" minY="645" maxY="668" name="subway-mexico-s"/>
+  <symbol minX="0" maxX="30" minY="669" maxY="692" name="subway-tabriz-s"/>
+  <symbol minX="30" maxX="54" minY="669" maxY="692" name="subway-maracaibo-s"/>
+  <symbol minX="54" maxX="76" minY="669" maxY="691" name="waterfall-s"/>
+  <symbol minX="76" maxX="98" minY="669" maxY="691" name="waste-basket-s"/>
+  <symbol minX="98" maxX="120" minY="669" maxY="691" name="zoo-s"/>
+  <symbol minX="120" maxX="142" minY="669" maxY="691" name="viewpoint-s"/>
+  <symbol minX="142" maxX="164" minY="669" maxY="691" name="airport-s"/>
+  <symbol minX="164" maxX="186" minY="669" maxY="691" name="nparkf-s"/>
+  <symbol minX="186" maxX="208" minY="669" maxY="691" name="subway-s"/>
+  <symbol minX="208" maxX="232" minY="669" maxY="691" name="subway-rotterdam-s"/>
+  <symbol minX="232" maxX="254" minY="669" maxY="691" name="hotel-s"/>
+  <symbol minX="254" maxX="282" minY="669" maxY="691" name="subway-philadelphia-s"/>
+  <symbol minX="282" maxX="312" minY="669" maxY="691" name="subway-palma-s"/>
+  <symbol minX="312" maxX="334" minY="669" maxY="691" name="jewish-s"/>
+  <symbol minX="334" maxX="356" minY="669" maxY="691" name="subway-newyork-s"/>
+  <symbol minX="356" maxX="378" minY="669" maxY="691" name="lighthouse-s"/>
+  <symbol minX="378" maxX="400" minY="669" maxY="691" name="monument-s"/>
+  <symbol minX="400" maxX="422" minY="669" maxY="691" name="museum-s"/>
+  <symbol minX="422" maxX="444" minY="669" maxY="691" name="muslim-s"/>
+  <symbol minX="444" maxX="466" minY="669" maxY="691" name="nparkf-outline-s"/>
+  <symbol minX="466" maxX="497" minY="669" maxY="691" name="subway-madrid-m"/>
+  <symbol minX="497" maxX="528" minY="669" maxY="691" name="subway-lucknow-m"/>
+  <symbol minX="528" maxX="555" minY="669" maxY="691" name="subway-osaka-s"/>
+  <symbol minX="555" maxX="577" minY="669" maxY="691" name="park-outline-s"/>
+  <symbol minX="577" maxX="608" minY="669" maxY="691" name="subway-kolkata-m"/>
+  <symbol minX="608" maxX="630" minY="669" maxY="691" name="park-s"/>
+  <symbol minX="630" maxX="652" minY="669" maxY="691" name="place-of-worship-s"/>
+  <symbol minX="652" maxX="674" minY="669" maxY="691" name="remains-s"/>
+  <symbol minX="674" maxX="696" minY="669" maxY="691" name="shinto-s"/>
+  <symbol minX="696" maxX="718" minY="669" maxY="691" name="subway-entrance-s"/>
+  <symbol minX="718" maxX="740" minY="669" maxY="691" name="ship-s"/>
+  <symbol minX="740" maxX="762" minY="669" maxY="691" name="shop-s"/>
+  <symbol minX="762" maxX="791" minY="669" maxY="691" name="subway-dnepro-s"/>
+  <symbol minX="791" maxX="813" minY="669" maxY="691" name="stadium-s"/>
+  <symbol minX="813" maxX="844" minY="669" maxY="691" name="subway-barcelona-m"/>
+  <symbol minX="844" maxX="875" minY="669" maxY="691" name="subway-bilbao-m"/>
+  <symbol minX="875" maxX="897" minY="669" maxY="691" name="toll_booth-s"/>
+  <symbol minX="897" maxX="915" minY="669" maxY="691" name="transit_train-m"/>
+  <symbol minX="915" maxX="937" minY="669" maxY="691" name="buddhist-s"/>
+  <symbol minX="937" maxX="959" minY="669" maxY="691" name="bus-s"/>
+  <symbol minX="959" maxX="981" minY="669" maxY="691" name="cable-car-s"/>
+  <symbol minX="981" maxX="999" minY="669" maxY="691" name="transit_light_rail-m"/>
+  <symbol minX="999" maxX="1021" minY="669" maxY="691" name="car-repair-s"/>
+  <symbol minX="0" maxX="22" minY="692" maxY="714" name="charging-station-s"/>
+  <symbol minX="22" maxX="46" minY="692" maxY="714" name="transfer_arrow"/>
+  <symbol minX="46" maxX="68" minY="692" maxY="714" name="tram-s"/>
+  <symbol minX="68" maxX="90" minY="692" maxY="714" name="train-s"/>
+  <symbol minX="90" maxX="112" minY="692" maxY="714" name="tourism-s"/>
+  <symbol minX="112" maxX="134" minY="692" maxY="714" name="theme_park-s"/>
+  <symbol minX="134" maxX="156" minY="692" maxY="714" name="theatre-s"/>
+  <symbol minX="156" maxX="178" minY="692" maxY="714" name="taoist-s"/>
+  <symbol minX="178" maxX="200" minY="692" maxY="714" name="christian-s"/>
+  <symbol minX="200" maxX="222" minY="692" maxY="714" name="drinking-water-s"/>
+  <symbol minX="222" maxX="244" minY="692" maxY="714" name="college-s"/>
+  <symbol minX="244" maxX="268" minY="692" maxY="714" name="subway-tbilisi-s"/>
+  <symbol minX="268" maxX="290" minY="692" maxY="714" name="hospital-s"/>
+  <symbol minX="290" maxX="312" minY="692" maxY="714" name="hindu-s"/>
+  <symbol minX="312" maxX="334" minY="692" maxY="714" name="fuel-s"/>
+  <symbol minX="334" maxX="356" minY="692" maxY="714" name="geyser-s"/>
+  <symbol minX="356" maxX="387" minY="692" maxY="713" name="subway-sanfrancisco-s"/>
+  <symbol minX="387" maxX="415" minY="692" maxY="713" name="subway-barcelona-s"/>
+  <symbol minX="415" maxX="446" minY="692" maxY="713" name="subway-brussel-s"/>
+  <symbol minX="446" maxX="464" minY="692" maxY="713" name="transit_monorail-m"/>
+  <symbol minX="464" maxX="485" minY="692" maxY="713" name="subway-paris-s"/>
+  <symbol minX="485" maxX="516" minY="692" maxY="713" name="subway-fukuoka-m"/>
+  <symbol minX="516" maxX="547" minY="692" maxY="713" name="subway-palma-m"/>
+  <symbol minX="547" maxX="577" minY="692" maxY="713" name="subway-novosibirsk-s"/>
+  <symbol minX="577" maxX="608" minY="692" maxY="713" name="subway-kharkiv-s"/>
+  <symbol minX="608" maxX="638" minY="692" maxY="713" name="subway-kiev-m"/>
+  <symbol minX="638" maxX="669" minY="692" maxY="713" name="subway-novosibirsk-m"/>
+  <symbol minX="669" maxX="690" minY="692" maxY="713" name="elevator"/>
+  <symbol minX="690" maxX="717" minY="692" maxY="713" name="subway-kryvyirih-s"/>
+  <symbol minX="717" maxX="748" minY="692" maxY="713" name="subway-sanfrancisco-m"/>
+  <symbol minX="748" maxX="769" minY="692" maxY="713" name="lightrail-berlin-s"/>
+  <symbol minX="769" maxX="797" minY="692" maxY="713" name="subway-madrid-s"/>
+  <symbol minX="797" maxX="812" minY="692" maxY="712" name="transit_train-s"/>
+  <symbol minX="812" maxX="832" minY="692" maxY="712" name="storage-tank"/>
+  <symbol minX="832" maxX="857" minY="692" maxY="712" name="subway-alicante-s"/>
+  <symbol minX="857" maxX="877" minY="692" maxY="712" name="board"/>
+  <symbol minX="877" maxX="897" minY="692" maxY="712" name="map"/>
+  <symbol minX="897" maxX="928" minY="692" maxY="712" name="subway-bucharest-m"/>
+  <symbol minX="928" maxX="959" minY="692" maxY="712" name="subway-haagse-s"/>
+  <symbol minX="959" maxX="989" minY="692" maxY="712" name="subway-bucharest-s"/>
+  <symbol minX="989" maxX="1020" minY="692" maxY="712" name="subway-sendai-s"/>
+  <symbol minX="0" maxX="31" minY="714" maxY="734" name="subway-sendai-m"/>
+  <symbol minX="31" maxX="62" minY="714" maxY="734" name="subway-manila-m"/>
+  <symbol minX="62" maxX="82" minY="714" maxY="734" name="transit_subway-m"/>
+  <symbol minX="82" maxX="103" minY="714" maxY="734" name="subway-moscow-s"/>
+  <symbol minX="103" maxX="123" minY="714" maxY="733" name="subway-seattle-s"/>
+  <symbol minX="123" maxX="154" minY="714" maxY="733" name="subway-kharkiv-m"/>
+  <symbol minX="154" maxX="177" minY="714" maxY="733" name="subway-london-s"/>
+  <symbol minX="177" maxX="207" minY="714" maxY="733" name="subway-manila-s"/>
+  <symbol minX="207" maxX="226" minY="714" maxY="733" name="subway-rome-s"/>
+  <symbol minX="226" maxX="257" minY="714" maxY="733" name="subway-brussel-m"/>
+  <symbol minX="257" maxX="288" minY="714" maxY="733" name="subway-taipei-s"/>
+  <symbol minX="288" maxX="307" minY="714" maxY="733" name="subway-ubahn-s"/>
+  <symbol minX="307" maxX="326" minY="714" maxY="733" name="cave-s"/>
+  <symbol minX="326" maxX="353" minY="714" maxY="733" name="subway-bilbao-s"/>
+  <symbol minX="353" maxX="384" minY="714" maxY="733" name="subway-edmonton-s"/>
+  <symbol minX="384" maxX="402" minY="714" maxY="732" name="subway-xs"/>
+  <symbol minX="402" maxX="414" minY="714" maxY="732" name="entrance-s"/>
+  <symbol minX="414" maxX="429" minY="714" maxY="732" name="transit_light_rail-s"/>
+  <symbol minX="429" maxX="447" minY="714" maxY="732" name="star-l"/>
+  <symbol minX="447" maxX="465" minY="714" maxY="732" name="subway-newyork-xs"/>
+  <symbol minX="465" maxX="492" minY="714" maxY="732" name="railway-crossing-l"/>
+  <symbol minX="492" maxX="511" minY="714" maxY="732" name="main_entrance-s"/>
+  <symbol minX="511" maxX="529" minY="714" maxY="732" name="speedcam-s"/>
+  <symbol minX="529" maxX="560" minY="714" maxY="732" name="subway-haagse-m"/>
+  <symbol minX="560" maxX="578" minY="714" maxY="732" name="parking-s"/>
+  <symbol minX="578" maxX="596" minY="714" maxY="732" name="transit_subway-s"/>
+  <symbol minX="596" maxX="617" minY="714" maxY="732" name="bench"/>
+  <symbol minX="617" maxX="632" minY="714" maxY="732" name="transit_monorail-s"/>
+  <symbol minX="632" maxX="663" minY="714" maxY="731" name="subway-edmonton-m"/>
+  <symbol minX="663" maxX="693" minY="714" maxY="730" name="subway-malaga-s"/>
+  <symbol minX="693" maxX="724" minY="714" maxY="730" name="subway-malaga-m"/>
+  <symbol minX="724" maxX="747" minY="714" maxY="730" name="subway-kolkata-s"/>
+  <symbol minX="747" maxX="772" minY="714" maxY="730" name="subway-kiev-s"/>
+  <symbol minX="772" maxX="791" minY="714" maxY="730" name="volcano-m"/>
+  <symbol minX="791" maxX="807" minY="714" maxY="730" name="star-m"/>
+  <symbol minX="807" maxX="838" minY="714" maxY="730" name="subway-taipei-m"/>
+  <symbol minX="838" maxX="868" minY="714" maxY="729" name="subway-baku-s"/>
+  <symbol minX="868" maxX="893" minY="714" maxY="729" name="subway-minsk-m"/>
+  <symbol minX="893" maxX="924" minY="714" maxY="729" name="subway-baku-m"/>
+  <symbol minX="924" maxX="947" minY="714" maxY="729" name="railway-crossing-m"/>
+  <symbol minX="947" maxX="965" minY="714" maxY="729" name="plaque"/>
+  <symbol minX="965" maxX="988" minY="714" maxY="728" name="subway-minsk-s"/>
+  <symbol minX="988" maxX="1002" minY="714" maxY="728" name="star-s"/>
+  <symbol minX="0" maxX="31" minY="734" maxY="748" name="subway-chongqing-s"/>
+  <symbol minX="31" maxX="59" minY="734" maxY="747" name="arrow-m"/>
+  <symbol minX="59" maxX="73" minY="734" maxY="747" name="volcano-s"/>
+  <symbol minX="73" maxX="95" minY="734" maxY="747" name="mountain-pass"/>
+  <symbol minX="95" maxX="109" minY="734" maxY="747" name="peakt-m"/>
+  <symbol minX="109" maxX="140" minY="734" maxY="747" name="subway-chongqing-m"/>
+  <symbol minX="140" maxX="152" minY="734" maxY="746" name="zero-icon"/>
+  <symbol minX="152" maxX="164" minY="734" maxY="745" name="peakt-s"/>
+  <symbol minX="164" maxX="174" minY="734" maxY="744" name="dot-m"/>
+  <symbol minX="174" maxX="195" minY="734" maxY="744" name="arrow-s"/>
+  <symbol minX="195" maxX="209" minY="734" maxY="741" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 8d27caadb3..babd541936 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index a072fdd1e7..56e34538af 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -3,700 +3,695 @@
  <file width="1024" height="512">
   <symbol minX="0" maxX="78" minY="0" maxY="48" name="route-arrow"/>
   <symbol minX="78" maxX="122" minY="0" maxY="44" name="compass-image"/>
-  <symbol minX="122" maxX="164" minY="0" maxY="42" name="cross_geoposition"/>
-  <symbol minX="164" maxX="208" minY="0" maxY="42" name="route-point-finish"/>
-  <symbol minX="208" maxX="250" minY="0" maxY="42" name="shield-us-i-wide-scaled"/>
-  <symbol minX="250" maxX="286" minY="0" maxY="42" name="shield-us-i-thin-scaled"/>
+  <symbol minX="122" maxX="158" minY="0" maxY="42" name="shield-us-i-thin-scaled"/>
+  <symbol minX="158" maxX="200" minY="0" maxY="42" name="shield-us-i-wide-scaled"/>
+  <symbol minX="200" maxX="242" minY="0" maxY="42" name="cross_geoposition"/>
+  <symbol minX="242" maxX="286" minY="0" maxY="42" name="route-point-finish"/>
   <symbol minX="286" maxX="326" minY="0" maxY="40" name="search-result-shop-department_store"/>
-  <symbol minX="326" maxX="366" minY="0" maxY="40" name="search-result-marketplace"/>
-  <symbol minX="366" maxX="406" minY="0" maxY="40" name="search-result-shop-cosmetics"/>
-  <symbol minX="406" maxX="446" minY="0" maxY="40" name="search-result-shop-convenience"/>
-  <symbol minX="446" maxX="486" minY="0" maxY="40" name="search-result-shop-confectionery"/>
-  <symbol minX="486" maxX="526" minY="0" maxY="40" name="search-result-shop-clothes"/>
-  <symbol minX="526" maxX="566" minY="0" maxY="40" name="search-result-shop-butcher"/>
-  <symbol minX="566" maxX="606" minY="0" maxY="40" name="search-result-shop-alcohol"/>
-  <symbol minX="606" maxX="646" minY="0" maxY="40" name="search-result-restaurant"/>
-  <symbol minX="646" maxX="686" minY="0" maxY="40" name="search-result-pub"/>
-  <symbol minX="686" maxX="726" minY="0" maxY="40" name="search-result-playground"/>
-  <symbol minX="726" maxX="766" minY="0" maxY="40" name="search-result-nightclub"/>
-  <symbol minX="766" maxX="806" minY="0" maxY="40" name="search-result-fastfood"/>
-  <symbol minX="806" maxX="846" minY="0" maxY="40" name="search-result-cinema"/>
-  <symbol minX="846" maxX="886" minY="0" maxY="40" name="search-result-casino"/>
-  <symbol minX="886" maxX="926" minY="0" maxY="40" name="search-result-cafe"/>
-  <symbol minX="926" maxX="966" minY="0" maxY="40" name="search-result-bar"/>
-  <symbol minX="966" maxX="1006" minY="0" maxY="40" name="search-result-bakery"/>
-  <symbol minX="0" maxX="40" minY="48" maxY="88" name="search-result-shop-greengrocer"/>
-  <symbol minX="40" maxX="82" minY="48" maxY="88" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="82" maxX="122" minY="48" maxY="88" name="search-result-zoo"/>
-  <symbol minX="122" maxX="162" minY="48" maxY="88" name="search-result-shop-gift"/>
-  <symbol minX="162" maxX="202" minY="48" maxY="88" name="search-result-water-park"/>
-  <symbol minX="202" maxX="242" minY="48" maxY="88" name="search-result-theme-park"/>
-  <symbol minX="242" maxX="282" minY="48" maxY="88" name="search-result-shop-toys"/>
-  <symbol minX="282" maxX="322" minY="48" maxY="88" name="search-result-shop-supermarket"/>
-  <symbol minX="322" maxX="362" minY="48" maxY="88" name="search-result-shop-sports"/>
-  <symbol minX="362" maxX="402" minY="48" maxY="88" name="search-result-shop-shoes"/>
-  <symbol minX="402" maxX="442" minY="48" maxY="88" name="search-result-shop-seafood"/>
-  <symbol minX="442" maxX="482" minY="48" maxY="88" name="search-result-shop-mall"/>
-  <symbol minX="482" maxX="522" minY="48" maxY="88" name="search-result-shop-jewelry"/>
+  <symbol minX="326" maxX="366" minY="0" maxY="40" name="search-result-shop-supermarket"/>
+  <symbol minX="366" maxX="406" minY="0" maxY="40" name="search-result-shop-shoes"/>
+  <symbol minX="406" maxX="446" minY="0" maxY="40" name="search-result-shop-cosmetics"/>
+  <symbol minX="446" maxX="486" minY="0" maxY="40" name="search-result-shop-convenience"/>
+  <symbol minX="486" maxX="526" minY="0" maxY="40" name="search-result-shop-alcohol"/>
+  <symbol minX="526" maxX="566" minY="0" maxY="40" name="search-result-pub"/>
+  <symbol minX="566" maxX="606" minY="0" maxY="40" name="search-result-restaurant"/>
+  <symbol minX="606" maxX="646" minY="0" maxY="40" name="search-result-cinema"/>
+  <symbol minX="646" maxX="686" minY="0" maxY="40" name="search-result-fastfood"/>
+  <symbol minX="686" maxX="726" minY="0" maxY="40" name="search-result-shop-sports"/>
+  <symbol minX="726" maxX="766" minY="0" maxY="40" name="search-result-shop-confectionery"/>
+  <symbol minX="766" maxX="806" minY="0" maxY="40" name="search-result-marketplace"/>
+  <symbol minX="806" maxX="846" minY="0" maxY="40" name="search-result-water-park"/>
+  <symbol minX="846" maxX="886" minY="0" maxY="40" name="search-result-theme-park"/>
+  <symbol minX="886" maxX="926" minY="0" maxY="40" name="search-result-shop-butcher"/>
+  <symbol minX="926" maxX="966" minY="0" maxY="40" name="search-result-nightclub"/>
+  <symbol minX="966" maxX="1006" minY="0" maxY="40" name="search-result-playground"/>
+  <symbol minX="0" maxX="40" minY="48" maxY="88" name="search-result-shop-gift"/>
+  <symbol minX="40" maxX="80" minY="48" maxY="88" name="search-result-shop-toys"/>
+  <symbol minX="80" maxX="120" minY="48" maxY="88" name="search-result-shop-greengrocer"/>
+  <symbol minX="120" maxX="160" minY="48" maxY="88" name="search-result-shop-jewelry"/>
+  <symbol minX="160" maxX="200" minY="48" maxY="88" name="search-result-bakery"/>
+  <symbol minX="200" maxX="240" minY="48" maxY="88" name="search-result-bar"/>
+  <symbol minX="240" maxX="280" minY="48" maxY="88" name="search-result-shop-mall"/>
+  <symbol minX="280" maxX="320" minY="48" maxY="88" name="search-result-shop-seafood"/>
+  <symbol minX="320" maxX="360" minY="48" maxY="88" name="search-result-shop-clothes"/>
+  <symbol minX="360" maxX="402" minY="48" maxY="88" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="402" maxX="442" minY="48" maxY="88" name="search-result-cafe"/>
+  <symbol minX="442" maxX="482" minY="48" maxY="88" name="search-result-casino"/>
+  <symbol minX="482" maxX="522" minY="48" maxY="88" name="search-result-zoo"/>
   <symbol minX="522" maxX="558" minY="48" maxY="86" name="shield-us-hw-thin-scaled"/>
   <symbol minX="558" maxX="588" minY="48" maxY="85" name="ferry"/>
   <symbol minX="588" maxX="618" minY="48" maxY="85" name="unpaved_road"/>
   <symbol minX="618" maxX="648" minY="48" maxY="85" name="paid_road"/>
-  <symbol minX="648" maxX="684" minY="48" maxY="84" name="infosign"/>
-  <symbol minX="684" maxX="720" minY="48" maxY="84" name="track_marker_selected"/>
-  <symbol minX="720" maxX="745" minY="48" maxY="82" name="bookmark-parking-m"/>
-  <symbol minX="745" maxX="770" minY="48" maxY="82" name="bookmark-museum-m"/>
-  <symbol minX="770" maxX="795" minY="48" maxY="82" name="bookmark-building-m"/>
-  <symbol minX="795" maxX="820" minY="48" maxY="82" name="bookmark-water-m"/>
-  <symbol minX="820" maxX="845" minY="48" maxY="82" name="bookmark-buddhism-m"/>
-  <symbol minX="845" maxX="870" minY="48" maxY="82" name="bookmark-animals-m"/>
-  <symbol minX="870" maxX="895" minY="48" maxY="82" name="bookmark-viewpoint-m"/>
-  <symbol minX="895" maxX="920" minY="48" maxY="82" name="bookmark-transport-m"/>
-  <symbol minX="920" maxX="945" minY="48" maxY="82" name="bookmark-swim-m"/>
-  <symbol minX="945" maxX="970" minY="48" maxY="82" name="bookmark-start-m"/>
-  <symbol minX="970" maxX="995" minY="48" maxY="82" name="bookmark-sport-m"/>
-  <symbol minX="995" maxX="1020" minY="48" maxY="82" name="bookmark-sights-m"/>
-  <symbol minX="0" maxX="25" minY="88" maxY="122" name="bookmark-shop-m"/>
-  <symbol minX="25" maxX="50" minY="88" maxY="122" name="bookmark-bg-m"/>
-  <symbol minX="50" maxX="75" minY="88" maxY="122" name="bookmark-park-m"/>
-  <symbol minX="75" maxX="100" minY="88" maxY="122" name="bookmark-mountain-m"/>
-  <symbol minX="100" maxX="125" minY="88" maxY="122" name="bookmark-medicine-m"/>
-  <symbol minX="125" maxX="150" minY="88" maxY="122" name="bookmark-judaism-m"/>
-  <symbol minX="150" maxX="175" minY="88" maxY="122" name="bookmark-islam-m"/>
-  <symbol minX="175" maxX="200" minY="88" maxY="122" name="bookmark-hotel-m"/>
-  <symbol minX="200" maxX="225" minY="88" maxY="122" name="bookmark-gas-m"/>
-  <symbol minX="225" maxX="250" minY="88" maxY="122" name="bookmark-food-m"/>
-  <symbol minX="250" maxX="275" minY="88" maxY="122" name="bookmark-finish-m"/>
-  <symbol minX="275" maxX="300" minY="88" maxY="122" name="bookmark-exchange-m"/>
-  <symbol minX="300" maxX="325" minY="88" maxY="122" name="bookmark-entertainment-m"/>
-  <symbol minX="325" maxX="350" minY="88" maxY="122" name="bookmark-default-m"/>
-  <symbol minX="350" maxX="375" minY="88" maxY="122" name="bookmark-bar-m"/>
-  <symbol minX="375" maxX="400" minY="88" maxY="122" name="bookmark-christianity-m"/>
-  <symbol minX="400" maxX="444" minY="88" maxY="120" name="norating-bg-l"/>
-  <symbol minX="444" maxX="476" minY="88" maxY="120" name="route-point-start"/>
-  <symbol minX="476" maxX="508" minY="88" maxY="120" name="route-point-9"/>
-  <symbol minX="508" maxX="540" minY="88" maxY="120" name="route-point-8"/>
-  <symbol minX="540" maxX="572" minY="88" maxY="120" name="route-point-7"/>
-  <symbol minX="572" maxX="604" minY="88" maxY="120" name="route-point-6"/>
-  <symbol minX="604" maxX="636" minY="88" maxY="120" name="route-point-5"/>
-  <symbol minX="636" maxX="668" minY="88" maxY="120" name="route-point-4"/>
-  <symbol minX="668" maxX="700" minY="88" maxY="120" name="route-point-3"/>
-  <symbol minX="700" maxX="732" minY="88" maxY="120" name="route-point-20"/>
-  <symbol minX="732" maxX="764" minY="88" maxY="120" name="route-point-2"/>
-  <symbol minX="764" maxX="796" minY="88" maxY="120" name="route-point-19"/>
-  <symbol minX="796" maxX="828" minY="88" maxY="120" name="route-point-18"/>
-  <symbol minX="828" maxX="860" minY="88" maxY="120" name="route-point-17"/>
-  <symbol minX="860" maxX="892" minY="88" maxY="120" name="route-point-16"/>
-  <symbol minX="892" maxX="924" minY="88" maxY="120" name="route-point-15"/>
-  <symbol minX="924" maxX="956" minY="88" maxY="120" name="route-point-14"/>
-  <symbol minX="956" maxX="988" minY="88" maxY="120" name="route-point-13"/>
-  <symbol minX="988" maxX="1020" minY="88" maxY="120" name="route-point-12"/>
-  <symbol minX="0" maxX="32" minY="122" maxY="154" name="route-point-11"/>
-  <symbol minX="32" maxX="64" minY="122" maxY="154" name="route-point-10"/>
-  <symbol minX="64" maxX="96" minY="122" maxY="154" name="route-point-1"/>
-  <symbol minX="96" maxX="140" minY="122" maxY="154" name="norating-default-l"/>
-  <symbol minX="140" maxX="184" minY="122" maxY="154" name="coloredmark-bg-l"/>
-  <symbol minX="184" maxX="228" minY="122" maxY="154" name="coloredmark-default-l"/>
-  <symbol minX="228" maxX="252" minY="122" maxY="150" name="shield-us-i-thin"/>
-  <symbol minX="252" maxX="282" minY="122" maxY="150" name="shield-us-i-wide"/>
-  <symbol minX="282" maxX="308" minY="122" maxY="148" name="shield-us-hw-thin"/>
-  <symbol minX="308" maxX="338" minY="122" maxY="148" name="shield-us-hw-wide"/>
-  <symbol minX="338" maxX="356" minY="122" maxY="147" name="bookmark-default-s"/>
-  <symbol minX="356" maxX="374" minY="122" maxY="147" name="bookmark-bg-s"/>
-  <symbol minX="374" maxX="398" minY="122" maxY="146" name="track_marker_deselected"/>
-  <symbol minX="398" maxX="422" minY="122" maxY="146" name="current-position"/>
-  <symbol minX="422" maxX="444" minY="122" maxY="144" name="subway-chengdu-m"/>
-  <symbol minX="444" maxX="466" minY="122" maxY="144" name="subway-guadalajara-m"/>
-  <symbol minX="466" maxX="488" minY="122" maxY="144" name="subway-glasgow-m"/>
-  <symbol minX="488" maxX="510" minY="122" maxY="144" name="subway-foshan-m"/>
-  <symbol minX="510" maxX="532" minY="122" maxY="144" name="subway-ekb-m"/>
-  <symbol minX="532" maxX="554" minY="122" maxY="144" name="subway-dubai-m"/>
-  <symbol minX="554" maxX="575" minY="122" maxY="144" name="subway-delhi-m"/>
-  <symbol minX="575" maxX="597" minY="122" maxY="144" name="subway-chicago-m"/>
-  <symbol minX="597" maxX="619" minY="122" maxY="144" name="airport-m"/>
-  <symbol minX="619" maxX="641" minY="122" maxY="144" name="subway-changchun-m"/>
-  <symbol minX="641" maxX="663" minY="122" maxY="144" name="subway-catania-m"/>
-  <symbol minX="663" maxX="685" minY="122" maxY="144" name="subway-caracas-m"/>
-  <symbol minX="685" maxX="707" minY="122" maxY="144" name="subway-cairo-m"/>
-  <symbol minX="707" maxX="729" minY="122" maxY="144" name="subway-bursaray-m"/>
-  <symbol minX="729" maxX="751" minY="122" maxY="144" name="subway-buenosaires-m"/>
-  <symbol minX="751" maxX="773" minY="122" maxY="144" name="subway-budapest-m"/>
-  <symbol minX="773" maxX="793" minY="122" maxY="144" name="subway-brescia-m"/>
-  <symbol minX="793" maxX="815" minY="122" maxY="144" name="subway-helsinki-m"/>
-  <symbol minX="815" maxX="837" minY="122" maxY="144" name="subway-hirosima-m"/>
-  <symbol minX="837" maxX="859" minY="122" maxY="144" name="subway-isfahan-m"/>
-  <symbol minX="859" maxX="877" minY="122" maxY="144" name="subway-istanbul-m"/>
-  <symbol minX="877" maxX="899" minY="122" maxY="144" name="subway-kazan-m"/>
-  <symbol minX="899" maxX="921" minY="122" maxY="144" name="subway-kobe-m"/>
-  <symbol minX="921" maxX="943" minY="122" maxY="144" name="subway-kunming-m"/>
-  <symbol minX="943" maxX="965" minY="122" maxY="144" name="subway-kyoto-m"/>
-  <symbol minX="965" maxX="987" minY="122" maxY="144" name="subway-lausanne-m"/>
-  <symbol minX="987" maxX="1009" minY="122" maxY="144" name="subway-lille-m"/>
-  <symbol minX="0" maxX="22" minY="154" maxY="176" name="subway-lima-m"/>
-  <symbol minX="22" maxX="44" minY="154" maxY="176" name="subway-lisboa-m"/>
-  <symbol minX="44" maxX="66" minY="154" maxY="176" name="subway-losangeles-m"/>
-  <symbol minX="66" maxX="88" minY="154" maxY="176" name="subway-m"/>
-  <symbol minX="88" maxX="110" minY="154" maxY="176" name="subway-marseille-s"/>
-  <symbol minX="110" maxX="132" minY="154" maxY="176" name="subway-mashhad-m"/>
-  <symbol minX="132" maxX="154" minY="154" maxY="176" name="second_hand_shop-m"/>
-  <symbol minX="154" maxX="176" minY="154" maxY="176" name="skateboard-m"/>
-  <symbol minX="176" maxX="198" minY="154" maxY="176" name="shower-m"/>
-  <symbol minX="198" maxX="220" minY="154" maxY="176" name="shop-m"/>
-  <symbol minX="220" maxX="242" minY="154" maxY="176" name="shop-bicycle-m"/>
-  <symbol minX="242" maxX="264" minY="154" maxY="176" name="shoes-m"/>
-  <symbol minX="264" maxX="286" minY="154" maxY="176" name="ship-m"/>
-  <symbol minX="286" maxX="308" minY="154" maxY="176" name="shinto-m"/>
-  <symbol minX="308" maxX="330" minY="154" maxY="176" name="shelter-m"/>
-  <symbol minX="330" maxX="352" minY="154" maxY="176" name="skiing-m"/>
-  <symbol minX="352" maxX="374" minY="154" maxY="176" name="seafood-shop-m"/>
-  <symbol minX="374" maxX="396" minY="154" maxY="176" name="school-m"/>
-  <symbol minX="396" maxX="418" minY="154" maxY="176" name="sawmill-m"/>
-  <symbol minX="418" maxX="440" minY="154" maxY="176" name="sauna-m"/>
-  <symbol minX="440" maxX="462" minY="154" maxY="176" name="sample_collection-m"/>
-  <symbol minX="462" maxX="484" minY="154" maxY="176" name="subway-guangzhou-m"/>
-  <symbol minX="484" maxX="506" minY="154" maxY="176" name="restaurant-m"/>
-  <symbol minX="506" maxX="528" minY="154" maxY="176" name="subway-adana-s"/>
-  <symbol minX="528" maxX="550" minY="154" maxY="176" name="subway-bengaluru-m"/>
-  <symbol minX="550" maxX="572" minY="154" maxY="176" name="subway-beijing-m"/>
-  <symbol minX="572" maxX="594" minY="154" maxY="176" name="subway-bangkok-m"/>
-  <symbol minX="594" maxX="615" minY="154" maxY="176" name="subway-athens-m"/>
-  <symbol minX="615" maxX="637" minY="154" maxY="176" name="subway-ankara-s"/>
-  <symbol minX="637" maxX="659" minY="154" maxY="176" name="subway-ankara-m"/>
-  <symbol minX="659" maxX="679" minY="154" maxY="176" name="subway-amsterdam-m"/>
-  <symbol minX="679" maxX="701" minY="154" maxY="176" name="subway-algeria-m"/>
-  <symbol minX="701" maxX="723" minY="154" maxY="176" name="subway-brasilia-m"/>
-  <symbol minX="723" maxX="745" minY="154" maxY="176" name="subway-adana-m"/>
-  <symbol minX="745" maxX="767" minY="154" maxY="176" name="stationery_shop-m"/>
-  <symbol minX="767" maxX="789" minY="154" maxY="176" name="stadium-m"/>
-  <symbol minX="789" maxX="811" minY="154" maxY="176" name="sports-m"/>
-  <symbol minX="811" maxX="833" minY="154" maxY="176" name="speedcam-alert-l"/>
-  <symbol minX="833" maxX="855" minY="154" maxY="176" name="speech_therapist-m"/>
-  <symbol minX="855" maxX="877" minY="154" maxY="176" name="soccer-m"/>
-  <symbol minX="877" maxX="899" minY="154" maxY="176" name="taoist-m"/>
-  <symbol minX="899" maxX="921" minY="154" maxY="176" name="toll_booth-m"/>
-  <symbol minX="921" maxX="943" minY="154" maxY="176" name="toilets-m"/>
-  <symbol minX="943" maxX="965" minY="154" maxY="176" name="tire-repair-m"/>
-  <symbol minX="965" maxX="987" minY="154" maxY="176" name="ticket-shop-m"/>
-  <symbol minX="987" maxX="1009" minY="154" maxY="176" name="theme_park-m"/>
-  <symbol minX="0" maxX="22" minY="176" maxY="198" name="theatre-m"/>
-  <symbol minX="22" maxX="44" minY="176" maxY="198" name="tennis-m"/>
-  <symbol minX="44" maxX="66" minY="176" maxY="198" name="taxi-m"/>
-  <symbol minX="66" maxX="88" minY="176" maxY="198" name="tomb-m"/>
-  <symbol minX="88" maxX="110" minY="176" maxY="198" name="table-tennis-m"/>
-  <symbol minX="110" maxX="132" minY="176" maxY="198" name="swimming-m"/>
-  <symbol minX="132" maxX="154" minY="176" maxY="198" name="sweets-m"/>
-  <symbol minX="154" maxX="176" minY="176" maxY="198" name="survey_point-m"/>
-  <symbol minX="176" maxX="198" minY="176" maxY="198" name="subway-yokohama-m"/>
-  <symbol minX="198" maxX="220" minY="176" maxY="198" name="subway-wuhan-m"/>
-  <symbol minX="220" maxX="242" minY="176" maxY="198" name="subway-washington-m"/>
-  <symbol minX="242" maxX="264" minY="176" maxY="198" name="video-games-m"/>
-  <symbol minX="264" maxX="286" minY="176" maxY="198" name="zoo-m"/>
-  <symbol minX="286" maxX="308" minY="176" maxY="198" name="yoga-m"/>
+  <symbol minX="648" maxX="684" minY="48" maxY="84" name="track_marker_selected"/>
+  <symbol minX="684" maxX="720" minY="48" maxY="84" name="infosign"/>
+  <symbol minX="720" maxX="745" minY="48" maxY="82" name="bookmark-building-m"/>
+  <symbol minX="745" maxX="770" minY="48" maxY="82" name="bookmark-parking-m"/>
+  <symbol minX="770" maxX="795" minY="48" maxY="82" name="bookmark-buddhism-m"/>
+  <symbol minX="795" maxX="820" minY="48" maxY="82" name="bookmark-mountain-m"/>
+  <symbol minX="820" maxX="845" minY="48" maxY="82" name="bookmark-christianity-m"/>
+  <symbol minX="845" maxX="870" minY="48" maxY="82" name="bookmark-default-m"/>
+  <symbol minX="870" maxX="895" minY="48" maxY="82" name="bookmark-medicine-m"/>
+  <symbol minX="895" maxX="920" minY="48" maxY="82" name="bookmark-judaism-m"/>
+  <symbol minX="920" maxX="945" minY="48" maxY="82" name="bookmark-islam-m"/>
+  <symbol minX="945" maxX="970" minY="48" maxY="82" name="bookmark-hotel-m"/>
+  <symbol minX="970" maxX="995" minY="48" maxY="82" name="bookmark-entertainment-m"/>
+  <symbol minX="995" maxX="1020" minY="48" maxY="82" name="bookmark-gas-m"/>
+  <symbol minX="0" maxX="25" minY="88" maxY="122" name="bookmark-exchange-m"/>
+  <symbol minX="25" maxX="50" minY="88" maxY="122" name="bookmark-finish-m"/>
+  <symbol minX="50" maxX="75" minY="88" maxY="122" name="bookmark-food-m"/>
+  <symbol minX="75" maxX="100" minY="88" maxY="122" name="bookmark-park-m"/>
+  <symbol minX="100" maxX="125" minY="88" maxY="122" name="bookmark-water-m"/>
+  <symbol minX="125" maxX="150" minY="88" maxY="122" name="bookmark-viewpoint-m"/>
+  <symbol minX="150" maxX="175" minY="88" maxY="122" name="bookmark-transport-m"/>
+  <symbol minX="175" maxX="200" minY="88" maxY="122" name="bookmark-swim-m"/>
+  <symbol minX="200" maxX="225" minY="88" maxY="122" name="bookmark-start-m"/>
+  <symbol minX="225" maxX="250" minY="88" maxY="122" name="bookmark-sport-m"/>
+  <symbol minX="250" maxX="275" minY="88" maxY="122" name="bookmark-sights-m"/>
+  <symbol minX="275" maxX="300" minY="88" maxY="122" name="bookmark-shop-m"/>
+  <symbol minX="300" maxX="325" minY="88" maxY="122" name="bookmark-animals-m"/>
+  <symbol minX="325" maxX="350" minY="88" maxY="122" name="bookmark-bar-m"/>
+  <symbol minX="350" maxX="375" minY="88" maxY="122" name="bookmark-bg-m"/>
+  <symbol minX="375" maxX="400" minY="88" maxY="122" name="bookmark-museum-m"/>
+  <symbol minX="400" maxX="432" minY="88" maxY="120" name="route-point-16"/>
+  <symbol minX="432" maxX="464" minY="88" maxY="120" name="route-point-10"/>
+  <symbol minX="464" maxX="496" minY="88" maxY="120" name="route-point-11"/>
+  <symbol minX="496" maxX="528" minY="88" maxY="120" name="route-point-12"/>
+  <symbol minX="528" maxX="560" minY="88" maxY="120" name="route-point-14"/>
+  <symbol minX="560" maxX="592" minY="88" maxY="120" name="route-point-13"/>
+  <symbol minX="592" maxX="636" minY="88" maxY="120" name="coloredmark-bg-l"/>
+  <symbol minX="636" maxX="680" minY="88" maxY="120" name="coloredmark-default-l"/>
+  <symbol minX="680" maxX="712" minY="88" maxY="120" name="route-point-1"/>
+  <symbol minX="712" maxX="744" minY="88" maxY="120" name="route-point-15"/>
+  <symbol minX="744" maxX="788" minY="88" maxY="120" name="norating-default-l"/>
+  <symbol minX="788" maxX="832" minY="88" maxY="120" name="norating-bg-l"/>
+  <symbol minX="832" maxX="864" minY="88" maxY="120" name="route-point-6"/>
+  <symbol minX="864" maxX="896" minY="88" maxY="120" name="route-point-17"/>
+  <symbol minX="896" maxX="928" minY="88" maxY="120" name="route-point-start"/>
+  <symbol minX="928" maxX="960" minY="88" maxY="120" name="route-point-18"/>
+  <symbol minX="960" maxX="992" minY="88" maxY="120" name="route-point-19"/>
+  <symbol minX="992" maxX="1024" minY="88" maxY="120" name="route-point-20"/>
+  <symbol minX="0" maxX="32" minY="122" maxY="154" name="route-point-5"/>
+  <symbol minX="32" maxX="64" minY="122" maxY="154" name="route-point-3"/>
+  <symbol minX="64" maxX="96" minY="122" maxY="154" name="route-point-8"/>
+  <symbol minX="96" maxX="128" minY="122" maxY="154" name="route-point-9"/>
+  <symbol minX="128" maxX="160" minY="122" maxY="154" name="route-point-4"/>
+  <symbol minX="160" maxX="192" minY="122" maxY="154" name="route-point-7"/>
+  <symbol minX="192" maxX="224" minY="122" maxY="154" name="route-point-2"/>
+  <symbol minX="224" maxX="248" minY="122" maxY="150" name="shield-us-i-thin"/>
+  <symbol minX="248" maxX="278" minY="122" maxY="150" name="shield-us-i-wide"/>
+  <symbol minX="278" maxX="308" minY="122" maxY="148" name="shield-us-hw-wide"/>
+  <symbol minX="308" maxX="334" minY="122" maxY="148" name="shield-us-hw-thin"/>
+  <symbol minX="334" maxX="352" minY="122" maxY="147" name="bookmark-bg-s"/>
+  <symbol minX="352" maxX="370" minY="122" maxY="147" name="bookmark-default-s"/>
+  <symbol minX="370" maxX="394" minY="122" maxY="146" name="current-position"/>
+  <symbol minX="394" maxX="418" minY="122" maxY="146" name="track_marker_deselected"/>
+  <symbol minX="418" maxX="440" minY="122" maxY="144" name="subway-chengdu-m"/>
+  <symbol minX="440" maxX="462" minY="122" maxY="144" name="shinto-m"/>
+  <symbol minX="462" maxX="484" minY="122" maxY="144" name="shoes-m"/>
+  <symbol minX="484" maxX="506" minY="122" maxY="144" name="shop-bicycle-m"/>
+  <symbol minX="506" maxX="528" minY="122" maxY="144" name="shop-m"/>
+  <symbol minX="528" maxX="550" minY="122" maxY="144" name="subway-changchun-m"/>
+  <symbol minX="550" maxX="572" minY="122" maxY="144" name="shower-m"/>
+  <symbol minX="572" maxX="594" minY="122" maxY="144" name="skateboard-m"/>
+  <symbol minX="594" maxX="616" minY="122" maxY="144" name="subway-catania-m"/>
+  <symbol minX="616" maxX="638" minY="122" maxY="144" name="subway-chicago-m"/>
+  <symbol minX="638" maxX="660" minY="122" maxY="144" name="ship-m"/>
+  <symbol minX="660" maxX="682" minY="122" maxY="144" name="subway-bursaray-m"/>
+  <symbol minX="682" maxX="703" minY="122" maxY="144" name="subway-delhi-m"/>
+  <symbol minX="703" maxX="725" minY="122" maxY="144" name="shelter-m"/>
+  <symbol minX="725" maxX="747" minY="122" maxY="144" name="second_hand_shop-m"/>
+  <symbol minX="747" maxX="769" minY="122" maxY="144" name="subway-dubai-m"/>
+  <symbol minX="769" maxX="791" minY="122" maxY="144" name="seafood-shop-m"/>
+  <symbol minX="791" maxX="813" minY="122" maxY="144" name="school-m"/>
+  <symbol minX="813" maxX="835" minY="122" maxY="144" name="sawmill-m"/>
+  <symbol minX="835" maxX="857" minY="122" maxY="144" name="airport-m"/>
+  <symbol minX="857" maxX="879" minY="122" maxY="144" name="subway-adana-m"/>
+  <symbol minX="879" maxX="901" minY="122" maxY="144" name="subway-beijing-m"/>
+  <symbol minX="901" maxX="923" minY="122" maxY="144" name="sauna-m"/>
+  <symbol minX="923" maxX="945" minY="122" maxY="144" name="subway-bangkok-m"/>
+  <symbol minX="945" maxX="966" minY="122" maxY="144" name="subway-athens-m"/>
+  <symbol minX="966" maxX="988" minY="122" maxY="144" name="subway-brasilia-m"/>
+  <symbol minX="988" maxX="1010" minY="122" maxY="144" name="subway-ankara-s"/>
+  <symbol minX="0" maxX="22" minY="154" maxY="176" name="subway-ankara-m"/>
+  <symbol minX="22" maxX="42" minY="154" maxY="176" name="subway-amsterdam-m"/>
+  <symbol minX="42" maxX="62" minY="154" maxY="176" name="subway-brescia-m"/>
+  <symbol minX="62" maxX="84" minY="154" maxY="176" name="subway-algeria-m"/>
+  <symbol minX="84" maxX="106" minY="154" maxY="176" name="subway-adana-s"/>
+  <symbol minX="106" maxX="128" minY="154" maxY="176" name="skiing-m"/>
+  <symbol minX="128" maxX="150" minY="154" maxY="176" name="subway-budapest-m"/>
+  <symbol minX="150" maxX="172" minY="154" maxY="176" name="stationery_shop-m"/>
+  <symbol minX="172" maxX="194" minY="154" maxY="176" name="stadium-m"/>
+  <symbol minX="194" maxX="216" minY="154" maxY="176" name="sports-m"/>
+  <symbol minX="216" maxX="238" minY="154" maxY="176" name="subway-buenosaires-m"/>
+  <symbol minX="238" maxX="260" minY="154" maxY="176" name="subway-bengaluru-m"/>
+  <symbol minX="260" maxX="282" minY="154" maxY="176" name="subway-cairo-m"/>
+  <symbol minX="282" maxX="304" minY="154" maxY="176" name="speedcam-alert-l"/>
+  <symbol minX="304" maxX="326" minY="154" maxY="176" name="speech_therapist-m"/>
+  <symbol minX="326" maxX="348" minY="154" maxY="176" name="subway-caracas-m"/>
+  <symbol minX="348" maxX="370" minY="154" maxY="176" name="soccer-m"/>
+  <symbol minX="370" maxX="392" minY="154" maxY="176" name="subway-warszawa-m"/>
+  <symbol minX="392" maxX="414" minY="154" maxY="176" name="taxi-m"/>
+  <symbol minX="414" maxX="436" minY="154" maxY="176" name="yoga-m"/>
+  <symbol minX="436" maxX="458" minY="154" maxY="176" name="taoist-m"/>
+  <symbol minX="458" maxX="480" minY="154" maxY="176" name="table-tennis-m"/>
+  <symbol minX="480" maxX="502" minY="154" maxY="176" name="swimming-m"/>
+  <symbol minX="502" maxX="524" minY="154" maxY="176" name="sweets-m"/>
+  <symbol minX="524" maxX="546" minY="154" maxY="176" name="survey_point-m"/>
+  <symbol minX="546" maxX="568" minY="154" maxY="176" name="subway-yokohama-m"/>
+  <symbol minX="568" maxX="590" minY="154" maxY="176" name="zoo-m"/>
+  <symbol minX="590" maxX="612" minY="154" maxY="176" name="subway-wuhan-m"/>
+  <symbol minX="612" maxX="634" minY="154" maxY="176" name="subway-washington-m"/>
+  <symbol minX="634" maxX="656" minY="154" maxY="176" name="tennis-m"/>
+  <symbol minX="656" maxX="678" minY="154" maxY="176" name="subway-volgograd-m"/>
+  <symbol minX="678" maxX="700" minY="154" maxY="176" name="subway-vienna-m"/>
+  <symbol minX="700" maxX="722" minY="154" maxY="176" name="subway-valencia-m"/>
+  <symbol minX="722" maxX="744" minY="154" maxY="176" name="subway-tyneandwear-m"/>
+  <symbol minX="744" maxX="766" minY="154" maxY="176" name="subway-tokyo-m"/>
+  <symbol minX="766" maxX="788" minY="154" maxY="176" name="subway-tianjin-m"/>
+  <symbol minX="788" maxX="810" minY="154" maxY="176" name="subway-tashkent-m"/>
+  <symbol minX="810" maxX="832" minY="154" maxY="176" name="subway-stockholm-m"/>
+  <symbol minX="832" maxX="854" minY="154" maxY="176" name="subway-stlouis-m"/>
+  <symbol minX="854" maxX="876" minY="154" maxY="176" name="subway-southkorea-m"/>
+  <symbol minX="876" maxX="898" minY="154" maxY="176" name="waterfall-m"/>
+  <symbol minX="898" maxX="920" minY="154" maxY="176" name="travel_agency_shop-m"/>
+  <symbol minX="920" maxX="942" minY="154" maxY="176" name="vending-m"/>
+  <symbol minX="942" maxX="964" minY="154" maxY="176" name="veterinary-m"/>
+  <symbol minX="964" maxX="986" minY="154" maxY="176" name="video-games-m"/>
+  <symbol minX="986" maxX="1008" minY="154" maxY="176" name="viewpoint-m"/>
+  <symbol minX="0" maxX="22" minY="176" maxY="198" name="volleyball-m"/>
+  <symbol minX="22" maxX="44" minY="176" maxY="198" name="waste-basket-m"/>
+  <symbol minX="44" maxX="66" minY="176" maxY="198" name="tram-m"/>
+  <symbol minX="66" maxX="88" minY="176" maxY="198" name="train-m"/>
+  <symbol minX="88" maxX="110" minY="176" maxY="198" name="toys-m"/>
+  <symbol minX="110" maxX="132" minY="176" maxY="198" name="subway-sofia-m"/>
+  <symbol minX="132" maxX="154" minY="176" maxY="198" name="tourism-m"/>
+  <symbol minX="154" maxX="176" minY="176" maxY="198" name="tomb-m"/>
+  <symbol minX="176" maxX="198" minY="176" maxY="198" name="toll_booth-m"/>
+  <symbol minX="198" maxX="220" minY="176" maxY="198" name="toilets-m"/>
+  <symbol minX="220" maxX="242" minY="176" maxY="198" name="tire-repair-m"/>
+  <symbol minX="242" maxX="264" minY="176" maxY="198" name="ticket-shop-m"/>
+  <symbol minX="264" maxX="286" minY="176" maxY="198" name="wayside_shrine-m"/>
+  <symbol minX="286" maxX="308" minY="176" maxY="198" name="theme_park-m"/>
   <symbol minX="308" maxX="330" minY="176" maxY="198" name="windmill-m"/>
-  <symbol minX="330" maxX="352" minY="176" maxY="198" name="wayside_shrine-m"/>
-  <symbol minX="352" maxX="374" minY="176" maxY="198" name="waterfall-m"/>
-  <symbol minX="374" maxX="396" minY="176" maxY="198" name="waste-basket-m"/>
-  <symbol minX="396" maxX="418" minY="176" maxY="198" name="volleyball-m"/>
-  <symbol minX="418" maxX="440" minY="176" maxY="198" name="viewpoint-m"/>
-  <symbol minX="440" maxX="462" minY="176" maxY="198" name="subway-warszawa-m"/>
-  <symbol minX="462" maxX="484" minY="176" maxY="198" name="veterinary-m"/>
-  <symbol minX="484" maxX="506" minY="176" maxY="198" name="vending-m"/>
-  <symbol minX="506" maxX="528" minY="176" maxY="198" name="travel_agency_shop-m"/>
-  <symbol minX="528" maxX="550" minY="176" maxY="198" name="tram-m"/>
-  <symbol minX="550" maxX="572" minY="176" maxY="198" name="train-m"/>
-  <symbol minX="572" maxX="594" minY="176" maxY="198" name="toys-m"/>
-  <symbol minX="594" maxX="616" minY="176" maxY="198" name="tourism-m"/>
-  <symbol minX="616" maxX="637" minY="176" maxY="198" name="subway-nnov-m"/>
-  <symbol minX="637" maxX="659" minY="176" maxY="198" name="subway-reseau-paris-m"/>
-  <symbol minX="659" maxX="681" minY="176" maxY="198" name="subway-rennes-m"/>
-  <symbol minX="681" maxX="703" minY="176" maxY="198" name="subway-pyongyang-m"/>
-  <symbol minX="703" maxX="724" minY="176" maxY="198" name="subway-porto-m"/>
-  <symbol minX="724" maxX="746" minY="176" maxY="198" name="subway-pittsburgh-m"/>
-  <symbol minX="746" maxX="768" minY="176" maxY="198" name="subway-perugia-m"/>
-  <symbol minX="768" maxX="790" minY="176" maxY="198" name="subway-panama-m"/>
-  <symbol minX="790" maxX="812" minY="176" maxY="198" name="subway-oslo-m"/>
-  <symbol minX="812" maxX="834" minY="176" maxY="198" name="subway-riodejaneiro-m"/>
-  <symbol minX="834" maxX="856" minY="176" maxY="198" name="subway-newyork-m"/>
-  <symbol minX="856" maxX="878" minY="176" maxY="198" name="subway-nagoya-m"/>
-  <symbol minX="878" maxX="900" minY="176" maxY="198" name="subway-minatomirai-m"/>
-  <symbol minX="900" maxX="922" minY="176" maxY="198" name="subway-milan-m"/>
-  <symbol minX="922" maxX="943" minY="176" maxY="198" name="subway-mexico-m"/>
-  <symbol minX="943" maxX="965" minY="176" maxY="198" name="subway-medellin-m"/>
-  <symbol minX="965" maxX="987" minY="176" maxY="198" name="subway-mecca-m"/>
-  <symbol minX="987" maxX="1009" minY="176" maxY="198" name="subway-massachusetts-m"/>
-  <symbol minX="0" maxX="22" minY="198" maxY="220" name="subway-samara-m"/>
-  <symbol minX="22" maxX="44" minY="198" maxY="220" name="subway-santodomingo-m"/>
-  <symbol minX="44" maxX="66" minY="198" maxY="220" name="subway-saopaulo-m"/>
-  <symbol minX="66" maxX="88" minY="198" maxY="220" name="subway-shiraz-m"/>
-  <symbol minX="88" maxX="110" minY="198" maxY="220" name="subway-sofia-m"/>
-  <symbol minX="110" maxX="132" minY="198" maxY="220" name="subway-southkorea-m"/>
-  <symbol minX="132" maxX="154" minY="198" maxY="220" name="subway-stlouis-m"/>
-  <symbol minX="154" maxX="176" minY="198" maxY="220" name="subway-stockholm-m"/>
-  <symbol minX="176" maxX="198" minY="198" maxY="220" name="subway-tashkent-m"/>
-  <symbol minX="198" maxX="220" minY="198" maxY="220" name="subway-tianjin-m"/>
-  <symbol minX="220" maxX="242" minY="198" maxY="220" name="subway-tokyo-m"/>
-  <symbol minX="242" maxX="264" minY="198" maxY="220" name="subway-tyneandwear-m"/>
-  <symbol minX="264" maxX="286" minY="198" maxY="220" name="subway-valencia-m"/>
-  <symbol minX="286" maxX="308" minY="198" maxY="220" name="subway-vienna-m"/>
-  <symbol minX="308" maxX="330" minY="198" maxY="220" name="subway-volgograd-m"/>
-  <symbol minX="330" maxX="352" minY="198" maxY="220" name="lawyer-m"/>
-  <symbol minX="352" maxX="374" minY="198" maxY="220" name="cemetery-m"/>
-  <symbol minX="374" maxX="396" minY="198" maxY="220" name="mail-m"/>
-  <symbol minX="396" maxX="418" minY="198" maxY="220" name="charging-station-m"/>
-  <symbol minX="418" maxX="440" minY="198" maxY="220" name="charity_shop-m"/>
-  <symbol minX="440" maxX="462" minY="198" maxY="220" name="cheese-m"/>
-  <symbol minX="462" maxX="484" minY="198" maxY="220" name="chemist-m"/>
-  <symbol minX="484" maxX="506" minY="198" maxY="220" name="chess-m"/>
-  <symbol minX="506" maxX="528" minY="198" maxY="220" name="lighthouse-m"/>
-  <symbol minX="528" maxX="550" minY="198" maxY="220" name="chimney-m"/>
-  <symbol minX="550" maxX="572" minY="198" maxY="220" name="christian-m"/>
-  <symbol minX="572" maxX="594" minY="198" maxY="220" name="lift_gate-m"/>
-  <symbol minX="594" maxX="616" minY="198" maxY="220" name="cinema-m"/>
-  <symbol minX="616" maxX="638" minY="198" maxY="220" name="library-m"/>
-  <symbol minX="638" maxX="660" minY="198" maxY="220" name="climbing-m"/>
-  <symbol minX="660" maxX="682" minY="198" maxY="220" name="marina-m"/>
-  <symbol minX="682" maxX="704" minY="198" maxY="220" name="clothes-m"/>
-  <symbol minX="704" maxX="726" minY="198" maxY="220" name="laundry-m"/>
-  <symbol minX="726" maxX="748" minY="198" maxY="220" name="language_school-m"/>
-  <symbol minX="748" maxX="770" minY="198" maxY="220" name="kiosk-m"/>
-  <symbol minX="770" maxX="792" minY="198" maxY="220" name="kindergarten-m"/>
-  <symbol minX="792" maxX="814" minY="198" maxY="220" name="college-m"/>
-  <symbol minX="814" maxX="836" minY="198" maxY="220" name="jewish-m"/>
-  <symbol minX="836" maxX="858" minY="198" maxY="220" name="computer-m"/>
-  <symbol minX="858" maxX="880" minY="198" maxY="220" name="convenience-m"/>
-  <symbol minX="880" maxX="902" minY="198" maxY="220" name="jewelry-m"/>
-  <symbol minX="902" maxX="924" minY="198" maxY="220" name="copyshop-m"/>
-  <symbol minX="924" maxX="946" minY="198" maxY="220" name="cricket-m"/>
-  <symbol minX="946" maxX="968" minY="198" maxY="220" name="internet_cafe-m"/>
-  <symbol minX="968" maxX="990" minY="198" maxY="220" name="motorcycle_shop-m"/>
-  <symbol minX="990" maxX="1012" minY="198" maxY="220" name="brewery-m"/>
-  <symbol minX="0" maxX="22" minY="220" maxY="242" name="buddhist-m"/>
-  <symbol minX="22" maxX="44" minY="220" maxY="242" name="muslim-m"/>
-  <symbol minX="44" maxX="66" minY="220" maxY="242" name="musical-instrument-m"/>
-  <symbol minX="66" maxX="88" minY="220" maxY="242" name="music_school-m"/>
-  <symbol minX="88" maxX="110" minY="220" maxY="242" name="music-m"/>
-  <symbol minX="110" maxX="132" minY="220" maxY="242" name="bus-m"/>
-  <symbol minX="132" maxX="154" minY="220" maxY="242" name="butcher-m"/>
-  <symbol minX="154" maxX="176" minY="220" maxY="242" name="cable-car-m"/>
-  <symbol minX="176" maxX="198" minY="220" maxY="242" name="cafe-m"/>
-  <symbol minX="198" maxX="220" minY="220" maxY="242" name="campsite-m"/>
-  <symbol minX="220" maxX="242" minY="220" maxY="242" name="museum-m"/>
-  <symbol minX="242" maxX="264" minY="220" maxY="242" name="car-part-m"/>
-  <symbol minX="264" maxX="286" minY="220" maxY="242" name="interior_decoration-m"/>
-  <symbol minX="286" maxX="308" minY="220" maxY="242" name="car-repair-m"/>
-  <symbol minX="308" maxX="330" minY="220" maxY="242" name="monument-m"/>
-  <symbol minX="330" maxX="352" minY="220" maxY="242" name="mobile_phone-m"/>
-  <symbol minX="352" maxX="374" minY="220" maxY="242" name="car-wash-m"/>
-  <symbol minX="374" maxX="396" minY="220" maxY="242" name="car_sharing-m"/>
-  <symbol minX="396" maxX="418" minY="220" maxY="242" name="military-m"/>
-  <symbol minX="418" maxX="440" minY="220" maxY="242" name="car_shop-m"/>
-  <symbol minX="440" maxX="462" minY="220" maxY="242" name="caravan-shop-m"/>
-  <symbol minX="462" maxX="484" minY="220" maxY="242" name="caravan_site-m"/>
-  <symbol minX="484" maxX="506" minY="220" maxY="242" name="carpenter-m"/>
-  <symbol minX="506" maxX="528" minY="220" maxY="242" name="casino-m"/>
-  <symbol minX="528" maxX="550" minY="220" maxY="242" name="metal_construction-m"/>
-  <symbol minX="550" maxX="572" minY="220" maxY="242" name="marketplace-m"/>
-  <symbol minX="572" maxX="594" minY="220" maxY="242" name="gallery-m"/>
-  <symbol minX="594" maxX="616" minY="220" maxY="242" name="greengrocer-m"/>
-  <symbol minX="616" maxX="638" minY="220" maxY="242" name="golf-m"/>
-  <symbol minX="638" maxX="660" minY="220" maxY="242" name="gift-m"/>
-  <symbol minX="660" maxX="682" minY="220" maxY="242" name="dump-station-m"/>
-  <symbol minX="682" maxX="704" minY="220" maxY="242" name="electrician-m"/>
-  <symbol minX="704" maxX="726" minY="220" maxY="242" name="electronics-m"/>
-  <symbol minX="726" maxX="748" minY="220" maxY="242" name="geyser-m"/>
-  <symbol minX="748" maxX="770" minY="220" maxY="242" name="geyser-l"/>
-  <symbol minX="770" maxX="792" minY="220" maxY="242" name="garden_center-m"/>
-  <symbol minX="792" maxX="814" minY="220" maxY="242" name="embassy-m"/>
-  <symbol minX="814" maxX="836" minY="220" maxY="242" name="garden-outline-m"/>
-  <symbol minX="836" maxX="858" minY="220" maxY="242" name="garden-m"/>
-  <symbol minX="858" maxX="880" minY="220" maxY="242" name="emergency-phone-m"/>
-  <symbol minX="880" maxX="902" minY="220" maxY="242" name="driving_school-m"/>
-  <symbol minX="902" maxX="924" minY="220" maxY="242" name="furniture-m"/>
-  <symbol minX="924" maxX="946" minY="220" maxY="242" name="funicular-m"/>
-  <symbol minX="946" maxX="968" minY="220" maxY="242" name="equestrian-m"/>
-  <symbol minX="968" maxX="990" minY="220" maxY="242" name="erotic-m"/>
-  <symbol minX="990" maxX="1012" minY="220" maxY="242" name="fastfood-m"/>
-  <symbol minX="0" maxX="22" minY="242" maxY="264" name="fire_station-m"/>
-  <symbol minX="22" maxX="44" minY="242" maxY="264" name="firehydrant-m"/>
-  <symbol minX="44" maxX="66" minY="242" maxY="264" name="florist-m"/>
-  <symbol minX="66" maxX="88" minY="242" maxY="264" name="fountain-m"/>
-  <symbol minX="88" maxX="110" minY="242" maxY="264" name="funeral_directors-m"/>
-  <symbol minX="110" maxX="132" minY="242" maxY="264" name="fountain-s"/>
-  <symbol minX="132" maxX="154" minY="242" maxY="264" name="fuel-m"/>
-  <symbol minX="154" maxX="176" minY="242" maxY="264" name="fuel-dispenser-m"/>
-  <symbol minX="176" maxX="198" minY="242" maxY="264" name="hospital-m"/>
-  <symbol minX="198" maxX="220" minY="242" maxY="264" name="cross-m"/>
-  <symbol minX="220" maxX="242" minY="242" maxY="264" name="curling-m"/>
-  <symbol minX="242" maxX="264" minY="242" maxY="264" name="defibrillator-m"/>
-  <symbol minX="264" maxX="286" minY="242" maxY="264" name="information-m"/>
-  <symbol minX="286" maxX="308" minY="242" maxY="264" name="ice_cream-m"/>
-  <symbol minX="308" maxX="330" minY="242" maxY="264" name="hunting-tower-m"/>
-  <symbol minX="330" maxX="352" minY="242" maxY="264" name="dentist-m"/>
-  <symbol minX="352" maxX="374" minY="242" maxY="264" name="hotel-m"/>
-  <symbol minX="374" maxX="396" minY="242" maxY="264" name="department_store-m"/>
-  <symbol minX="396" maxX="418" minY="242" maxY="264" name="diving-m"/>
-  <symbol minX="418" maxX="440" minY="242" maxY="264" name="hostel-m"/>
-  <symbol minX="440" maxX="462" minY="242" maxY="264" name="dog_park-m"/>
-  <symbol minX="462" maxX="484" minY="242" maxY="264" name="doityourself-m"/>
-  <symbol minX="484" maxX="506" minY="242" maxY="264" name="media-m"/>
-  <symbol minX="506" maxX="528" minY="242" maxY="264" name="home-m"/>
-  <symbol minX="528" maxX="550" minY="242" maxY="264" name="drinking-water-m"/>
-  <symbol minX="550" maxX="572" minY="242" maxY="264" name="hockey-m"/>
-  <symbol minX="572" maxX="594" minY="242" maxY="264" name="historic-ship-m"/>
-  <symbol minX="594" maxX="616" minY="242" maxY="264" name="hindu-m"/>
-  <symbol minX="616" maxX="638" minY="242" maxY="264" name="heliport-m"/>
-  <symbol minX="638" maxX="660" minY="242" maxY="264" name="helipad-m"/>
-  <symbol minX="660" maxX="682" minY="242" maxY="264" name="handball-m"/>
-  <symbol minX="682" maxX="704" minY="242" maxY="264" name="hand-m"/>
-  <symbol minX="704" maxX="726" minY="242" maxY="264" name="hairdresser-m"/>
-  <symbol minX="726" maxX="748" minY="242" maxY="264" name="gym-m"/>
-  <symbol minX="748" maxX="770" minY="242" maxY="264" name="guidepost"/>
-  <symbol minX="770" maxX="792" minY="242" maxY="264" name="grocery-m"/>
-  <symbol minX="792" maxX="814" minY="242" maxY="264" name="pharmacy-m"/>
-  <symbol minX="814" maxX="836" minY="242" maxY="264" name="padel-m"/>
-  <symbol minX="836" maxX="858" minY="242" maxY="264" name="outdoor-shop-m"/>
-  <symbol minX="858" maxX="880" minY="242" maxY="264" name="optometrist-m"/>
-  <symbol minX="880" maxX="902" minY="242" maxY="264" name="optician-m"/>
-  <symbol minX="902" maxX="924" minY="242" maxY="264" name="australian-football-m"/>
-  <symbol minX="924" maxX="946" minY="242" maxY="264" name="pelota-m"/>
-  <symbol minX="946" maxX="968" minY="242" maxY="264" name="office-m"/>
-  <symbol minX="968" maxX="990" minY="242" maxY="264" name="petshop-m"/>
-  <symbol minX="990" maxX="1012" minY="242" maxY="264" name="bicycle-m"/>
-  <symbol minX="0" maxX="22" minY="264" maxY="286" name="audiologist-m"/>
-  <symbol minX="22" maxX="44" minY="264" maxY="286" name="badminton-m"/>
-  <symbol minX="44" maxX="66" minY="264" maxY="286" name="atm-m"/>
-  <symbol minX="66" maxX="88" minY="264" maxY="286" name="art-m"/>
-  <symbol minX="88" maxX="110" minY="264" maxY="286" name="bicycle-repair-station"/>
-  <symbol minX="110" maxX="132" minY="264" maxY="286" name="archery-m"/>
-  <symbol minX="132" maxX="154" minY="264" maxY="286" name="phone-m"/>
-  <symbol minX="154" maxX="176" minY="264" maxY="286" name="photo-shop-m"/>
-  <symbol minX="176" maxX="198" minY="264" maxY="286" name="archaeological-site-m"/>
-  <symbol minX="198" maxX="220" minY="264" maxY="286" name="blacksmith-m"/>
-  <symbol minX="220" maxX="242" minY="264" maxY="286" name="nparkf-outline-m"/>
-  <symbol minX="242" maxX="264" minY="264" maxY="286" name="bank-l"/>
-  <symbol minX="264" maxX="286" minY="264" maxY="286" name="banknote-m"/>
-  <symbol minX="286" maxX="308" minY="264" maxY="286" name="bar-m"/>
-  <symbol minX="308" maxX="330" minY="264" maxY="286" name="parking-meter-m"/>
-  <symbol minX="330" maxX="352" minY="264" maxY="286" name="banknote-l"/>
-  <symbol minX="352" maxX="374" minY="264" maxY="286" name="bank-m"/>
-  <symbol minX="374" maxX="396" minY="264" maxY="286" name="baseball-m"/>
-  <symbol minX="396" maxX="418" minY="264" maxY="286" name="basketball-m"/>
-  <symbol minX="418" maxX="440" minY="264" maxY="286" name="bbq-m"/>
-  <symbol minX="440" maxX="462" minY="264" maxY="286" name="bcontrol-m"/>
-  <symbol minX="462" maxX="484" minY="264" maxY="286" name="remains-m"/>
-  <symbol minX="484" maxX="506" minY="264" maxY="286" name="bowling_alley-m"/>
-  <symbol minX="506" maxX="528" minY="264" maxY="286" name="beach-m"/>
-  <symbol minX="528" maxX="550" minY="264" maxY="286" name="beauty-m"/>
-  <symbol minX="550" maxX="572" minY="264" maxY="286" name="beekeeper-m"/>
-  <symbol minX="572" maxX="594" minY="264" maxY="286" name="beer-m"/>
-  <symbol minX="594" maxX="616" minY="264" maxY="286" name="park-outline-m"/>
-  <symbol minX="616" maxX="638" minY="264" maxY="286" name="bakery-m"/>
-  <symbol minX="638" maxX="660" minY="264" maxY="286" name="park-m"/>
-  <symbol minX="660" maxX="682" minY="264" maxY="286" name="painter-m"/>
-  <symbol minX="682" maxX="704" minY="264" maxY="286" name="postbox-m"/>
-  <symbol minX="704" maxX="726" minY="264" maxY="286" name="america-football-m"/>
-  <symbol minX="726" maxX="748" minY="264" maxY="286" name="playground-m"/>
-  <symbol minX="748" maxX="770" minY="264" maxY="286" name="plumber-m"/>
-  <symbol minX="770" maxX="792" minY="264" maxY="286" name="bookmaker-m"/>
-  <symbol minX="792" maxX="814" minY="264" maxY="286" name="npark-m"/>
-  <symbol minX="814" maxX="836" minY="264" maxY="286" name="alternative-m"/>
-  <symbol minX="836" maxX="858" minY="264" maxY="286" name="podiatrist-m"/>
-  <symbol minX="858" maxX="880" minY="264" maxY="286" name="alpine_hut-m"/>
-  <symbol minX="880" maxX="902" minY="264" maxY="286" name="police-m"/>
-  <symbol minX="902" maxX="924" minY="264" maxY="286" name="bowling-m"/>
-  <symbol minX="924" maxX="946" minY="264" maxY="286" name="physiotherapist-m"/>
-  <symbol minX="946" maxX="968" minY="264" maxY="286" name="power-m"/>
-  <symbol minX="968" maxX="990" minY="264" maxY="286" name="nightclub-m"/>
-  <symbol minX="990" maxX="1012" minY="264" maxY="286" name="prison-m"/>
-  <symbol minX="0" maxX="22" minY="286" maxY="308" name="psychotherapist-m"/>
-  <symbol minX="22" maxX="44" minY="286" maxY="308" name="public-building-m"/>
-  <symbol minX="44" maxX="66" minY="286" maxY="308" name="newsagent_shop-m"/>
-  <symbol minX="66" maxX="88" minY="286" maxY="308" name="alcohol-m"/>
-  <symbol minX="88" maxX="110" minY="286" maxY="308" name="airport_gate-m"/>
-  <symbol minX="110" maxX="132" minY="286" maxY="308" name="needle_and_thread-m"/>
-  <symbol minX="132" maxX="154" minY="286" maxY="308" name="recycling-m"/>
-  <symbol minX="154" maxX="176" minY="286" maxY="308" name="place-of-worship-m"/>
-  <symbol minX="176" maxX="198" minY="286" maxY="308" name="book-shop-m"/>
-  <symbol minX="198" maxX="220" minY="286" maxY="308" name="picnic-m"/>
-  <symbol minX="220" maxX="242" minY="286" maxY="308" name="pitch-m"/>
-  <symbol minX="242" maxX="264" minY="286" maxY="308" name="apartment-m"/>
-  <symbol minX="264" maxX="286" minY="286" maxY="308" name="blood_donation-m"/>
-  <symbol minX="286" maxX="308" minY="286" maxY="308" name="nparkf-m"/>
-  <symbol minX="308" maxX="330" minY="286" maxY="308" name="picnic_table-m"/>
-  <symbol minX="330" maxX="352" minY="286" maxY="308" name="antiques-m"/>
-  <symbol minX="352" maxX="374" minY="286" maxY="307" name="subway-shanghai-m"/>
-  <symbol minX="374" maxX="396" minY="286" maxY="307" name="subway-marseille-m"/>
-  <symbol minX="396" maxX="418" minY="286" maxY="307" name="subway-maracaibo-m"/>
-  <symbol minX="418" maxX="440" minY="286" maxY="307" name="subway-dalian-m"/>
-  <symbol minX="440" maxX="462" minY="286" maxY="307" name="subway-izmir-m"/>
-  <symbol minX="462" maxX="483" minY="286" maxY="307" name="subway-stlouis-s"/>
-  <symbol minX="483" maxX="503" minY="286" maxY="307" name="subway-warsaw-m"/>
-  <symbol minX="503" maxX="524" minY="286" maxY="307" name="subway-algeria-s"/>
-  <symbol minX="524" maxX="545" minY="286" maxY="307" name="subway-southkorea-s"/>
-  <symbol minX="545" maxX="567" minY="286" maxY="307" name="subway-sapporo-m"/>
-  <symbol minX="567" maxX="588" minY="286" maxY="307" name="subway-entrance-m"/>
-  <symbol minX="588" maxX="609" minY="286" maxY="307" name="subway-spb-m"/>
-  <symbol minX="609" maxX="630" minY="286" maxY="307" name="subway-montreal-m"/>
-  <symbol minX="630" maxX="651" minY="286" maxY="307" name="subway-ekb-s"/>
-  <symbol minX="651" maxX="671" minY="286" maxY="306" name="search-result"/>
-  <symbol minX="671" maxX="691" minY="286" maxY="306" name="lightrail-berlin-m"/>
-  <symbol minX="691" maxX="711" minY="286" maxY="306" name="subway-pittsburgh-s"/>
-  <symbol minX="711" maxX="729" minY="286" maxY="306" name="subway-istanbul-s"/>
-  <symbol minX="729" maxX="749" minY="286" maxY="305" name="subway-izmir-s"/>
-  <symbol minX="749" maxX="768" minY="286" maxY="305" name="non-found-search-result"/>
-  <symbol minX="768" maxX="787" minY="286" maxY="305" name="speedcam-m"/>
-  <symbol minX="787" maxX="806" minY="286" maxY="305" name="parking_entrance-m"/>
-  <symbol minX="806" maxX="825" minY="286" maxY="305" name="parking-m"/>
-  <symbol minX="825" maxX="844" minY="286" maxY="305" name="subway-sapporo-s"/>
-  <symbol minX="844" maxX="862" minY="286" maxY="305" name="subway-brescia-s"/>
-  <symbol minX="862" maxX="884" minY="286" maxY="305" name="subway-taoyuan-m"/>
-  <symbol minX="884" maxX="906" minY="286" maxY="305" name="subway-rotterdam-m"/>
-  <symbol minX="906" maxX="925" minY="286" maxY="305" name="bike-parking-m"/>
-  <symbol minX="925" maxX="944" minY="286" maxY="305" name="subway-isfahan-s"/>
-  <symbol minX="944" maxX="963" minY="286" maxY="305" name="parking-disabled-m"/>
-  <symbol minX="963" maxX="982" minY="286" maxY="305" name="subway-medellin-s"/>
-  <symbol minX="982" maxX="1017" minY="286" maxY="305" name="coloredmark-bg-s"/>
-  <symbol minX="0" maxX="35" minY="308" maxY="327" name="coloredmark-default-s"/>
-  <symbol minX="35" maxX="54" minY="308" maxY="327" name="motorcycle-parking-m"/>
-  <symbol minX="54" maxX="73" minY="308" maxY="327" name="subway-cairo-s"/>
-  <symbol minX="73" maxX="92" minY="308" maxY="327" name="bicycle-rental"/>
-  <symbol minX="92" maxX="110" minY="308" maxY="327" name="subway-mashhad-s"/>
-  <symbol minX="110" maxX="129" minY="308" maxY="327" name="subway-panama-s"/>
-  <symbol minX="129" maxX="151" minY="308" maxY="327" name="subway-tbilisi-m"/>
-  <symbol minX="151" maxX="170" minY="308" maxY="327" name="parking_pay-m"/>
-  <symbol minX="170" maxX="188" minY="308" maxY="326" name="subway-sofia-s"/>
-  <symbol minX="188" maxX="206" minY="308" maxY="326" name="subway-wuhan-s"/>
-  <symbol minX="206" maxX="224" minY="308" maxY="326" name="subway-riodejaneiro-s"/>
-  <symbol minX="224" maxX="242" minY="308" maxY="326" name="subway-washington-s"/>
-  <symbol minX="242" maxX="263" minY="308" maxY="326" name="subway-yerevan-s"/>
-  <symbol minX="263" maxX="281" minY="308" maxY="326" name="subway-warszawa-s"/>
-  <symbol minX="281" maxX="299" minY="308" maxY="326" name="subway-yokohama-s"/>
-  <symbol minX="299" maxX="317" minY="308" maxY="326" name="subway-bangkok-s"/>
-  <symbol minX="317" maxX="333" minY="308" maxY="326" name="subway-warsaw-s"/>
-  <symbol minX="333" maxX="351" minY="308" maxY="326" name="subway-volgograd-s"/>
-  <symbol minX="351" maxX="365" minY="308" maxY="326" name="bookmark-default-xs"/>
-  <symbol minX="365" maxX="383" minY="308" maxY="326" name="subway-vienna-s"/>
-  <symbol minX="383" maxX="401" minY="308" maxY="326" name="subway-valencia-s"/>
-  <symbol minX="401" maxX="419" minY="308" maxY="326" name="subway-stockholm-s"/>
-  <symbol minX="419" maxX="437" minY="308" maxY="326" name="subway-athens-s"/>
-  <symbol minX="437" maxX="459" minY="308" maxY="326" name="subway-almaty-m"/>
-  <symbol minX="459" maxX="477" minY="308" maxY="326" name="subway-ubahn-m"/>
-  <symbol minX="477" maxX="495" minY="308" maxY="326" name="subway-tyneandwear-s"/>
-  <symbol minX="495" maxX="515" minY="308" maxY="326" name="subway-taoyuan-s"/>
-  <symbol minX="515" maxX="533" minY="308" maxY="326" name="subway-tokyo-s"/>
-  <symbol minX="533" maxX="551" minY="308" maxY="326" name="subway-tianjin-s"/>
-  <symbol minX="551" maxX="565" minY="308" maxY="326" name="bookmark-bg-xs"/>
-  <symbol minX="565" maxX="583" minY="308" maxY="326" name="subway-tashkent-s"/>
-  <symbol minX="583" maxX="601" minY="308" maxY="326" name="subway-minatomirai-s"/>
-  <symbol minX="601" maxX="623" minY="308" maxY="326" name="subway-dnepro-m"/>
-  <symbol minX="623" maxX="641" minY="308" maxY="326" name="subway-delhi-s"/>
-  <symbol minX="641" maxX="659" minY="308" maxY="326" name="subway-dalian-s"/>
-  <symbol minX="659" maxX="677" minY="308" maxY="326" name="subway-massachusetts-s"/>
-  <symbol minX="677" maxX="695" minY="308" maxY="326" name="subway-chicago-s"/>
-  <symbol minX="695" maxX="713" minY="308" maxY="326" name="subway-mecca-s"/>
-  <symbol minX="713" maxX="731" minY="308" maxY="326" name="subway-chengdu-s"/>
-  <symbol minX="731" maxX="749" minY="308" maxY="326" name="subway-milan-s"/>
-  <symbol minX="749" maxX="771" minY="308" maxY="326" name="subway-lyon-m"/>
-  <symbol minX="771" maxX="789" minY="308" maxY="326" name="subway-changchun-s"/>
-  <symbol minX="789" maxX="807" minY="308" maxY="326" name="subway-montreal-s"/>
-  <symbol minX="807" maxX="828" minY="308" maxY="326" name="subway-moscow-m"/>
-  <symbol minX="828" maxX="846" minY="308" maxY="326" name="subway-nagoya-s"/>
-  <symbol minX="846" maxX="864" minY="308" maxY="326" name="subway-catania-s"/>
-  <symbol minX="864" maxX="882" minY="308" maxY="326" name="subway-caracas-s"/>
-  <symbol minX="882" maxX="900" minY="308" maxY="326" name="subway-nnov-s"/>
-  <symbol minX="900" maxX="918" minY="308" maxY="326" name="subway-foshan-s"/>
-  <symbol minX="918" maxX="936" minY="308" maxY="326" name="subway-guangzhou-s"/>
-  <symbol minX="936" maxX="954" minY="308" maxY="326" name="subway-helsinki-s"/>
-  <symbol minX="954" maxX="972" minY="308" maxY="326" name="subway-hirosima-s"/>
-  <symbol minX="972" maxX="990" minY="308" maxY="326" name="subway-guadalajara-s"/>
-  <symbol minX="990" maxX="1008" minY="308" maxY="326" name="subway-glasgow-s"/>
-  <symbol minX="0" maxX="18" minY="327" maxY="345" name="subway-kazan-s"/>
-  <symbol minX="18" maxX="39" minY="327" maxY="345" name="subway-fukuoka-s"/>
-  <symbol minX="39" maxX="57" minY="327" maxY="345" name="subway-kobe-s"/>
-  <symbol minX="57" maxX="75" minY="327" maxY="345" name="subway-shanghai-s"/>
-  <symbol minX="75" maxX="93" minY="327" maxY="345" name="subway-kunming-s"/>
-  <symbol minX="93" maxX="111" minY="327" maxY="345" name="subway-kyoto-s"/>
-  <symbol minX="111" maxX="129" minY="327" maxY="345" name="subway-lille-s"/>
-  <symbol minX="129" maxX="147" minY="327" maxY="345" name="subway-lima-s"/>
-  <symbol minX="147" maxX="165" minY="327" maxY="345" name="subway-lisboa-s"/>
-  <symbol minX="165" maxX="183" minY="327" maxY="345" name="subway-losangeles-s"/>
-  <symbol minX="183" maxX="201" minY="327" maxY="345" name="subway-dubai-s"/>
-  <symbol minX="201" maxX="219" minY="327" maxY="345" name="subway-rome-m"/>
-  <symbol minX="219" maxX="237" minY="327" maxY="345" name="subway-shiraz-s"/>
-  <symbol minX="237" maxX="255" minY="327" maxY="345" name="subway-beijing-s"/>
-  <symbol minX="255" maxX="275" minY="327" maxY="345" name="subway-seattle-m"/>
-  <symbol minX="275" maxX="293" minY="327" maxY="345" name="subway-saopaulo-s"/>
-  <symbol minX="293" maxX="311" minY="327" maxY="345" name="subway-santodomingo-s"/>
-  <symbol minX="311" maxX="329" minY="327" maxY="345" name="subway-bengaluru-s"/>
-  <symbol minX="329" maxX="350" minY="327" maxY="345" name="subway-santiago-s"/>
-  <symbol minX="350" maxX="368" minY="327" maxY="345" name="subway-samara-s"/>
-  <symbol minX="368" maxX="386" minY="327" maxY="345" name="subway-brasilia-s"/>
-  <symbol minX="386" maxX="404" minY="327" maxY="345" name="subway-reseau-paris-s"/>
-  <symbol minX="404" maxX="422" minY="327" maxY="345" name="subway-rennes-s"/>
-  <symbol minX="422" maxX="440" minY="327" maxY="345" name="subway-pyongyang-s"/>
-  <symbol minX="440" maxX="458" minY="327" maxY="345" name="subway-porto-s"/>
-  <symbol minX="458" maxX="476" minY="327" maxY="345" name="subway-budapest-s"/>
-  <symbol minX="476" maxX="498" minY="327" maxY="345" name="subway-omsk-s"/>
-  <symbol minX="498" maxX="516" minY="327" maxY="345" name="subway-oslo-s"/>
-  <symbol minX="516" maxX="534" minY="327" maxY="345" name="subway-perugia-s"/>
-  <symbol minX="534" maxX="552" minY="327" maxY="345" name="subway-buenosaires-s"/>
-  <symbol minX="552" maxX="570" minY="327" maxY="345" name="subway-bursaray-s"/>
-  <symbol minX="570" maxX="588" minY="327" maxY="345" name="subway-paris-m"/>
-  <symbol minX="588" maxX="610" minY="327" maxY="344" name="subway-tabriz-m"/>
-  <symbol minX="610" maxX="632" minY="327" maxY="344" name="subway-alicante-m"/>
-  <symbol minX="632" maxX="654" minY="327" maxY="344" name="subway-osaka-m"/>
-  <symbol minX="654" maxX="671" minY="327" maxY="344" name="subway-spb-s"/>
-  <symbol minX="671" maxX="693" minY="327" maxY="344" name="subway-santiago-m"/>
-  <symbol minX="693" maxX="715" minY="327" maxY="344" name="subway-kryvyirih-m"/>
-  <symbol minX="715" maxX="737" minY="327" maxY="344" name="subway-philadelphia-m"/>
-  <symbol minX="737" maxX="754" minY="327" maxY="344" name="subway-lausanne-s"/>
-  <symbol minX="754" maxX="775" minY="327" maxY="344" name="subway-tabriz-s"/>
-  <symbol minX="775" maxX="791" minY="327" maxY="344" name="subway-amsterdam-s"/>
-  <symbol minX="791" maxX="812" minY="327" maxY="344" name="subway-london-m"/>
-  <symbol minX="812" maxX="834" minY="327" maxY="344" name="subway-omsk-m"/>
-  <symbol minX="834" maxX="856" minY="327" maxY="344" name="subway-yerevan-m"/>
-  <symbol minX="856" maxX="874" minY="327" maxY="344" name="subway-maracaibo-s"/>
-  <symbol minX="874" maxX="896" minY="327" maxY="344" name="subway-lucknow-s"/>
-  <symbol minX="896" maxX="913" minY="327" maxY="344" name="cave-m"/>
-  <symbol minX="913" maxX="934" minY="327" maxY="344" name="subway-almaty-s"/>
-  <symbol minX="934" maxX="950" minY="327" maxY="344" name="subway-mexico-s"/>
-  <symbol minX="950" maxX="966" minY="327" maxY="343" name="bus-s"/>
-  <symbol minX="966" maxX="982" minY="327" maxY="343" name="airport-s"/>
-  <symbol minX="982" maxX="998" minY="327" maxY="343" name="viewpoint-s"/>
-  <symbol minX="998" maxX="1014" minY="327" maxY="343" name="christian-s"/>
-  <symbol minX="0" maxX="16" minY="345" maxY="361" name="waste-basket-s"/>
-  <symbol minX="16" maxX="32" minY="345" maxY="361" name="buddhist-s"/>
-  <symbol minX="32" maxX="48" minY="345" maxY="361" name="waterfall-s"/>
-  <symbol minX="48" maxX="64" minY="345" maxY="361" name="drinking-water-s"/>
-  <symbol minX="64" maxX="80" minY="345" maxY="361" name="charging-station-s"/>
-  <symbol minX="80" maxX="96" minY="345" maxY="361" name="cable-car-s"/>
-  <symbol minX="96" maxX="112" minY="345" maxY="361" name="zoo-s"/>
-  <symbol minX="112" maxX="128" minY="345" maxY="361" name="car-repair-s"/>
-  <symbol minX="128" maxX="144" minY="345" maxY="361" name="college-s"/>
-  <symbol minX="144" maxX="164" minY="345" maxY="361" name="subway-philadelphia-s"/>
-  <symbol minX="164" maxX="180" minY="345" maxY="361" name="park-outline-s"/>
-  <symbol minX="180" maxX="196" minY="345" maxY="361" name="hospital-s"/>
-  <symbol minX="196" maxX="214" minY="345" maxY="361" name="subway-tbilisi-s"/>
-  <symbol minX="214" maxX="236" minY="345" maxY="361" name="subway-bucharest-m"/>
-  <symbol minX="236" maxX="252" minY="345" maxY="361" name="hotel-s"/>
-  <symbol minX="252" maxX="268" minY="345" maxY="361" name="nparkf-s"/>
-  <symbol minX="268" maxX="284" minY="345" maxY="361" name="nparkf-outline-s"/>
-  <symbol minX="284" maxX="305" minY="345" maxY="361" name="subway-dnepro-s"/>
-  <symbol minX="305" maxX="321" minY="345" maxY="361" name="subway-entrance-s"/>
-  <symbol minX="321" maxX="337" minY="345" maxY="361" name="subway-s"/>
-  <symbol minX="337" maxX="355" minY="345" maxY="361" name="subway-rotterdam-s"/>
-  <symbol minX="355" maxX="371" minY="345" maxY="361" name="jewish-s"/>
-  <symbol minX="371" maxX="387" minY="345" maxY="361" name="fuel-s"/>
-  <symbol minX="387" maxX="403" minY="345" maxY="361" name="muslim-s"/>
-  <symbol minX="403" maxX="424" minY="345" maxY="361" name="subway-palma-s"/>
-  <symbol minX="424" maxX="446" minY="345" maxY="361" name="subway-palma-m"/>
-  <symbol minX="446" maxX="465" minY="345" maxY="361" name="subway-osaka-s"/>
-  <symbol minX="465" maxX="481" minY="345" maxY="361" name="museum-s"/>
-  <symbol minX="481" maxX="497" minY="345" maxY="361" name="subway-newyork-s"/>
-  <symbol minX="497" maxX="513" minY="345" maxY="361" name="lighthouse-s"/>
-  <symbol minX="513" maxX="535" minY="345" maxY="361" name="subway-kolkata-m"/>
-  <symbol minX="535" maxX="551" minY="345" maxY="361" name="monument-s"/>
-  <symbol minX="551" maxX="573" minY="345" maxY="361" name="subway-lucknow-m"/>
-  <symbol minX="573" maxX="595" minY="345" maxY="361" name="subway-madrid-m"/>
-  <symbol minX="595" maxX="611" minY="345" maxY="361" name="tourism-s"/>
-  <symbol minX="611" maxX="627" minY="345" maxY="361" name="place-of-worship-s"/>
-  <symbol minX="627" maxX="643" minY="345" maxY="361" name="shop-s"/>
-  <symbol minX="643" maxX="659" minY="345" maxY="361" name="ship-s"/>
-  <symbol minX="659" maxX="675" minY="345" maxY="361" name="stadium-s"/>
-  <symbol minX="675" maxX="688" minY="345" maxY="361" name="transit_train-m"/>
-  <symbol minX="688" maxX="701" minY="345" maxY="361" name="transit_light_rail-m"/>
-  <symbol minX="701" maxX="719" minY="345" maxY="361" name="transfer_arrow"/>
-  <symbol minX="719" maxX="735" minY="345" maxY="361" name="tram-s"/>
-  <symbol minX="735" maxX="751" minY="345" maxY="361" name="shinto-s"/>
-  <symbol minX="751" maxX="767" minY="345" maxY="361" name="train-s"/>
-  <symbol minX="767" maxX="789" minY="345" maxY="361" name="subway-barcelona-m"/>
-  <symbol minX="789" maxX="805" minY="345" maxY="361" name="remains-s"/>
-  <symbol minX="805" maxX="821" minY="345" maxY="361" name="toll_booth-s"/>
-  <symbol minX="821" maxX="843" minY="345" maxY="361" name="subway-bilbao-m"/>
-  <symbol minX="843" maxX="859" minY="345" maxY="361" name="theme_park-s"/>
-  <symbol minX="859" maxX="875" minY="345" maxY="361" name="geyser-s"/>
-  <symbol minX="875" maxX="891" minY="345" maxY="361" name="theatre-s"/>
-  <symbol minX="891" maxX="907" minY="345" maxY="361" name="taoist-s"/>
-  <symbol minX="907" maxX="923" minY="345" maxY="361" name="hindu-s"/>
-  <symbol minX="923" maxX="939" minY="345" maxY="361" name="park-s"/>
-  <symbol minX="939" maxX="959" minY="345" maxY="360" name="subway-madrid-s"/>
-  <symbol minX="959" maxX="977" minY="345" maxY="360" name="subway-lyon-s"/>
-  <symbol minX="977" maxX="996" minY="345" maxY="360" name="subway-kryvyirih-s"/>
-  <symbol minX="996" maxX="1008" minY="345" maxY="360" name="transit_train-s"/>
-  <symbol minX="0" maxX="21" minY="361" maxY="376" name="subway-kiev-m"/>
-  <symbol minX="21" maxX="43" minY="361" maxY="376" name="subway-kharkiv-s"/>
-  <symbol minX="43" maxX="58" minY="361" maxY="376" name="storage-tank"/>
-  <symbol minX="58" maxX="76" minY="361" maxY="376" name="subway-alicante-s"/>
-  <symbol minX="76" maxX="98" minY="361" maxY="376" name="subway-fukuoka-m"/>
-  <symbol minX="98" maxX="113" minY="361" maxY="376" name="board"/>
-  <symbol minX="113" maxX="133" minY="361" maxY="376" name="subway-barcelona-s"/>
-  <symbol minX="133" maxX="154" minY="361" maxY="376" name="subway-bucharest-s"/>
-  <symbol minX="154" maxX="176" minY="361" maxY="376" name="subway-brussel-s"/>
-  <symbol minX="176" maxX="191" minY="361" maxY="376" name="elevator"/>
-  <symbol minX="191" maxX="206" minY="361" maxY="376" name="subway-paris-s"/>
-  <symbol minX="206" maxX="228" minY="361" maxY="376" name="subway-sanfrancisco-m"/>
-  <symbol minX="228" maxX="249" minY="361" maxY="376" name="subway-novosibirsk-s"/>
-  <symbol minX="249" maxX="271" minY="361" maxY="376" name="subway-novosibirsk-m"/>
-  <symbol minX="271" maxX="293" minY="361" maxY="376" name="subway-sanfrancisco-s"/>
-  <symbol minX="293" maxX="308" minY="361" maxY="376" name="subway-moscow-s"/>
-  <symbol minX="308" maxX="323" minY="361" maxY="376" name="transit_subway-m"/>
-  <symbol minX="323" maxX="345" minY="361" maxY="376" name="subway-sendai-m"/>
-  <symbol minX="345" maxX="358" minY="361" maxY="376" name="transit_monorail-m"/>
-  <symbol minX="358" maxX="373" minY="361" maxY="376" name="lightrail-berlin-s"/>
-  <symbol minX="373" maxX="388" minY="361" maxY="376" name="map"/>
-  <symbol minX="388" maxX="410" minY="361" maxY="375" name="subway-sendai-s"/>
-  <symbol minX="410" maxX="425" minY="361" maxY="375" name="subway-seattle-s"/>
-  <symbol minX="425" maxX="447" minY="361" maxY="375" name="subway-taipei-s"/>
-  <symbol minX="447" maxX="469" minY="361" maxY="375" name="subway-edmonton-s"/>
-  <symbol minX="469" maxX="491" minY="361" maxY="375" name="subway-brussel-m"/>
-  <symbol minX="491" maxX="505" minY="361" maxY="375" name="subway-ubahn-s"/>
-  <symbol minX="505" maxX="524" minY="361" maxY="375" name="subway-bilbao-s"/>
-  <symbol minX="524" maxX="546" minY="361" maxY="375" name="subway-manila-m"/>
-  <symbol minX="546" maxX="560" minY="361" maxY="375" name="subway-rome-s"/>
-  <symbol minX="560" maxX="582" minY="361" maxY="375" name="subway-haagse-s"/>
-  <symbol minX="582" maxX="604" minY="361" maxY="375" name="subway-kharkiv-m"/>
-  <symbol minX="604" maxX="626" minY="361" maxY="375" name="subway-haagse-m"/>
-  <symbol minX="626" maxX="647" minY="361" maxY="375" name="subway-manila-s"/>
-  <symbol minX="647" maxX="661" minY="361" maxY="375" name="cave-s"/>
-  <symbol minX="661" maxX="678" minY="361" maxY="375" name="subway-london-s"/>
-  <symbol minX="678" maxX="691" minY="361" maxY="374" name="parking-s"/>
-  <symbol minX="691" maxX="700" minY="361" maxY="374" name="entrance-s"/>
-  <symbol minX="700" maxX="713" minY="361" maxY="374" name="gate-s"/>
-  <symbol minX="713" maxX="726" minY="361" maxY="374" name="subway-xs"/>
-  <symbol minX="726" maxX="738" minY="361" maxY="374" name="transit_light_rail-s"/>
-  <symbol minX="738" maxX="752" minY="361" maxY="374" name="main_entrance-s"/>
-  <symbol minX="752" maxX="767" minY="361" maxY="374" name="bench"/>
-  <symbol minX="767" maxX="780" minY="361" maxY="374" name="star-l"/>
-  <symbol minX="780" maxX="799" minY="361" maxY="374" name="railway-crossing-l"/>
-  <symbol minX="799" maxX="812" minY="361" maxY="374" name="transit_subway-s"/>
-  <symbol minX="812" maxX="825" minY="361" maxY="374" name="speedcam-s"/>
-  <symbol minX="825" maxX="838" minY="361" maxY="374" name="subway-newyork-xs"/>
-  <symbol minX="838" maxX="850" minY="361" maxY="374" name="transit_monorail-s"/>
-  <symbol minX="850" maxX="862" minY="361" maxY="373" name="star-m"/>
-  <symbol minX="862" maxX="879" minY="361" maxY="373" name="railway-crossing-m"/>
-  <symbol minX="879" maxX="892" minY="361" maxY="373" name="plaque"/>
-  <symbol minX="892" maxX="906" minY="361" maxY="373" name="volcano-m"/>
-  <symbol minX="906" maxX="927" minY="361" maxY="373" name="subway-baku-s"/>
-  <symbol minX="927" maxX="948" minY="361" maxY="373" name="subway-malaga-s"/>
-  <symbol minX="948" maxX="970" minY="361" maxY="373" name="subway-malaga-m"/>
-  <symbol minX="970" maxX="988" minY="361" maxY="373" name="subway-minsk-m"/>
-  <symbol minX="988" maxX="1005" minY="361" maxY="373" name="subway-kolkata-s"/>
-  <symbol minX="1005" maxX="1023" minY="361" maxY="373" name="subway-kiev-s"/>
-  <symbol minX="0" maxX="22" minY="376" maxY="388" name="subway-edmonton-m"/>
-  <symbol minX="22" maxX="44" minY="376" maxY="388" name="subway-taipei-m"/>
-  <symbol minX="44" maxX="66" minY="376" maxY="387" name="subway-chongqing-s"/>
-  <symbol minX="66" maxX="77" minY="376" maxY="387" name="star-s"/>
-  <symbol minX="77" maxX="94" minY="376" maxY="387" name="subway-minsk-s"/>
-  <symbol minX="94" maxX="116" minY="376" maxY="387" name="subway-baku-m"/>
-  <symbol minX="116" maxX="138" minY="376" maxY="386" name="subway-chongqing-m"/>
-  <symbol minX="138" maxX="158" minY="376" maxY="386" name="arrow-m"/>
-  <symbol minX="158" maxX="174" minY="376" maxY="386" name="mountain-pass"/>
-  <symbol minX="174" maxX="185" minY="376" maxY="386" name="volcano-s"/>
-  <symbol minX="185" maxX="196" minY="376" maxY="386" name="peakt-m"/>
-  <symbol minX="196" maxX="205" minY="376" maxY="385" name="peakt-s"/>
-  <symbol minX="205" maxX="214" minY="376" maxY="385" name="zero-icon"/>
-  <symbol minX="214" maxX="229" minY="376" maxY="384" name="arrow-s"/>
-  <symbol minX="229" maxX="237" minY="376" maxY="384" name="dot-m"/>
-  <symbol minX="237" maxX="248" minY="376" maxY="382" name="arrow-xs"/>
+  <symbol minX="330" maxX="352" minY="176" maxY="198" name="theatre-m"/>
+  <symbol minX="352" maxX="374" minY="176" maxY="198" name="subway-kunming-m"/>
+  <symbol minX="374" maxX="396" minY="176" maxY="198" name="subway-mashhad-m"/>
+  <symbol minX="396" maxX="418" minY="176" maxY="198" name="subway-marseille-s"/>
+  <symbol minX="418" maxX="440" minY="176" maxY="198" name="subway-m"/>
+  <symbol minX="440" maxX="462" minY="176" maxY="198" name="subway-lyon-m"/>
+  <symbol minX="462" maxX="484" minY="176" maxY="198" name="subway-losangeles-m"/>
+  <symbol minX="484" maxX="506" minY="176" maxY="198" name="subway-lisboa-m"/>
+  <symbol minX="506" maxX="528" minY="176" maxY="198" name="subway-lima-m"/>
+  <symbol minX="528" maxX="550" minY="176" maxY="198" name="subway-lille-m"/>
+  <symbol minX="550" maxX="572" minY="176" maxY="198" name="subway-lausanne-m"/>
+  <symbol minX="572" maxX="594" minY="176" maxY="198" name="subway-kyoto-m"/>
+  <symbol minX="594" maxX="616" minY="176" maxY="198" name="subway-massachusetts-m"/>
+  <symbol minX="616" maxX="638" minY="176" maxY="198" name="subway-kobe-m"/>
+  <symbol minX="638" maxX="660" minY="176" maxY="198" name="subway-kazan-m"/>
+  <symbol minX="660" maxX="678" minY="176" maxY="198" name="subway-istanbul-m"/>
+  <symbol minX="678" maxX="700" minY="176" maxY="198" name="subway-isfahan-m"/>
+  <symbol minX="700" maxX="722" minY="176" maxY="198" name="subway-hirosima-m"/>
+  <symbol minX="722" maxX="744" minY="176" maxY="198" name="subway-helsinki-m"/>
+  <symbol minX="744" maxX="766" minY="176" maxY="198" name="subway-guangzhou-m"/>
+  <symbol minX="766" maxX="788" minY="176" maxY="198" name="subway-guadalajara-m"/>
+  <symbol minX="788" maxX="810" minY="176" maxY="198" name="subway-glasgow-m"/>
+  <symbol minX="810" maxX="832" minY="176" maxY="198" name="subway-foshan-m"/>
+  <symbol minX="832" maxX="854" minY="176" maxY="198" name="subway-perugia-m"/>
+  <symbol minX="854" maxX="876" minY="176" maxY="198" name="subway-shiraz-m"/>
+  <symbol minX="876" maxX="898" minY="176" maxY="198" name="subway-saopaulo-m"/>
+  <symbol minX="898" maxX="920" minY="176" maxY="198" name="subway-santodomingo-m"/>
+  <symbol minX="920" maxX="942" minY="176" maxY="198" name="subway-samara-m"/>
+  <symbol minX="942" maxX="964" minY="176" maxY="198" name="subway-riodejaneiro-m"/>
+  <symbol minX="964" maxX="986" minY="176" maxY="198" name="subway-reseau-paris-m"/>
+  <symbol minX="986" maxX="1008" minY="176" maxY="198" name="subway-rennes-m"/>
+  <symbol minX="0" maxX="22" minY="198" maxY="220" name="subway-pyongyang-m"/>
+  <symbol minX="22" maxX="43" minY="198" maxY="220" name="subway-porto-m"/>
+  <symbol minX="43" maxX="65" minY="198" maxY="220" name="subway-pittsburgh-m"/>
+  <symbol minX="65" maxX="87" minY="198" maxY="220" name="subway-ekb-m"/>
+  <symbol minX="87" maxX="109" minY="198" maxY="220" name="subway-panama-m"/>
+  <symbol minX="109" maxX="131" minY="198" maxY="220" name="subway-oslo-m"/>
+  <symbol minX="131" maxX="152" minY="198" maxY="220" name="subway-nnov-m"/>
+  <symbol minX="152" maxX="174" minY="198" maxY="220" name="subway-newyork-m"/>
+  <symbol minX="174" maxX="196" minY="198" maxY="220" name="subway-nagoya-m"/>
+  <symbol minX="196" maxX="218" minY="198" maxY="220" name="subway-minatomirai-m"/>
+  <symbol minX="218" maxX="240" minY="198" maxY="220" name="subway-milan-m"/>
+  <symbol minX="240" maxX="261" minY="198" maxY="220" name="subway-mexico-m"/>
+  <symbol minX="261" maxX="283" minY="198" maxY="220" name="subway-medellin-m"/>
+  <symbol minX="283" maxX="305" minY="198" maxY="220" name="subway-mecca-m"/>
+  <symbol minX="305" maxX="327" minY="198" maxY="220" name="diving-m"/>
+  <symbol minX="327" maxX="349" minY="198" maxY="220" name="fire_station-m"/>
+  <symbol minX="349" maxX="371" minY="198" maxY="220" name="fastfood-m"/>
+  <symbol minX="371" maxX="393" minY="198" maxY="220" name="erotic-m"/>
+  <symbol minX="393" maxX="415" minY="198" maxY="220" name="equestrian-m"/>
+  <symbol minX="415" maxX="437" minY="198" maxY="220" name="emergency-phone-m"/>
+  <symbol minX="437" maxX="459" minY="198" maxY="220" name="embassy-m"/>
+  <symbol minX="459" maxX="481" minY="198" maxY="220" name="electronics-m"/>
+  <symbol minX="481" maxX="503" minY="198" maxY="220" name="electrician-m"/>
+  <symbol minX="503" maxX="525" minY="198" maxY="220" name="dump-station-m"/>
+  <symbol minX="525" maxX="547" minY="198" maxY="220" name="driving_school-m"/>
+  <symbol minX="547" maxX="569" minY="198" maxY="220" name="drinking-water-m"/>
+  <symbol minX="569" maxX="591" minY="198" maxY="220" name="doityourself-m"/>
+  <symbol minX="591" maxX="613" minY="198" maxY="220" name="dog_park-m"/>
+  <symbol minX="613" maxX="635" minY="198" maxY="220" name="firehydrant-m"/>
+  <symbol minX="635" maxX="657" minY="198" maxY="220" name="department_store-m"/>
+  <symbol minX="657" maxX="679" minY="198" maxY="220" name="dentist-m"/>
+  <symbol minX="679" maxX="701" minY="198" maxY="220" name="defibrillator-m"/>
+  <symbol minX="701" maxX="723" minY="198" maxY="220" name="curling-m"/>
+  <symbol minX="723" maxX="745" minY="198" maxY="220" name="cross-m"/>
+  <symbol minX="745" maxX="767" minY="198" maxY="220" name="cricket-m"/>
+  <symbol minX="767" maxX="789" minY="198" maxY="220" name="copyshop-m"/>
+  <symbol minX="789" maxX="811" minY="198" maxY="220" name="convenience-m"/>
+  <symbol minX="811" maxX="833" minY="198" maxY="220" name="computer-m"/>
+  <symbol minX="833" maxX="855" minY="198" maxY="220" name="college-m"/>
+  <symbol minX="855" maxX="877" minY="198" maxY="220" name="clothes-m"/>
+  <symbol minX="877" maxX="899" minY="198" maxY="220" name="climbing-m"/>
+  <symbol minX="899" maxX="921" minY="198" maxY="220" name="cinema-m"/>
+  <symbol minX="921" maxX="943" minY="198" maxY="220" name="geyser-l"/>
+  <symbol minX="943" maxX="965" minY="198" maxY="220" name="hindu-m"/>
+  <symbol minX="965" maxX="987" minY="198" maxY="220" name="heliport-m"/>
+  <symbol minX="987" maxX="1009" minY="198" maxY="220" name="helipad-m"/>
+  <symbol minX="0" maxX="22" minY="220" maxY="242" name="handball-m"/>
+  <symbol minX="22" maxX="44" minY="220" maxY="242" name="hand-m"/>
+  <symbol minX="44" maxX="66" minY="220" maxY="242" name="hairdresser-m"/>
+  <symbol minX="66" maxX="88" minY="220" maxY="242" name="gym-m"/>
+  <symbol minX="88" maxX="110" minY="220" maxY="242" name="guidepost"/>
+  <symbol minX="110" maxX="132" minY="220" maxY="242" name="grocery-m"/>
+  <symbol minX="132" maxX="154" minY="220" maxY="242" name="greengrocer-m"/>
+  <symbol minX="154" maxX="176" minY="220" maxY="242" name="golf-m"/>
+  <symbol minX="176" maxX="198" minY="220" maxY="242" name="gift-m"/>
+  <symbol minX="198" maxX="220" minY="220" maxY="242" name="geyser-m"/>
+  <symbol minX="220" maxX="242" minY="220" maxY="242" name="christian-m"/>
+  <symbol minX="242" maxX="264" minY="220" maxY="242" name="gate-m"/>
+  <symbol minX="264" maxX="286" minY="220" maxY="242" name="garden_center-m"/>
+  <symbol minX="286" maxX="308" minY="220" maxY="242" name="garden-outline-m"/>
+  <symbol minX="308" maxX="330" minY="220" maxY="242" name="garden-m"/>
+  <symbol minX="330" maxX="352" minY="220" maxY="242" name="gallery-m"/>
+  <symbol minX="352" maxX="374" minY="220" maxY="242" name="furniture-m"/>
+  <symbol minX="374" maxX="396" minY="220" maxY="242" name="funicular-m"/>
+  <symbol minX="396" maxX="418" minY="220" maxY="242" name="funeral_directors-m"/>
+  <symbol minX="418" maxX="440" minY="220" maxY="242" name="fuel-m"/>
+  <symbol minX="440" maxX="462" minY="220" maxY="242" name="fuel-dispenser-m"/>
+  <symbol minX="462" maxX="484" minY="220" maxY="242" name="fountain-s"/>
+  <symbol minX="484" maxX="506" minY="220" maxY="242" name="fountain-m"/>
+  <symbol minX="506" maxX="528" minY="220" maxY="242" name="florist-m"/>
+  <symbol minX="528" maxX="550" minY="220" maxY="242" name="bank-m"/>
+  <symbol minX="550" maxX="572" minY="220" maxY="242" name="bicycle-repair-station"/>
+  <symbol minX="572" maxX="594" minY="220" maxY="242" name="bicycle-m"/>
+  <symbol minX="594" maxX="616" minY="220" maxY="242" name="beer-m"/>
+  <symbol minX="616" maxX="638" minY="220" maxY="242" name="beekeeper-m"/>
+  <symbol minX="638" maxX="660" minY="220" maxY="242" name="beauty-m"/>
+  <symbol minX="660" maxX="682" minY="220" maxY="242" name="beach-m"/>
+  <symbol minX="682" maxX="704" minY="220" maxY="242" name="bcontrol-m"/>
+  <symbol minX="704" maxX="726" minY="220" maxY="242" name="bbq-m"/>
+  <symbol minX="726" maxX="748" minY="220" maxY="242" name="basketball-m"/>
+  <symbol minX="748" maxX="770" minY="220" maxY="242" name="baseball-m"/>
+  <symbol minX="770" maxX="792" minY="220" maxY="242" name="bar-m"/>
+  <symbol minX="792" maxX="814" minY="220" maxY="242" name="banknote-m"/>
+  <symbol minX="814" maxX="836" minY="220" maxY="242" name="banknote-l"/>
+  <symbol minX="836" maxX="858" minY="220" maxY="242" name="blacksmith-m"/>
+  <symbol minX="858" maxX="880" minY="220" maxY="242" name="bank-l"/>
+  <symbol minX="880" maxX="902" minY="220" maxY="242" name="bakery-m"/>
+  <symbol minX="902" maxX="924" minY="220" maxY="242" name="badminton-m"/>
+  <symbol minX="924" maxX="946" minY="220" maxY="242" name="australian-football-m"/>
+  <symbol minX="946" maxX="968" minY="220" maxY="242" name="audiologist-m"/>
+  <symbol minX="968" maxX="990" minY="220" maxY="242" name="atm-m"/>
+  <symbol minX="990" maxX="1012" minY="220" maxY="242" name="archery-m"/>
+  <symbol minX="0" maxX="22" minY="242" maxY="264" name="archaeological-site-m"/>
+  <symbol minX="22" maxX="44" minY="242" maxY="264" name="apartment-m"/>
+  <symbol minX="44" maxX="66" minY="242" maxY="264" name="america-football-m"/>
+  <symbol minX="66" maxX="88" minY="242" maxY="264" name="alternative-m"/>
+  <symbol minX="88" maxX="110" minY="242" maxY="264" name="alpine_hut-m"/>
+  <symbol minX="110" maxX="132" minY="242" maxY="264" name="alcohol-m"/>
+  <symbol minX="132" maxX="154" minY="242" maxY="264" name="car-repair-m"/>
+  <symbol minX="154" maxX="176" minY="242" maxY="264" name="chimney-m"/>
+  <symbol minX="176" maxX="198" minY="242" maxY="264" name="chess-m"/>
+  <symbol minX="198" maxX="220" minY="242" maxY="264" name="chemist-m"/>
+  <symbol minX="220" maxX="242" minY="242" maxY="264" name="charity_shop-m"/>
+  <symbol minX="242" maxX="264" minY="242" maxY="264" name="charging-station-m"/>
+  <symbol minX="264" maxX="286" minY="242" maxY="264" name="cemetery-m"/>
+  <symbol minX="286" maxX="308" minY="242" maxY="264" name="casino-m"/>
+  <symbol minX="308" maxX="330" minY="242" maxY="264" name="carpenter-m"/>
+  <symbol minX="330" maxX="352" minY="242" maxY="264" name="caravan_site-m"/>
+  <symbol minX="352" maxX="374" minY="242" maxY="264" name="caravan-shop-m"/>
+  <symbol minX="374" maxX="396" minY="242" maxY="264" name="car_shop-m"/>
+  <symbol minX="396" maxX="418" minY="242" maxY="264" name="car_sharing-m"/>
+  <symbol minX="418" maxX="440" minY="242" maxY="264" name="car-wash-m"/>
+  <symbol minX="440" maxX="462" minY="242" maxY="264" name="restaurant-m"/>
+  <symbol minX="462" maxX="484" minY="242" maxY="264" name="car-part-m"/>
+  <symbol minX="484" maxX="506" minY="242" maxY="264" name="campsite-m"/>
+  <symbol minX="506" maxX="528" minY="242" maxY="264" name="cafe-m"/>
+  <symbol minX="528" maxX="550" minY="242" maxY="264" name="cable-car-m"/>
+  <symbol minX="550" maxX="572" minY="242" maxY="264" name="butcher-m"/>
+  <symbol minX="572" maxX="594" minY="242" maxY="264" name="bus-m"/>
+  <symbol minX="594" maxX="616" minY="242" maxY="264" name="buddhist-m"/>
+  <symbol minX="616" maxX="638" minY="242" maxY="264" name="brewery-m"/>
+  <symbol minX="638" maxX="660" minY="242" maxY="264" name="bowling_alley-m"/>
+  <symbol minX="660" maxX="682" minY="242" maxY="264" name="bowling-m"/>
+  <symbol minX="682" maxX="704" minY="242" maxY="264" name="bookmaker-m"/>
+  <symbol minX="704" maxX="726" minY="242" maxY="264" name="book-shop-m"/>
+  <symbol minX="726" maxX="748" minY="242" maxY="264" name="blood_donation-m"/>
+  <symbol minX="748" maxX="770" minY="242" maxY="264" name="library-m"/>
+  <symbol minX="770" maxX="792" minY="242" maxY="264" name="media-m"/>
+  <symbol minX="792" maxX="814" minY="242" maxY="264" name="padel-m"/>
+  <symbol minX="814" maxX="836" minY="242" maxY="264" name="marketplace-m"/>
+  <symbol minX="836" maxX="858" minY="242" maxY="264" name="painter-m"/>
+  <symbol minX="858" maxX="880" minY="242" maxY="264" name="marina-m"/>
+  <symbol minX="880" maxX="902" minY="242" maxY="264" name="mail-m"/>
+  <symbol minX="902" maxX="924" minY="242" maxY="264" name="park-m"/>
+  <symbol minX="924" maxX="946" minY="242" maxY="264" name="park-outline-m"/>
+  <symbol minX="946" maxX="968" minY="242" maxY="264" name="lift_gate-m"/>
+  <symbol minX="968" maxX="990" minY="242" maxY="264" name="metal_construction-m"/>
+  <symbol minX="990" maxX="1012" minY="242" maxY="264" name="parking-meter-m"/>
+  <symbol minX="0" maxX="22" minY="264" maxY="286" name="lawyer-m"/>
+  <symbol minX="22" maxX="44" minY="264" maxY="286" name="laundry-m"/>
+  <symbol minX="44" maxX="66" minY="264" maxY="286" name="pelota-m"/>
+  <symbol minX="66" maxX="88" minY="264" maxY="286" name="language_school-m"/>
+  <symbol minX="88" maxX="110" minY="264" maxY="286" name="petshop-m"/>
+  <symbol minX="110" maxX="132" minY="264" maxY="286" name="pharmacy-m"/>
+  <symbol minX="132" maxX="154" minY="264" maxY="286" name="kiosk-m"/>
+  <symbol minX="154" maxX="176" minY="264" maxY="286" name="kindergarten-m"/>
+  <symbol minX="176" maxX="198" minY="264" maxY="286" name="optician-m"/>
+  <symbol minX="198" maxX="220" minY="264" maxY="286" name="nightclub-m"/>
+  <symbol minX="220" maxX="242" minY="264" maxY="286" name="npark-m"/>
+  <symbol minX="242" maxX="264" minY="264" maxY="286" name="newsagent_shop-m"/>
+  <symbol minX="264" maxX="286" minY="264" maxY="286" name="nparkf-m"/>
+  <symbol minX="286" maxX="308" minY="264" maxY="286" name="needle_and_thread-m"/>
+  <symbol minX="308" maxX="330" minY="264" maxY="286" name="nparkf-outline-m"/>
+  <symbol minX="330" maxX="352" minY="264" maxY="286" name="muslim-m"/>
+  <symbol minX="352" maxX="374" minY="264" maxY="286" name="office-m"/>
+  <symbol minX="374" maxX="396" minY="264" maxY="286" name="musical-instrument-m"/>
+  <symbol minX="396" maxX="418" minY="264" maxY="286" name="lighthouse-m"/>
+  <symbol minX="418" maxX="440" minY="264" maxY="286" name="music_school-m"/>
+  <symbol minX="440" maxX="462" minY="264" maxY="286" name="music-m"/>
+  <symbol minX="462" maxX="484" minY="264" maxY="286" name="museum-m"/>
+  <symbol minX="484" maxX="506" minY="264" maxY="286" name="optometrist-m"/>
+  <symbol minX="506" maxX="528" minY="264" maxY="286" name="motorcycle_shop-m"/>
+  <symbol minX="528" maxX="550" minY="264" maxY="286" name="outdoor-shop-m"/>
+  <symbol minX="550" maxX="572" minY="264" maxY="286" name="monument-m"/>
+  <symbol minX="572" maxX="594" minY="264" maxY="286" name="mobile_phone-m"/>
+  <symbol minX="594" maxX="616" minY="264" maxY="286" name="military-m"/>
+  <symbol minX="616" maxX="638" minY="264" maxY="286" name="plumber-m"/>
+  <symbol minX="638" maxX="660" minY="264" maxY="286" name="public-building-m"/>
+  <symbol minX="660" maxX="682" minY="264" maxY="286" name="hotel-m"/>
+  <symbol minX="682" maxX="704" minY="264" maxY="286" name="information-m"/>
+  <symbol minX="704" maxX="726" minY="264" maxY="286" name="home-m"/>
+  <symbol minX="726" maxX="748" minY="264" maxY="286" name="prison-m"/>
+  <symbol minX="748" maxX="770" minY="264" maxY="286" name="place-of-worship-m"/>
+  <symbol minX="770" maxX="792" minY="264" maxY="286" name="remains-m"/>
+  <symbol minX="792" maxX="814" minY="264" maxY="286" name="playground-m"/>
+  <symbol minX="814" maxX="836" minY="264" maxY="286" name="hospital-m"/>
+  <symbol minX="836" maxX="858" minY="264" maxY="286" name="pitch-m"/>
+  <symbol minX="858" maxX="880" minY="264" maxY="286" name="ice_cream-m"/>
+  <symbol minX="880" maxX="902" minY="264" maxY="286" name="recycling-m"/>
+  <symbol minX="902" maxX="924" minY="264" maxY="286" name="podiatrist-m"/>
+  <symbol minX="924" maxX="946" minY="264" maxY="286" name="hostel-m"/>
+  <symbol minX="946" maxX="968" minY="264" maxY="286" name="police-m"/>
+  <symbol minX="968" maxX="990" minY="264" maxY="286" name="power-m"/>
+  <symbol minX="990" maxX="1012" minY="264" maxY="286" name="postbox-m"/>
+  <symbol minX="0" maxX="22" minY="286" maxY="308" name="hunting-tower-m"/>
+  <symbol minX="22" maxX="44" minY="286" maxY="308" name="jewish-m"/>
+  <symbol minX="44" maxX="66" minY="286" maxY="308" name="historic-ship-m"/>
+  <symbol minX="66" maxX="88" minY="286" maxY="308" name="physiotherapist-m"/>
+  <symbol minX="88" maxX="110" minY="286" maxY="308" name="sample_collection-m"/>
+  <symbol minX="110" maxX="132" minY="286" maxY="308" name="picnic-m"/>
+  <symbol minX="132" maxX="154" minY="286" maxY="308" name="picnic_table-m"/>
+  <symbol minX="154" maxX="176" minY="286" maxY="308" name="psychotherapist-m"/>
+  <symbol minX="176" maxX="198" minY="286" maxY="308" name="internet_cafe-m"/>
+  <symbol minX="198" maxX="220" minY="286" maxY="308" name="photo-shop-m"/>
+  <symbol minX="220" maxX="242" minY="286" maxY="308" name="jewelry-m"/>
+  <symbol minX="242" maxX="264" minY="286" maxY="308" name="phone-m"/>
+  <symbol minX="264" maxX="286" minY="286" maxY="308" name="hockey-m"/>
+  <symbol minX="286" maxX="306" minY="286" maxY="307" name="subway-warsaw-m"/>
+  <symbol minX="306" maxX="327" minY="286" maxY="307" name="subway-algeria-s"/>
+  <symbol minX="327" maxX="349" minY="286" maxY="307" name="subway-maracaibo-m"/>
+  <symbol minX="349" maxX="370" minY="286" maxY="307" name="subway-ekb-s"/>
+  <symbol minX="370" maxX="392" minY="286" maxY="307" name="subway-shanghai-m"/>
+  <symbol minX="392" maxX="414" minY="286" maxY="307" name="subway-marseille-m"/>
+  <symbol minX="414" maxX="436" minY="286" maxY="307" name="subway-dalian-m"/>
+  <symbol minX="436" maxX="457" minY="286" maxY="307" name="subway-entrance-m"/>
+  <symbol minX="457" maxX="478" minY="286" maxY="307" name="subway-montreal-m"/>
+  <symbol minX="478" maxX="500" minY="286" maxY="307" name="subway-izmir-m"/>
+  <symbol minX="500" maxX="521" minY="286" maxY="307" name="subway-stlouis-s"/>
+  <symbol minX="521" maxX="542" minY="286" maxY="307" name="subway-spb-m"/>
+  <symbol minX="542" maxX="563" minY="286" maxY="307" name="subway-southkorea-s"/>
+  <symbol minX="563" maxX="585" minY="286" maxY="307" name="subway-sapporo-m"/>
+  <symbol minX="585" maxX="605" minY="286" maxY="306" name="search-result"/>
+  <symbol minX="605" maxX="625" minY="286" maxY="306" name="subway-pittsburgh-s"/>
+  <symbol minX="625" maxX="645" minY="286" maxY="306" name="lightrail-berlin-m"/>
+  <symbol minX="645" maxX="663" minY="286" maxY="306" name="subway-istanbul-s"/>
+  <symbol minX="663" maxX="698" minY="286" maxY="305" name="coloredmark-default-s"/>
+  <symbol minX="698" maxX="720" minY="286" maxY="305" name="subway-taoyuan-m"/>
+  <symbol minX="720" maxX="742" minY="286" maxY="305" name="subway-tbilisi-m"/>
+  <symbol minX="742" maxX="764" minY="286" maxY="305" name="subway-rotterdam-m"/>
+  <symbol minX="764" maxX="784" minY="286" maxY="305" name="subway-izmir-s"/>
+  <symbol minX="784" maxX="803" minY="286" maxY="305" name="subway-sapporo-s"/>
+  <symbol minX="803" maxX="822" minY="286" maxY="305" name="subway-isfahan-s"/>
+  <symbol minX="822" maxX="841" minY="286" maxY="305" name="speedcam-m"/>
+  <symbol minX="841" maxX="860" minY="286" maxY="305" name="motorcycle-parking-m"/>
+  <symbol minX="860" maxX="879" minY="286" maxY="305" name="parking_pay-m"/>
+  <symbol minX="879" maxX="897" minY="286" maxY="305" name="subway-mashhad-s"/>
+  <symbol minX="897" maxX="916" minY="286" maxY="305" name="parking_entrance-m"/>
+  <symbol minX="916" maxX="935" minY="286" maxY="305" name="bicycle-rental"/>
+  <symbol minX="935" maxX="954" minY="286" maxY="305" name="subway-medellin-s"/>
+  <symbol minX="954" maxX="973" minY="286" maxY="305" name="non-found-search-result"/>
+  <symbol minX="973" maxX="992" minY="286" maxY="305" name="parking-m"/>
+  <symbol minX="992" maxX="1011" minY="286" maxY="305" name="bike-parking-m"/>
+  <symbol minX="0" maxX="19" minY="308" maxY="327" name="parking-disabled-m"/>
+  <symbol minX="19" maxX="38" minY="308" maxY="327" name="subway-cairo-s"/>
+  <symbol minX="38" maxX="56" minY="308" maxY="327" name="subway-brescia-s"/>
+  <symbol minX="56" maxX="91" minY="308" maxY="327" name="coloredmark-bg-s"/>
+  <symbol minX="91" maxX="110" minY="308" maxY="327" name="subway-panama-s"/>
+  <symbol minX="110" maxX="131" minY="308" maxY="326" name="subway-yerevan-s"/>
+  <symbol minX="131" maxX="149" minY="308" maxY="326" name="subway-shiraz-s"/>
+  <symbol minX="149" maxX="167" minY="308" maxY="326" name="subway-tokyo-s"/>
+  <symbol minX="167" maxX="189" minY="308" maxY="326" name="subway-almaty-m"/>
+  <symbol minX="189" maxX="207" minY="308" maxY="326" name="subway-sofia-s"/>
+  <symbol minX="207" maxX="225" minY="308" maxY="326" name="subway-tianjin-s"/>
+  <symbol minX="225" maxX="243" minY="308" maxY="326" name="subway-tyneandwear-s"/>
+  <symbol minX="243" maxX="261" minY="308" maxY="326" name="subway-ubahn-m"/>
+  <symbol minX="261" maxX="279" minY="308" maxY="326" name="subway-yokohama-s"/>
+  <symbol minX="279" maxX="299" minY="308" maxY="326" name="subway-taoyuan-s"/>
+  <symbol minX="299" maxX="317" minY="308" maxY="326" name="subway-athens-s"/>
+  <symbol minX="317" maxX="335" minY="308" maxY="326" name="subway-valencia-s"/>
+  <symbol minX="335" maxX="353" minY="308" maxY="326" name="subway-hirosima-s"/>
+  <symbol minX="353" maxX="371" minY="308" maxY="326" name="subway-wuhan-s"/>
+  <symbol minX="371" maxX="389" minY="308" maxY="326" name="subway-stockholm-s"/>
+  <symbol minX="389" maxX="407" minY="308" maxY="326" name="subway-washington-s"/>
+  <symbol minX="407" maxX="425" minY="308" maxY="326" name="subway-warszawa-s"/>
+  <symbol minX="425" maxX="443" minY="308" maxY="326" name="subway-tashkent-s"/>
+  <symbol minX="443" maxX="459" minY="308" maxY="326" name="subway-warsaw-s"/>
+  <symbol minX="459" maxX="477" minY="308" maxY="326" name="subway-volgograd-s"/>
+  <symbol minX="477" maxX="495" minY="308" maxY="326" name="subway-vienna-s"/>
+  <symbol minX="495" maxX="513" minY="308" maxY="326" name="subway-changchun-s"/>
+  <symbol minX="513" maxX="531" minY="308" maxY="326" name="subway-delhi-s"/>
+  <symbol minX="531" maxX="549" minY="308" maxY="326" name="subway-dalian-s"/>
+  <symbol minX="549" maxX="567" minY="308" maxY="326" name="subway-massachusetts-s"/>
+  <symbol minX="567" maxX="585" minY="308" maxY="326" name="subway-mecca-s"/>
+  <symbol minX="585" maxX="603" minY="308" maxY="326" name="subway-chicago-s"/>
+  <symbol minX="603" maxX="621" minY="308" maxY="326" name="subway-chengdu-s"/>
+  <symbol minX="621" maxX="639" minY="308" maxY="326" name="subway-milan-s"/>
+  <symbol minX="639" maxX="657" minY="308" maxY="326" name="subway-minatomirai-s"/>
+  <symbol minX="657" maxX="679" minY="308" maxY="326" name="subway-dnepro-m"/>
+  <symbol minX="679" maxX="697" minY="308" maxY="326" name="subway-montreal-s"/>
+  <symbol minX="697" maxX="718" minY="308" maxY="326" name="subway-moscow-m"/>
+  <symbol minX="718" maxX="736" minY="308" maxY="326" name="subway-catania-s"/>
+  <symbol minX="736" maxX="754" minY="308" maxY="326" name="subway-nagoya-s"/>
+  <symbol minX="754" maxX="772" minY="308" maxY="326" name="subway-caracas-s"/>
+  <symbol minX="772" maxX="790" minY="308" maxY="326" name="subway-nnov-s"/>
+  <symbol minX="790" maxX="808" minY="308" maxY="326" name="subway-bursaray-s"/>
+  <symbol minX="808" maxX="826" minY="308" maxY="326" name="subway-kyoto-s"/>
+  <symbol minX="826" maxX="844" minY="308" maxY="326" name="subway-helsinki-s"/>
+  <symbol minX="844" maxX="862" minY="308" maxY="326" name="subway-kazan-s"/>
+  <symbol minX="862" maxX="880" minY="308" maxY="326" name="subway-guangzhou-s"/>
+  <symbol minX="880" maxX="898" minY="308" maxY="326" name="subway-guadalajara-s"/>
+  <symbol minX="898" maxX="916" minY="308" maxY="326" name="subway-kobe-s"/>
+  <symbol minX="916" maxX="934" minY="308" maxY="326" name="subway-glasgow-s"/>
+  <symbol minX="934" maxX="952" minY="308" maxY="326" name="subway-kunming-s"/>
+  <symbol minX="952" maxX="973" minY="308" maxY="326" name="subway-fukuoka-s"/>
+  <symbol minX="973" maxX="991" minY="308" maxY="326" name="subway-bangkok-s"/>
+  <symbol minX="991" maxX="1009" minY="308" maxY="326" name="subway-foshan-s"/>
+  <symbol minX="0" maxX="18" minY="327" maxY="345" name="subway-lille-s"/>
+  <symbol minX="18" maxX="36" minY="327" maxY="345" name="subway-lima-s"/>
+  <symbol minX="36" maxX="54" minY="327" maxY="345" name="subway-lisboa-s"/>
+  <symbol minX="54" maxX="72" minY="327" maxY="345" name="subway-losangeles-s"/>
+  <symbol minX="72" maxX="90" minY="327" maxY="345" name="subway-lyon-s"/>
+  <symbol minX="90" maxX="108" minY="327" maxY="345" name="subway-dubai-s"/>
+  <symbol minX="108" maxX="130" minY="327" maxY="345" name="subway-omsk-s"/>
+  <symbol minX="130" maxX="148" minY="327" maxY="345" name="subway-beijing-s"/>
+  <symbol minX="148" maxX="166" minY="327" maxY="345" name="subway-samara-s"/>
+  <symbol minX="166" maxX="184" minY="327" maxY="345" name="subway-bengaluru-s"/>
+  <symbol minX="184" maxX="198" minY="327" maxY="345" name="bookmark-default-xs"/>
+  <symbol minX="198" maxX="216" minY="327" maxY="345" name="subway-rome-m"/>
+  <symbol minX="216" maxX="237" minY="327" maxY="345" name="subway-santiago-s"/>
+  <symbol minX="237" maxX="255" minY="327" maxY="345" name="subway-riodejaneiro-s"/>
+  <symbol minX="255" maxX="273" minY="327" maxY="345" name="subway-reseau-paris-s"/>
+  <symbol minX="273" maxX="291" minY="327" maxY="345" name="subway-rennes-s"/>
+  <symbol minX="291" maxX="309" minY="327" maxY="345" name="subway-pyongyang-s"/>
+  <symbol minX="309" maxX="327" minY="327" maxY="345" name="subway-brasilia-s"/>
+  <symbol minX="327" maxX="345" minY="327" maxY="345" name="subway-santodomingo-s"/>
+  <symbol minX="345" maxX="363" minY="327" maxY="345" name="subway-shanghai-s"/>
+  <symbol minX="363" maxX="381" minY="327" maxY="345" name="subway-buenosaires-s"/>
+  <symbol minX="381" maxX="399" minY="327" maxY="345" name="subway-oslo-s"/>
+  <symbol minX="399" maxX="417" minY="327" maxY="345" name="subway-budapest-s"/>
+  <symbol minX="417" maxX="431" minY="327" maxY="345" name="bookmark-bg-xs"/>
+  <symbol minX="431" maxX="451" minY="327" maxY="345" name="subway-seattle-m"/>
+  <symbol minX="451" maxX="469" minY="327" maxY="345" name="subway-paris-m"/>
+  <symbol minX="469" maxX="487" minY="327" maxY="345" name="subway-perugia-s"/>
+  <symbol minX="487" maxX="505" minY="327" maxY="345" name="subway-saopaulo-s"/>
+  <symbol minX="505" maxX="523" minY="327" maxY="345" name="subway-porto-s"/>
+  <symbol minX="523" maxX="540" minY="327" maxY="344" name="cave-m"/>
+  <symbol minX="540" maxX="557" minY="327" maxY="344" name="subway-spb-s"/>
+  <symbol minX="557" maxX="579" minY="327" maxY="344" name="subway-santiago-m"/>
+  <symbol minX="579" maxX="601" minY="327" maxY="344" name="subway-kryvyirih-m"/>
+  <symbol minX="601" maxX="618" minY="327" maxY="344" name="subway-lausanne-s"/>
+  <symbol minX="618" maxX="640" minY="327" maxY="344" name="subway-omsk-m"/>
+  <symbol minX="640" maxX="662" minY="327" maxY="344" name="subway-tabriz-m"/>
+  <symbol minX="662" maxX="683" minY="327" maxY="344" name="subway-tabriz-s"/>
+  <symbol minX="683" maxX="704" minY="327" maxY="344" name="subway-london-m"/>
+  <symbol minX="704" maxX="726" minY="327" maxY="344" name="subway-lucknow-s"/>
+  <symbol minX="726" maxX="742" minY="327" maxY="344" name="subway-amsterdam-s"/>
+  <symbol minX="742" maxX="760" minY="327" maxY="344" name="subway-maracaibo-s"/>
+  <symbol minX="760" maxX="782" minY="327" maxY="344" name="subway-osaka-m"/>
+  <symbol minX="782" maxX="803" minY="327" maxY="344" name="subway-almaty-s"/>
+  <symbol minX="803" maxX="819" minY="327" maxY="344" name="subway-mexico-s"/>
+  <symbol minX="819" maxX="841" minY="327" maxY="344" name="subway-philadelphia-m"/>
+  <symbol minX="841" maxX="863" minY="327" maxY="344" name="subway-alicante-m"/>
+  <symbol minX="863" maxX="885" minY="327" maxY="344" name="subway-yerevan-m"/>
+  <symbol minX="885" maxX="901" minY="327" maxY="343" name="airport-s"/>
+  <symbol minX="901" maxX="917" minY="327" maxY="343" name="zoo-s"/>
+  <symbol minX="917" maxX="933" minY="327" maxY="343" name="viewpoint-s"/>
+  <symbol minX="933" maxX="949" minY="327" maxY="343" name="waste-basket-s"/>
+  <symbol minX="949" maxX="965" minY="327" maxY="343" name="waterfall-s"/>
+  <symbol minX="965" maxX="981" minY="327" maxY="343" name="place-of-worship-s"/>
+  <symbol minX="981" maxX="997" minY="327" maxY="343" name="subway-s"/>
+  <symbol minX="997" maxX="1015" minY="327" maxY="343" name="subway-rotterdam-s"/>
+  <symbol minX="0" maxX="21" minY="345" maxY="361" name="subway-palma-s"/>
+  <symbol minX="21" maxX="43" minY="345" maxY="361" name="subway-palma-m"/>
+  <symbol minX="43" maxX="62" minY="345" maxY="361" name="subway-osaka-s"/>
+  <symbol minX="62" maxX="78" minY="345" maxY="361" name="monument-s"/>
+  <symbol minX="78" maxX="94" minY="345" maxY="361" name="museum-s"/>
+  <symbol minX="94" maxX="110" minY="345" maxY="361" name="muslim-s"/>
+  <symbol minX="110" maxX="126" minY="345" maxY="361" name="subway-newyork-s"/>
+  <symbol minX="126" maxX="142" minY="345" maxY="361" name="nparkf-outline-s"/>
+  <symbol minX="142" maxX="158" minY="345" maxY="361" name="nparkf-s"/>
+  <symbol minX="158" maxX="174" minY="345" maxY="361" name="park-outline-s"/>
+  <symbol minX="174" maxX="190" minY="345" maxY="361" name="park-s"/>
+  <symbol minX="190" maxX="210" minY="345" maxY="361" name="subway-philadelphia-s"/>
+  <symbol minX="210" maxX="226" minY="345" maxY="361" name="remains-s"/>
+  <symbol minX="226" maxX="242" minY="345" maxY="361" name="shinto-s"/>
+  <symbol minX="242" maxX="258" minY="345" maxY="361" name="ship-s"/>
+  <symbol minX="258" maxX="280" minY="345" maxY="361" name="subway-madrid-m"/>
+  <symbol minX="280" maxX="302" minY="345" maxY="361" name="subway-lucknow-m"/>
+  <symbol minX="302" maxX="318" minY="345" maxY="361" name="shop-s"/>
+  <symbol minX="318" maxX="334" minY="345" maxY="361" name="stadium-s"/>
+  <symbol minX="334" maxX="356" minY="345" maxY="361" name="subway-kolkata-m"/>
+  <symbol minX="356" maxX="378" minY="345" maxY="361" name="subway-barcelona-m"/>
+  <symbol minX="378" maxX="400" minY="345" maxY="361" name="subway-bilbao-m"/>
+  <symbol minX="400" maxX="422" minY="345" maxY="361" name="subway-bucharest-m"/>
+  <symbol minX="422" maxX="438" minY="345" maxY="361" name="subway-entrance-s"/>
+  <symbol minX="438" maxX="459" minY="345" maxY="361" name="subway-dnepro-s"/>
+  <symbol minX="459" maxX="475" minY="345" maxY="361" name="tourism-s"/>
+  <symbol minX="475" maxX="488" minY="345" maxY="361" name="transit_train-m"/>
+  <symbol minX="488" maxX="504" minY="345" maxY="361" name="buddhist-s"/>
+  <symbol minX="504" maxX="520" minY="345" maxY="361" name="bus-s"/>
+  <symbol minX="520" maxX="536" minY="345" maxY="361" name="cable-car-s"/>
+  <symbol minX="536" maxX="552" minY="345" maxY="361" name="car-repair-s"/>
+  <symbol minX="552" maxX="565" minY="345" maxY="361" name="transit_light_rail-m"/>
+  <symbol minX="565" maxX="581" minY="345" maxY="361" name="charging-station-s"/>
+  <symbol minX="581" maxX="597" minY="345" maxY="361" name="christian-s"/>
+  <symbol minX="597" maxX="615" minY="345" maxY="361" name="transfer_arrow"/>
+  <symbol minX="615" maxX="631" minY="345" maxY="361" name="tram-s"/>
+  <symbol minX="631" maxX="647" minY="345" maxY="361" name="train-s"/>
+  <symbol minX="647" maxX="663" minY="345" maxY="361" name="lighthouse-s"/>
+  <symbol minX="663" maxX="679" minY="345" maxY="361" name="toll_booth-s"/>
+  <symbol minX="679" maxX="695" minY="345" maxY="361" name="theme_park-s"/>
+  <symbol minX="695" maxX="711" minY="345" maxY="361" name="taoist-s"/>
+  <symbol minX="711" maxX="727" minY="345" maxY="361" name="jewish-s"/>
+  <symbol minX="727" maxX="743" minY="345" maxY="361" name="hotel-s"/>
+  <symbol minX="743" maxX="759" minY="345" maxY="361" name="hospital-s"/>
+  <symbol minX="759" maxX="775" minY="345" maxY="361" name="hindu-s"/>
+  <symbol minX="775" maxX="791" minY="345" maxY="361" name="geyser-s"/>
+  <symbol minX="791" maxX="807" minY="345" maxY="361" name="fuel-s"/>
+  <symbol minX="807" maxX="825" minY="345" maxY="361" name="subway-tbilisi-s"/>
+  <symbol minX="825" maxX="841" minY="345" maxY="361" name="drinking-water-s"/>
+  <symbol minX="841" maxX="857" minY="345" maxY="361" name="college-s"/>
+  <symbol minX="857" maxX="873" minY="345" maxY="361" name="theatre-s"/>
+  <symbol minX="873" maxX="888" minY="345" maxY="360" name="elevator"/>
+  <symbol minX="888" maxX="903" minY="345" maxY="360" name="storage-tank"/>
+  <symbol minX="903" maxX="918" minY="345" maxY="360" name="map"/>
+  <symbol minX="918" maxX="936" minY="345" maxY="360" name="subway-alicante-s"/>
+  <symbol minX="936" maxX="948" minY="345" maxY="360" name="transit_train-s"/>
+  <symbol minX="948" maxX="968" minY="345" maxY="360" name="subway-barcelona-s"/>
+  <symbol minX="968" maxX="983" minY="345" maxY="360" name="lightrail-berlin-s"/>
+  <symbol minX="983" maxX="1005" minY="345" maxY="360" name="subway-brussel-s"/>
+  <symbol minX="0" maxX="21" minY="361" maxY="376" name="subway-bucharest-s"/>
+  <symbol minX="21" maxX="36" minY="361" maxY="376" name="board"/>
+  <symbol minX="36" maxX="56" minY="361" maxY="376" name="subway-madrid-s"/>
+  <symbol minX="56" maxX="78" minY="361" maxY="376" name="subway-sanfrancisco-m"/>
+  <symbol minX="78" maxX="93" minY="361" maxY="376" name="subway-paris-s"/>
+  <symbol minX="93" maxX="114" minY="361" maxY="376" name="subway-novosibirsk-s"/>
+  <symbol minX="114" maxX="136" minY="361" maxY="376" name="subway-sanfrancisco-s"/>
+  <symbol minX="136" maxX="158" minY="361" maxY="376" name="subway-novosibirsk-m"/>
+  <symbol minX="158" maxX="173" minY="361" maxY="376" name="subway-moscow-s"/>
+  <symbol minX="173" maxX="195" minY="361" maxY="376" name="subway-sendai-m"/>
+  <symbol minX="195" maxX="214" minY="361" maxY="376" name="subway-kryvyirih-s"/>
+  <symbol minX="214" maxX="227" minY="361" maxY="376" name="transit_monorail-m"/>
+  <symbol minX="227" maxX="242" minY="361" maxY="376" name="transit_subway-m"/>
+  <symbol minX="242" maxX="264" minY="361" maxY="376" name="subway-kharkiv-s"/>
+  <symbol minX="264" maxX="285" minY="361" maxY="376" name="subway-kiev-m"/>
+  <symbol minX="285" maxX="307" minY="361" maxY="376" name="subway-fukuoka-m"/>
+  <symbol minX="307" maxX="329" minY="361" maxY="375" name="subway-edmonton-s"/>
+  <symbol minX="329" maxX="343" minY="361" maxY="375" name="subway-rome-s"/>
+  <symbol minX="343" maxX="365" minY="361" maxY="375" name="subway-haagse-m"/>
+  <symbol minX="365" maxX="387" minY="361" maxY="375" name="subway-haagse-s"/>
+  <symbol minX="387" maxX="402" minY="361" maxY="375" name="subway-seattle-s"/>
+  <symbol minX="402" maxX="424" minY="361" maxY="375" name="subway-brussel-m"/>
+  <symbol minX="424" maxX="445" minY="361" maxY="375" name="subway-manila-s"/>
+  <symbol minX="445" maxX="467" minY="361" maxY="375" name="subway-sendai-s"/>
+  <symbol minX="467" maxX="489" minY="361" maxY="375" name="subway-manila-m"/>
+  <symbol minX="489" maxX="511" minY="361" maxY="375" name="subway-taipei-s"/>
+  <symbol minX="511" maxX="533" minY="361" maxY="375" name="subway-kharkiv-m"/>
+  <symbol minX="533" maxX="550" minY="361" maxY="375" name="subway-london-s"/>
+  <symbol minX="550" maxX="564" minY="361" maxY="375" name="cave-s"/>
+  <symbol minX="564" maxX="583" minY="361" maxY="375" name="subway-bilbao-s"/>
+  <symbol minX="583" maxX="597" minY="361" maxY="375" name="subway-ubahn-s"/>
+  <symbol minX="597" maxX="610" minY="361" maxY="374" name="star-l"/>
+  <symbol minX="610" maxX="622" minY="361" maxY="374" name="transit_monorail-s"/>
+  <symbol minX="622" maxX="636" minY="361" maxY="374" name="main_entrance-s"/>
+  <symbol minX="636" maxX="651" minY="361" maxY="374" name="bench"/>
+  <symbol minX="651" maxX="664" minY="361" maxY="374" name="transit_subway-s"/>
+  <symbol minX="664" maxX="676" minY="361" maxY="374" name="transit_light_rail-s"/>
+  <symbol minX="676" maxX="689" minY="361" maxY="374" name="subway-newyork-xs"/>
+  <symbol minX="689" maxX="702" minY="361" maxY="374" name="speedcam-s"/>
+  <symbol minX="702" maxX="715" minY="361" maxY="374" name="parking-s"/>
+  <symbol minX="715" maxX="728" minY="361" maxY="374" name="subway-xs"/>
+  <symbol minX="728" maxX="747" minY="361" maxY="374" name="railway-crossing-l"/>
+  <symbol minX="747" maxX="756" minY="361" maxY="374" name="entrance-s"/>
+  <symbol minX="756" maxX="770" minY="361" maxY="373" name="volcano-m"/>
+  <symbol minX="770" maxX="792" minY="361" maxY="373" name="subway-taipei-m"/>
+  <symbol minX="792" maxX="810" minY="361" maxY="373" name="subway-minsk-m"/>
+  <symbol minX="810" maxX="832" minY="361" maxY="373" name="subway-edmonton-m"/>
+  <symbol minX="832" maxX="845" minY="361" maxY="373" name="plaque"/>
+  <symbol minX="845" maxX="862" minY="361" maxY="373" name="railway-crossing-m"/>
+  <symbol minX="862" maxX="883" minY="361" maxY="373" name="subway-malaga-s"/>
+  <symbol minX="883" maxX="905" minY="361" maxY="373" name="subway-malaga-m"/>
+  <symbol minX="905" maxX="926" minY="361" maxY="373" name="subway-baku-s"/>
+  <symbol minX="926" maxX="938" minY="361" maxY="373" name="star-m"/>
+  <symbol minX="938" maxX="955" minY="361" maxY="373" name="subway-kolkata-s"/>
+  <symbol minX="955" maxX="973" minY="361" maxY="373" name="subway-kiev-s"/>
+  <symbol minX="973" maxX="990" minY="361" maxY="372" name="subway-minsk-s"/>
+  <symbol minX="990" maxX="1012" minY="361" maxY="372" name="subway-chongqing-s"/>
+  <symbol minX="0" maxX="22" minY="376" maxY="387" name="subway-baku-m"/>
+  <symbol minX="22" maxX="33" minY="376" maxY="387" name="star-s"/>
+  <symbol minX="33" maxX="53" minY="376" maxY="386" name="arrow-m"/>
+  <symbol minX="53" maxX="69" minY="376" maxY="386" name="mountain-pass"/>
+  <symbol minX="69" maxX="91" minY="376" maxY="386" name="subway-chongqing-m"/>
+  <symbol minX="91" maxX="102" minY="376" maxY="386" name="volcano-s"/>
+  <symbol minX="102" maxX="113" minY="376" maxY="386" name="peakt-m"/>
+  <symbol minX="113" maxX="122" minY="376" maxY="385" name="zero-icon"/>
+  <symbol minX="122" maxX="131" minY="376" maxY="385" name="peakt-s"/>
+  <symbol minX="131" maxX="139" minY="376" maxY="384" name="dot-m"/>
+  <symbol minX="139" maxX="154" minY="376" maxY="384" name="arrow-s"/>
+  <symbol minX="154" maxX="165" minY="376" maxY="382" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 1d79dea0d1..c56907ae27 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index f2b3965599..372d99498e 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -3,699 +3,694 @@
  <file width="1024" height="512">
   <symbol minX="0" maxX="78" minY="0" maxY="48" name="route-arrow"/>
   <symbol minX="78" maxX="122" minY="0" maxY="44" name="compass-image"/>
-  <symbol minX="122" maxX="158" minY="0" maxY="42" name="shield-us-i-thin-scaled"/>
-  <symbol minX="158" maxX="202" minY="0" maxY="42" name="route-point-finish"/>
-  <symbol minX="202" maxX="244" minY="0" maxY="42" name="cross_geoposition"/>
-  <symbol minX="244" maxX="286" minY="0" maxY="42" name="shield-us-i-wide-scaled"/>
-  <symbol minX="286" maxX="326" minY="0" maxY="40" name="search-result-shop-supermarket"/>
-  <symbol minX="326" maxX="366" minY="0" maxY="40" name="search-result-shop-butcher"/>
-  <symbol minX="366" maxX="406" minY="0" maxY="40" name="search-result-shop-confectionery"/>
-  <symbol minX="406" maxX="446" minY="0" maxY="40" name="search-result-shop-convenience"/>
-  <symbol minX="446" maxX="486" minY="0" maxY="40" name="search-result-shop-cosmetics"/>
-  <symbol minX="486" maxX="526" minY="0" maxY="40" name="search-result-shop-sports"/>
-  <symbol minX="526" maxX="566" minY="0" maxY="40" name="search-result-shop-shoes"/>
-  <symbol minX="566" maxX="606" minY="0" maxY="40" name="search-result-shop-department_store"/>
-  <symbol minX="606" maxX="646" minY="0" maxY="40" name="search-result-shop-seafood"/>
-  <symbol minX="646" maxX="686" minY="0" maxY="40" name="search-result-shop-gift"/>
-  <symbol minX="686" maxX="726" minY="0" maxY="40" name="search-result-shop-mall"/>
-  <symbol minX="726" maxX="768" minY="0" maxY="40" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="768" maxX="808" minY="0" maxY="40" name="search-result-shop-jewelry"/>
-  <symbol minX="808" maxX="848" minY="0" maxY="40" name="search-result-shop-greengrocer"/>
-  <symbol minX="848" maxX="888" minY="0" maxY="40" name="search-result-theme-park"/>
-  <symbol minX="888" maxX="928" minY="0" maxY="40" name="search-result-water-park"/>
-  <symbol minX="928" maxX="968" minY="0" maxY="40" name="search-result-bakery"/>
-  <symbol minX="968" maxX="1008" minY="0" maxY="40" name="search-result-bar"/>
-  <symbol minX="0" maxX="40" minY="48" maxY="88" name="search-result-cafe"/>
-  <symbol minX="40" maxX="80" minY="48" maxY="88" name="search-result-casino"/>
-  <symbol minX="80" maxX="120" minY="48" maxY="88" name="search-result-cinema"/>
-  <symbol minX="120" maxX="160" minY="48" maxY="88" name="search-result-fastfood"/>
-  <symbol minX="160" maxX="200" minY="48" maxY="88" name="search-result-marketplace"/>
-  <symbol minX="200" maxX="240" minY="48" maxY="88" name="search-result-nightclub"/>
-  <symbol minX="240" maxX="280" minY="48" maxY="88" name="search-result-shop-clothes"/>
-  <symbol minX="280" maxX="320" minY="48" maxY="88" name="search-result-playground"/>
-  <symbol minX="320" maxX="360" minY="48" maxY="88" name="search-result-pub"/>
-  <symbol minX="360" maxX="400" minY="48" maxY="88" name="search-result-restaurant"/>
-  <symbol minX="400" maxX="440" minY="48" maxY="88" name="search-result-shop-alcohol"/>
-  <symbol minX="440" maxX="480" minY="48" maxY="88" name="search-result-shop-toys"/>
-  <symbol minX="480" maxX="520" minY="48" maxY="88" name="search-result-zoo"/>
+  <symbol minX="122" maxX="164" minY="0" maxY="42" name="cross_geoposition"/>
+  <symbol minX="164" maxX="200" minY="0" maxY="42" name="shield-us-i-thin-scaled"/>
+  <symbol minX="200" maxX="242" minY="0" maxY="42" name="shield-us-i-wide-scaled"/>
+  <symbol minX="242" maxX="286" minY="0" maxY="42" name="route-point-finish"/>
+  <symbol minX="286" maxX="326" minY="0" maxY="40" name="search-result-shop-cosmetics"/>
+  <symbol minX="326" maxX="366" minY="0" maxY="40" name="search-result-shop-shoes"/>
+  <symbol minX="366" maxX="406" minY="0" maxY="40" name="search-result-shop-convenience"/>
+  <symbol minX="406" maxX="446" minY="0" maxY="40" name="search-result-zoo"/>
+  <symbol minX="446" maxX="486" minY="0" maxY="40" name="search-result-water-park"/>
+  <symbol minX="486" maxX="526" minY="0" maxY="40" name="search-result-cinema"/>
+  <symbol minX="526" maxX="566" minY="0" maxY="40" name="search-result-fastfood"/>
+  <symbol minX="566" maxX="606" minY="0" maxY="40" name="search-result-theme-park"/>
+  <symbol minX="606" maxX="646" minY="0" maxY="40" name="search-result-marketplace"/>
+  <symbol minX="646" maxX="686" minY="0" maxY="40" name="search-result-shop-sports"/>
+  <symbol minX="686" maxX="726" minY="0" maxY="40" name="search-result-restaurant"/>
+  <symbol minX="726" maxX="766" minY="0" maxY="40" name="search-result-nightclub"/>
+  <symbol minX="766" maxX="806" minY="0" maxY="40" name="search-result-playground"/>
+  <symbol minX="806" maxX="846" minY="0" maxY="40" name="search-result-shop-confectionery"/>
+  <symbol minX="846" maxX="886" minY="0" maxY="40" name="search-result-pub"/>
+  <symbol minX="886" maxX="926" minY="0" maxY="40" name="search-result-shop-butcher"/>
+  <symbol minX="926" maxX="968" minY="0" maxY="40" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="968" maxX="1008" minY="0" maxY="40" name="search-result-shop-clothes"/>
+  <symbol minX="0" maxX="40" minY="48" maxY="88" name="search-result-shop-supermarket"/>
+  <symbol minX="40" maxX="80" minY="48" maxY="88" name="search-result-shop-toys"/>
+  <symbol minX="80" maxX="120" minY="48" maxY="88" name="search-result-shop-alcohol"/>
+  <symbol minX="120" maxX="160" minY="48" maxY="88" name="search-result-shop-greengrocer"/>
+  <symbol minX="160" maxX="200" minY="48" maxY="88" name="search-result-bakery"/>
+  <symbol minX="200" maxX="240" minY="48" maxY="88" name="search-result-bar"/>
+  <symbol minX="240" maxX="280" minY="48" maxY="88" name="search-result-shop-jewelry"/>
+  <symbol minX="280" maxX="320" minY="48" maxY="88" name="search-result-shop-mall"/>
+  <symbol minX="320" maxX="360" minY="48" maxY="88" name="search-result-shop-gift"/>
+  <symbol minX="360" maxX="400" minY="48" maxY="88" name="search-result-shop-seafood"/>
+  <symbol minX="400" maxX="440" minY="48" maxY="88" name="search-result-casino"/>
+  <symbol minX="440" maxX="480" minY="48" maxY="88" name="search-result-cafe"/>
+  <symbol minX="480" maxX="520" minY="48" maxY="88" name="search-result-shop-department_store"/>
   <symbol minX="520" maxX="556" minY="48" maxY="86" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="556" maxX="586" minY="48" maxY="85" name="unpaved_road"/>
-  <symbol minX="586" maxX="616" minY="48" maxY="85" name="paid_road"/>
-  <symbol minX="616" maxX="646" minY="48" maxY="85" name="ferry"/>
-  <symbol minX="646" maxX="682" minY="48" maxY="84" name="track_marker_selected"/>
-  <symbol minX="682" maxX="718" minY="48" maxY="84" name="infosign"/>
+  <symbol minX="556" maxX="586" minY="48" maxY="85" name="ferry"/>
+  <symbol minX="586" maxX="616" minY="48" maxY="85" name="unpaved_road"/>
+  <symbol minX="616" maxX="646" minY="48" maxY="85" name="paid_road"/>
+  <symbol minX="646" maxX="682" minY="48" maxY="84" name="infosign"/>
+  <symbol minX="682" maxX="718" minY="48" maxY="84" name="track_marker_selected"/>
   <symbol minX="718" maxX="743" minY="48" maxY="82" name="bookmark-entertainment-m"/>
   <symbol minX="743" maxX="768" minY="48" maxY="82" name="bookmark-food-m"/>
-  <symbol minX="768" maxX="793" minY="48" maxY="82" name="bookmark-animals-m"/>
-  <symbol minX="793" maxX="818" minY="48" maxY="82" name="bookmark-bar-m"/>
-  <symbol minX="818" maxX="843" minY="48" maxY="82" name="bookmark-water-m"/>
-  <symbol minX="843" maxX="868" minY="48" maxY="82" name="bookmark-bg-m"/>
-  <symbol minX="868" maxX="893" minY="48" maxY="82" name="bookmark-viewpoint-m"/>
-  <symbol minX="893" maxX="918" minY="48" maxY="82" name="bookmark-buddhism-m"/>
-  <symbol minX="918" maxX="943" minY="48" maxY="82" name="bookmark-transport-m"/>
-  <symbol minX="943" maxX="968" minY="48" maxY="82" name="bookmark-building-m"/>
-  <symbol minX="968" maxX="993" minY="48" maxY="82" name="bookmark-christianity-m"/>
-  <symbol minX="993" maxX="1018" minY="48" maxY="82" name="bookmark-default-m"/>
-  <symbol minX="0" maxX="25" minY="88" maxY="122" name="bookmark-parking-m"/>
-  <symbol minX="25" maxX="50" minY="88" maxY="122" name="bookmark-swim-m"/>
-  <symbol minX="50" maxX="75" minY="88" maxY="122" name="bookmark-exchange-m"/>
-  <symbol minX="75" maxX="100" minY="88" maxY="122" name="bookmark-finish-m"/>
-  <symbol minX="100" maxX="125" minY="88" maxY="122" name="bookmark-start-m"/>
-  <symbol minX="125" maxX="150" minY="88" maxY="122" name="bookmark-sport-m"/>
-  <symbol minX="150" maxX="175" minY="88" maxY="122" name="bookmark-gas-m"/>
-  <symbol minX="175" maxX="200" minY="88" maxY="122" name="bookmark-hotel-m"/>
-  <symbol minX="200" maxX="225" minY="88" maxY="122" name="bookmark-sights-m"/>
-  <symbol minX="225" maxX="250" minY="88" maxY="122" name="bookmark-islam-m"/>
+  <symbol minX="768" maxX="793" minY="48" maxY="82" name="bookmark-finish-m"/>
+  <symbol minX="793" maxX="818" minY="48" maxY="82" name="bookmark-buddhism-m"/>
+  <symbol minX="818" maxX="843" minY="48" maxY="82" name="bookmark-mountain-m"/>
+  <symbol minX="843" maxX="868" minY="48" maxY="82" name="bookmark-gas-m"/>
+  <symbol minX="868" maxX="893" minY="48" maxY="82" name="bookmark-building-m"/>
+  <symbol minX="893" maxX="918" minY="48" maxY="82" name="bookmark-islam-m"/>
+  <symbol minX="918" maxX="943" minY="48" maxY="82" name="bookmark-christianity-m"/>
+  <symbol minX="943" maxX="968" minY="48" maxY="82" name="bookmark-default-m"/>
+  <symbol minX="968" maxX="993" minY="48" maxY="82" name="bookmark-exchange-m"/>
+  <symbol minX="993" maxX="1018" minY="48" maxY="82" name="bookmark-hotel-m"/>
+  <symbol minX="0" maxX="25" minY="88" maxY="122" name="bookmark-medicine-m"/>
+  <symbol minX="25" maxX="50" minY="88" maxY="122" name="bookmark-judaism-m"/>
+  <symbol minX="50" maxX="75" minY="88" maxY="122" name="bookmark-park-m"/>
+  <symbol minX="75" maxX="100" minY="88" maxY="122" name="bookmark-water-m"/>
+  <symbol minX="100" maxX="125" minY="88" maxY="122" name="bookmark-viewpoint-m"/>
+  <symbol minX="125" maxX="150" minY="88" maxY="122" name="bookmark-transport-m"/>
+  <symbol minX="150" maxX="175" minY="88" maxY="122" name="bookmark-swim-m"/>
+  <symbol minX="175" maxX="200" minY="88" maxY="122" name="bookmark-start-m"/>
+  <symbol minX="200" maxX="225" minY="88" maxY="122" name="bookmark-sport-m"/>
+  <symbol minX="225" maxX="250" minY="88" maxY="122" name="bookmark-sights-m"/>
   <symbol minX="250" maxX="275" minY="88" maxY="122" name="bookmark-shop-m"/>
-  <symbol minX="275" maxX="300" minY="88" maxY="122" name="bookmark-judaism-m"/>
-  <symbol minX="300" maxX="325" minY="88" maxY="122" name="bookmark-medicine-m"/>
-  <symbol minX="325" maxX="350" minY="88" maxY="122" name="bookmark-mountain-m"/>
-  <symbol minX="350" maxX="375" minY="88" maxY="122" name="bookmark-museum-m"/>
-  <symbol minX="375" maxX="400" minY="88" maxY="122" name="bookmark-park-m"/>
-  <symbol minX="400" maxX="432" minY="88" maxY="120" name="route-point-14"/>
-  <symbol minX="432" maxX="464" minY="88" maxY="120" name="route-point-4"/>
-  <symbol minX="464" maxX="496" minY="88" maxY="120" name="route-point-3"/>
-  <symbol minX="496" maxX="528" minY="88" maxY="120" name="route-point-20"/>
-  <symbol minX="528" maxX="560" minY="88" maxY="120" name="route-point-2"/>
-  <symbol minX="560" maxX="592" minY="88" maxY="120" name="route-point-19"/>
-  <symbol minX="592" maxX="624" minY="88" maxY="120" name="route-point-18"/>
-  <symbol minX="624" maxX="656" minY="88" maxY="120" name="route-point-17"/>
-  <symbol minX="656" maxX="688" minY="88" maxY="120" name="route-point-16"/>
-  <symbol minX="688" maxX="720" minY="88" maxY="120" name="route-point-15"/>
-  <symbol minX="720" maxX="752" minY="88" maxY="120" name="route-point-8"/>
-  <symbol minX="752" maxX="784" minY="88" maxY="120" name="route-point-13"/>
-  <symbol minX="784" maxX="816" minY="88" maxY="120" name="route-point-12"/>
-  <symbol minX="816" maxX="848" minY="88" maxY="120" name="route-point-11"/>
-  <symbol minX="848" maxX="880" minY="88" maxY="120" name="route-point-10"/>
-  <symbol minX="880" maxX="912" minY="88" maxY="120" name="route-point-1"/>
-  <symbol minX="912" maxX="956" minY="88" maxY="120" name="norating-default-l"/>
-  <symbol minX="956" maxX="1000" minY="88" maxY="120" name="norating-bg-l"/>
-  <symbol minX="0" maxX="44" minY="122" maxY="154" name="coloredmark-bg-l"/>
-  <symbol minX="44" maxX="88" minY="122" maxY="154" name="coloredmark-default-l"/>
-  <symbol minX="88" maxX="120" minY="122" maxY="154" name="route-point-start"/>
-  <symbol minX="120" maxX="152" minY="122" maxY="154" name="route-point-5"/>
-  <symbol minX="152" maxX="184" minY="122" maxY="154" name="route-point-6"/>
-  <symbol minX="184" maxX="216" minY="122" maxY="154" name="route-point-7"/>
-  <symbol minX="216" maxX="248" minY="122" maxY="154" name="route-point-9"/>
+  <symbol minX="275" maxX="300" minY="88" maxY="122" name="bookmark-parking-m"/>
+  <symbol minX="300" maxX="325" minY="88" maxY="122" name="bookmark-animals-m"/>
+  <symbol minX="325" maxX="350" minY="88" maxY="122" name="bookmark-bar-m"/>
+  <symbol minX="350" maxX="375" minY="88" maxY="122" name="bookmark-bg-m"/>
+  <symbol minX="375" maxX="400" minY="88" maxY="122" name="bookmark-museum-m"/>
+  <symbol minX="400" maxX="432" minY="88" maxY="120" name="route-point-16"/>
+  <symbol minX="432" maxX="476" minY="88" maxY="120" name="norating-bg-l"/>
+  <symbol minX="476" maxX="520" minY="88" maxY="120" name="norating-default-l"/>
+  <symbol minX="520" maxX="552" minY="88" maxY="120" name="route-point-1"/>
+  <symbol minX="552" maxX="596" minY="88" maxY="120" name="coloredmark-default-l"/>
+  <symbol minX="596" maxX="640" minY="88" maxY="120" name="coloredmark-bg-l"/>
+  <symbol minX="640" maxX="672" minY="88" maxY="120" name="route-point-13"/>
+  <symbol minX="672" maxX="704" minY="88" maxY="120" name="route-point-15"/>
+  <symbol minX="704" maxX="736" minY="88" maxY="120" name="route-point-12"/>
+  <symbol minX="736" maxX="768" minY="88" maxY="120" name="route-point-11"/>
+  <symbol minX="768" maxX="800" minY="88" maxY="120" name="route-point-14"/>
+  <symbol minX="800" maxX="832" minY="88" maxY="120" name="route-point-10"/>
+  <symbol minX="832" maxX="864" minY="88" maxY="120" name="route-point-9"/>
+  <symbol minX="864" maxX="896" minY="88" maxY="120" name="route-point-20"/>
+  <symbol minX="896" maxX="928" minY="88" maxY="120" name="route-point-17"/>
+  <symbol minX="928" maxX="960" minY="88" maxY="120" name="route-point-start"/>
+  <symbol minX="960" maxX="992" minY="88" maxY="120" name="route-point-18"/>
+  <symbol minX="992" maxX="1024" minY="88" maxY="120" name="route-point-19"/>
+  <symbol minX="0" maxX="32" minY="122" maxY="154" name="route-point-6"/>
+  <symbol minX="32" maxX="64" minY="122" maxY="154" name="route-point-7"/>
+  <symbol minX="64" maxX="96" minY="122" maxY="154" name="route-point-3"/>
+  <symbol minX="96" maxX="128" minY="122" maxY="154" name="route-point-5"/>
+  <symbol minX="128" maxX="160" minY="122" maxY="154" name="route-point-4"/>
+  <symbol minX="160" maxX="192" minY="122" maxY="154" name="route-point-2"/>
+  <symbol minX="192" maxX="224" minY="122" maxY="154" name="route-point-8"/>
+  <symbol minX="224" maxX="248" minY="122" maxY="150" name="shield-us-i-thin"/>
   <symbol minX="248" maxX="278" minY="122" maxY="150" name="shield-us-i-wide"/>
-  <symbol minX="278" maxX="302" minY="122" maxY="150" name="shield-us-i-thin"/>
-  <symbol minX="302" maxX="328" minY="122" maxY="148" name="shield-us-hw-thin"/>
-  <symbol minX="328" maxX="358" minY="122" maxY="148" name="shield-us-hw-wide"/>
-  <symbol minX="358" maxX="376" minY="122" maxY="147" name="bookmark-bg-s"/>
-  <symbol minX="376" maxX="394" minY="122" maxY="147" name="bookmark-default-s"/>
-  <symbol minX="394" maxX="418" minY="122" maxY="146" name="track_marker_deselected"/>
-  <symbol minX="418" maxX="442" minY="122" maxY="146" name="current-position"/>
-  <symbol minX="442" maxX="464" minY="122" maxY="144" name="subway-riodejaneiro-m"/>
-  <symbol minX="464" maxX="486" minY="122" maxY="144" name="subway-tianjin-m"/>
-  <symbol minX="486" maxX="508" minY="122" maxY="144" name="sample_collection-m"/>
-  <symbol minX="508" maxX="530" minY="122" maxY="144" name="subway-bangkok-m"/>
-  <symbol minX="530" maxX="552" minY="122" maxY="144" name="sawmill-m"/>
-  <symbol minX="552" maxX="573" minY="122" maxY="144" name="subway-athens-m"/>
-  <symbol minX="573" maxX="595" minY="122" maxY="144" name="school-m"/>
-  <symbol minX="595" maxX="617" minY="122" maxY="144" name="seafood-shop-m"/>
-  <symbol minX="617" maxX="639" minY="122" maxY="144" name="shelter-m"/>
-  <symbol minX="639" maxX="661" minY="122" maxY="144" name="subway-reseau-paris-m"/>
-  <symbol minX="661" maxX="683" minY="122" maxY="144" name="subway-rennes-m"/>
-  <symbol minX="683" maxX="705" minY="122" maxY="144" name="subway-beijing-m"/>
-  <symbol minX="705" maxX="727" minY="122" maxY="144" name="subway-shiraz-m"/>
-  <symbol minX="727" maxX="749" minY="122" maxY="144" name="subway-bengaluru-m"/>
-  <symbol minX="749" maxX="771" minY="122" maxY="144" name="subway-tokyo-m"/>
-  <symbol minX="771" maxX="793" minY="122" maxY="144" name="subway-brasilia-m"/>
-  <symbol minX="793" maxX="815" minY="122" maxY="144" name="subway-pyongyang-m"/>
-  <symbol minX="815" maxX="836" minY="122" maxY="144" name="subway-porto-m"/>
-  <symbol minX="836" maxX="858" minY="122" maxY="144" name="subway-pittsburgh-m"/>
-  <symbol minX="858" maxX="880" minY="122" maxY="144" name="subway-tyneandwear-m"/>
-  <symbol minX="880" maxX="900" minY="122" maxY="144" name="subway-brescia-m"/>
-  <symbol minX="900" maxX="922" minY="122" maxY="144" name="restaurant-m"/>
-  <symbol minX="922" maxX="944" minY="122" maxY="144" name="subway-perugia-m"/>
-  <symbol minX="944" maxX="966" minY="122" maxY="144" name="subway-bursaray-m"/>
-  <symbol minX="966" maxX="988" minY="122" maxY="144" name="subway-valencia-m"/>
-  <symbol minX="988" maxX="1010" minY="122" maxY="144" name="subway-stockholm-m"/>
-  <symbol minX="0" maxX="22" minY="154" maxY="176" name="shower-m"/>
-  <symbol minX="22" maxX="44" minY="154" maxY="176" name="skateboard-m"/>
-  <symbol minX="44" maxX="66" minY="154" maxY="176" name="skiing-m"/>
-  <symbol minX="66" maxX="88" minY="154" maxY="176" name="soccer-m"/>
-  <symbol minX="88" maxX="110" minY="154" maxY="176" name="speech_therapist-m"/>
-  <symbol minX="110" maxX="132" minY="154" maxY="176" name="subway-southkorea-m"/>
-  <symbol minX="132" maxX="154" minY="154" maxY="176" name="subway-saopaulo-m"/>
-  <symbol minX="154" maxX="176" minY="154" maxY="176" name="speedcam-alert-l"/>
-  <symbol minX="176" maxX="198" minY="154" maxY="176" name="shop-m"/>
-  <symbol minX="198" maxX="220" minY="154" maxY="176" name="subway-santodomingo-m"/>
-  <symbol minX="220" maxX="242" minY="154" maxY="176" name="sports-m"/>
-  <symbol minX="242" maxX="264" minY="154" maxY="176" name="stadium-m"/>
-  <symbol minX="264" maxX="286" minY="154" maxY="176" name="shop-bicycle-m"/>
-  <symbol minX="286" maxX="308" minY="154" maxY="176" name="subway-stlouis-m"/>
-  <symbol minX="308" maxX="330" minY="154" maxY="176" name="subway-ankara-s"/>
-  <symbol minX="330" maxX="352" minY="154" maxY="176" name="shoes-m"/>
-  <symbol minX="352" maxX="374" minY="154" maxY="176" name="subway-sofia-m"/>
-  <symbol minX="374" maxX="396" minY="154" maxY="176" name="stationery_shop-m"/>
-  <symbol minX="396" maxX="418" minY="154" maxY="176" name="subway-adana-m"/>
-  <symbol minX="418" maxX="440" minY="154" maxY="176" name="subway-adana-s"/>
-  <symbol minX="440" maxX="462" minY="154" maxY="176" name="subway-algeria-m"/>
-  <symbol minX="462" maxX="484" minY="154" maxY="176" name="subway-samara-m"/>
-  <symbol minX="484" maxX="506" minY="154" maxY="176" name="subway-tashkent-m"/>
-  <symbol minX="506" maxX="528" minY="154" maxY="176" name="ship-m"/>
-  <symbol minX="528" maxX="550" minY="154" maxY="176" name="shinto-m"/>
-  <symbol minX="550" maxX="570" minY="154" maxY="176" name="subway-amsterdam-m"/>
-  <symbol minX="570" maxX="592" minY="154" maxY="176" name="second_hand_shop-m"/>
-  <symbol minX="592" maxX="614" minY="154" maxY="176" name="subway-ankara-m"/>
-  <symbol minX="614" maxX="636" minY="154" maxY="176" name="theme_park-m"/>
-  <symbol minX="636" maxX="658" minY="154" maxY="176" name="zoo-m"/>
-  <symbol minX="658" maxX="680" minY="154" maxY="176" name="subway-m"/>
-  <symbol minX="680" maxX="702" minY="154" maxY="176" name="tourism-m"/>
-  <symbol minX="702" maxX="724" minY="154" maxY="176" name="tomb-m"/>
-  <symbol minX="724" maxX="746" minY="154" maxY="176" name="toll_booth-m"/>
-  <symbol minX="746" maxX="768" minY="154" maxY="176" name="subway-kobe-m"/>
-  <symbol minX="768" maxX="790" minY="154" maxY="176" name="toilets-m"/>
-  <symbol minX="790" maxX="812" minY="154" maxY="176" name="tire-repair-m"/>
-  <symbol minX="812" maxX="834" minY="154" maxY="176" name="ticket-shop-m"/>
-  <symbol minX="834" maxX="856" minY="154" maxY="176" name="toys-m"/>
-  <symbol minX="856" maxX="878" minY="154" maxY="176" name="subway-marseille-s"/>
-  <symbol minX="878" maxX="900" minY="154" maxY="176" name="subway-kazan-m"/>
-  <symbol minX="900" maxX="918" minY="154" maxY="176" name="subway-istanbul-m"/>
-  <symbol minX="918" maxX="940" minY="154" maxY="176" name="subway-isfahan-m"/>
-  <symbol minX="940" maxX="962" minY="154" maxY="176" name="subway-mashhad-m"/>
-  <symbol minX="962" maxX="984" minY="154" maxY="176" name="subway-hirosima-m"/>
-  <symbol minX="984" maxX="1006" minY="154" maxY="176" name="subway-helsinki-m"/>
-  <symbol minX="0" maxX="22" minY="176" maxY="198" name="subway-massachusetts-m"/>
-  <symbol minX="22" maxX="44" minY="176" maxY="198" name="airport-m"/>
-  <symbol minX="44" maxX="66" minY="176" maxY="198" name="subway-lima-m"/>
-  <symbol minX="66" maxX="88" minY="176" maxY="198" name="vending-m"/>
-  <symbol minX="88" maxX="110" minY="176" maxY="198" name="subway-losangeles-m"/>
-  <symbol minX="110" maxX="132" minY="176" maxY="198" name="tram-m"/>
-  <symbol minX="132" maxX="154" minY="176" maxY="198" name="veterinary-m"/>
-  <symbol minX="154" maxX="176" minY="176" maxY="198" name="video-games-m"/>
-  <symbol minX="176" maxX="198" minY="176" maxY="198" name="viewpoint-m"/>
-  <symbol minX="198" maxX="220" minY="176" maxY="198" name="subway-lisboa-m"/>
-  <symbol minX="220" maxX="242" minY="176" maxY="198" name="train-m"/>
-  <symbol minX="242" maxX="264" minY="176" maxY="198" name="volleyball-m"/>
-  <symbol minX="264" maxX="286" minY="176" maxY="198" name="subway-guangzhou-m"/>
-  <symbol minX="286" maxX="308" minY="176" maxY="198" name="waste-basket-m"/>
-  <symbol minX="308" maxX="330" minY="176" maxY="198" name="subway-lille-m"/>
-  <symbol minX="330" maxX="352" minY="176" maxY="198" name="waterfall-m"/>
-  <symbol minX="352" maxX="374" minY="176" maxY="198" name="subway-lausanne-m"/>
-  <symbol minX="374" maxX="396" minY="176" maxY="198" name="wayside_shrine-m"/>
-  <symbol minX="396" maxX="418" minY="176" maxY="198" name="subway-kyoto-m"/>
-  <symbol minX="418" maxX="440" minY="176" maxY="198" name="windmill-m"/>
-  <symbol minX="440" maxX="462" minY="176" maxY="198" name="subway-kunming-m"/>
-  <symbol minX="462" maxX="484" minY="176" maxY="198" name="yoga-m"/>
-  <symbol minX="484" maxX="506" minY="176" maxY="198" name="subway-changchun-m"/>
-  <symbol minX="506" maxX="528" minY="176" maxY="198" name="subway-yokohama-m"/>
-  <symbol minX="528" maxX="550" minY="176" maxY="198" name="subway-nagoya-m"/>
-  <symbol minX="550" maxX="572" minY="176" maxY="198" name="subway-newyork-m"/>
-  <symbol minX="572" maxX="594" minY="176" maxY="198" name="subway-chicago-m"/>
-  <symbol minX="594" maxX="616" minY="176" maxY="198" name="subway-wuhan-m"/>
-  <symbol minX="616" maxX="637" minY="176" maxY="198" name="subway-nnov-m"/>
-  <symbol minX="637" maxX="659" minY="176" maxY="198" name="subway-chengdu-m"/>
-  <symbol minX="659" maxX="681" minY="176" maxY="198" name="subway-washington-m"/>
-  <symbol minX="681" maxX="703" minY="176" maxY="198" name="subway-warszawa-m"/>
-  <symbol minX="703" maxX="725" minY="176" maxY="198" name="survey_point-m"/>
-  <symbol minX="725" maxX="747" minY="176" maxY="198" name="subway-oslo-m"/>
-  <symbol minX="747" maxX="769" minY="176" maxY="198" name="subway-catania-m"/>
-  <symbol minX="769" maxX="791" minY="176" maxY="198" name="subway-volgograd-m"/>
-  <symbol minX="791" maxX="813" minY="176" maxY="198" name="subway-caracas-m"/>
-  <symbol minX="813" maxX="835" minY="176" maxY="198" name="subway-cairo-m"/>
-  <symbol minX="835" maxX="857" minY="176" maxY="198" name="subway-vienna-m"/>
-  <symbol minX="857" maxX="879" minY="176" maxY="198" name="travel_agency_shop-m"/>
-  <symbol minX="879" maxX="901" minY="176" maxY="198" name="subway-buenosaires-m"/>
-  <symbol minX="901" maxX="923" minY="176" maxY="198" name="subway-budapest-m"/>
-  <symbol minX="923" maxX="945" minY="176" maxY="198" name="taxi-m"/>
-  <symbol minX="945" maxX="967" minY="176" maxY="198" name="theatre-m"/>
-  <symbol minX="967" maxX="989" minY="176" maxY="198" name="subway-guadalajara-m"/>
-  <symbol minX="989" maxX="1011" minY="176" maxY="198" name="subway-mecca-m"/>
-  <symbol minX="0" maxX="22" minY="198" maxY="220" name="subway-glasgow-m"/>
-  <symbol minX="22" maxX="44" minY="198" maxY="220" name="sauna-m"/>
-  <symbol minX="44" maxX="66" minY="198" maxY="220" name="tennis-m"/>
-  <symbol minX="66" maxX="88" minY="198" maxY="220" name="subway-medellin-m"/>
-  <symbol minX="88" maxX="109" minY="198" maxY="220" name="subway-mexico-m"/>
-  <symbol minX="109" maxX="131" minY="198" maxY="220" name="subway-foshan-m"/>
-  <symbol minX="131" maxX="153" minY="198" maxY="220" name="subway-panama-m"/>
-  <symbol minX="153" maxX="175" minY="198" maxY="220" name="subway-ekb-m"/>
-  <symbol minX="175" maxX="197" minY="198" maxY="220" name="subway-milan-m"/>
-  <symbol minX="197" maxX="219" minY="198" maxY="220" name="taoist-m"/>
-  <symbol minX="219" maxX="241" minY="198" maxY="220" name="subway-minatomirai-m"/>
-  <symbol minX="241" maxX="263" minY="198" maxY="220" name="subway-dubai-m"/>
-  <symbol minX="263" maxX="285" minY="198" maxY="220" name="table-tennis-m"/>
-  <symbol minX="285" maxX="307" minY="198" maxY="220" name="swimming-m"/>
-  <symbol minX="307" maxX="329" minY="198" maxY="220" name="sweets-m"/>
-  <symbol minX="329" maxX="350" minY="198" maxY="220" name="subway-delhi-m"/>
-  <symbol minX="350" maxX="372" minY="198" maxY="220" name="electrician-m"/>
-  <symbol minX="372" maxX="394" minY="198" maxY="220" name="fire_station-m"/>
-  <symbol minX="394" maxX="416" minY="198" maxY="220" name="bakery-m"/>
-  <symbol minX="416" maxX="438" minY="198" maxY="220" name="bank-m"/>
-  <symbol minX="438" maxX="460" minY="198" maxY="220" name="banknote-m"/>
-  <symbol minX="460" maxX="482" minY="198" maxY="220" name="fastfood-m"/>
-  <symbol minX="482" maxX="504" minY="198" maxY="220" name="erotic-m"/>
-  <symbol minX="504" maxX="526" minY="198" maxY="220" name="equestrian-m"/>
-  <symbol minX="526" maxX="548" minY="198" maxY="220" name="emergency-phone-m"/>
-  <symbol minX="548" maxX="570" minY="198" maxY="220" name="bar-m"/>
-  <symbol minX="570" maxX="592" minY="198" maxY="220" name="embassy-m"/>
-  <symbol minX="592" maxX="614" minY="198" maxY="220" name="electronics-m"/>
-  <symbol minX="614" maxX="636" minY="198" maxY="220" name="badminton-m"/>
-  <symbol minX="636" maxX="658" minY="198" maxY="220" name="dump-station-m"/>
-  <symbol minX="658" maxX="680" minY="198" maxY="220" name="driving_school-m"/>
-  <symbol minX="680" maxX="702" minY="198" maxY="220" name="drinking-water-m"/>
-  <symbol minX="702" maxX="724" minY="198" maxY="220" name="doityourself-m"/>
-  <symbol minX="724" maxX="746" minY="198" maxY="220" name="dog_park-m"/>
-  <symbol minX="746" maxX="768" minY="198" maxY="220" name="diving-m"/>
-  <symbol minX="768" maxX="790" minY="198" maxY="220" name="department_store-m"/>
-  <symbol minX="790" maxX="812" minY="198" maxY="220" name="dentist-m"/>
-  <symbol minX="812" maxX="834" minY="198" maxY="220" name="defibrillator-m"/>
-  <symbol minX="834" maxX="856" minY="198" maxY="220" name="curling-m"/>
-  <symbol minX="856" maxX="878" minY="198" maxY="220" name="cross-m"/>
-  <symbol minX="878" maxX="900" minY="198" maxY="220" name="gallery-m"/>
-  <symbol minX="900" maxX="922" minY="198" maxY="220" name="grocery-m"/>
-  <symbol minX="922" maxX="944" minY="198" maxY="220" name="greengrocer-m"/>
-  <symbol minX="944" maxX="966" minY="198" maxY="220" name="atm-m"/>
-  <symbol minX="966" maxX="988" minY="198" maxY="220" name="audiologist-m"/>
-  <symbol minX="988" maxX="1010" minY="198" maxY="220" name="golf-m"/>
-  <symbol minX="0" maxX="22" minY="220" maxY="242" name="gift-m"/>
-  <symbol minX="22" maxX="44" minY="220" maxY="242" name="geyser-m"/>
-  <symbol minX="44" maxX="66" minY="220" maxY="242" name="geyser-l"/>
-  <symbol minX="66" maxX="88" minY="220" maxY="242" name="garden_center-m"/>
-  <symbol minX="88" maxX="110" minY="220" maxY="242" name="garden-outline-m"/>
-  <symbol minX="110" maxX="132" minY="220" maxY="242" name="garden-m"/>
-  <symbol minX="132" maxX="154" minY="220" maxY="242" name="cricket-m"/>
-  <symbol minX="154" maxX="176" minY="220" maxY="242" name="furniture-m"/>
-  <symbol minX="176" maxX="198" minY="220" maxY="242" name="funicular-m"/>
-  <symbol minX="198" maxX="220" minY="220" maxY="242" name="funeral_directors-m"/>
-  <symbol minX="220" maxX="242" minY="220" maxY="242" name="fuel-m"/>
-  <symbol minX="242" maxX="264" minY="220" maxY="242" name="australian-football-m"/>
-  <symbol minX="264" maxX="286" minY="220" maxY="242" name="fuel-dispenser-m"/>
-  <symbol minX="286" maxX="308" minY="220" maxY="242" name="fountain-s"/>
-  <symbol minX="308" maxX="330" minY="220" maxY="242" name="fountain-m"/>
-  <symbol minX="330" maxX="352" minY="220" maxY="242" name="florist-m"/>
-  <symbol minX="352" maxX="374" minY="220" maxY="242" name="firehydrant-m"/>
-  <symbol minX="374" maxX="396" minY="220" maxY="242" name="brewery-m"/>
-  <symbol minX="396" maxX="418" minY="220" maxY="242" name="car-wash-m"/>
-  <symbol minX="418" maxX="440" minY="220" maxY="242" name="bcontrol-m"/>
-  <symbol minX="440" maxX="462" minY="220" maxY="242" name="car-repair-m"/>
-  <symbol minX="462" maxX="484" minY="220" maxY="242" name="car-part-m"/>
-  <symbol minX="484" maxX="506" minY="220" maxY="242" name="campsite-m"/>
-  <symbol minX="506" maxX="528" minY="220" maxY="242" name="cafe-m"/>
-  <symbol minX="528" maxX="550" minY="220" maxY="242" name="cable-car-m"/>
-  <symbol minX="550" maxX="572" minY="220" maxY="242" name="beach-m"/>
-  <symbol minX="572" maxX="594" minY="220" maxY="242" name="butcher-m"/>
-  <symbol minX="594" maxX="616" minY="220" maxY="242" name="bus-m"/>
-  <symbol minX="616" maxX="638" minY="220" maxY="242" name="buddhist-m"/>
-  <symbol minX="638" maxX="660" minY="220" maxY="242" name="car_sharing-m"/>
-  <symbol minX="660" maxX="682" minY="220" maxY="242" name="bowling_alley-m"/>
-  <symbol minX="682" maxX="704" minY="220" maxY="242" name="bowling-m"/>
-  <symbol minX="704" maxX="726" minY="220" maxY="242" name="bookmaker-m"/>
-  <symbol minX="726" maxX="748" minY="220" maxY="242" name="book-shop-m"/>
-  <symbol minX="748" maxX="770" minY="220" maxY="242" name="beauty-m"/>
-  <symbol minX="770" maxX="792" minY="220" maxY="242" name="blood_donation-m"/>
-  <symbol minX="792" maxX="814" minY="220" maxY="242" name="blacksmith-m"/>
-  <symbol minX="814" maxX="836" minY="220" maxY="242" name="beekeeper-m"/>
-  <symbol minX="836" maxX="858" minY="220" maxY="242" name="beer-m"/>
-  <symbol minX="858" maxX="880" minY="220" maxY="242" name="bicycle-repair-station"/>
-  <symbol minX="880" maxX="902" minY="220" maxY="242" name="bicycle-m"/>
-  <symbol minX="902" maxX="924" minY="220" maxY="242" name="charity_shop-m"/>
-  <symbol minX="924" maxX="946" minY="220" maxY="242" name="copyshop-m"/>
-  <symbol minX="946" maxX="968" minY="220" maxY="242" name="computer-m"/>
-  <symbol minX="968" maxX="990" minY="220" maxY="242" name="college-m"/>
-  <symbol minX="990" maxX="1012" minY="220" maxY="242" name="clothes-m"/>
-  <symbol minX="0" maxX="22" minY="242" maxY="264" name="climbing-m"/>
-  <symbol minX="22" maxX="44" minY="242" maxY="264" name="cinema-m"/>
-  <symbol minX="44" maxX="66" minY="242" maxY="264" name="christian-m"/>
-  <symbol minX="66" maxX="88" minY="242" maxY="264" name="chimney-m"/>
-  <symbol minX="88" maxX="110" minY="242" maxY="264" name="chess-m"/>
-  <symbol minX="110" maxX="132" minY="242" maxY="264" name="chemist-m"/>
-  <symbol minX="132" maxX="154" minY="242" maxY="264" name="cheese-m"/>
-  <symbol minX="154" maxX="176" minY="242" maxY="264" name="guidepost"/>
-  <symbol minX="176" maxX="198" minY="242" maxY="264" name="charging-station-m"/>
-  <symbol minX="198" maxX="220" minY="242" maxY="264" name="cemetery-m"/>
-  <symbol minX="220" maxX="242" minY="242" maxY="264" name="baseball-m"/>
-  <symbol minX="242" maxX="264" minY="242" maxY="264" name="casino-m"/>
-  <symbol minX="264" maxX="286" minY="242" maxY="264" name="carpenter-m"/>
-  <symbol minX="286" maxX="308" minY="242" maxY="264" name="caravan_site-m"/>
-  <symbol minX="308" maxX="330" minY="242" maxY="264" name="caravan-shop-m"/>
-  <symbol minX="330" maxX="352" minY="242" maxY="264" name="basketball-m"/>
-  <symbol minX="352" maxX="374" minY="242" maxY="264" name="car_shop-m"/>
-  <symbol minX="374" maxX="396" minY="242" maxY="264" name="bbq-m"/>
-  <symbol minX="396" maxX="418" minY="242" maxY="264" name="nparkf-outline-m"/>
-  <symbol minX="418" maxX="440" minY="242" maxY="264" name="parking-meter-m"/>
-  <symbol minX="440" maxX="462" minY="242" maxY="264" name="alpine_hut-m"/>
-  <symbol minX="462" maxX="484" minY="242" maxY="264" name="alternative-m"/>
-  <symbol minX="484" maxX="506" minY="242" maxY="264" name="park-outline-m"/>
-  <symbol minX="506" maxX="528" minY="242" maxY="264" name="park-m"/>
-  <symbol minX="528" maxX="550" minY="242" maxY="264" name="painter-m"/>
-  <symbol minX="550" maxX="572" minY="242" maxY="264" name="padel-m"/>
-  <symbol minX="572" maxX="594" minY="242" maxY="264" name="outdoor-shop-m"/>
-  <symbol minX="594" maxX="616" minY="242" maxY="264" name="optometrist-m"/>
-  <symbol minX="616" maxX="638" minY="242" maxY="264" name="optician-m"/>
-  <symbol minX="638" maxX="660" minY="242" maxY="264" name="office-m"/>
-  <symbol minX="660" maxX="682" minY="242" maxY="264" name="alcohol-m"/>
-  <symbol minX="682" maxX="704" minY="242" maxY="264" name="nparkf-m"/>
-  <symbol minX="704" maxX="726" minY="242" maxY="264" name="npark-m"/>
-  <symbol minX="726" maxX="748" minY="242" maxY="264" name="nightclub-m"/>
-  <symbol minX="748" maxX="770" minY="242" maxY="264" name="newsagent_shop-m"/>
-  <symbol minX="770" maxX="792" minY="242" maxY="264" name="needle_and_thread-m"/>
-  <symbol minX="792" maxX="814" minY="242" maxY="264" name="muslim-m"/>
-  <symbol minX="814" maxX="836" minY="242" maxY="264" name="musical-instrument-m"/>
-  <symbol minX="836" maxX="858" minY="242" maxY="264" name="music_school-m"/>
-  <symbol minX="858" maxX="880" minY="242" maxY="264" name="music-m"/>
-  <symbol minX="880" maxX="902" minY="242" maxY="264" name="gym-m"/>
-  <symbol minX="902" maxX="924" minY="242" maxY="264" name="motorcycle_shop-m"/>
-  <symbol minX="924" maxX="946" minY="242" maxY="264" name="place-of-worship-m"/>
-  <symbol minX="946" maxX="968" minY="242" maxY="264" name="recycling-m"/>
-  <symbol minX="968" maxX="990" minY="242" maxY="264" name="public-building-m"/>
-  <symbol minX="990" maxX="1012" minY="242" maxY="264" name="remains-m"/>
-  <symbol minX="0" maxX="22" minY="264" maxY="286" name="psychotherapist-m"/>
-  <symbol minX="22" maxX="44" minY="264" maxY="286" name="prison-m"/>
-  <symbol minX="44" maxX="66" minY="264" maxY="286" name="power-m"/>
-  <symbol minX="66" maxX="88" minY="264" maxY="286" name="postbox-m"/>
-  <symbol minX="88" maxX="110" minY="264" maxY="286" name="police-m"/>
-  <symbol minX="110" maxX="132" minY="264" maxY="286" name="podiatrist-m"/>
-  <symbol minX="132" maxX="154" minY="264" maxY="286" name="plumber-m"/>
-  <symbol minX="154" maxX="176" minY="264" maxY="286" name="playground-m"/>
-  <symbol minX="176" maxX="198" minY="264" maxY="286" name="museum-m"/>
-  <symbol minX="198" maxX="220" minY="264" maxY="286" name="pitch-m"/>
-  <symbol minX="220" maxX="242" minY="264" maxY="286" name="picnic_table-m"/>
-  <symbol minX="242" maxX="264" minY="264" maxY="286" name="picnic-m"/>
-  <symbol minX="264" maxX="286" minY="264" maxY="286" name="physiotherapist-m"/>
-  <symbol minX="286" maxX="308" minY="264" maxY="286" name="photo-shop-m"/>
-  <symbol minX="308" maxX="330" minY="264" maxY="286" name="phone-m"/>
-  <symbol minX="330" maxX="352" minY="264" maxY="286" name="pharmacy-m"/>
-  <symbol minX="352" maxX="374" minY="264" maxY="286" name="petshop-m"/>
-  <symbol minX="374" maxX="396" minY="264" maxY="286" name="pelota-m"/>
-  <symbol minX="396" maxX="418" minY="264" maxY="286" name="airport_gate-m"/>
-  <symbol minX="418" maxX="440" minY="264" maxY="286" name="hunting-tower-m"/>
-  <symbol minX="440" maxX="462" minY="264" maxY="286" name="kiosk-m"/>
-  <symbol minX="462" maxX="484" minY="264" maxY="286" name="handball-m"/>
-  <symbol minX="484" maxX="506" minY="264" maxY="286" name="kindergarten-m"/>
-  <symbol minX="506" maxX="528" minY="264" maxY="286" name="jewish-m"/>
-  <symbol minX="528" maxX="550" minY="264" maxY="286" name="archery-m"/>
-  <symbol minX="550" maxX="572" minY="264" maxY="286" name="jewelry-m"/>
-  <symbol minX="572" maxX="594" minY="264" maxY="286" name="internet_cafe-m"/>
-  <symbol minX="594" maxX="616" minY="264" maxY="286" name="interior_decoration-m"/>
-  <symbol minX="616" maxX="638" minY="264" maxY="286" name="information-m"/>
+  <symbol minX="278" maxX="304" minY="122" maxY="148" name="shield-us-hw-thin"/>
+  <symbol minX="304" maxX="334" minY="122" maxY="148" name="shield-us-hw-wide"/>
+  <symbol minX="334" maxX="352" minY="122" maxY="147" name="bookmark-bg-s"/>
+  <symbol minX="352" maxX="370" minY="122" maxY="147" name="bookmark-default-s"/>
+  <symbol minX="370" maxX="394" minY="122" maxY="146" name="track_marker_deselected"/>
+  <symbol minX="394" maxX="418" minY="122" maxY="146" name="current-position"/>
+  <symbol minX="418" maxX="440" minY="122" maxY="144" name="shoes-m"/>
+  <symbol minX="440" maxX="462" minY="122" maxY="144" name="shop-m"/>
+  <symbol minX="462" maxX="484" minY="122" maxY="144" name="subway-chengdu-m"/>
+  <symbol minX="484" maxX="506" minY="122" maxY="144" name="shop-bicycle-m"/>
+  <symbol minX="506" maxX="528" minY="122" maxY="144" name="subway-changchun-m"/>
+  <symbol minX="528" maxX="550" minY="122" maxY="144" name="shower-m"/>
+  <symbol minX="550" maxX="572" minY="122" maxY="144" name="skateboard-m"/>
+  <symbol minX="572" maxX="594" minY="122" maxY="144" name="skiing-m"/>
+  <symbol minX="594" maxX="616" minY="122" maxY="144" name="sauna-m"/>
+  <symbol minX="616" maxX="638" minY="122" maxY="144" name="subway-chicago-m"/>
+  <symbol minX="638" maxX="660" minY="122" maxY="144" name="ship-m"/>
+  <symbol minX="660" maxX="682" minY="122" maxY="144" name="shinto-m"/>
+  <symbol minX="682" maxX="704" minY="122" maxY="144" name="shelter-m"/>
+  <symbol minX="704" maxX="726" minY="122" maxY="144" name="second_hand_shop-m"/>
+  <symbol minX="726" maxX="747" minY="122" maxY="144" name="subway-delhi-m"/>
+  <symbol minX="747" maxX="769" minY="122" maxY="144" name="seafood-shop-m"/>
+  <symbol minX="769" maxX="791" minY="122" maxY="144" name="subway-dubai-m"/>
+  <symbol minX="791" maxX="813" minY="122" maxY="144" name="school-m"/>
+  <symbol minX="813" maxX="835" minY="122" maxY="144" name="sawmill-m"/>
+  <symbol minX="835" maxX="857" minY="122" maxY="144" name="subway-bengaluru-m"/>
+  <symbol minX="857" maxX="879" minY="122" maxY="144" name="subway-adana-m"/>
+  <symbol minX="879" maxX="901" minY="122" maxY="144" name="subway-beijing-m"/>
+  <symbol minX="901" maxX="923" minY="122" maxY="144" name="subway-lisboa-m"/>
+  <symbol minX="923" maxX="945" minY="122" maxY="144" name="subway-bangkok-m"/>
+  <symbol minX="945" maxX="966" minY="122" maxY="144" name="subway-athens-m"/>
+  <symbol minX="966" maxX="988" minY="122" maxY="144" name="subway-ankara-s"/>
+  <symbol minX="988" maxX="1010" minY="122" maxY="144" name="subway-ankara-m"/>
+  <symbol minX="0" maxX="20" minY="154" maxY="176" name="subway-amsterdam-m"/>
+  <symbol minX="20" maxX="42" minY="154" maxY="176" name="subway-brasilia-m"/>
+  <symbol minX="42" maxX="64" minY="154" maxY="176" name="subway-algeria-m"/>
+  <symbol minX="64" maxX="84" minY="154" maxY="176" name="subway-brescia-m"/>
+  <symbol minX="84" maxX="106" minY="154" maxY="176" name="subway-adana-s"/>
+  <symbol minX="106" maxX="128" minY="154" maxY="176" name="soccer-m"/>
+  <symbol minX="128" maxX="150" minY="154" maxY="176" name="stationery_shop-m"/>
+  <symbol minX="150" maxX="172" minY="154" maxY="176" name="stadium-m"/>
+  <symbol minX="172" maxX="194" minY="154" maxY="176" name="sports-m"/>
+  <symbol minX="194" maxX="216" minY="154" maxY="176" name="subway-budapest-m"/>
+  <symbol minX="216" maxX="238" minY="154" maxY="176" name="subway-buenosaires-m"/>
+  <symbol minX="238" maxX="260" minY="154" maxY="176" name="subway-bursaray-m"/>
+  <symbol minX="260" maxX="282" minY="154" maxY="176" name="speedcam-alert-l"/>
+  <symbol minX="282" maxX="304" minY="154" maxY="176" name="subway-cairo-m"/>
+  <symbol minX="304" maxX="326" minY="154" maxY="176" name="subway-caracas-m"/>
+  <symbol minX="326" maxX="348" minY="154" maxY="176" name="subway-catania-m"/>
+  <symbol minX="348" maxX="370" minY="154" maxY="176" name="speech_therapist-m"/>
+  <symbol minX="370" maxX="392" minY="154" maxY="176" name="subway-warszawa-m"/>
+  <symbol minX="392" maxX="414" minY="154" maxY="176" name="yoga-m"/>
+  <symbol minX="414" maxX="436" minY="154" maxY="176" name="taoist-m"/>
+  <symbol minX="436" maxX="458" minY="154" maxY="176" name="table-tennis-m"/>
+  <symbol minX="458" maxX="480" minY="154" maxY="176" name="swimming-m"/>
+  <symbol minX="480" maxX="502" minY="154" maxY="176" name="sweets-m"/>
+  <symbol minX="502" maxX="524" minY="154" maxY="176" name="survey_point-m"/>
+  <symbol minX="524" maxX="546" minY="154" maxY="176" name="subway-yokohama-m"/>
+  <symbol minX="546" maxX="568" minY="154" maxY="176" name="zoo-m"/>
+  <symbol minX="568" maxX="590" minY="154" maxY="176" name="subway-wuhan-m"/>
+  <symbol minX="590" maxX="612" minY="154" maxY="176" name="subway-washington-m"/>
+  <symbol minX="612" maxX="634" minY="154" maxY="176" name="taxi-m"/>
+  <symbol minX="634" maxX="656" minY="154" maxY="176" name="subway-volgograd-m"/>
+  <symbol minX="656" maxX="678" minY="154" maxY="176" name="subway-vienna-m"/>
+  <symbol minX="678" maxX="700" minY="154" maxY="176" name="subway-valencia-m"/>
+  <symbol minX="700" maxX="722" minY="154" maxY="176" name="subway-tyneandwear-m"/>
+  <symbol minX="722" maxX="744" minY="154" maxY="176" name="subway-tokyo-m"/>
+  <symbol minX="744" maxX="766" minY="154" maxY="176" name="subway-tianjin-m"/>
+  <symbol minX="766" maxX="788" minY="154" maxY="176" name="subway-tashkent-m"/>
+  <symbol minX="788" maxX="810" minY="154" maxY="176" name="subway-stockholm-m"/>
+  <symbol minX="810" maxX="832" minY="154" maxY="176" name="subway-stlouis-m"/>
+  <symbol minX="832" maxX="854" minY="154" maxY="176" name="subway-southkorea-m"/>
+  <symbol minX="854" maxX="876" minY="154" maxY="176" name="tourism-m"/>
+  <symbol minX="876" maxX="898" minY="154" maxY="176" name="vending-m"/>
+  <symbol minX="898" maxX="920" minY="154" maxY="176" name="veterinary-m"/>
+  <symbol minX="920" maxX="942" minY="154" maxY="176" name="video-games-m"/>
+  <symbol minX="942" maxX="964" minY="154" maxY="176" name="viewpoint-m"/>
+  <symbol minX="964" maxX="986" minY="154" maxY="176" name="volleyball-m"/>
+  <symbol minX="986" maxX="1008" minY="154" maxY="176" name="waste-basket-m"/>
+  <symbol minX="0" maxX="22" minY="176" maxY="198" name="tram-m"/>
+  <symbol minX="22" maxX="44" minY="176" maxY="198" name="train-m"/>
+  <symbol minX="44" maxX="66" minY="176" maxY="198" name="toys-m"/>
+  <symbol minX="66" maxX="88" minY="176" maxY="198" name="waterfall-m"/>
+  <symbol minX="88" maxX="110" minY="176" maxY="198" name="subway-sofia-m"/>
+  <symbol minX="110" maxX="132" minY="176" maxY="198" name="tomb-m"/>
+  <symbol minX="132" maxX="154" minY="176" maxY="198" name="toll_booth-m"/>
+  <symbol minX="154" maxX="176" minY="176" maxY="198" name="toilets-m"/>
+  <symbol minX="176" maxX="198" minY="176" maxY="198" name="tire-repair-m"/>
+  <symbol minX="198" maxX="220" minY="176" maxY="198" name="ticket-shop-m"/>
+  <symbol minX="220" maxX="242" minY="176" maxY="198" name="wayside_shrine-m"/>
+  <symbol minX="242" maxX="264" minY="176" maxY="198" name="theme_park-m"/>
+  <symbol minX="264" maxX="286" minY="176" maxY="198" name="windmill-m"/>
+  <symbol minX="286" maxX="308" minY="176" maxY="198" name="theatre-m"/>
+  <symbol minX="308" maxX="330" minY="176" maxY="198" name="tennis-m"/>
+  <symbol minX="330" maxX="352" minY="176" maxY="198" name="subway-kunming-m"/>
+  <symbol minX="352" maxX="374" minY="176" maxY="198" name="subway-mashhad-m"/>
+  <symbol minX="374" maxX="396" minY="176" maxY="198" name="subway-marseille-s"/>
+  <symbol minX="396" maxX="418" minY="176" maxY="198" name="subway-m"/>
+  <symbol minX="418" maxX="440" minY="176" maxY="198" name="subway-lyon-m"/>
+  <symbol minX="440" maxX="462" minY="176" maxY="198" name="subway-losangeles-m"/>
+  <symbol minX="462" maxX="484" minY="176" maxY="198" name="travel_agency_shop-m"/>
+  <symbol minX="484" maxX="506" minY="176" maxY="198" name="subway-lima-m"/>
+  <symbol minX="506" maxX="528" minY="176" maxY="198" name="subway-lille-m"/>
+  <symbol minX="528" maxX="550" minY="176" maxY="198" name="subway-lausanne-m"/>
+  <symbol minX="550" maxX="572" minY="176" maxY="198" name="subway-kyoto-m"/>
+  <symbol minX="572" maxX="594" minY="176" maxY="198" name="subway-massachusetts-m"/>
+  <symbol minX="594" maxX="616" minY="176" maxY="198" name="subway-kobe-m"/>
+  <symbol minX="616" maxX="638" minY="176" maxY="198" name="subway-kazan-m"/>
+  <symbol minX="638" maxX="656" minY="176" maxY="198" name="subway-istanbul-m"/>
+  <symbol minX="656" maxX="678" minY="176" maxY="198" name="subway-isfahan-m"/>
+  <symbol minX="678" maxX="700" minY="176" maxY="198" name="subway-hirosima-m"/>
+  <symbol minX="700" maxX="722" minY="176" maxY="198" name="subway-helsinki-m"/>
+  <symbol minX="722" maxX="744" minY="176" maxY="198" name="subway-guangzhou-m"/>
+  <symbol minX="744" maxX="766" minY="176" maxY="198" name="subway-guadalajara-m"/>
+  <symbol minX="766" maxX="788" minY="176" maxY="198" name="subway-glasgow-m"/>
+  <symbol minX="788" maxX="810" minY="176" maxY="198" name="subway-foshan-m"/>
+  <symbol minX="810" maxX="832" minY="176" maxY="198" name="subway-perugia-m"/>
+  <symbol minX="832" maxX="854" minY="176" maxY="198" name="subway-shiraz-m"/>
+  <symbol minX="854" maxX="876" minY="176" maxY="198" name="subway-saopaulo-m"/>
+  <symbol minX="876" maxX="898" minY="176" maxY="198" name="subway-santodomingo-m"/>
+  <symbol minX="898" maxX="920" minY="176" maxY="198" name="subway-samara-m"/>
+  <symbol minX="920" maxX="942" minY="176" maxY="198" name="subway-riodejaneiro-m"/>
+  <symbol minX="942" maxX="964" minY="176" maxY="198" name="subway-reseau-paris-m"/>
+  <symbol minX="964" maxX="986" minY="176" maxY="198" name="subway-rennes-m"/>
+  <symbol minX="986" maxX="1008" minY="176" maxY="198" name="subway-pyongyang-m"/>
+  <symbol minX="0" maxX="21" minY="198" maxY="220" name="subway-porto-m"/>
+  <symbol minX="21" maxX="43" minY="198" maxY="220" name="subway-pittsburgh-m"/>
+  <symbol minX="43" maxX="65" minY="198" maxY="220" name="subway-ekb-m"/>
+  <symbol minX="65" maxX="87" minY="198" maxY="220" name="subway-panama-m"/>
+  <symbol minX="87" maxX="109" minY="198" maxY="220" name="subway-oslo-m"/>
+  <symbol minX="109" maxX="130" minY="198" maxY="220" name="subway-nnov-m"/>
+  <symbol minX="130" maxX="152" minY="198" maxY="220" name="subway-newyork-m"/>
+  <symbol minX="152" maxX="174" minY="198" maxY="220" name="subway-nagoya-m"/>
+  <symbol minX="174" maxX="196" minY="198" maxY="220" name="subway-minatomirai-m"/>
+  <symbol minX="196" maxX="218" minY="198" maxY="220" name="subway-milan-m"/>
+  <symbol minX="218" maxX="239" minY="198" maxY="220" name="subway-mexico-m"/>
+  <symbol minX="239" maxX="261" minY="198" maxY="220" name="subway-medellin-m"/>
+  <symbol minX="261" maxX="283" minY="198" maxY="220" name="subway-mecca-m"/>
+  <symbol minX="283" maxX="305" minY="198" maxY="220" name="doityourself-m"/>
+  <symbol minX="305" maxX="327" minY="198" maxY="220" name="florist-m"/>
+  <symbol minX="327" maxX="349" minY="198" maxY="220" name="firehydrant-m"/>
+  <symbol minX="349" maxX="371" minY="198" maxY="220" name="fire_station-m"/>
+  <symbol minX="371" maxX="393" minY="198" maxY="220" name="fastfood-m"/>
+  <symbol minX="393" maxX="415" minY="198" maxY="220" name="erotic-m"/>
+  <symbol minX="415" maxX="437" minY="198" maxY="220" name="equestrian-m"/>
+  <symbol minX="437" maxX="459" minY="198" maxY="220" name="emergency-phone-m"/>
+  <symbol minX="459" maxX="481" minY="198" maxY="220" name="embassy-m"/>
+  <symbol minX="481" maxX="503" minY="198" maxY="220" name="electronics-m"/>
+  <symbol minX="503" maxX="525" minY="198" maxY="220" name="electrician-m"/>
+  <symbol minX="525" maxX="547" minY="198" maxY="220" name="dump-station-m"/>
+  <symbol minX="547" maxX="569" minY="198" maxY="220" name="driving_school-m"/>
+  <symbol minX="569" maxX="591" minY="198" maxY="220" name="drinking-water-m"/>
+  <symbol minX="591" maxX="613" minY="198" maxY="220" name="fountain-m"/>
+  <symbol minX="613" maxX="635" minY="198" maxY="220" name="dog_park-m"/>
+  <symbol minX="635" maxX="657" minY="198" maxY="220" name="diving-m"/>
+  <symbol minX="657" maxX="679" minY="198" maxY="220" name="department_store-m"/>
+  <symbol minX="679" maxX="701" minY="198" maxY="220" name="dentist-m"/>
+  <symbol minX="701" maxX="723" minY="198" maxY="220" name="defibrillator-m"/>
+  <symbol minX="723" maxX="745" minY="198" maxY="220" name="curling-m"/>
+  <symbol minX="745" maxX="767" minY="198" maxY="220" name="cross-m"/>
+  <symbol minX="767" maxX="789" minY="198" maxY="220" name="cricket-m"/>
+  <symbol minX="789" maxX="811" minY="198" maxY="220" name="copyshop-m"/>
+  <symbol minX="811" maxX="833" minY="198" maxY="220" name="computer-m"/>
+  <symbol minX="833" maxX="855" minY="198" maxY="220" name="college-m"/>
+  <symbol minX="855" maxX="877" minY="198" maxY="220" name="clothes-m"/>
+  <symbol minX="877" maxX="899" minY="198" maxY="220" name="climbing-m"/>
+  <symbol minX="899" maxX="921" minY="198" maxY="220" name="gift-m"/>
+  <symbol minX="921" maxX="943" minY="198" maxY="220" name="hockey-m"/>
+  <symbol minX="943" maxX="965" minY="198" maxY="220" name="historic-ship-m"/>
+  <symbol minX="965" maxX="987" minY="198" maxY="220" name="hindu-m"/>
+  <symbol minX="987" maxX="1009" minY="198" maxY="220" name="heliport-m"/>
+  <symbol minX="0" maxX="22" minY="220" maxY="242" name="helipad-m"/>
+  <symbol minX="22" maxX="44" minY="220" maxY="242" name="handball-m"/>
+  <symbol minX="44" maxX="66" minY="220" maxY="242" name="hand-m"/>
+  <symbol minX="66" maxX="88" minY="220" maxY="242" name="hairdresser-m"/>
+  <symbol minX="88" maxX="110" minY="220" maxY="242" name="gym-m"/>
+  <symbol minX="110" maxX="132" minY="220" maxY="242" name="guidepost"/>
+  <symbol minX="132" maxX="154" minY="220" maxY="242" name="grocery-m"/>
+  <symbol minX="154" maxX="176" minY="220" maxY="242" name="greengrocer-m"/>
+  <symbol minX="176" maxX="198" minY="220" maxY="242" name="golf-m"/>
+  <symbol minX="198" maxX="220" minY="220" maxY="242" name="cinema-m"/>
+  <symbol minX="220" maxX="242" minY="220" maxY="242" name="geyser-m"/>
+  <symbol minX="242" maxX="264" minY="220" maxY="242" name="geyser-l"/>
+  <symbol minX="264" maxX="286" minY="220" maxY="242" name="gate-m"/>
+  <symbol minX="286" maxX="308" minY="220" maxY="242" name="garden_center-m"/>
+  <symbol minX="308" maxX="330" minY="220" maxY="242" name="garden-outline-m"/>
+  <symbol minX="330" maxX="352" minY="220" maxY="242" name="garden-m"/>
+  <symbol minX="352" maxX="374" minY="220" maxY="242" name="gallery-m"/>
+  <symbol minX="374" maxX="396" minY="220" maxY="242" name="furniture-m"/>
+  <symbol minX="396" maxX="418" minY="220" maxY="242" name="funicular-m"/>
+  <symbol minX="418" maxX="440" minY="220" maxY="242" name="funeral_directors-m"/>
+  <symbol minX="440" maxX="462" minY="220" maxY="242" name="fuel-m"/>
+  <symbol minX="462" maxX="484" minY="220" maxY="242" name="fuel-dispenser-m"/>
+  <symbol minX="484" maxX="506" minY="220" maxY="242" name="fountain-s"/>
+  <symbol minX="506" maxX="528" minY="220" maxY="242" name="bank-m"/>
+  <symbol minX="528" maxX="550" minY="220" maxY="242" name="blacksmith-m"/>
+  <symbol minX="550" maxX="572" minY="220" maxY="242" name="bicycle-repair-station"/>
+  <symbol minX="572" maxX="594" minY="220" maxY="242" name="bicycle-m"/>
+  <symbol minX="594" maxX="616" minY="220" maxY="242" name="beer-m"/>
+  <symbol minX="616" maxX="638" minY="220" maxY="242" name="beekeeper-m"/>
+  <symbol minX="638" maxX="660" minY="220" maxY="242" name="beauty-m"/>
+  <symbol minX="660" maxX="682" minY="220" maxY="242" name="beach-m"/>
+  <symbol minX="682" maxX="704" minY="220" maxY="242" name="bcontrol-m"/>
+  <symbol minX="704" maxX="726" minY="220" maxY="242" name="bbq-m"/>
+  <symbol minX="726" maxX="748" minY="220" maxY="242" name="basketball-m"/>
+  <symbol minX="748" maxX="770" minY="220" maxY="242" name="baseball-m"/>
+  <symbol minX="770" maxX="792" minY="220" maxY="242" name="bar-m"/>
+  <symbol minX="792" maxX="814" minY="220" maxY="242" name="banknote-m"/>
+  <symbol minX="814" maxX="836" minY="220" maxY="242" name="blood_donation-m"/>
+  <symbol minX="836" maxX="858" minY="220" maxY="242" name="bakery-m"/>
+  <symbol minX="858" maxX="880" minY="220" maxY="242" name="badminton-m"/>
+  <symbol minX="880" maxX="902" minY="220" maxY="242" name="australian-football-m"/>
+  <symbol minX="902" maxX="924" minY="220" maxY="242" name="audiologist-m"/>
+  <symbol minX="924" maxX="946" minY="220" maxY="242" name="atm-m"/>
+  <symbol minX="946" maxX="968" minY="220" maxY="242" name="archery-m"/>
+  <symbol minX="968" maxX="990" minY="220" maxY="242" name="archaeological-site-m"/>
+  <symbol minX="990" maxX="1012" minY="220" maxY="242" name="apartment-m"/>
+  <symbol minX="0" maxX="22" minY="242" maxY="264" name="america-football-m"/>
+  <symbol minX="22" maxX="44" minY="242" maxY="264" name="alternative-m"/>
+  <symbol minX="44" maxX="66" minY="242" maxY="264" name="alpine_hut-m"/>
+  <symbol minX="66" maxX="88" minY="242" maxY="264" name="alcohol-m"/>
+  <symbol minX="88" maxX="110" minY="242" maxY="264" name="airport-m"/>
+  <symbol minX="110" maxX="132" minY="242" maxY="264" name="car-wash-m"/>
+  <symbol minX="132" maxX="154" minY="242" maxY="264" name="christian-m"/>
+  <symbol minX="154" maxX="176" minY="242" maxY="264" name="chimney-m"/>
+  <symbol minX="176" maxX="198" minY="242" maxY="264" name="chess-m"/>
+  <symbol minX="198" maxX="220" minY="242" maxY="264" name="chemist-m"/>
+  <symbol minX="220" maxX="242" minY="242" maxY="264" name="charity_shop-m"/>
+  <symbol minX="242" maxX="264" minY="242" maxY="264" name="charging-station-m"/>
+  <symbol minX="264" maxX="286" minY="242" maxY="264" name="cemetery-m"/>
+  <symbol minX="286" maxX="308" minY="242" maxY="264" name="casino-m"/>
+  <symbol minX="308" maxX="330" minY="242" maxY="264" name="carpenter-m"/>
+  <symbol minX="330" maxX="352" minY="242" maxY="264" name="caravan_site-m"/>
+  <symbol minX="352" maxX="374" minY="242" maxY="264" name="caravan-shop-m"/>
+  <symbol minX="374" maxX="396" minY="242" maxY="264" name="car_shop-m"/>
+  <symbol minX="396" maxX="418" minY="242" maxY="264" name="car_sharing-m"/>
+  <symbol minX="418" maxX="440" minY="242" maxY="264" name="restaurant-m"/>
+  <symbol minX="440" maxX="462" minY="242" maxY="264" name="car-repair-m"/>
+  <symbol minX="462" maxX="484" minY="242" maxY="264" name="car-part-m"/>
+  <symbol minX="484" maxX="506" minY="242" maxY="264" name="campsite-m"/>
+  <symbol minX="506" maxX="528" minY="242" maxY="264" name="cafe-m"/>
+  <symbol minX="528" maxX="550" minY="242" maxY="264" name="cable-car-m"/>
+  <symbol minX="550" maxX="572" minY="242" maxY="264" name="butcher-m"/>
+  <symbol minX="572" maxX="594" minY="242" maxY="264" name="bus-m"/>
+  <symbol minX="594" maxX="616" minY="242" maxY="264" name="buddhist-m"/>
+  <symbol minX="616" maxX="638" minY="242" maxY="264" name="brewery-m"/>
+  <symbol minX="638" maxX="660" minY="242" maxY="264" name="bowling_alley-m"/>
+  <symbol minX="660" maxX="682" minY="242" maxY="264" name="bowling-m"/>
+  <symbol minX="682" maxX="704" minY="242" maxY="264" name="bookmaker-m"/>
+  <symbol minX="704" maxX="726" minY="242" maxY="264" name="book-shop-m"/>
+  <symbol minX="726" maxX="748" minY="242" maxY="264" name="lighthouse-m"/>
+  <symbol minX="748" maxX="770" minY="242" maxY="264" name="metal_construction-m"/>
+  <symbol minX="770" maxX="792" minY="242" maxY="264" name="padel-m"/>
+  <symbol minX="792" maxX="814" minY="242" maxY="264" name="media_shop-m"/>
+  <symbol minX="814" maxX="836" minY="242" maxY="264" name="painter-m"/>
+  <symbol minX="836" maxX="858" minY="242" maxY="264" name="media-m"/>
+  <symbol minX="858" maxX="880" minY="242" maxY="264" name="marketplace-m"/>
+  <symbol minX="880" maxX="902" minY="242" maxY="264" name="park-m"/>
+  <symbol minX="902" maxX="924" minY="242" maxY="264" name="marina-m"/>
+  <symbol minX="924" maxX="946" minY="242" maxY="264" name="park-outline-m"/>
+  <symbol minX="946" maxX="968" minY="242" maxY="264" name="military-m"/>
+  <symbol minX="968" maxX="990" minY="242" maxY="264" name="parking-meter-m"/>
+  <symbol minX="990" maxX="1012" minY="242" maxY="264" name="lift_gate-m"/>
+  <symbol minX="0" maxX="22" minY="264" maxY="286" name="library-m"/>
+  <symbol minX="22" maxX="44" minY="264" maxY="286" name="pelota-m"/>
+  <symbol minX="44" maxX="66" minY="264" maxY="286" name="lawyer-m"/>
+  <symbol minX="66" maxX="88" minY="264" maxY="286" name="petshop-m"/>
+  <symbol minX="88" maxX="110" minY="264" maxY="286" name="pharmacy-m"/>
+  <symbol minX="110" maxX="132" minY="264" maxY="286" name="laundry-m"/>
+  <symbol minX="132" maxX="154" minY="264" maxY="286" name="language_school-m"/>
+  <symbol minX="154" maxX="176" minY="264" maxY="286" name="optician-m"/>
+  <symbol minX="176" maxX="198" minY="264" maxY="286" name="nightclub-m"/>
+  <symbol minX="198" maxX="220" minY="264" maxY="286" name="npark-m"/>
+  <symbol minX="220" maxX="242" minY="264" maxY="286" name="newsagent_shop-m"/>
+  <symbol minX="242" maxX="264" minY="264" maxY="286" name="nparkf-m"/>
+  <symbol minX="264" maxX="286" minY="264" maxY="286" name="needle_and_thread-m"/>
+  <symbol minX="286" maxX="308" minY="264" maxY="286" name="nparkf-outline-m"/>
+  <symbol minX="308" maxX="330" minY="264" maxY="286" name="muslim-m"/>
+  <symbol minX="330" maxX="352" minY="264" maxY="286" name="office-m"/>
+  <symbol minX="352" maxX="374" minY="264" maxY="286" name="musical-instrument-m"/>
+  <symbol minX="374" maxX="396" minY="264" maxY="286" name="mail-m"/>
+  <symbol minX="396" maxX="418" minY="264" maxY="286" name="music_school-m"/>
+  <symbol minX="418" maxX="440" minY="264" maxY="286" name="music-m"/>
+  <symbol minX="440" maxX="462" minY="264" maxY="286" name="optometrist-m"/>
+  <symbol minX="462" maxX="484" minY="264" maxY="286" name="museum-m"/>
+  <symbol minX="484" maxX="506" minY="264" maxY="286" name="motorcycle_shop-m"/>
+  <symbol minX="506" maxX="528" minY="264" maxY="286" name="outdoor-shop-m"/>
+  <symbol minX="528" maxX="550" minY="264" maxY="286" name="motel-m"/>
+  <symbol minX="550" maxX="572" minY="264" maxY="286" name="monument-m"/>
+  <symbol minX="572" maxX="594" minY="264" maxY="286" name="mobile_phone-m"/>
+  <symbol minX="594" maxX="616" minY="264" maxY="286" name="hotel-m"/>
+  <symbol minX="616" maxX="638" minY="264" maxY="286" name="public-building-m"/>
   <symbol minX="638" maxX="660" minY="264" maxY="286" name="ice_cream-m"/>
-  <symbol minX="660" maxX="682" minY="264" maxY="286" name="archaeological-site-m"/>
-  <symbol minX="682" maxX="704" minY="264" maxY="286" name="hotel-m"/>
+  <symbol minX="660" maxX="682" minY="264" maxY="286" name="prison-m"/>
+  <symbol minX="682" maxX="704" minY="264" maxY="286" name="pitch-m"/>
   <symbol minX="704" maxX="726" minY="264" maxY="286" name="hostel-m"/>
-  <symbol minX="726" maxX="748" minY="264" maxY="286" name="hospital-m"/>
-  <symbol minX="748" maxX="770" minY="264" maxY="286" name="home-m"/>
-  <symbol minX="770" maxX="792" minY="264" maxY="286" name="hockey-m"/>
-  <symbol minX="792" maxX="814" minY="264" maxY="286" name="historic-ship-m"/>
-  <symbol minX="814" maxX="836" minY="264" maxY="286" name="art-m"/>
-  <symbol minX="836" maxX="858" minY="264" maxY="286" name="hindu-m"/>
-  <symbol minX="858" maxX="880" minY="264" maxY="286" name="heliport-m"/>
-  <symbol minX="880" maxX="902" minY="264" maxY="286" name="helipad-m"/>
-  <symbol minX="902" maxX="924" minY="264" maxY="286" name="mail-m"/>
-  <symbol minX="924" maxX="946" minY="264" maxY="286" name="motel-m"/>
-  <symbol minX="946" maxX="968" minY="264" maxY="286" name="monument-m"/>
-  <symbol minX="968" maxX="990" minY="264" maxY="286" name="mobile_phone-m"/>
-  <symbol minX="990" maxX="1012" minY="264" maxY="286" name="military-m"/>
-  <symbol minX="0" maxX="22" minY="286" maxY="308" name="metal_construction-m"/>
-  <symbol minX="22" maxX="44" minY="286" maxY="308" name="media_shop-m"/>
-  <symbol minX="44" maxX="66" minY="286" maxY="308" name="media-m"/>
-  <symbol minX="66" maxX="88" minY="286" maxY="308" name="america-football-m"/>
-  <symbol minX="88" maxX="110" minY="286" maxY="308" name="marketplace-m"/>
-  <symbol minX="110" maxX="132" minY="286" maxY="308" name="marina-m"/>
-  <symbol minX="132" maxX="154" minY="286" maxY="308" name="hairdresser-m"/>
-  <symbol minX="154" maxX="176" minY="286" maxY="308" name="antiques-m"/>
-  <symbol minX="176" maxX="198" minY="286" maxY="308" name="hand-m"/>
-  <symbol minX="198" maxX="220" minY="286" maxY="308" name="lighthouse-m"/>
-  <symbol minX="220" maxX="242" minY="286" maxY="308" name="lift_gate-m"/>
-  <symbol minX="242" maxX="264" minY="286" maxY="308" name="library-m"/>
-  <symbol minX="264" maxX="286" minY="286" maxY="308" name="apartment-m"/>
-  <symbol minX="286" maxX="308" minY="286" maxY="308" name="lawyer-m"/>
-  <symbol minX="308" maxX="330" minY="286" maxY="308" name="laundry-m"/>
-  <symbol minX="330" maxX="352" minY="286" maxY="308" name="language_school-m"/>
-  <symbol minX="352" maxX="374" minY="286" maxY="307" name="subway-shanghai-m"/>
-  <symbol minX="374" maxX="394" minY="286" maxY="307" name="subway-warsaw-m"/>
-  <symbol minX="394" maxX="416" minY="286" maxY="307" name="subway-sapporo-m"/>
-  <symbol minX="416" maxX="437" minY="286" maxY="307" name="subway-stlouis-s"/>
-  <symbol minX="437" maxX="458" minY="286" maxY="307" name="subway-southkorea-s"/>
-  <symbol minX="458" maxX="479" minY="286" maxY="307" name="subway-spb-m"/>
-  <symbol minX="479" maxX="501" minY="286" maxY="307" name="subway-izmir-m"/>
-  <symbol minX="501" maxX="522" minY="286" maxY="307" name="subway-algeria-s"/>
-  <symbol minX="522" maxX="544" minY="286" maxY="307" name="subway-maracaibo-m"/>
-  <symbol minX="544" maxX="566" minY="286" maxY="307" name="subway-dalian-m"/>
-  <symbol minX="566" maxX="587" minY="286" maxY="307" name="subway-ekb-s"/>
-  <symbol minX="587" maxX="608" minY="286" maxY="307" name="subway-montreal-m"/>
-  <symbol minX="608" maxX="629" minY="286" maxY="307" name="subway-entrance-m"/>
-  <symbol minX="629" maxX="651" minY="286" maxY="307" name="subway-marseille-m"/>
-  <symbol minX="651" maxX="671" minY="286" maxY="306" name="subway-pittsburgh-s"/>
-  <symbol minX="671" maxX="691" minY="286" maxY="306" name="lightrail-berlin-m"/>
-  <symbol minX="691" maxX="711" minY="286" maxY="306" name="search-result"/>
-  <symbol minX="711" maxX="729" minY="286" maxY="306" name="subway-istanbul-s"/>
-  <symbol minX="729" maxX="747" minY="286" maxY="305" name="subway-brescia-s"/>
-  <symbol minX="747" maxX="766" minY="286" maxY="305" name="subway-isfahan-s"/>
-  <symbol minX="766" maxX="785" minY="286" maxY="305" name="bicycle-rental"/>
-  <symbol minX="785" maxX="804" minY="286" maxY="305" name="motorcycle-parking-m"/>
-  <symbol minX="804" maxX="826" minY="286" maxY="305" name="subway-tbilisi-m"/>
-  <symbol minX="826" maxX="861" minY="286" maxY="305" name="coloredmark-default-s"/>
-  <symbol minX="861" maxX="880" minY="286" maxY="305" name="subway-cairo-s"/>
-  <symbol minX="880" maxX="902" minY="286" maxY="305" name="subway-rotterdam-m"/>
-  <symbol minX="902" maxX="924" minY="286" maxY="305" name="subway-taoyuan-m"/>
-  <symbol minX="924" maxX="959" minY="286" maxY="305" name="coloredmark-bg-s"/>
-  <symbol minX="959" maxX="978" minY="286" maxY="305" name="non-found-search-result"/>
-  <symbol minX="978" maxX="997" minY="286" maxY="305" name="parking_pay-m"/>
-  <symbol minX="997" maxX="1016" minY="286" maxY="305" name="speedcam-m"/>
-  <symbol minX="0" maxX="19" minY="308" maxY="327" name="bike-parking-m"/>
-  <symbol minX="19" maxX="38" minY="308" maxY="327" name="subway-sapporo-s"/>
-  <symbol minX="38" maxX="57" minY="308" maxY="327" name="parking_entrance-m"/>
-  <symbol minX="57" maxX="76" minY="308" maxY="327" name="subway-medellin-s"/>
-  <symbol minX="76" maxX="95" minY="308" maxY="327" name="parking-m"/>
-  <symbol minX="95" maxX="113" minY="308" maxY="327" name="subway-mashhad-s"/>
-  <symbol minX="113" maxX="132" minY="308" maxY="327" name="subway-panama-s"/>
-  <symbol minX="132" maxX="151" minY="308" maxY="327" name="parking-disabled-m"/>
-  <symbol minX="151" maxX="171" minY="308" maxY="327" name="subway-izmir-s"/>
-  <symbol minX="171" maxX="189" minY="308" maxY="326" name="subway-sofia-s"/>
-  <symbol minX="189" maxX="203" minY="308" maxY="326" name="bookmark-default-xs"/>
-  <symbol minX="203" maxX="221" minY="308" maxY="326" name="subway-shiraz-s"/>
-  <symbol minX="221" maxX="239" minY="308" maxY="326" name="subway-stockholm-s"/>
-  <symbol minX="239" maxX="257" minY="308" maxY="326" name="subway-guangzhou-s"/>
+  <symbol minX="726" maxX="748" minY="264" maxY="286" name="jewelry-m"/>
+  <symbol minX="748" maxX="770" minY="264" maxY="286" name="place-of-worship-m"/>
+  <symbol minX="770" maxX="792" minY="264" maxY="286" name="remains-m"/>
+  <symbol minX="792" maxX="814" minY="264" maxY="286" name="playground-m"/>
+  <symbol minX="814" maxX="836" minY="264" maxY="286" name="hunting-tower-m"/>
+  <symbol minX="836" maxX="858" minY="264" maxY="286" name="plumber-m"/>
+  <symbol minX="858" maxX="880" minY="264" maxY="286" name="internet_cafe-m"/>
+  <symbol minX="880" maxX="902" minY="264" maxY="286" name="recycling-m"/>
+  <symbol minX="902" maxX="924" minY="264" maxY="286" name="podiatrist-m"/>
+  <symbol minX="924" maxX="946" minY="264" maxY="286" name="police-m"/>
+  <symbol minX="946" maxX="968" minY="264" maxY="286" name="power-m"/>
+  <symbol minX="968" maxX="990" minY="264" maxY="286" name="postbox-m"/>
+  <symbol minX="990" maxX="1012" minY="264" maxY="286" name="information-m"/>
+  <symbol minX="0" maxX="22" minY="286" maxY="308" name="kiosk-m"/>
+  <symbol minX="22" maxX="44" minY="286" maxY="308" name="home-m"/>
+  <symbol minX="44" maxX="66" minY="286" maxY="308" name="hospital-m"/>
+  <symbol minX="66" maxX="88" minY="286" maxY="308" name="physiotherapist-m"/>
+  <symbol minX="88" maxX="110" minY="286" maxY="308" name="sample_collection-m"/>
+  <symbol minX="110" maxX="132" minY="286" maxY="308" name="picnic-m"/>
+  <symbol minX="132" maxX="154" minY="286" maxY="308" name="psychotherapist-m"/>
+  <symbol minX="154" maxX="176" minY="286" maxY="308" name="jewish-m"/>
+  <symbol minX="176" maxX="198" minY="286" maxY="308" name="photo-shop-m"/>
+  <symbol minX="198" maxX="220" minY="286" maxY="308" name="picnic_table-m"/>
+  <symbol minX="220" maxX="242" minY="286" maxY="308" name="kindergarten-m"/>
+  <symbol minX="242" maxX="264" minY="286" maxY="308" name="phone-m"/>
+  <symbol minX="264" maxX="284" minY="286" maxY="307" name="subway-warsaw-m"/>
+  <symbol minX="284" maxX="306" minY="286" maxY="307" name="subway-maracaibo-m"/>
+  <symbol minX="306" maxX="327" minY="286" maxY="307" name="subway-algeria-s"/>
+  <symbol minX="327" maxX="349" minY="286" maxY="307" name="subway-dalian-m"/>
+  <symbol minX="349" maxX="370" minY="286" maxY="307" name="subway-ekb-s"/>
+  <symbol minX="370" maxX="392" minY="286" maxY="307" name="subway-marseille-m"/>
+  <symbol minX="392" maxX="414" minY="286" maxY="307" name="subway-shanghai-m"/>
+  <symbol minX="414" maxX="435" minY="286" maxY="307" name="subway-entrance-m"/>
+  <symbol minX="435" maxX="456" minY="286" maxY="307" name="subway-montreal-m"/>
+  <symbol minX="456" maxX="478" minY="286" maxY="307" name="subway-izmir-m"/>
+  <symbol minX="478" maxX="499" minY="286" maxY="307" name="subway-stlouis-s"/>
+  <symbol minX="499" maxX="520" minY="286" maxY="307" name="subway-spb-m"/>
+  <symbol minX="520" maxX="541" minY="286" maxY="307" name="subway-southkorea-s"/>
+  <symbol minX="541" maxX="563" minY="286" maxY="307" name="subway-sapporo-m"/>
+  <symbol minX="563" maxX="583" minY="286" maxY="306" name="search-result"/>
+  <symbol minX="583" maxX="603" minY="286" maxY="306" name="subway-pittsburgh-s"/>
+  <symbol minX="603" maxX="621" minY="286" maxY="306" name="subway-istanbul-s"/>
+  <symbol minX="621" maxX="641" minY="286" maxY="306" name="lightrail-berlin-m"/>
+  <symbol minX="641" maxX="676" minY="286" maxY="305" name="coloredmark-default-s"/>
+  <symbol minX="676" maxX="698" minY="286" maxY="305" name="subway-taoyuan-m"/>
+  <symbol minX="698" maxX="720" minY="286" maxY="305" name="subway-tbilisi-m"/>
+  <symbol minX="720" maxX="742" minY="286" maxY="305" name="subway-rotterdam-m"/>
+  <symbol minX="742" maxX="762" minY="286" maxY="305" name="subway-izmir-s"/>
+  <symbol minX="762" maxX="781" minY="286" maxY="305" name="subway-sapporo-s"/>
+  <symbol minX="781" maxX="800" minY="286" maxY="305" name="subway-isfahan-s"/>
+  <symbol minX="800" maxX="819" minY="286" maxY="305" name="speedcam-m"/>
+  <symbol minX="819" maxX="838" minY="286" maxY="305" name="motorcycle-parking-m"/>
+  <symbol minX="838" maxX="857" minY="286" maxY="305" name="parking_pay-m"/>
+  <symbol minX="857" maxX="875" minY="286" maxY="305" name="subway-mashhad-s"/>
+  <symbol minX="875" maxX="894" minY="286" maxY="305" name="parking_entrance-m"/>
+  <symbol minX="894" maxX="913" minY="286" maxY="305" name="bicycle-rental"/>
+  <symbol minX="913" maxX="932" minY="286" maxY="305" name="subway-medellin-s"/>
+  <symbol minX="932" maxX="951" minY="286" maxY="305" name="non-found-search-result"/>
+  <symbol minX="951" maxX="970" minY="286" maxY="305" name="bike-parking-m"/>
+  <symbol minX="970" maxX="989" minY="286" maxY="305" name="parking-m"/>
+  <symbol minX="989" maxX="1008" minY="286" maxY="305" name="parking-disabled-m"/>
+  <symbol minX="0" maxX="19" minY="308" maxY="327" name="subway-cairo-s"/>
+  <symbol minX="19" maxX="37" minY="308" maxY="327" name="subway-brescia-s"/>
+  <symbol minX="37" maxX="72" minY="308" maxY="327" name="coloredmark-bg-s"/>
+  <symbol minX="72" maxX="91" minY="308" maxY="327" name="subway-panama-s"/>
+  <symbol minX="91" maxX="109" minY="308" maxY="326" name="subway-athens-s"/>
+  <symbol minX="109" maxX="127" minY="308" maxY="326" name="subway-shiraz-s"/>
+  <symbol minX="127" maxX="145" minY="308" maxY="326" name="subway-tokyo-s"/>
+  <symbol minX="145" maxX="167" minY="308" maxY="326" name="subway-almaty-m"/>
+  <symbol minX="167" maxX="185" minY="308" maxY="326" name="subway-sofia-s"/>
+  <symbol minX="185" maxX="203" minY="308" maxY="326" name="subway-tianjin-s"/>
+  <symbol minX="203" maxX="221" minY="308" maxY="326" name="subway-tyneandwear-s"/>
+  <symbol minX="221" maxX="239" minY="308" maxY="326" name="subway-ubahn-m"/>
+  <symbol minX="239" maxX="257" minY="308" maxY="326" name="subway-yokohama-s"/>
   <symbol minX="257" maxX="277" minY="308" maxY="326" name="subway-taoyuan-s"/>
-  <symbol minX="277" maxX="295" minY="308" maxY="326" name="subway-tashkent-s"/>
-  <symbol minX="295" maxX="313" minY="308" maxY="326" name="subway-tianjin-s"/>
-  <symbol minX="313" maxX="331" minY="308" maxY="326" name="subway-tokyo-s"/>
-  <symbol minX="331" maxX="345" minY="308" maxY="326" name="bookmark-bg-xs"/>
-  <symbol minX="345" maxX="363" minY="308" maxY="326" name="subway-tyneandwear-s"/>
-  <symbol minX="363" maxX="381" minY="308" maxY="326" name="subway-ubahn-m"/>
-  <symbol minX="381" maxX="399" minY="308" maxY="326" name="subway-valencia-s"/>
-  <symbol minX="399" maxX="417" minY="308" maxY="326" name="subway-vienna-s"/>
-  <symbol minX="417" maxX="435" minY="308" maxY="326" name="subway-volgograd-s"/>
-  <symbol minX="435" maxX="453" minY="308" maxY="326" name="subway-yokohama-s"/>
-  <symbol minX="453" maxX="469" minY="308" maxY="326" name="subway-warsaw-s"/>
-  <symbol minX="469" maxX="487" minY="308" maxY="326" name="subway-warszawa-s"/>
-  <symbol minX="487" maxX="508" minY="308" maxY="326" name="subway-yerevan-s"/>
-  <symbol minX="508" maxX="526" minY="308" maxY="326" name="subway-washington-s"/>
-  <symbol minX="526" maxX="544" minY="308" maxY="326" name="subway-wuhan-s"/>
-  <symbol minX="544" maxX="562" minY="308" maxY="326" name="subway-montreal-s"/>
-  <symbol minX="562" maxX="580" minY="308" maxY="326" name="subway-dalian-s"/>
-  <symbol minX="580" maxX="598" minY="308" maxY="326" name="subway-chicago-s"/>
-  <symbol minX="598" maxX="616" minY="308" maxY="326" name="subway-massachusetts-s"/>
-  <symbol minX="616" maxX="634" minY="308" maxY="326" name="subway-mecca-s"/>
-  <symbol minX="634" maxX="652" minY="308" maxY="326" name="subway-chengdu-s"/>
-  <symbol minX="652" maxX="670" minY="308" maxY="326" name="subway-milan-s"/>
-  <symbol minX="670" maxX="688" minY="308" maxY="326" name="subway-minatomirai-s"/>
-  <symbol minX="688" maxX="706" minY="308" maxY="326" name="subway-changchun-s"/>
-  <symbol minX="706" maxX="724" minY="308" maxY="326" name="subway-catania-s"/>
-  <symbol minX="724" maxX="742" minY="308" maxY="326" name="subway-delhi-s"/>
-  <symbol minX="742" maxX="763" minY="308" maxY="326" name="subway-moscow-m"/>
-  <symbol minX="763" maxX="781" minY="308" maxY="326" name="subway-caracas-s"/>
-  <symbol minX="781" maxX="799" minY="308" maxY="326" name="subway-nagoya-s"/>
-  <symbol minX="799" maxX="817" minY="308" maxY="326" name="subway-bursaray-s"/>
-  <symbol minX="817" maxX="835" minY="308" maxY="326" name="subway-buenosaires-s"/>
-  <symbol minX="835" maxX="853" minY="308" maxY="326" name="subway-nnov-s"/>
-  <symbol minX="853" maxX="871" minY="308" maxY="326" name="subway-budapest-s"/>
-  <symbol minX="871" maxX="893" minY="308" maxY="326" name="subway-omsk-s"/>
-  <symbol minX="893" maxX="911" minY="308" maxY="326" name="subway-hirosima-s"/>
-  <symbol minX="911" maxX="929" minY="308" maxY="326" name="subway-kyoto-s"/>
-  <symbol minX="929" maxX="947" minY="308" maxY="326" name="subway-lille-s"/>
-  <symbol minX="947" maxX="965" minY="308" maxY="326" name="subway-lima-s"/>
-  <symbol minX="965" maxX="983" minY="308" maxY="326" name="subway-kunming-s"/>
-  <symbol minX="983" maxX="1001" minY="308" maxY="326" name="subway-lisboa-s"/>
-  <symbol minX="1001" maxX="1019" minY="308" maxY="326" name="subway-losangeles-s"/>
-  <symbol minX="0" maxX="18" minY="327" maxY="345" name="subway-kobe-s"/>
-  <symbol minX="18" maxX="36" minY="327" maxY="345" name="subway-kazan-s"/>
-  <symbol minX="36" maxX="54" minY="327" maxY="345" name="subway-shanghai-s"/>
-  <symbol minX="54" maxX="72" minY="327" maxY="345" name="subway-helsinki-s"/>
-  <symbol minX="72" maxX="90" minY="327" maxY="345" name="subway-guadalajara-s"/>
-  <symbol minX="90" maxX="108" minY="327" maxY="345" name="subway-glasgow-s"/>
-  <symbol minX="108" maxX="129" minY="327" maxY="345" name="subway-fukuoka-s"/>
-  <symbol minX="129" maxX="147" minY="327" maxY="345" name="subway-foshan-s"/>
-  <symbol minX="147" maxX="169" minY="327" maxY="345" name="subway-lyon-m"/>
-  <symbol minX="169" maxX="187" minY="327" maxY="345" name="subway-dubai-s"/>
-  <symbol minX="187" maxX="209" minY="327" maxY="345" name="subway-dnepro-m"/>
-  <symbol minX="209" maxX="227" minY="327" maxY="345" name="subway-beijing-s"/>
-  <symbol minX="227" maxX="245" minY="327" maxY="345" name="subway-saopaulo-s"/>
-  <symbol minX="245" maxX="263" minY="327" maxY="345" name="subway-bangkok-s"/>
-  <symbol minX="263" maxX="281" minY="327" maxY="345" name="subway-athens-s"/>
-  <symbol minX="281" maxX="299" minY="327" maxY="345" name="subway-santodomingo-s"/>
-  <symbol minX="299" maxX="317" minY="327" maxY="345" name="subway-rome-m"/>
-  <symbol minX="317" maxX="335" minY="327" maxY="345" name="subway-riodejaneiro-s"/>
-  <symbol minX="335" maxX="355" minY="327" maxY="345" name="subway-seattle-m"/>
-  <symbol minX="355" maxX="373" minY="327" maxY="345" name="subway-reseau-paris-s"/>
-  <symbol minX="373" maxX="391" minY="327" maxY="345" name="subway-rennes-s"/>
-  <symbol minX="391" maxX="409" minY="327" maxY="345" name="subway-pyongyang-s"/>
-  <symbol minX="409" maxX="427" minY="327" maxY="345" name="subway-porto-s"/>
-  <symbol minX="427" maxX="445" minY="327" maxY="345" name="subway-perugia-s"/>
-  <symbol minX="445" maxX="463" minY="327" maxY="345" name="subway-bengaluru-s"/>
-  <symbol minX="463" maxX="481" minY="327" maxY="345" name="subway-samara-s"/>
-  <symbol minX="481" maxX="499" minY="327" maxY="345" name="subway-paris-m"/>
-  <symbol minX="499" maxX="517" minY="327" maxY="345" name="subway-brasilia-s"/>
-  <symbol minX="517" maxX="535" minY="327" maxY="345" name="subway-oslo-s"/>
-  <symbol minX="535" maxX="556" minY="327" maxY="345" name="subway-santiago-s"/>
-  <symbol minX="556" maxX="578" minY="327" maxY="345" name="subway-almaty-m"/>
-  <symbol minX="578" maxX="599" minY="327" maxY="344" name="subway-tabriz-s"/>
-  <symbol minX="599" maxX="616" minY="327" maxY="344" name="subway-spb-s"/>
-  <symbol minX="616" maxX="638" minY="327" maxY="344" name="subway-lucknow-s"/>
-  <symbol minX="638" maxX="660" minY="327" maxY="344" name="subway-tabriz-m"/>
-  <symbol minX="660" maxX="676" minY="327" maxY="344" name="subway-amsterdam-s"/>
-  <symbol minX="676" maxX="697" minY="327" maxY="344" name="subway-almaty-s"/>
-  <symbol minX="697" maxX="719" minY="327" maxY="344" name="subway-osaka-m"/>
-  <symbol minX="719" maxX="741" minY="327" maxY="344" name="subway-santiago-m"/>
-  <symbol minX="741" maxX="763" minY="327" maxY="344" name="subway-kryvyirih-m"/>
-  <symbol minX="763" maxX="780" minY="327" maxY="344" name="subway-lausanne-s"/>
-  <symbol minX="780" maxX="802" minY="327" maxY="344" name="subway-omsk-m"/>
-  <symbol minX="802" maxX="819" minY="327" maxY="344" name="cave-m"/>
-  <symbol minX="819" maxX="841" minY="327" maxY="344" name="subway-yerevan-m"/>
-  <symbol minX="841" maxX="863" minY="327" maxY="344" name="subway-alicante-m"/>
-  <symbol minX="863" maxX="885" minY="327" maxY="344" name="subway-philadelphia-m"/>
-  <symbol minX="885" maxX="901" minY="327" maxY="344" name="subway-mexico-s"/>
-  <symbol minX="901" maxX="919" minY="327" maxY="344" name="subway-maracaibo-s"/>
-  <symbol minX="919" maxX="940" minY="327" maxY="344" name="subway-london-m"/>
-  <symbol minX="940" maxX="962" minY="327" maxY="343" name="subway-kolkata-m"/>
-  <symbol minX="962" maxX="978" minY="327" maxY="343" name="zoo-s"/>
-  <symbol minX="978" maxX="994" minY="327" maxY="343" name="shop-s"/>
-  <symbol minX="994" maxX="1010" minY="327" maxY="343" name="stadium-s"/>
-  <symbol minX="0" maxX="16" minY="345" maxY="361" name="monument-s"/>
-  <symbol minX="16" maxX="32" minY="345" maxY="361" name="lighthouse-s"/>
-  <symbol minX="32" maxX="53" minY="345" maxY="361" name="subway-dnepro-s"/>
-  <symbol minX="53" maxX="69" minY="345" maxY="361" name="museum-s"/>
-  <symbol minX="69" maxX="85" minY="345" maxY="361" name="muslim-s"/>
-  <symbol minX="85" maxX="101" minY="345" maxY="361" name="subway-entrance-s"/>
-  <symbol minX="101" maxX="117" minY="345" maxY="361" name="nparkf-outline-s"/>
-  <symbol minX="117" maxX="133" minY="345" maxY="361" name="nparkf-s"/>
-  <symbol minX="133" maxX="149" minY="345" maxY="361" name="ship-s"/>
-  <symbol minX="149" maxX="165" minY="345" maxY="361" name="shinto-s"/>
-  <symbol minX="165" maxX="181" minY="345" maxY="361" name="park-outline-s"/>
-  <symbol minX="181" maxX="197" minY="345" maxY="361" name="park-s"/>
-  <symbol minX="197" maxX="219" minY="345" maxY="361" name="subway-barcelona-m"/>
-  <symbol minX="219" maxX="241" minY="345" maxY="361" name="subway-bilbao-m"/>
-  <symbol minX="241" maxX="257" minY="345" maxY="361" name="remains-s"/>
-  <symbol minX="257" maxX="279" minY="345" maxY="361" name="subway-bucharest-m"/>
-  <symbol minX="279" maxX="295" minY="345" maxY="361" name="place-of-worship-s"/>
-  <symbol minX="295" maxX="311" minY="345" maxY="361" name="car-repair-s"/>
-  <symbol minX="311" maxX="327" minY="345" maxY="361" name="tourism-s"/>
-  <symbol minX="327" maxX="349" minY="345" maxY="361" name="subway-madrid-m"/>
-  <symbol minX="349" maxX="365" minY="345" maxY="361" name="toll_booth-s"/>
-  <symbol minX="365" maxX="381" minY="345" maxY="361" name="drinking-water-s"/>
-  <symbol minX="381" maxX="397" minY="345" maxY="361" name="college-s"/>
-  <symbol minX="397" maxX="413" minY="345" maxY="361" name="christian-s"/>
-  <symbol minX="413" maxX="429" minY="345" maxY="361" name="theme_park-s"/>
-  <symbol minX="429" maxX="445" minY="345" maxY="361" name="theatre-s"/>
-  <symbol minX="445" maxX="461" minY="345" maxY="361" name="taoist-s"/>
-  <symbol minX="461" maxX="477" minY="345" maxY="361" name="charging-station-s"/>
-  <symbol minX="477" maxX="493" minY="345" maxY="361" name="subway-newyork-s"/>
-  <symbol minX="493" maxX="509" minY="345" maxY="361" name="waste-basket-s"/>
-  <symbol minX="509" maxX="528" minY="345" maxY="361" name="subway-osaka-s"/>
-  <symbol minX="528" maxX="550" minY="345" maxY="361" name="subway-palma-m"/>
-  <symbol minX="550" maxX="571" minY="345" maxY="361" name="subway-palma-s"/>
-  <symbol minX="571" maxX="587" minY="345" maxY="361" name="cable-car-s"/>
-  <symbol minX="587" maxX="607" minY="345" maxY="361" name="subway-philadelphia-s"/>
-  <symbol minX="607" maxX="625" minY="345" maxY="361" name="subway-tbilisi-s"/>
-  <symbol minX="625" maxX="641" minY="345" maxY="361" name="bus-s"/>
-  <symbol minX="641" maxX="659" minY="345" maxY="361" name="subway-rotterdam-s"/>
-  <symbol minX="659" maxX="675" minY="345" maxY="361" name="subway-s"/>
-  <symbol minX="675" maxX="691" minY="345" maxY="361" name="buddhist-s"/>
-  <symbol minX="691" maxX="707" minY="345" maxY="361" name="airport-s"/>
-  <symbol minX="707" maxX="723" minY="345" maxY="361" name="hindu-s"/>
-  <symbol minX="723" maxX="745" minY="345" maxY="361" name="subway-lucknow-m"/>
-  <symbol minX="745" maxX="761" minY="345" maxY="361" name="hospital-s"/>
-  <symbol minX="761" maxX="777" minY="345" maxY="361" name="viewpoint-s"/>
-  <symbol minX="777" maxX="793" minY="345" maxY="361" name="hotel-s"/>
-  <symbol minX="793" maxX="809" minY="345" maxY="361" name="jewish-s"/>
-  <symbol minX="809" maxX="822" minY="345" maxY="361" name="transit_train-m"/>
-  <symbol minX="822" maxX="838" minY="345" maxY="361" name="geyser-s"/>
-  <symbol minX="838" maxX="854" minY="345" maxY="361" name="fuel-s"/>
-  <symbol minX="854" maxX="867" minY="345" maxY="361" name="transit_light_rail-m"/>
-  <symbol minX="867" maxX="885" minY="345" maxY="361" name="transfer_arrow"/>
-  <symbol minX="885" maxX="901" minY="345" maxY="361" name="waterfall-s"/>
-  <symbol minX="901" maxX="917" minY="345" maxY="361" name="tram-s"/>
-  <symbol minX="917" maxX="933" minY="345" maxY="361" name="train-s"/>
-  <symbol minX="933" maxX="951" minY="345" maxY="360" name="subway-alicante-s"/>
-  <symbol minX="951" maxX="973" minY="345" maxY="360" name="subway-sanfrancisco-s"/>
-  <symbol minX="973" maxX="995" minY="345" maxY="360" name="subway-brussel-s"/>
-  <symbol minX="995" maxX="1017" minY="345" maxY="360" name="subway-sanfrancisco-m"/>
-  <symbol minX="0" maxX="15" minY="361" maxY="376" name="board"/>
-  <symbol minX="15" maxX="34" minY="361" maxY="376" name="subway-kryvyirih-s"/>
-  <symbol minX="34" maxX="49" minY="361" maxY="376" name="storage-tank"/>
-  <symbol minX="49" maxX="71" minY="361" maxY="376" name="subway-sendai-m"/>
-  <symbol minX="71" maxX="91" minY="361" maxY="376" name="subway-barcelona-s"/>
-  <symbol minX="91" maxX="106" minY="361" maxY="376" name="lightrail-berlin-s"/>
-  <symbol minX="106" maxX="118" minY="361" maxY="376" name="transit_train-s"/>
-  <symbol minX="118" maxX="140" minY="361" maxY="376" name="subway-fukuoka-m"/>
-  <symbol minX="140" maxX="160" minY="361" maxY="376" name="subway-madrid-s"/>
-  <symbol minX="160" maxX="175" minY="361" maxY="376" name="elevator"/>
-  <symbol minX="175" maxX="188" minY="361" maxY="376" name="transit_monorail-m"/>
-  <symbol minX="188" maxX="203" minY="361" maxY="376" name="transit_subway-m"/>
-  <symbol minX="203" maxX="218" minY="361" maxY="376" name="subway-moscow-s"/>
-  <symbol minX="218" maxX="240" minY="361" maxY="376" name="subway-kharkiv-s"/>
-  <symbol minX="240" maxX="262" minY="361" maxY="376" name="subway-novosibirsk-m"/>
-  <symbol minX="262" maxX="283" minY="361" maxY="376" name="subway-bucharest-s"/>
-  <symbol minX="283" maxX="304" minY="361" maxY="376" name="subway-novosibirsk-s"/>
-  <symbol minX="304" maxX="322" minY="361" maxY="376" name="subway-lyon-s"/>
-  <symbol minX="322" maxX="343" minY="361" maxY="376" name="subway-kiev-m"/>
-  <symbol minX="343" maxX="358" minY="361" maxY="376" name="map"/>
-  <symbol minX="358" maxX="373" minY="361" maxY="376" name="subway-paris-s"/>
-  <symbol minX="373" maxX="387" minY="361" maxY="375" name="cave-s"/>
-  <symbol minX="387" maxX="409" minY="361" maxY="375" name="subway-sendai-s"/>
-  <symbol minX="409" maxX="431" minY="361" maxY="375" name="subway-brussel-m"/>
-  <symbol minX="431" maxX="453" minY="361" maxY="375" name="subway-haagse-s"/>
-  <symbol minX="453" maxX="475" minY="361" maxY="375" name="subway-haagse-m"/>
-  <symbol minX="475" maxX="497" minY="361" maxY="375" name="subway-edmonton-s"/>
-  <symbol minX="497" maxX="518" minY="361" maxY="375" name="subway-manila-s"/>
-  <symbol minX="518" maxX="540" minY="361" maxY="375" name="subway-manila-m"/>
-  <symbol minX="540" maxX="562" minY="361" maxY="375" name="subway-kharkiv-m"/>
-  <symbol minX="562" maxX="576" minY="361" maxY="375" name="subway-ubahn-s"/>
-  <symbol minX="576" maxX="590" minY="361" maxY="375" name="subway-rome-s"/>
-  <symbol minX="590" maxX="612" minY="361" maxY="375" name="subway-taipei-s"/>
-  <symbol minX="612" maxX="631" minY="361" maxY="375" name="subway-bilbao-s"/>
-  <symbol minX="631" maxX="648" minY="361" maxY="375" name="subway-london-s"/>
-  <symbol minX="648" maxX="663" minY="361" maxY="375" name="subway-seattle-s"/>
-  <symbol minX="663" maxX="675" minY="361" maxY="374" name="transit_light_rail-s"/>
-  <symbol minX="675" maxX="688" minY="361" maxY="374" name="star-l"/>
-  <symbol minX="688" maxX="697" minY="361" maxY="374" name="entrance-s"/>
-  <symbol minX="697" maxX="711" minY="361" maxY="374" name="main_entrance-s"/>
-  <symbol minX="711" maxX="724" minY="361" maxY="374" name="gate-s"/>
-  <symbol minX="724" maxX="737" minY="361" maxY="374" name="transit_subway-s"/>
-  <symbol minX="737" maxX="749" minY="361" maxY="374" name="transit_monorail-s"/>
-  <symbol minX="749" maxX="762" minY="361" maxY="374" name="subway-xs"/>
-  <symbol minX="762" maxX="775" minY="361" maxY="374" name="parking-s"/>
-  <symbol minX="775" maxX="788" minY="361" maxY="374" name="subway-newyork-xs"/>
-  <symbol minX="788" maxX="807" minY="361" maxY="374" name="railway-crossing-l"/>
-  <symbol minX="807" maxX="822" minY="361" maxY="374" name="bench"/>
-  <symbol minX="822" maxX="835" minY="361" maxY="374" name="speedcam-s"/>
-  <symbol minX="835" maxX="853" minY="361" maxY="373" name="subway-minsk-m"/>
-  <symbol minX="853" maxX="874" minY="361" maxY="373" name="subway-malaga-s"/>
-  <symbol minX="874" maxX="896" minY="361" maxY="373" name="subway-malaga-m"/>
-  <symbol minX="896" maxX="918" minY="361" maxY="373" name="subway-taipei-m"/>
-  <symbol minX="918" maxX="930" minY="361" maxY="373" name="star-m"/>
-  <symbol minX="930" maxX="947" minY="361" maxY="373" name="subway-kolkata-s"/>
-  <symbol minX="947" maxX="965" minY="361" maxY="373" name="subway-kiev-s"/>
-  <symbol minX="965" maxX="986" minY="361" maxY="373" name="subway-baku-s"/>
-  <symbol minX="986" maxX="1008" minY="361" maxY="373" name="subway-edmonton-m"/>
-  <symbol minX="1008" maxX="1022" minY="361" maxY="373" name="volcano-m"/>
-  <symbol minX="0" maxX="17" minY="376" maxY="388" name="railway-crossing-m"/>
-  <symbol minX="17" maxX="30" minY="376" maxY="388" name="plaque"/>
-  <symbol minX="30" maxX="41" minY="376" maxY="387" name="star-s"/>
-  <symbol minX="41" maxX="63" minY="376" maxY="387" name="subway-baku-m"/>
-  <symbol minX="63" maxX="85" minY="376" maxY="387" name="subway-chongqing-s"/>
-  <symbol minX="85" maxX="102" minY="376" maxY="387" name="subway-minsk-s"/>
-  <symbol minX="102" maxX="124" minY="376" maxY="386" name="subway-chongqing-m"/>
-  <symbol minX="124" maxX="144" minY="376" maxY="386" name="arrow-m"/>
-  <symbol minX="144" maxX="155" minY="376" maxY="386" name="peakt-m"/>
-  <symbol minX="155" maxX="171" minY="376" maxY="386" name="mountain-pass"/>
-  <symbol minX="171" maxX="182" minY="376" maxY="386" name="volcano-s"/>
-  <symbol minX="182" maxX="191" minY="376" maxY="385" name="peakt-s"/>
-  <symbol minX="191" maxX="200" minY="376" maxY="385" name="zero-icon"/>
-  <symbol minX="200" maxX="208" minY="376" maxY="384" name="dot-m"/>
-  <symbol minX="208" maxX="223" minY="376" maxY="384" name="arrow-s"/>
-  <symbol minX="223" maxX="234" minY="376" maxY="382" name="arrow-xs"/>
+  <symbol minX="277" maxX="298" minY="308" maxY="326" name="subway-yerevan-s"/>
+  <symbol minX="298" maxX="316" minY="308" maxY="326" name="subway-valencia-s"/>
+  <symbol minX="316" maxX="334" minY="308" maxY="326" name="subway-hirosima-s"/>
+  <symbol minX="334" maxX="352" minY="308" maxY="326" name="subway-wuhan-s"/>
+  <symbol minX="352" maxX="370" minY="308" maxY="326" name="subway-stockholm-s"/>
+  <symbol minX="370" maxX="388" minY="308" maxY="326" name="subway-washington-s"/>
+  <symbol minX="388" maxX="406" minY="308" maxY="326" name="subway-warszawa-s"/>
+  <symbol minX="406" maxX="424" minY="308" maxY="326" name="subway-tashkent-s"/>
+  <symbol minX="424" maxX="440" minY="308" maxY="326" name="subway-warsaw-s"/>
+  <symbol minX="440" maxX="458" minY="308" maxY="326" name="subway-volgograd-s"/>
+  <symbol minX="458" maxX="476" minY="308" maxY="326" name="subway-vienna-s"/>
+  <symbol minX="476" maxX="494" minY="308" maxY="326" name="subway-changchun-s"/>
+  <symbol minX="494" maxX="512" minY="308" maxY="326" name="subway-delhi-s"/>
+  <symbol minX="512" maxX="530" minY="308" maxY="326" name="subway-dalian-s"/>
+  <symbol minX="530" maxX="548" minY="308" maxY="326" name="subway-massachusetts-s"/>
+  <symbol minX="548" maxX="566" minY="308" maxY="326" name="subway-mecca-s"/>
+  <symbol minX="566" maxX="584" minY="308" maxY="326" name="subway-chicago-s"/>
+  <symbol minX="584" maxX="602" minY="308" maxY="326" name="subway-chengdu-s"/>
+  <symbol minX="602" maxX="620" minY="308" maxY="326" name="subway-milan-s"/>
+  <symbol minX="620" maxX="638" minY="308" maxY="326" name="subway-minatomirai-s"/>
+  <symbol minX="638" maxX="660" minY="308" maxY="326" name="subway-dnepro-m"/>
+  <symbol minX="660" maxX="678" minY="308" maxY="326" name="subway-montreal-s"/>
+  <symbol minX="678" maxX="699" minY="308" maxY="326" name="subway-moscow-m"/>
+  <symbol minX="699" maxX="717" minY="308" maxY="326" name="subway-catania-s"/>
+  <symbol minX="717" maxX="735" minY="308" maxY="326" name="subway-nagoya-s"/>
+  <symbol minX="735" maxX="753" minY="308" maxY="326" name="subway-caracas-s"/>
+  <symbol minX="753" maxX="771" minY="308" maxY="326" name="subway-nnov-s"/>
+  <symbol minX="771" maxX="789" minY="308" maxY="326" name="subway-bursaray-s"/>
+  <symbol minX="789" maxX="807" minY="308" maxY="326" name="subway-kyoto-s"/>
+  <symbol minX="807" maxX="825" minY="308" maxY="326" name="subway-helsinki-s"/>
+  <symbol minX="825" maxX="843" minY="308" maxY="326" name="subway-kazan-s"/>
+  <symbol minX="843" maxX="861" minY="308" maxY="326" name="subway-guangzhou-s"/>
+  <symbol minX="861" maxX="879" minY="308" maxY="326" name="subway-guadalajara-s"/>
+  <symbol minX="879" maxX="897" minY="308" maxY="326" name="subway-kobe-s"/>
+  <symbol minX="897" maxX="915" minY="308" maxY="326" name="subway-glasgow-s"/>
+  <symbol minX="915" maxX="933" minY="308" maxY="326" name="subway-kunming-s"/>
+  <symbol minX="933" maxX="954" minY="308" maxY="326" name="subway-fukuoka-s"/>
+  <symbol minX="954" maxX="972" minY="308" maxY="326" name="subway-bangkok-s"/>
+  <symbol minX="972" maxX="990" minY="308" maxY="326" name="subway-foshan-s"/>
+  <symbol minX="990" maxX="1008" minY="308" maxY="326" name="subway-lille-s"/>
+  <symbol minX="0" maxX="18" minY="327" maxY="345" name="subway-lima-s"/>
+  <symbol minX="18" maxX="36" minY="327" maxY="345" name="subway-lisboa-s"/>
+  <symbol minX="36" maxX="54" minY="327" maxY="345" name="subway-losangeles-s"/>
+  <symbol minX="54" maxX="72" minY="327" maxY="345" name="subway-lyon-s"/>
+  <symbol minX="72" maxX="90" minY="327" maxY="345" name="subway-dubai-s"/>
+  <symbol minX="90" maxX="112" minY="327" maxY="345" name="subway-omsk-s"/>
+  <symbol minX="112" maxX="130" minY="327" maxY="345" name="subway-beijing-s"/>
+  <symbol minX="130" maxX="148" minY="327" maxY="345" name="subway-samara-s"/>
+  <symbol minX="148" maxX="166" minY="327" maxY="345" name="subway-bengaluru-s"/>
+  <symbol minX="166" maxX="180" minY="327" maxY="345" name="bookmark-default-xs"/>
+  <symbol minX="180" maxX="198" minY="327" maxY="345" name="subway-rome-m"/>
+  <symbol minX="198" maxX="219" minY="327" maxY="345" name="subway-santiago-s"/>
+  <symbol minX="219" maxX="237" minY="327" maxY="345" name="subway-riodejaneiro-s"/>
+  <symbol minX="237" maxX="255" minY="327" maxY="345" name="subway-santodomingo-s"/>
+  <symbol minX="255" maxX="273" minY="327" maxY="345" name="subway-reseau-paris-s"/>
+  <symbol minX="273" maxX="291" minY="327" maxY="345" name="subway-rennes-s"/>
+  <symbol minX="291" maxX="309" minY="327" maxY="345" name="subway-pyongyang-s"/>
+  <symbol minX="309" maxX="327" minY="327" maxY="345" name="subway-brasilia-s"/>
+  <symbol minX="327" maxX="345" minY="327" maxY="345" name="subway-porto-s"/>
+  <symbol minX="345" maxX="363" minY="327" maxY="345" name="subway-saopaulo-s"/>
+  <symbol minX="363" maxX="381" minY="327" maxY="345" name="subway-perugia-s"/>
+  <symbol minX="381" maxX="399" minY="327" maxY="345" name="subway-paris-m"/>
+  <symbol minX="399" maxX="419" minY="327" maxY="345" name="subway-seattle-m"/>
+  <symbol minX="419" maxX="433" minY="327" maxY="345" name="bookmark-bg-xs"/>
+  <symbol minX="433" maxX="451" minY="327" maxY="345" name="subway-budapest-s"/>
+  <symbol minX="451" maxX="469" minY="327" maxY="345" name="subway-oslo-s"/>
+  <symbol minX="469" maxX="487" minY="327" maxY="345" name="subway-buenosaires-s"/>
+  <symbol minX="487" maxX="505" minY="327" maxY="345" name="subway-shanghai-s"/>
+  <symbol minX="505" maxX="527" minY="327" maxY="344" name="subway-kryvyirih-m"/>
+  <symbol minX="527" maxX="544" minY="327" maxY="344" name="cave-m"/>
+  <symbol minX="544" maxX="561" minY="327" maxY="344" name="subway-spb-s"/>
+  <symbol minX="561" maxX="583" minY="327" maxY="344" name="subway-santiago-m"/>
+  <symbol minX="583" maxX="600" minY="327" maxY="344" name="subway-lausanne-s"/>
+  <symbol minX="600" maxX="622" minY="327" maxY="344" name="subway-omsk-m"/>
+  <symbol minX="622" maxX="644" minY="327" maxY="344" name="subway-tabriz-m"/>
+  <symbol minX="644" maxX="665" minY="327" maxY="344" name="subway-tabriz-s"/>
+  <symbol minX="665" maxX="686" minY="327" maxY="344" name="subway-london-m"/>
+  <symbol minX="686" maxX="708" minY="327" maxY="344" name="subway-lucknow-s"/>
+  <symbol minX="708" maxX="724" minY="327" maxY="344" name="subway-amsterdam-s"/>
+  <symbol minX="724" maxX="742" minY="327" maxY="344" name="subway-maracaibo-s"/>
+  <symbol minX="742" maxX="764" minY="327" maxY="344" name="subway-osaka-m"/>
+  <symbol minX="764" maxX="785" minY="327" maxY="344" name="subway-almaty-s"/>
+  <symbol minX="785" maxX="801" minY="327" maxY="344" name="subway-mexico-s"/>
+  <symbol minX="801" maxX="823" minY="327" maxY="344" name="subway-philadelphia-m"/>
+  <symbol minX="823" maxX="845" minY="327" maxY="344" name="subway-alicante-m"/>
+  <symbol minX="845" maxX="867" minY="327" maxY="344" name="subway-yerevan-m"/>
+  <symbol minX="867" maxX="883" minY="327" maxY="343" name="airport-s"/>
+  <symbol minX="883" maxX="899" minY="327" maxY="343" name="zoo-s"/>
+  <symbol minX="899" maxX="915" minY="327" maxY="343" name="viewpoint-s"/>
+  <symbol minX="915" maxX="931" minY="327" maxY="343" name="waste-basket-s"/>
+  <symbol minX="931" maxX="947" minY="327" maxY="343" name="waterfall-s"/>
+  <symbol minX="947" maxX="963" minY="327" maxY="343" name="place-of-worship-s"/>
+  <symbol minX="963" maxX="979" minY="327" maxY="343" name="subway-s"/>
+  <symbol minX="979" maxX="997" minY="327" maxY="343" name="subway-rotterdam-s"/>
+  <symbol minX="997" maxX="1018" minY="327" maxY="343" name="subway-palma-s"/>
+  <symbol minX="0" maxX="22" minY="345" maxY="361" name="subway-palma-m"/>
+  <symbol minX="22" maxX="41" minY="345" maxY="361" name="subway-osaka-s"/>
+  <symbol minX="41" maxX="57" minY="345" maxY="361" name="monument-s"/>
+  <symbol minX="57" maxX="73" minY="345" maxY="361" name="museum-s"/>
+  <symbol minX="73" maxX="89" minY="345" maxY="361" name="muslim-s"/>
+  <symbol minX="89" maxX="105" minY="345" maxY="361" name="subway-newyork-s"/>
+  <symbol minX="105" maxX="121" minY="345" maxY="361" name="nparkf-outline-s"/>
+  <symbol minX="121" maxX="137" minY="345" maxY="361" name="nparkf-s"/>
+  <symbol minX="137" maxX="153" minY="345" maxY="361" name="park-outline-s"/>
+  <symbol minX="153" maxX="169" minY="345" maxY="361" name="park-s"/>
+  <symbol minX="169" maxX="189" minY="345" maxY="361" name="subway-philadelphia-s"/>
+  <symbol minX="189" maxX="205" minY="345" maxY="361" name="remains-s"/>
+  <symbol minX="205" maxX="221" minY="345" maxY="361" name="shinto-s"/>
+  <symbol minX="221" maxX="237" minY="345" maxY="361" name="ship-s"/>
+  <symbol minX="237" maxX="259" minY="345" maxY="361" name="subway-madrid-m"/>
+  <symbol minX="259" maxX="281" minY="345" maxY="361" name="subway-lucknow-m"/>
+  <symbol minX="281" maxX="297" minY="345" maxY="361" name="shop-s"/>
+  <symbol minX="297" maxX="313" minY="345" maxY="361" name="stadium-s"/>
+  <symbol minX="313" maxX="335" minY="345" maxY="361" name="subway-kolkata-m"/>
+  <symbol minX="335" maxX="357" minY="345" maxY="361" name="subway-barcelona-m"/>
+  <symbol minX="357" maxX="379" minY="345" maxY="361" name="subway-bilbao-m"/>
+  <symbol minX="379" maxX="401" minY="345" maxY="361" name="subway-bucharest-m"/>
+  <symbol minX="401" maxX="417" minY="345" maxY="361" name="subway-entrance-s"/>
+  <symbol minX="417" maxX="438" minY="345" maxY="361" name="subway-dnepro-s"/>
+  <symbol minX="438" maxX="454" minY="345" maxY="361" name="tourism-s"/>
+  <symbol minX="454" maxX="467" minY="345" maxY="361" name="transit_train-m"/>
+  <symbol minX="467" maxX="483" minY="345" maxY="361" name="buddhist-s"/>
+  <symbol minX="483" maxX="499" minY="345" maxY="361" name="bus-s"/>
+  <symbol minX="499" maxX="515" minY="345" maxY="361" name="cable-car-s"/>
+  <symbol minX="515" maxX="531" minY="345" maxY="361" name="car-repair-s"/>
+  <symbol minX="531" maxX="544" minY="345" maxY="361" name="transit_light_rail-m"/>
+  <symbol minX="544" maxX="560" minY="345" maxY="361" name="charging-station-s"/>
+  <symbol minX="560" maxX="576" minY="345" maxY="361" name="christian-s"/>
+  <symbol minX="576" maxX="594" minY="345" maxY="361" name="transfer_arrow"/>
+  <symbol minX="594" maxX="610" minY="345" maxY="361" name="tram-s"/>
+  <symbol minX="610" maxX="626" minY="345" maxY="361" name="train-s"/>
+  <symbol minX="626" maxX="642" minY="345" maxY="361" name="lighthouse-s"/>
+  <symbol minX="642" maxX="658" minY="345" maxY="361" name="toll_booth-s"/>
+  <symbol minX="658" maxX="674" minY="345" maxY="361" name="theme_park-s"/>
+  <symbol minX="674" maxX="690" minY="345" maxY="361" name="taoist-s"/>
+  <symbol minX="690" maxX="706" minY="345" maxY="361" name="jewish-s"/>
+  <symbol minX="706" maxX="722" minY="345" maxY="361" name="hotel-s"/>
+  <symbol minX="722" maxX="738" minY="345" maxY="361" name="hospital-s"/>
+  <symbol minX="738" maxX="754" minY="345" maxY="361" name="hindu-s"/>
+  <symbol minX="754" maxX="770" minY="345" maxY="361" name="geyser-s"/>
+  <symbol minX="770" maxX="786" minY="345" maxY="361" name="fuel-s"/>
+  <symbol minX="786" maxX="804" minY="345" maxY="361" name="subway-tbilisi-s"/>
+  <symbol minX="804" maxX="820" minY="345" maxY="361" name="drinking-water-s"/>
+  <symbol minX="820" maxX="836" minY="345" maxY="361" name="college-s"/>
+  <symbol minX="836" maxX="852" minY="345" maxY="361" name="theatre-s"/>
+  <symbol minX="852" maxX="867" minY="345" maxY="360" name="elevator"/>
+  <symbol minX="867" maxX="882" minY="345" maxY="360" name="storage-tank"/>
+  <symbol minX="882" maxX="897" minY="345" maxY="360" name="map"/>
+  <symbol minX="897" maxX="915" minY="345" maxY="360" name="subway-alicante-s"/>
+  <symbol minX="915" maxX="927" minY="345" maxY="360" name="transit_train-s"/>
+  <symbol minX="927" maxX="947" minY="345" maxY="360" name="subway-barcelona-s"/>
+  <symbol minX="947" maxX="962" minY="345" maxY="360" name="lightrail-berlin-s"/>
+  <symbol minX="962" maxX="984" minY="345" maxY="360" name="subway-brussel-s"/>
+  <symbol minX="984" maxX="1005" minY="345" maxY="360" name="subway-bucharest-s"/>
+  <symbol minX="1005" maxX="1020" minY="345" maxY="360" name="board"/>
+  <symbol minX="0" maxX="20" minY="361" maxY="376" name="subway-madrid-s"/>
+  <symbol minX="20" maxX="42" minY="361" maxY="376" name="subway-sanfrancisco-m"/>
+  <symbol minX="42" maxX="57" minY="361" maxY="376" name="subway-paris-s"/>
+  <symbol minX="57" maxX="78" minY="361" maxY="376" name="subway-novosibirsk-s"/>
+  <symbol minX="78" maxX="100" minY="361" maxY="376" name="subway-sanfrancisco-s"/>
+  <symbol minX="100" maxX="122" minY="361" maxY="376" name="subway-novosibirsk-m"/>
+  <symbol minX="122" maxX="137" minY="361" maxY="376" name="subway-moscow-s"/>
+  <symbol minX="137" maxX="159" minY="361" maxY="376" name="subway-sendai-m"/>
+  <symbol minX="159" maxX="178" minY="361" maxY="376" name="subway-kryvyirih-s"/>
+  <symbol minX="178" maxX="191" minY="361" maxY="376" name="transit_monorail-m"/>
+  <symbol minX="191" maxX="206" minY="361" maxY="376" name="transit_subway-m"/>
+  <symbol minX="206" maxX="228" minY="361" maxY="376" name="subway-kharkiv-s"/>
+  <symbol minX="228" maxX="249" minY="361" maxY="376" name="subway-kiev-m"/>
+  <symbol minX="249" maxX="271" minY="361" maxY="376" name="subway-fukuoka-m"/>
+  <symbol minX="271" maxX="293" minY="361" maxY="375" name="subway-edmonton-s"/>
+  <symbol minX="293" maxX="307" minY="361" maxY="375" name="subway-rome-s"/>
+  <symbol minX="307" maxX="329" minY="361" maxY="375" name="subway-haagse-m"/>
+  <symbol minX="329" maxX="351" minY="361" maxY="375" name="subway-haagse-s"/>
+  <symbol minX="351" maxX="366" minY="361" maxY="375" name="subway-seattle-s"/>
+  <symbol minX="366" maxX="388" minY="361" maxY="375" name="subway-brussel-m"/>
+  <symbol minX="388" maxX="409" minY="361" maxY="375" name="subway-manila-s"/>
+  <symbol minX="409" maxX="431" minY="361" maxY="375" name="subway-sendai-s"/>
+  <symbol minX="431" maxX="453" minY="361" maxY="375" name="subway-manila-m"/>
+  <symbol minX="453" maxX="475" minY="361" maxY="375" name="subway-taipei-s"/>
+  <symbol minX="475" maxX="497" minY="361" maxY="375" name="subway-kharkiv-m"/>
+  <symbol minX="497" maxX="514" minY="361" maxY="375" name="subway-london-s"/>
+  <symbol minX="514" maxX="528" minY="361" maxY="375" name="cave-s"/>
+  <symbol minX="528" maxX="547" minY="361" maxY="375" name="subway-bilbao-s"/>
+  <symbol minX="547" maxX="561" minY="361" maxY="375" name="subway-ubahn-s"/>
+  <symbol minX="561" maxX="574" minY="361" maxY="374" name="star-l"/>
+  <symbol minX="574" maxX="586" minY="361" maxY="374" name="transit_monorail-s"/>
+  <symbol minX="586" maxX="600" minY="361" maxY="374" name="main_entrance-s"/>
+  <symbol minX="600" maxX="615" minY="361" maxY="374" name="bench"/>
+  <symbol minX="615" maxX="628" minY="361" maxY="374" name="transit_subway-s"/>
+  <symbol minX="628" maxX="640" minY="361" maxY="374" name="transit_light_rail-s"/>
+  <symbol minX="640" maxX="653" minY="361" maxY="374" name="subway-newyork-xs"/>
+  <symbol minX="653" maxX="666" minY="361" maxY="374" name="speedcam-s"/>
+  <symbol minX="666" maxX="679" minY="361" maxY="374" name="parking-s"/>
+  <symbol minX="679" maxX="692" minY="361" maxY="374" name="subway-xs"/>
+  <symbol minX="692" maxX="711" minY="361" maxY="374" name="railway-crossing-l"/>
+  <symbol minX="711" maxX="720" minY="361" maxY="374" name="entrance-s"/>
+  <symbol minX="720" maxX="734" minY="361" maxY="373" name="volcano-m"/>
+  <symbol minX="734" maxX="756" minY="361" maxY="373" name="subway-taipei-m"/>
+  <symbol minX="756" maxX="774" minY="361" maxY="373" name="subway-minsk-m"/>
+  <symbol minX="774" maxX="796" minY="361" maxY="373" name="subway-edmonton-m"/>
+  <symbol minX="796" maxX="809" minY="361" maxY="373" name="plaque"/>
+  <symbol minX="809" maxX="826" minY="361" maxY="373" name="railway-crossing-m"/>
+  <symbol minX="826" maxX="847" minY="361" maxY="373" name="subway-malaga-s"/>
+  <symbol minX="847" maxX="869" minY="361" maxY="373" name="subway-malaga-m"/>
+  <symbol minX="869" maxX="890" minY="361" maxY="373" name="subway-baku-s"/>
+  <symbol minX="890" maxX="902" minY="361" maxY="373" name="star-m"/>
+  <symbol minX="902" maxX="919" minY="361" maxY="373" name="subway-kolkata-s"/>
+  <symbol minX="919" maxX="937" minY="361" maxY="373" name="subway-kiev-s"/>
+  <symbol minX="937" maxX="954" minY="361" maxY="372" name="subway-minsk-s"/>
+  <symbol minX="954" maxX="976" minY="361" maxY="372" name="subway-chongqing-s"/>
+  <symbol minX="976" maxX="998" minY="361" maxY="372" name="subway-baku-m"/>
+  <symbol minX="998" maxX="1009" minY="361" maxY="372" name="star-s"/>
+  <symbol minX="0" maxX="20" minY="376" maxY="386" name="arrow-m"/>
+  <symbol minX="20" maxX="36" minY="376" maxY="386" name="mountain-pass"/>
+  <symbol minX="36" maxX="58" minY="376" maxY="386" name="subway-chongqing-m"/>
+  <symbol minX="58" maxX="69" minY="376" maxY="386" name="volcano-s"/>
+  <symbol minX="69" maxX="80" minY="376" maxY="386" name="peakt-m"/>
+  <symbol minX="80" maxX="89" minY="376" maxY="385" name="zero-icon"/>
+  <symbol minX="89" maxX="98" minY="376" maxY="385" name="peakt-s"/>
+  <symbol minX="98" maxX="106" minY="376" maxY="384" name="dot-m"/>
+  <symbol minX="106" maxX="121" minY="376" maxY="384" name="arrow-s"/>
+  <symbol minX="121" maxX="132" minY="376" maxY="382" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 9cf2a26975..ef560d5a7d 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index ff57cd2cc9..289d98df9c 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -4,699 +4,694 @@
   <symbol minX="0" maxX="152" minY="0" maxY="92" name="route-arrow"/>
   <symbol minX="152" maxX="236" minY="0" maxY="84" name="compass-image"/>
   <symbol minX="236" maxX="316" minY="0" maxY="80" name="cross_geoposition"/>
-  <symbol minX="316" maxX="400" minY="0" maxY="80" name="route-point-finish"/>
-  <symbol minX="400" maxX="480" minY="0" maxY="80" name="shield-us-i-wide-scaled"/>
-  <symbol minX="480" maxX="548" minY="0" maxY="80" name="shield-us-i-thin-scaled"/>
-  <symbol minX="548" maxX="624" minY="0" maxY="76" name="search-result-shop-department_store"/>
-  <symbol minX="624" maxX="700" minY="0" maxY="76" name="search-result-marketplace"/>
-  <symbol minX="700" maxX="776" minY="0" maxY="76" name="search-result-shop-cosmetics"/>
-  <symbol minX="776" maxX="852" minY="0" maxY="76" name="search-result-shop-convenience"/>
-  <symbol minX="852" maxX="928" minY="0" maxY="76" name="search-result-shop-confectionery"/>
-  <symbol minX="928" maxX="1004" minY="0" maxY="76" name="search-result-shop-clothes"/>
-  <symbol minX="1004" maxX="1080" minY="0" maxY="76" name="search-result-shop-butcher"/>
-  <symbol minX="1080" maxX="1156" minY="0" maxY="76" name="search-result-shop-alcohol"/>
+  <symbol minX="316" maxX="384" minY="0" maxY="80" name="shield-us-i-thin-scaled"/>
+  <symbol minX="384" maxX="464" minY="0" maxY="80" name="shield-us-i-wide-scaled"/>
+  <symbol minX="464" maxX="548" minY="0" maxY="80" name="route-point-finish"/>
+  <symbol minX="548" maxX="624" minY="0" maxY="76" name="search-result-marketplace"/>
+  <symbol minX="624" maxX="700" minY="0" maxY="76" name="search-result-shop-confectionery"/>
+  <symbol minX="700" maxX="776" minY="0" maxY="76" name="search-result-shop-shoes"/>
+  <symbol minX="776" maxX="852" minY="0" maxY="76" name="search-result-shop-clothes"/>
+  <symbol minX="852" maxX="928" minY="0" maxY="76" name="search-result-cinema"/>
+  <symbol minX="928" maxX="1004" minY="0" maxY="76" name="search-result-fastfood"/>
+  <symbol minX="1004" maxX="1080" minY="0" maxY="76" name="search-result-shop-toys"/>
+  <symbol minX="1080" maxX="1156" minY="0" maxY="76" name="search-result-shop-supermarket"/>
   <symbol minX="1156" maxX="1232" minY="0" maxY="76" name="search-result-restaurant"/>
-  <symbol minX="1232" maxX="1308" minY="0" maxY="76" name="search-result-pub"/>
-  <symbol minX="1308" maxX="1384" minY="0" maxY="76" name="search-result-playground"/>
-  <symbol minX="1384" maxX="1460" minY="0" maxY="76" name="search-result-nightclub"/>
-  <symbol minX="1460" maxX="1536" minY="0" maxY="76" name="search-result-fastfood"/>
-  <symbol minX="1536" maxX="1612" minY="0" maxY="76" name="search-result-cinema"/>
-  <symbol minX="1612" maxX="1688" minY="0" maxY="76" name="search-result-casino"/>
-  <symbol minX="1688" maxX="1764" minY="0" maxY="76" name="search-result-cafe"/>
-  <symbol minX="1764" maxX="1840" minY="0" maxY="76" name="search-result-bar"/>
-  <symbol minX="1840" maxX="1916" minY="0" maxY="76" name="search-result-bakery"/>
-  <symbol minX="1916" maxX="1992" minY="0" maxY="76" name="search-result-shop-greengrocer"/>
-  <symbol minX="0" maxX="80" minY="92" maxY="168" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="80" maxX="156" minY="92" maxY="168" name="search-result-zoo"/>
-  <symbol minX="156" maxX="232" minY="92" maxY="168" name="search-result-shop-gift"/>
-  <symbol minX="232" maxX="308" minY="92" maxY="168" name="search-result-water-park"/>
-  <symbol minX="308" maxX="384" minY="92" maxY="168" name="search-result-theme-park"/>
-  <symbol minX="384" maxX="460" minY="92" maxY="168" name="search-result-shop-toys"/>
-  <symbol minX="460" maxX="536" minY="92" maxY="168" name="search-result-shop-supermarket"/>
-  <symbol minX="536" maxX="612" minY="92" maxY="168" name="search-result-shop-sports"/>
-  <symbol minX="612" maxX="688" minY="92" maxY="168" name="search-result-shop-shoes"/>
-  <symbol minX="688" maxX="764" minY="92" maxY="168" name="search-result-shop-seafood"/>
-  <symbol minX="764" maxX="840" minY="92" maxY="168" name="search-result-shop-mall"/>
-  <symbol minX="840" maxX="916" minY="92" maxY="168" name="search-result-shop-jewelry"/>
-  <symbol minX="916" maxX="984" minY="92" maxY="164" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="984" maxX="1040" minY="92" maxY="162" name="ferry"/>
-  <symbol minX="1040" maxX="1096" minY="92" maxY="162" name="unpaved_road"/>
-  <symbol minX="1096" maxX="1152" minY="92" maxY="162" name="paid_road"/>
-  <symbol minX="1152" maxX="1220" minY="92" maxY="160" name="infosign"/>
-  <symbol minX="1220" maxX="1288" minY="92" maxY="160" name="track_marker_selected"/>
-  <symbol minX="1288" maxX="1334" minY="92" maxY="157" name="bookmark-parking-m"/>
-  <symbol minX="1334" maxX="1380" minY="92" maxY="157" name="bookmark-museum-m"/>
-  <symbol minX="1380" maxX="1426" minY="92" maxY="157" name="bookmark-building-m"/>
-  <symbol minX="1426" maxX="1472" minY="92" maxY="157" name="bookmark-water-m"/>
-  <symbol minX="1472" maxX="1518" minY="92" maxY="157" name="bookmark-buddhism-m"/>
-  <symbol minX="1518" maxX="1564" minY="92" maxY="157" name="bookmark-animals-m"/>
-  <symbol minX="1564" maxX="1610" minY="92" maxY="157" name="bookmark-viewpoint-m"/>
-  <symbol minX="1610" maxX="1656" minY="92" maxY="157" name="bookmark-transport-m"/>
-  <symbol minX="1656" maxX="1702" minY="92" maxY="157" name="bookmark-swim-m"/>
-  <symbol minX="1702" maxX="1748" minY="92" maxY="157" name="bookmark-start-m"/>
-  <symbol minX="1748" maxX="1794" minY="92" maxY="157" name="bookmark-sport-m"/>
-  <symbol minX="1794" maxX="1840" minY="92" maxY="157" name="bookmark-sights-m"/>
-  <symbol minX="1840" maxX="1886" minY="92" maxY="157" name="bookmark-shop-m"/>
-  <symbol minX="1886" maxX="1932" minY="92" maxY="157" name="bookmark-bg-m"/>
-  <symbol minX="1932" maxX="1978" minY="92" maxY="157" name="bookmark-park-m"/>
-  <symbol minX="1978" maxX="2024" minY="92" maxY="157" name="bookmark-mountain-m"/>
-  <symbol minX="0" maxX="46" minY="168" maxY="233" name="bookmark-medicine-m"/>
-  <symbol minX="46" maxX="92" minY="168" maxY="233" name="bookmark-judaism-m"/>
-  <symbol minX="92" maxX="138" minY="168" maxY="233" name="bookmark-islam-m"/>
-  <symbol minX="138" maxX="184" minY="168" maxY="233" name="bookmark-hotel-m"/>
-  <symbol minX="184" maxX="230" minY="168" maxY="233" name="bookmark-gas-m"/>
-  <symbol minX="230" maxX="276" minY="168" maxY="233" name="bookmark-food-m"/>
-  <symbol minX="276" maxX="322" minY="168" maxY="233" name="bookmark-finish-m"/>
-  <symbol minX="322" maxX="368" minY="168" maxY="233" name="bookmark-exchange-m"/>
-  <symbol minX="368" maxX="414" minY="168" maxY="233" name="bookmark-entertainment-m"/>
-  <symbol minX="414" maxX="460" minY="168" maxY="233" name="bookmark-default-m"/>
-  <symbol minX="460" maxX="506" minY="168" maxY="233" name="bookmark-bar-m"/>
-  <symbol minX="506" maxX="552" minY="168" maxY="233" name="bookmark-christianity-m"/>
-  <symbol minX="552" maxX="636" minY="168" maxY="228" name="norating-bg-l"/>
-  <symbol minX="636" maxX="696" minY="168" maxY="228" name="route-point-start"/>
-  <symbol minX="696" maxX="756" minY="168" maxY="228" name="route-point-9"/>
-  <symbol minX="756" maxX="816" minY="168" maxY="228" name="route-point-8"/>
-  <symbol minX="816" maxX="876" minY="168" maxY="228" name="route-point-7"/>
-  <symbol minX="876" maxX="936" minY="168" maxY="228" name="route-point-6"/>
-  <symbol minX="936" maxX="996" minY="168" maxY="228" name="route-point-5"/>
-  <symbol minX="996" maxX="1056" minY="168" maxY="228" name="route-point-4"/>
-  <symbol minX="1056" maxX="1116" minY="168" maxY="228" name="route-point-3"/>
-  <symbol minX="1116" maxX="1176" minY="168" maxY="228" name="route-point-20"/>
-  <symbol minX="1176" maxX="1236" minY="168" maxY="228" name="route-point-2"/>
-  <symbol minX="1236" maxX="1296" minY="168" maxY="228" name="route-point-19"/>
-  <symbol minX="1296" maxX="1356" minY="168" maxY="228" name="route-point-18"/>
-  <symbol minX="1356" maxX="1416" minY="168" maxY="228" name="route-point-17"/>
-  <symbol minX="1416" maxX="1476" minY="168" maxY="228" name="route-point-16"/>
-  <symbol minX="1476" maxX="1536" minY="168" maxY="228" name="route-point-15"/>
-  <symbol minX="1536" maxX="1596" minY="168" maxY="228" name="route-point-14"/>
-  <symbol minX="1596" maxX="1656" minY="168" maxY="228" name="route-point-13"/>
-  <symbol minX="1656" maxX="1716" minY="168" maxY="228" name="route-point-12"/>
-  <symbol minX="1716" maxX="1776" minY="168" maxY="228" name="route-point-11"/>
-  <symbol minX="1776" maxX="1836" minY="168" maxY="228" name="route-point-10"/>
-  <symbol minX="1836" maxX="1896" minY="168" maxY="228" name="route-point-1"/>
-  <symbol minX="1896" maxX="1980" minY="168" maxY="228" name="norating-default-l"/>
-  <symbol minX="0" maxX="84" minY="233" maxY="293" name="coloredmark-bg-l"/>
-  <symbol minX="84" maxX="168" minY="233" maxY="293" name="coloredmark-default-l"/>
-  <symbol minX="168" maxX="212" minY="233" maxY="285" name="shield-us-i-thin"/>
-  <symbol minX="212" maxX="268" minY="233" maxY="285" name="shield-us-i-wide"/>
-  <symbol minX="268" maxX="316" minY="233" maxY="281" name="shield-us-hw-thin"/>
-  <symbol minX="316" maxX="372" minY="233" maxY="281" name="shield-us-hw-wide"/>
-  <symbol minX="372" maxX="405" minY="233" maxY="279" name="bookmark-default-s"/>
-  <symbol minX="405" maxX="438" minY="233" maxY="279" name="bookmark-bg-s"/>
-  <symbol minX="438" maxX="482" minY="233" maxY="277" name="track_marker_deselected"/>
-  <symbol minX="482" maxX="526" minY="233" maxY="277" name="current-position"/>
-  <symbol minX="526" maxX="566" minY="233" maxY="273" name="subway-chengdu-m"/>
-  <symbol minX="566" maxX="606" minY="233" maxY="273" name="subway-guadalajara-m"/>
-  <symbol minX="606" maxX="646" minY="233" maxY="273" name="subway-glasgow-m"/>
-  <symbol minX="646" maxX="686" minY="233" maxY="273" name="subway-foshan-m"/>
-  <symbol minX="686" maxX="726" minY="233" maxY="273" name="subway-ekb-m"/>
-  <symbol minX="726" maxX="766" minY="233" maxY="273" name="subway-dubai-m"/>
-  <symbol minX="766" maxX="804" minY="233" maxY="273" name="subway-delhi-m"/>
-  <symbol minX="804" maxX="844" minY="233" maxY="273" name="subway-chicago-m"/>
-  <symbol minX="844" maxX="884" minY="233" maxY="273" name="airport-m"/>
-  <symbol minX="884" maxX="924" minY="233" maxY="273" name="subway-changchun-m"/>
-  <symbol minX="924" maxX="964" minY="233" maxY="273" name="subway-catania-m"/>
-  <symbol minX="964" maxX="1004" minY="233" maxY="273" name="subway-caracas-m"/>
-  <symbol minX="1004" maxX="1044" minY="233" maxY="273" name="subway-cairo-m"/>
-  <symbol minX="1044" maxX="1084" minY="233" maxY="273" name="subway-bursaray-m"/>
-  <symbol minX="1084" maxX="1124" minY="233" maxY="273" name="subway-buenosaires-m"/>
-  <symbol minX="1124" maxX="1164" minY="233" maxY="273" name="subway-budapest-m"/>
-  <symbol minX="1164" maxX="1201" minY="233" maxY="273" name="subway-brescia-m"/>
-  <symbol minX="1201" maxX="1241" minY="233" maxY="273" name="subway-helsinki-m"/>
-  <symbol minX="1241" maxX="1281" minY="233" maxY="273" name="subway-hirosima-m"/>
-  <symbol minX="1281" maxX="1321" minY="233" maxY="273" name="subway-isfahan-m"/>
-  <symbol minX="1321" maxX="1354" minY="233" maxY="273" name="subway-istanbul-m"/>
-  <symbol minX="1354" maxX="1394" minY="233" maxY="273" name="subway-kazan-m"/>
-  <symbol minX="1394" maxX="1434" minY="233" maxY="273" name="subway-kobe-m"/>
-  <symbol minX="1434" maxX="1474" minY="233" maxY="273" name="subway-kunming-m"/>
-  <symbol minX="1474" maxX="1514" minY="233" maxY="273" name="subway-kyoto-m"/>
-  <symbol minX="1514" maxX="1554" minY="233" maxY="273" name="subway-lausanne-m"/>
-  <symbol minX="1554" maxX="1594" minY="233" maxY="273" name="subway-lille-m"/>
-  <symbol minX="1594" maxX="1634" minY="233" maxY="273" name="subway-lima-m"/>
-  <symbol minX="1634" maxX="1674" minY="233" maxY="273" name="subway-lisboa-m"/>
-  <symbol minX="1674" maxX="1714" minY="233" maxY="273" name="subway-losangeles-m"/>
-  <symbol minX="1714" maxX="1754" minY="233" maxY="273" name="subway-m"/>
-  <symbol minX="1754" maxX="1794" minY="233" maxY="273" name="subway-marseille-s"/>
-  <symbol minX="1794" maxX="1834" minY="233" maxY="273" name="subway-mashhad-m"/>
-  <symbol minX="1834" maxX="1874" minY="233" maxY="273" name="second_hand_shop-m"/>
-  <symbol minX="1874" maxX="1914" minY="233" maxY="273" name="skateboard-m"/>
-  <symbol minX="1914" maxX="1954" minY="233" maxY="273" name="shower-m"/>
-  <symbol minX="1954" maxX="1994" minY="233" maxY="273" name="shop-m"/>
-  <symbol minX="1994" maxX="2034" minY="233" maxY="273" name="shop-bicycle-m"/>
-  <symbol minX="0" maxX="40" minY="293" maxY="333" name="shoes-m"/>
-  <symbol minX="40" maxX="80" minY="293" maxY="333" name="ship-m"/>
-  <symbol minX="80" maxX="120" minY="293" maxY="333" name="shinto-m"/>
-  <symbol minX="120" maxX="160" minY="293" maxY="333" name="shelter-m"/>
-  <symbol minX="160" maxX="200" minY="293" maxY="333" name="skiing-m"/>
-  <symbol minX="200" maxX="240" minY="293" maxY="333" name="seafood-shop-m"/>
-  <symbol minX="240" maxX="280" minY="293" maxY="333" name="school-m"/>
-  <symbol minX="280" maxX="320" minY="293" maxY="333" name="sawmill-m"/>
-  <symbol minX="320" maxX="360" minY="293" maxY="333" name="sauna-m"/>
-  <symbol minX="360" maxX="400" minY="293" maxY="333" name="sample_collection-m"/>
-  <symbol minX="400" maxX="440" minY="293" maxY="333" name="subway-guangzhou-m"/>
-  <symbol minX="440" maxX="480" minY="293" maxY="333" name="restaurant-m"/>
-  <symbol minX="480" maxX="520" minY="293" maxY="333" name="subway-adana-s"/>
-  <symbol minX="520" maxX="560" minY="293" maxY="333" name="subway-bengaluru-m"/>
-  <symbol minX="560" maxX="600" minY="293" maxY="333" name="subway-beijing-m"/>
-  <symbol minX="600" maxX="640" minY="293" maxY="333" name="subway-bangkok-m"/>
-  <symbol minX="640" maxX="678" minY="293" maxY="333" name="subway-athens-m"/>
-  <symbol minX="678" maxX="718" minY="293" maxY="333" name="subway-ankara-s"/>
-  <symbol minX="718" maxX="758" minY="293" maxY="333" name="subway-ankara-m"/>
-  <symbol minX="758" maxX="794" minY="293" maxY="333" name="subway-amsterdam-m"/>
-  <symbol minX="794" maxX="834" minY="293" maxY="333" name="subway-algeria-m"/>
-  <symbol minX="834" maxX="874" minY="293" maxY="333" name="subway-brasilia-m"/>
-  <symbol minX="874" maxX="914" minY="293" maxY="333" name="subway-adana-m"/>
-  <symbol minX="914" maxX="954" minY="293" maxY="333" name="stationery_shop-m"/>
-  <symbol minX="954" maxX="994" minY="293" maxY="333" name="stadium-m"/>
-  <symbol minX="994" maxX="1034" minY="293" maxY="333" name="sports-m"/>
-  <symbol minX="1034" maxX="1074" minY="293" maxY="333" name="speedcam-alert-l"/>
-  <symbol minX="1074" maxX="1114" minY="293" maxY="333" name="speech_therapist-m"/>
-  <symbol minX="1114" maxX="1154" minY="293" maxY="333" name="soccer-m"/>
-  <symbol minX="1154" maxX="1194" minY="293" maxY="333" name="taoist-m"/>
-  <symbol minX="1194" maxX="1234" minY="293" maxY="333" name="toll_booth-m"/>
-  <symbol minX="1234" maxX="1274" minY="293" maxY="333" name="toilets-m"/>
-  <symbol minX="1274" maxX="1314" minY="293" maxY="333" name="tire-repair-m"/>
-  <symbol minX="1314" maxX="1354" minY="293" maxY="333" name="ticket-shop-m"/>
-  <symbol minX="1354" maxX="1394" minY="293" maxY="333" name="theme_park-m"/>
-  <symbol minX="1394" maxX="1434" minY="293" maxY="333" name="theatre-m"/>
-  <symbol minX="1434" maxX="1474" minY="293" maxY="333" name="tennis-m"/>
-  <symbol minX="1474" maxX="1514" minY="293" maxY="333" name="taxi-m"/>
-  <symbol minX="1514" maxX="1554" minY="293" maxY="333" name="tomb-m"/>
-  <symbol minX="1554" maxX="1594" minY="293" maxY="333" name="table-tennis-m"/>
-  <symbol minX="1594" maxX="1634" minY="293" maxY="333" name="swimming-m"/>
-  <symbol minX="1634" maxX="1674" minY="293" maxY="333" name="sweets-m"/>
-  <symbol minX="1674" maxX="1714" minY="293" maxY="333" name="survey_point-m"/>
-  <symbol minX="1714" maxX="1754" minY="293" maxY="333" name="subway-yokohama-m"/>
-  <symbol minX="1754" maxX="1794" minY="293" maxY="333" name="subway-wuhan-m"/>
-  <symbol minX="1794" maxX="1834" minY="293" maxY="333" name="subway-washington-m"/>
-  <symbol minX="1834" maxX="1874" minY="293" maxY="333" name="video-games-m"/>
-  <symbol minX="1874" maxX="1914" minY="293" maxY="333" name="zoo-m"/>
-  <symbol minX="1914" maxX="1954" minY="293" maxY="333" name="yoga-m"/>
-  <symbol minX="1954" maxX="1994" minY="293" maxY="333" name="windmill-m"/>
-  <symbol minX="1994" maxX="2034" minY="293" maxY="333" name="wayside_shrine-m"/>
-  <symbol minX="0" maxX="40" minY="333" maxY="373" name="waterfall-m"/>
-  <symbol minX="40" maxX="80" minY="333" maxY="373" name="waste-basket-m"/>
-  <symbol minX="80" maxX="120" minY="333" maxY="373" name="volleyball-m"/>
-  <symbol minX="120" maxX="160" minY="333" maxY="373" name="viewpoint-m"/>
-  <symbol minX="160" maxX="200" minY="333" maxY="373" name="subway-warszawa-m"/>
-  <symbol minX="200" maxX="240" minY="333" maxY="373" name="veterinary-m"/>
-  <symbol minX="240" maxX="280" minY="333" maxY="373" name="vending-m"/>
-  <symbol minX="280" maxX="320" minY="333" maxY="373" name="travel_agency_shop-m"/>
-  <symbol minX="320" maxX="360" minY="333" maxY="373" name="tram-m"/>
-  <symbol minX="360" maxX="400" minY="333" maxY="373" name="train-m"/>
-  <symbol minX="400" maxX="440" minY="333" maxY="373" name="toys-m"/>
-  <symbol minX="440" maxX="480" minY="333" maxY="373" name="tourism-m"/>
-  <symbol minX="480" maxX="519" minY="333" maxY="373" name="subway-nnov-m"/>
-  <symbol minX="519" maxX="559" minY="333" maxY="373" name="subway-reseau-paris-m"/>
-  <symbol minX="559" maxX="599" minY="333" maxY="373" name="subway-rennes-m"/>
-  <symbol minX="599" maxX="639" minY="333" maxY="373" name="subway-pyongyang-m"/>
-  <symbol minX="639" maxX="677" minY="333" maxY="373" name="subway-porto-m"/>
-  <symbol minX="677" maxX="717" minY="333" maxY="373" name="subway-pittsburgh-m"/>
-  <symbol minX="717" maxX="757" minY="333" maxY="373" name="subway-perugia-m"/>
-  <symbol minX="757" maxX="797" minY="333" maxY="373" name="subway-panama-m"/>
-  <symbol minX="797" maxX="837" minY="333" maxY="373" name="subway-oslo-m"/>
-  <symbol minX="837" maxX="877" minY="333" maxY="373" name="subway-riodejaneiro-m"/>
-  <symbol minX="877" maxX="917" minY="333" maxY="373" name="subway-newyork-m"/>
-  <symbol minX="917" maxX="957" minY="333" maxY="373" name="subway-nagoya-m"/>
-  <symbol minX="957" maxX="997" minY="333" maxY="373" name="subway-minatomirai-m"/>
-  <symbol minX="997" maxX="1037" minY="333" maxY="373" name="subway-milan-m"/>
-  <symbol minX="1037" maxX="1076" minY="333" maxY="373" name="subway-mexico-m"/>
-  <symbol minX="1076" maxX="1116" minY="333" maxY="373" name="subway-medellin-m"/>
-  <symbol minX="1116" maxX="1156" minY="333" maxY="373" name="subway-mecca-m"/>
-  <symbol minX="1156" maxX="1196" minY="333" maxY="373" name="subway-massachusetts-m"/>
-  <symbol minX="1196" maxX="1236" minY="333" maxY="373" name="subway-samara-m"/>
-  <symbol minX="1236" maxX="1276" minY="333" maxY="373" name="subway-santodomingo-m"/>
-  <symbol minX="1276" maxX="1316" minY="333" maxY="373" name="subway-saopaulo-m"/>
-  <symbol minX="1316" maxX="1356" minY="333" maxY="373" name="subway-shiraz-m"/>
-  <symbol minX="1356" maxX="1396" minY="333" maxY="373" name="subway-sofia-m"/>
-  <symbol minX="1396" maxX="1436" minY="333" maxY="373" name="subway-southkorea-m"/>
-  <symbol minX="1436" maxX="1476" minY="333" maxY="373" name="subway-stlouis-m"/>
-  <symbol minX="1476" maxX="1516" minY="333" maxY="373" name="subway-stockholm-m"/>
-  <symbol minX="1516" maxX="1556" minY="333" maxY="373" name="subway-tashkent-m"/>
-  <symbol minX="1556" maxX="1596" minY="333" maxY="373" name="subway-tianjin-m"/>
-  <symbol minX="1596" maxX="1636" minY="333" maxY="373" name="subway-tokyo-m"/>
-  <symbol minX="1636" maxX="1676" minY="333" maxY="373" name="subway-tyneandwear-m"/>
-  <symbol minX="1676" maxX="1716" minY="333" maxY="373" name="subway-valencia-m"/>
-  <symbol minX="1716" maxX="1756" minY="333" maxY="373" name="subway-vienna-m"/>
-  <symbol minX="1756" maxX="1796" minY="333" maxY="373" name="subway-volgograd-m"/>
-  <symbol minX="1796" maxX="1836" minY="333" maxY="373" name="laundry-m"/>
-  <symbol minX="1836" maxX="1876" minY="333" maxY="373" name="mail-m"/>
-  <symbol minX="1876" maxX="1916" minY="333" maxY="373" name="cemetery-m"/>
-  <symbol minX="1916" maxX="1956" minY="333" maxY="373" name="charging-station-m"/>
-  <symbol minX="1956" maxX="1996" minY="333" maxY="373" name="charity_shop-m"/>
-  <symbol minX="1996" maxX="2036" minY="333" maxY="373" name="cheese-m"/>
-  <symbol minX="0" maxX="40" minY="373" maxY="413" name="chemist-m"/>
-  <symbol minX="40" maxX="80" minY="373" maxY="413" name="lighthouse-m"/>
-  <symbol minX="80" maxX="120" minY="373" maxY="413" name="chess-m"/>
-  <symbol minX="120" maxX="160" minY="373" maxY="413" name="lift_gate-m"/>
-  <symbol minX="160" maxX="200" minY="373" maxY="413" name="chimney-m"/>
-  <symbol minX="200" maxX="240" minY="373" maxY="413" name="christian-m"/>
-  <symbol minX="240" maxX="280" minY="373" maxY="413" name="library-m"/>
-  <symbol minX="280" maxX="320" minY="373" maxY="413" name="lawyer-m"/>
-  <symbol minX="320" maxX="360" minY="373" maxY="413" name="cinema-m"/>
-  <symbol minX="360" maxX="400" minY="373" maxY="413" name="casino-m"/>
-  <symbol minX="400" maxX="440" minY="373" maxY="413" name="language_school-m"/>
-  <symbol minX="440" maxX="480" minY="373" maxY="413" name="kiosk-m"/>
-  <symbol minX="480" maxX="520" minY="373" maxY="413" name="kindergarten-m"/>
-  <symbol minX="520" maxX="560" minY="373" maxY="413" name="climbing-m"/>
-  <symbol minX="560" maxX="600" minY="373" maxY="413" name="jewish-m"/>
-  <symbol minX="600" maxX="640" minY="373" maxY="413" name="clothes-m"/>
-  <symbol minX="640" maxX="680" minY="373" maxY="413" name="college-m"/>
-  <symbol minX="680" maxX="720" minY="373" maxY="413" name="jewelry-m"/>
-  <symbol minX="720" maxX="760" minY="373" maxY="413" name="computer-m"/>
-  <symbol minX="760" maxX="800" minY="373" maxY="413" name="convenience-m"/>
-  <symbol minX="800" maxX="840" minY="373" maxY="413" name="internet_cafe-m"/>
-  <symbol minX="840" maxX="880" minY="373" maxY="413" name="interior_decoration-m"/>
-  <symbol minX="880" maxX="920" minY="373" maxY="413" name="copyshop-m"/>
-  <symbol minX="920" maxX="960" minY="373" maxY="413" name="car-part-m"/>
-  <symbol minX="960" maxX="1000" minY="373" maxY="413" name="brewery-m"/>
-  <symbol minX="1000" maxX="1040" minY="373" maxY="413" name="muslim-m"/>
-  <symbol minX="1040" maxX="1080" minY="373" maxY="413" name="musical-instrument-m"/>
-  <symbol minX="1080" maxX="1120" minY="373" maxY="413" name="music_school-m"/>
-  <symbol minX="1120" maxX="1160" minY="373" maxY="413" name="music-m"/>
-  <symbol minX="1160" maxX="1200" minY="373" maxY="413" name="buddhist-m"/>
-  <symbol minX="1200" maxX="1240" minY="373" maxY="413" name="bus-m"/>
-  <symbol minX="1240" maxX="1280" minY="373" maxY="413" name="butcher-m"/>
-  <symbol minX="1280" maxX="1320" minY="373" maxY="413" name="cable-car-m"/>
-  <symbol minX="1320" maxX="1360" minY="373" maxY="413" name="cafe-m"/>
-  <symbol minX="1360" maxX="1400" minY="373" maxY="413" name="museum-m"/>
-  <symbol minX="1400" maxX="1440" minY="373" maxY="413" name="campsite-m"/>
-  <symbol minX="1440" maxX="1480" minY="373" maxY="413" name="motorcycle_shop-m"/>
-  <symbol minX="1480" maxX="1520" minY="373" maxY="413" name="cricket-m"/>
-  <symbol minX="1520" maxX="1560" minY="373" maxY="413" name="monument-m"/>
-  <symbol minX="1560" maxX="1600" minY="373" maxY="413" name="car-repair-m"/>
-  <symbol minX="1600" maxX="1640" minY="373" maxY="413" name="mobile_phone-m"/>
-  <symbol minX="1640" maxX="1680" minY="373" maxY="413" name="car-wash-m"/>
-  <symbol minX="1680" maxX="1720" minY="373" maxY="413" name="military-m"/>
-  <symbol minX="1720" maxX="1760" minY="373" maxY="413" name="car_sharing-m"/>
-  <symbol minX="1760" maxX="1800" minY="373" maxY="413" name="car_shop-m"/>
-  <symbol minX="1800" maxX="1840" minY="373" maxY="413" name="caravan-shop-m"/>
-  <symbol minX="1840" maxX="1880" minY="373" maxY="413" name="caravan_site-m"/>
-  <symbol minX="1880" maxX="1920" minY="373" maxY="413" name="carpenter-m"/>
-  <symbol minX="1920" maxX="1960" minY="373" maxY="413" name="metal_construction-m"/>
-  <symbol minX="1960" maxX="2000" minY="373" maxY="413" name="marketplace-m"/>
-  <symbol minX="2000" maxX="2040" minY="373" maxY="413" name="marina-m"/>
-  <symbol minX="0" maxX="40" minY="413" maxY="453" name="embassy-m"/>
-  <symbol minX="40" maxX="80" minY="413" maxY="453" name="golf-m"/>
-  <symbol minX="80" maxX="120" minY="413" maxY="453" name="gift-m"/>
-  <symbol minX="120" maxX="160" minY="413" maxY="453" name="driving_school-m"/>
-  <symbol minX="160" maxX="200" minY="413" maxY="453" name="dump-station-m"/>
-  <symbol minX="200" maxX="240" minY="413" maxY="453" name="geyser-m"/>
-  <symbol minX="240" maxX="280" minY="413" maxY="453" name="geyser-l"/>
-  <symbol minX="280" maxX="320" minY="413" maxY="453" name="electrician-m"/>
-  <symbol minX="320" maxX="360" minY="413" maxY="453" name="garden_center-m"/>
-  <symbol minX="360" maxX="400" minY="413" maxY="453" name="electronics-m"/>
-  <symbol minX="400" maxX="440" minY="413" maxY="453" name="garden-outline-m"/>
-  <symbol minX="440" maxX="480" minY="413" maxY="453" name="garden-m"/>
-  <symbol minX="480" maxX="520" minY="413" maxY="453" name="gallery-m"/>
-  <symbol minX="520" maxX="560" minY="413" maxY="453" name="furniture-m"/>
-  <symbol minX="560" maxX="600" minY="413" maxY="453" name="greengrocer-m"/>
-  <symbol minX="600" maxX="640" minY="413" maxY="453" name="funicular-m"/>
-  <symbol minX="640" maxX="680" minY="413" maxY="453" name="emergency-phone-m"/>
-  <symbol minX="680" maxX="720" minY="413" maxY="453" name="equestrian-m"/>
-  <symbol minX="720" maxX="760" minY="413" maxY="453" name="erotic-m"/>
-  <symbol minX="760" maxX="800" minY="413" maxY="453" name="fastfood-m"/>
-  <symbol minX="800" maxX="840" minY="413" maxY="453" name="fire_station-m"/>
-  <symbol minX="840" maxX="880" minY="413" maxY="453" name="firehydrant-m"/>
-  <symbol minX="880" maxX="920" minY="413" maxY="453" name="florist-m"/>
-  <symbol minX="920" maxX="960" minY="413" maxY="453" name="funeral_directors-m"/>
-  <symbol minX="960" maxX="1000" minY="413" maxY="453" name="fountain-m"/>
-  <symbol minX="1000" maxX="1040" minY="413" maxY="453" name="fuel-m"/>
-  <symbol minX="1040" maxX="1080" minY="413" maxY="453" name="fuel-dispenser-m"/>
-  <symbol minX="1080" maxX="1120" minY="413" maxY="453" name="fountain-s"/>
-  <symbol minX="1120" maxX="1160" minY="413" maxY="453" name="dog_park-m"/>
-  <symbol minX="1160" maxX="1200" minY="413" maxY="453" name="cross-m"/>
-  <symbol minX="1200" maxX="1240" minY="413" maxY="453" name="information-m"/>
-  <symbol minX="1240" maxX="1280" minY="413" maxY="453" name="ice_cream-m"/>
-  <symbol minX="1280" maxX="1320" minY="413" maxY="453" name="hunting-tower-m"/>
-  <symbol minX="1320" maxX="1360" minY="413" maxY="453" name="curling-m"/>
-  <symbol minX="1360" maxX="1400" minY="413" maxY="453" name="hotel-m"/>
-  <symbol minX="1400" maxX="1440" minY="413" maxY="453" name="defibrillator-m"/>
-  <symbol minX="1440" maxX="1480" minY="413" maxY="453" name="dentist-m"/>
-  <symbol minX="1480" maxX="1520" minY="413" maxY="453" name="hostel-m"/>
-  <symbol minX="1520" maxX="1560" minY="413" maxY="453" name="department_store-m"/>
-  <symbol minX="1560" maxX="1600" minY="413" maxY="453" name="diving-m"/>
-  <symbol minX="1600" maxX="1640" minY="413" maxY="453" name="hospital-m"/>
-  <symbol minX="1640" maxX="1680" minY="413" maxY="453" name="home-m"/>
-  <symbol minX="1680" maxX="1720" minY="413" maxY="453" name="media-m"/>
-  <symbol minX="1720" maxX="1760" minY="413" maxY="453" name="hockey-m"/>
-  <symbol minX="1760" maxX="1800" minY="413" maxY="453" name="historic-ship-m"/>
-  <symbol minX="1800" maxX="1840" minY="413" maxY="453" name="doityourself-m"/>
-  <symbol minX="1840" maxX="1880" minY="413" maxY="453" name="hindu-m"/>
-  <symbol minX="1880" maxX="1920" minY="413" maxY="453" name="heliport-m"/>
-  <symbol minX="1920" maxX="1960" minY="413" maxY="453" name="helipad-m"/>
-  <symbol minX="1960" maxX="2000" minY="413" maxY="453" name="drinking-water-m"/>
-  <symbol minX="2000" maxX="2040" minY="413" maxY="453" name="handball-m"/>
-  <symbol minX="0" maxX="40" minY="453" maxY="493" name="hand-m"/>
-  <symbol minX="40" maxX="80" minY="453" maxY="493" name="hairdresser-m"/>
-  <symbol minX="80" maxX="120" minY="453" maxY="493" name="gym-m"/>
-  <symbol minX="120" maxX="160" minY="453" maxY="493" name="guidepost"/>
-  <symbol minX="160" maxX="200" minY="453" maxY="493" name="grocery-m"/>
-  <symbol minX="200" maxX="240" minY="453" maxY="493" name="basketball-m"/>
-  <symbol minX="240" maxX="280" minY="453" maxY="493" name="pharmacy-m"/>
-  <symbol minX="280" maxX="320" minY="453" maxY="493" name="audiologist-m"/>
-  <symbol minX="320" maxX="360" minY="453" maxY="493" name="petshop-m"/>
-  <symbol minX="360" maxX="400" minY="453" maxY="493" name="pelota-m"/>
-  <symbol minX="400" maxX="440" minY="453" maxY="493" name="australian-football-m"/>
-  <symbol minX="440" maxX="480" minY="453" maxY="493" name="badminton-m"/>
-  <symbol minX="480" maxX="520" minY="453" maxY="493" name="bakery-m"/>
-  <symbol minX="520" maxX="560" minY="453" maxY="493" name="bank-l"/>
-  <symbol minX="560" maxX="600" minY="453" maxY="493" name="bank-m"/>
-  <symbol minX="600" maxX="640" minY="453" maxY="493" name="banknote-l"/>
-  <symbol minX="640" maxX="680" minY="453" maxY="493" name="parking-meter-m"/>
-  <symbol minX="680" maxX="720" minY="453" maxY="493" name="banknote-m"/>
-  <symbol minX="720" maxX="760" minY="453" maxY="493" name="bar-m"/>
-  <symbol minX="760" maxX="800" minY="453" maxY="493" name="baseball-m"/>
-  <symbol minX="800" maxX="840" minY="453" maxY="493" name="atm-m"/>
-  <symbol minX="840" maxX="880" minY="453" maxY="493" name="bbq-m"/>
-  <symbol minX="880" maxX="920" minY="453" maxY="493" name="bcontrol-m"/>
-  <symbol minX="920" maxX="960" minY="453" maxY="493" name="beach-m"/>
-  <symbol minX="960" maxX="1000" minY="453" maxY="493" name="beauty-m"/>
-  <symbol minX="1000" maxX="1040" minY="453" maxY="493" name="beekeeper-m"/>
-  <symbol minX="1040" maxX="1080" minY="453" maxY="493" name="park-outline-m"/>
-  <symbol minX="1080" maxX="1120" minY="453" maxY="493" name="park-m"/>
-  <symbol minX="1120" maxX="1160" minY="453" maxY="493" name="painter-m"/>
-  <symbol minX="1160" maxX="1200" minY="453" maxY="493" name="padel-m"/>
-  <symbol minX="1200" maxX="1240" minY="453" maxY="493" name="outdoor-shop-m"/>
-  <symbol minX="1240" maxX="1280" minY="453" maxY="493" name="optometrist-m"/>
-  <symbol minX="1280" maxX="1320" minY="453" maxY="493" name="optician-m"/>
-  <symbol minX="1320" maxX="1360" minY="453" maxY="493" name="office-m"/>
-  <symbol minX="1360" maxX="1400" minY="453" maxY="493" name="beer-m"/>
-  <symbol minX="1400" maxX="1440" minY="453" maxY="493" name="playground-m"/>
-  <symbol minX="1440" maxX="1480" minY="453" maxY="493" name="remains-m"/>
-  <symbol minX="1480" maxX="1520" minY="453" maxY="493" name="recycling-m"/>
-  <symbol minX="1520" maxX="1560" minY="453" maxY="493" name="airport_gate-m"/>
-  <symbol minX="1560" maxX="1600" minY="453" maxY="493" name="alcohol-m"/>
-  <symbol minX="1600" maxX="1640" minY="453" maxY="493" name="public-building-m"/>
-  <symbol minX="1640" maxX="1680" minY="453" maxY="493" name="psychotherapist-m"/>
-  <symbol minX="1680" maxX="1720" minY="453" maxY="493" name="prison-m"/>
+  <symbol minX="1232" maxX="1308" minY="0" maxY="76" name="search-result-shop-butcher"/>
+  <symbol minX="1308" maxX="1384" minY="0" maxY="76" name="search-result-nightclub"/>
+  <symbol minX="1384" maxX="1460" minY="0" maxY="76" name="search-result-theme-park"/>
+  <symbol minX="1460" maxX="1536" minY="0" maxY="76" name="search-result-playground"/>
+  <symbol minX="1536" maxX="1612" minY="0" maxY="76" name="search-result-pub"/>
+  <symbol minX="1612" maxX="1688" minY="0" maxY="76" name="search-result-water-park"/>
+  <symbol minX="1688" maxX="1764" minY="0" maxY="76" name="search-result-shop-department_store"/>
+  <symbol minX="1764" maxX="1844" minY="0" maxY="76" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="1844" maxX="1920" minY="0" maxY="76" name="search-result-shop-gift"/>
+  <symbol minX="1920" maxX="1996" minY="0" maxY="76" name="search-result-shop-convenience"/>
+  <symbol minX="0" maxX="76" minY="92" maxY="168" name="search-result-bakery"/>
+  <symbol minX="76" maxX="152" minY="92" maxY="168" name="search-result-bar"/>
+  <symbol minX="152" maxX="228" minY="92" maxY="168" name="search-result-shop-greengrocer"/>
+  <symbol minX="228" maxX="304" minY="92" maxY="168" name="search-result-shop-jewelry"/>
+  <symbol minX="304" maxX="380" minY="92" maxY="168" name="search-result-shop-seafood"/>
+  <symbol minX="380" maxX="456" minY="92" maxY="168" name="search-result-shop-cosmetics"/>
+  <symbol minX="456" maxX="532" minY="92" maxY="168" name="search-result-shop-mall"/>
+  <symbol minX="532" maxX="608" minY="92" maxY="168" name="search-result-cafe"/>
+  <symbol minX="608" maxX="684" minY="92" maxY="168" name="search-result-casino"/>
+  <symbol minX="684" maxX="760" minY="92" maxY="168" name="search-result-shop-sports"/>
+  <symbol minX="760" maxX="836" minY="92" maxY="168" name="search-result-shop-alcohol"/>
+  <symbol minX="836" maxX="912" minY="92" maxY="168" name="search-result-zoo"/>
+  <symbol minX="912" maxX="980" minY="92" maxY="164" name="shield-us-hw-thin-scaled"/>
+  <symbol minX="980" maxX="1036" minY="92" maxY="162" name="ferry"/>
+  <symbol minX="1036" maxX="1092" minY="92" maxY="162" name="unpaved_road"/>
+  <symbol minX="1092" maxX="1148" minY="92" maxY="162" name="paid_road"/>
+  <symbol minX="1148" maxX="1216" minY="92" maxY="160" name="infosign"/>
+  <symbol minX="1216" maxX="1284" minY="92" maxY="160" name="track_marker_selected"/>
+  <symbol minX="1284" maxX="1330" minY="92" maxY="157" name="bookmark-finish-m"/>
+  <symbol minX="1330" maxX="1376" minY="92" maxY="157" name="bookmark-building-m"/>
+  <symbol minX="1376" maxX="1422" minY="92" maxY="157" name="bookmark-christianity-m"/>
+  <symbol minX="1422" maxX="1468" minY="92" maxY="157" name="bookmark-buddhism-m"/>
+  <symbol minX="1468" maxX="1514" minY="92" maxY="157" name="bookmark-islam-m"/>
+  <symbol minX="1514" maxX="1560" minY="92" maxY="157" name="bookmark-hotel-m"/>
+  <symbol minX="1560" maxX="1606" minY="92" maxY="157" name="bookmark-default-m"/>
+  <symbol minX="1606" maxX="1652" minY="92" maxY="157" name="bookmark-gas-m"/>
+  <symbol minX="1652" maxX="1698" minY="92" maxY="157" name="bookmark-food-m"/>
+  <symbol minX="1698" maxX="1744" minY="92" maxY="157" name="bookmark-parking-m"/>
+  <symbol minX="1744" maxX="1790" minY="92" maxY="157" name="bookmark-water-m"/>
+  <symbol minX="1790" maxX="1836" minY="92" maxY="157" name="bookmark-entertainment-m"/>
+  <symbol minX="1836" maxX="1882" minY="92" maxY="157" name="bookmark-exchange-m"/>
+  <symbol minX="1882" maxX="1928" minY="92" maxY="157" name="bookmark-shop-m"/>
+  <symbol minX="1928" maxX="1974" minY="92" maxY="157" name="bookmark-transport-m"/>
+  <symbol minX="1974" maxX="2020" minY="92" maxY="157" name="bookmark-swim-m"/>
+  <symbol minX="0" maxX="46" minY="168" maxY="233" name="bookmark-start-m"/>
+  <symbol minX="46" maxX="92" minY="168" maxY="233" name="bookmark-sport-m"/>
+  <symbol minX="92" maxX="138" minY="168" maxY="233" name="bookmark-sights-m"/>
+  <symbol minX="138" maxX="184" minY="168" maxY="233" name="bookmark-viewpoint-m"/>
+  <symbol minX="184" maxX="230" minY="168" maxY="233" name="bookmark-judaism-m"/>
+  <symbol minX="230" maxX="276" minY="168" maxY="233" name="bookmark-animals-m"/>
+  <symbol minX="276" maxX="322" minY="168" maxY="233" name="bookmark-park-m"/>
+  <symbol minX="322" maxX="368" minY="168" maxY="233" name="bookmark-bar-m"/>
+  <symbol minX="368" maxX="414" minY="168" maxY="233" name="bookmark-museum-m"/>
+  <symbol minX="414" maxX="460" minY="168" maxY="233" name="bookmark-mountain-m"/>
+  <symbol minX="460" maxX="506" minY="168" maxY="233" name="bookmark-bg-m"/>
+  <symbol minX="506" maxX="552" minY="168" maxY="233" name="bookmark-medicine-m"/>
+  <symbol minX="552" maxX="636" minY="168" maxY="228" name="norating-default-l"/>
+  <symbol minX="636" maxX="696" minY="168" maxY="228" name="route-point-14"/>
+  <symbol minX="696" maxX="756" minY="168" maxY="228" name="route-point-13"/>
+  <symbol minX="756" maxX="816" minY="168" maxY="228" name="route-point-12"/>
+  <symbol minX="816" maxX="876" minY="168" maxY="228" name="route-point-11"/>
+  <symbol minX="876" maxX="936" minY="168" maxY="228" name="route-point-15"/>
+  <symbol minX="936" maxX="996" minY="168" maxY="228" name="route-point-16"/>
+  <symbol minX="996" maxX="1056" minY="168" maxY="228" name="route-point-18"/>
+  <symbol minX="1056" maxX="1116" minY="168" maxY="228" name="route-point-start"/>
+  <symbol minX="1116" maxX="1200" minY="168" maxY="228" name="norating-bg-l"/>
+  <symbol minX="1200" maxX="1260" minY="168" maxY="228" name="route-point-9"/>
+  <symbol minX="1260" maxX="1320" minY="168" maxY="228" name="route-point-8"/>
+  <symbol minX="1320" maxX="1380" minY="168" maxY="228" name="route-point-1"/>
+  <symbol minX="1380" maxX="1440" minY="168" maxY="228" name="route-point-10"/>
+  <symbol minX="1440" maxX="1500" minY="168" maxY="228" name="route-point-7"/>
+  <symbol minX="1500" maxX="1560" minY="168" maxY="228" name="route-point-6"/>
+  <symbol minX="1560" maxX="1620" minY="168" maxY="228" name="route-point-5"/>
+  <symbol minX="1620" maxX="1680" minY="168" maxY="228" name="route-point-4"/>
+  <symbol minX="1680" maxX="1740" minY="168" maxY="228" name="route-point-3"/>
+  <symbol minX="1740" maxX="1800" minY="168" maxY="228" name="route-point-17"/>
+  <symbol minX="1800" maxX="1884" minY="168" maxY="228" name="coloredmark-default-l"/>
+  <symbol minX="1884" maxX="1968" minY="168" maxY="228" name="coloredmark-bg-l"/>
+  <symbol minX="1968" maxX="2028" minY="168" maxY="228" name="route-point-2"/>
+  <symbol minX="0" maxX="60" minY="233" maxY="293" name="route-point-19"/>
+  <symbol minX="60" maxX="120" minY="233" maxY="293" name="route-point-20"/>
+  <symbol minX="120" maxX="164" minY="233" maxY="285" name="shield-us-i-thin"/>
+  <symbol minX="164" maxX="220" minY="233" maxY="285" name="shield-us-i-wide"/>
+  <symbol minX="220" maxX="276" minY="233" maxY="281" name="shield-us-hw-wide"/>
+  <symbol minX="276" maxX="324" minY="233" maxY="281" name="shield-us-hw-thin"/>
+  <symbol minX="324" maxX="357" minY="233" maxY="279" name="bookmark-bg-s"/>
+  <symbol minX="357" maxX="390" minY="233" maxY="279" name="bookmark-default-s"/>
+  <symbol minX="390" maxX="434" minY="233" maxY="277" name="current-position"/>
+  <symbol minX="434" maxX="478" minY="233" maxY="277" name="track_marker_deselected"/>
+  <symbol minX="478" maxX="518" minY="233" maxY="273" name="subway-caracas-m"/>
+  <symbol minX="518" maxX="558" minY="233" maxY="273" name="subway-chicago-m"/>
+  <symbol minX="558" maxX="598" minY="233" maxY="273" name="subway-dubai-m"/>
+  <symbol minX="598" maxX="638" minY="233" maxY="273" name="subway-bangkok-m"/>
+  <symbol minX="638" maxX="678" minY="233" maxY="273" name="subway-bursaray-m"/>
+  <symbol minX="678" maxX="716" minY="233" maxY="273" name="subway-delhi-m"/>
+  <symbol minX="716" maxX="756" minY="233" maxY="273" name="subway-catania-m"/>
+  <symbol minX="756" maxX="796" minY="233" maxY="273" name="subway-chengdu-m"/>
+  <symbol minX="796" maxX="836" minY="233" maxY="273" name="subway-cairo-m"/>
+  <symbol minX="836" maxX="876" minY="233" maxY="273" name="subway-changchun-m"/>
+  <symbol minX="876" maxX="916" minY="233" maxY="273" name="ship-m"/>
+  <symbol minX="916" maxX="956" minY="233" maxY="273" name="speech_therapist-m"/>
+  <symbol minX="956" maxX="996" minY="233" maxY="273" name="soccer-m"/>
+  <symbol minX="996" maxX="1036" minY="233" maxY="273" name="skiing-m"/>
+  <symbol minX="1036" maxX="1076" minY="233" maxY="273" name="skateboard-m"/>
+  <symbol minX="1076" maxX="1116" minY="233" maxY="273" name="shower-m"/>
+  <symbol minX="1116" maxX="1156" minY="233" maxY="273" name="shop-m"/>
+  <symbol minX="1156" maxX="1196" minY="233" maxY="273" name="shop-bicycle-m"/>
+  <symbol minX="1196" maxX="1236" minY="233" maxY="273" name="shoes-m"/>
+  <symbol minX="1236" maxX="1276" minY="233" maxY="273" name="speedcam-alert-l"/>
+  <symbol minX="1276" maxX="1316" minY="233" maxY="273" name="shinto-m"/>
+  <symbol minX="1316" maxX="1356" minY="233" maxY="273" name="shelter-m"/>
+  <symbol minX="1356" maxX="1396" minY="233" maxY="273" name="second_hand_shop-m"/>
+  <symbol minX="1396" maxX="1436" minY="233" maxY="273" name="seafood-shop-m"/>
+  <symbol minX="1436" maxX="1476" minY="233" maxY="273" name="school-m"/>
+  <symbol minX="1476" maxX="1516" minY="233" maxY="273" name="sawmill-m"/>
+  <symbol minX="1516" maxX="1556" minY="233" maxY="273" name="travel_agency_shop-m"/>
+  <symbol minX="1556" maxX="1596" minY="233" maxY="273" name="subway-ankara-m"/>
+  <symbol minX="1596" maxX="1636" minY="233" maxY="273" name="subway-budapest-m"/>
+  <symbol minX="1636" maxX="1673" minY="233" maxY="273" name="subway-brescia-m"/>
+  <symbol minX="1673" maxX="1713" minY="233" maxY="273" name="subway-brasilia-m"/>
+  <symbol minX="1713" maxX="1753" minY="233" maxY="273" name="subway-bengaluru-m"/>
+  <symbol minX="1753" maxX="1793" minY="233" maxY="273" name="subway-beijing-m"/>
+  <symbol minX="1793" maxX="1833" minY="233" maxY="273" name="sauna-m"/>
+  <symbol minX="1833" maxX="1871" minY="233" maxY="273" name="subway-athens-m"/>
+  <symbol minX="1871" maxX="1911" minY="233" maxY="273" name="subway-ankara-s"/>
+  <symbol minX="1911" maxX="1951" minY="233" maxY="273" name="subway-buenosaires-m"/>
+  <symbol minX="1951" maxX="1987" minY="233" maxY="273" name="subway-amsterdam-m"/>
+  <symbol minX="1987" maxX="2027" minY="233" maxY="273" name="subway-algeria-m"/>
+  <symbol minX="0" maxX="40" minY="293" maxY="333" name="subway-adana-s"/>
+  <symbol minX="40" maxX="80" minY="293" maxY="333" name="subway-adana-m"/>
+  <symbol minX="80" maxX="120" minY="293" maxY="333" name="stationery_shop-m"/>
+  <symbol minX="120" maxX="160" minY="293" maxY="333" name="stadium-m"/>
+  <symbol minX="160" maxX="200" minY="293" maxY="333" name="sports-m"/>
+  <symbol minX="200" maxX="240" minY="293" maxY="333" name="subway-warszawa-m"/>
+  <symbol minX="240" maxX="280" minY="293" maxY="333" name="tennis-m"/>
+  <symbol minX="280" maxX="320" minY="293" maxY="333" name="taxi-m"/>
+  <symbol minX="320" maxX="360" minY="293" maxY="333" name="taoist-m"/>
+  <symbol minX="360" maxX="400" minY="293" maxY="333" name="table-tennis-m"/>
+  <symbol minX="400" maxX="440" minY="293" maxY="333" name="swimming-m"/>
+  <symbol minX="440" maxX="480" minY="293" maxY="333" name="sweets-m"/>
+  <symbol minX="480" maxX="520" minY="293" maxY="333" name="survey_point-m"/>
+  <symbol minX="520" maxX="560" minY="293" maxY="333" name="subway-yokohama-m"/>
+  <symbol minX="560" maxX="600" minY="293" maxY="333" name="subway-wuhan-m"/>
+  <symbol minX="600" maxX="640" minY="293" maxY="333" name="subway-washington-m"/>
+  <symbol minX="640" maxX="680" minY="293" maxY="333" name="theatre-m"/>
+  <symbol minX="680" maxX="720" minY="293" maxY="333" name="subway-volgograd-m"/>
+  <symbol minX="720" maxX="760" minY="293" maxY="333" name="subway-vienna-m"/>
+  <symbol minX="760" maxX="800" minY="293" maxY="333" name="subway-valencia-m"/>
+  <symbol minX="800" maxX="840" minY="293" maxY="333" name="subway-tyneandwear-m"/>
+  <symbol minX="840" maxX="880" minY="293" maxY="333" name="subway-tokyo-m"/>
+  <symbol minX="880" maxX="920" minY="293" maxY="333" name="subway-tianjin-m"/>
+  <symbol minX="920" maxX="960" minY="293" maxY="333" name="subway-tashkent-m"/>
+  <symbol minX="960" maxX="1000" minY="293" maxY="333" name="subway-stockholm-m"/>
+  <symbol minX="1000" maxX="1040" minY="293" maxY="333" name="subway-stlouis-m"/>
+  <symbol minX="1040" maxX="1080" minY="293" maxY="333" name="subway-southkorea-m"/>
+  <symbol minX="1080" maxX="1120" minY="293" maxY="333" name="wayside_shrine-m"/>
+  <symbol minX="1120" maxX="1160" minY="293" maxY="333" name="vending-m"/>
+  <symbol minX="1160" maxX="1200" minY="293" maxY="333" name="veterinary-m"/>
+  <symbol minX="1200" maxX="1240" minY="293" maxY="333" name="video-games-m"/>
+  <symbol minX="1240" maxX="1280" minY="293" maxY="333" name="viewpoint-m"/>
+  <symbol minX="1280" maxX="1320" minY="293" maxY="333" name="volleyball-m"/>
+  <symbol minX="1320" maxX="1360" minY="293" maxY="333" name="waste-basket-m"/>
+  <symbol minX="1360" maxX="1400" minY="293" maxY="333" name="waterfall-m"/>
+  <symbol minX="1400" maxX="1440" minY="293" maxY="333" name="tram-m"/>
+  <symbol minX="1440" maxX="1480" minY="293" maxY="333" name="train-m"/>
+  <symbol minX="1480" maxX="1520" minY="293" maxY="333" name="toys-m"/>
+  <symbol minX="1520" maxX="1560" minY="293" maxY="333" name="subway-sofia-m"/>
+  <symbol minX="1560" maxX="1600" minY="293" maxY="333" name="tourism-m"/>
+  <symbol minX="1600" maxX="1640" minY="293" maxY="333" name="tomb-m"/>
+  <symbol minX="1640" maxX="1680" minY="293" maxY="333" name="windmill-m"/>
+  <symbol minX="1680" maxX="1720" minY="293" maxY="333" name="toll_booth-m"/>
+  <symbol minX="1720" maxX="1760" minY="293" maxY="333" name="toilets-m"/>
+  <symbol minX="1760" maxX="1800" minY="293" maxY="333" name="tire-repair-m"/>
+  <symbol minX="1800" maxX="1840" minY="293" maxY="333" name="ticket-shop-m"/>
+  <symbol minX="1840" maxX="1880" minY="293" maxY="333" name="yoga-m"/>
+  <symbol minX="1880" maxX="1920" minY="293" maxY="333" name="theme_park-m"/>
+  <symbol minX="1920" maxX="1960" minY="293" maxY="333" name="zoo-m"/>
+  <symbol minX="1960" maxX="2000" minY="293" maxY="333" name="subway-kunming-m"/>
+  <symbol minX="2000" maxX="2040" minY="293" maxY="333" name="subway-mashhad-m"/>
+  <symbol minX="0" maxX="40" minY="333" maxY="373" name="subway-marseille-s"/>
+  <symbol minX="40" maxX="80" minY="333" maxY="373" name="subway-m"/>
+  <symbol minX="80" maxX="120" minY="333" maxY="373" name="subway-lyon-m"/>
+  <symbol minX="120" maxX="160" minY="333" maxY="373" name="subway-losangeles-m"/>
+  <symbol minX="160" maxX="200" minY="333" maxY="373" name="subway-lisboa-m"/>
+  <symbol minX="200" maxX="240" minY="333" maxY="373" name="subway-lima-m"/>
+  <symbol minX="240" maxX="280" minY="333" maxY="373" name="subway-lille-m"/>
+  <symbol minX="280" maxX="320" minY="333" maxY="373" name="subway-lausanne-m"/>
+  <symbol minX="320" maxX="360" minY="333" maxY="373" name="subway-kyoto-m"/>
+  <symbol minX="360" maxX="400" minY="333" maxY="373" name="subway-massachusetts-m"/>
+  <symbol minX="400" maxX="440" minY="333" maxY="373" name="subway-kobe-m"/>
+  <symbol minX="440" maxX="480" minY="333" maxY="373" name="subway-kazan-m"/>
+  <symbol minX="480" maxX="513" minY="333" maxY="373" name="subway-istanbul-m"/>
+  <symbol minX="513" maxX="553" minY="333" maxY="373" name="subway-isfahan-m"/>
+  <symbol minX="553" maxX="593" minY="333" maxY="373" name="subway-hirosima-m"/>
+  <symbol minX="593" maxX="633" minY="333" maxY="373" name="subway-helsinki-m"/>
+  <symbol minX="633" maxX="673" minY="333" maxY="373" name="subway-guangzhou-m"/>
+  <symbol minX="673" maxX="713" minY="333" maxY="373" name="subway-guadalajara-m"/>
+  <symbol minX="713" maxX="753" minY="333" maxY="373" name="subway-glasgow-m"/>
+  <symbol minX="753" maxX="793" minY="333" maxY="373" name="subway-foshan-m"/>
+  <symbol minX="793" maxX="833" minY="333" maxY="373" name="subway-perugia-m"/>
+  <symbol minX="833" maxX="873" minY="333" maxY="373" name="subway-shiraz-m"/>
+  <symbol minX="873" maxX="913" minY="333" maxY="373" name="subway-saopaulo-m"/>
+  <symbol minX="913" maxX="953" minY="333" maxY="373" name="subway-santodomingo-m"/>
+  <symbol minX="953" maxX="993" minY="333" maxY="373" name="subway-samara-m"/>
+  <symbol minX="993" maxX="1033" minY="333" maxY="373" name="subway-riodejaneiro-m"/>
+  <symbol minX="1033" maxX="1073" minY="333" maxY="373" name="subway-reseau-paris-m"/>
+  <symbol minX="1073" maxX="1113" minY="333" maxY="373" name="subway-rennes-m"/>
+  <symbol minX="1113" maxX="1153" minY="333" maxY="373" name="subway-pyongyang-m"/>
+  <symbol minX="1153" maxX="1191" minY="333" maxY="373" name="subway-porto-m"/>
+  <symbol minX="1191" maxX="1231" minY="333" maxY="373" name="subway-pittsburgh-m"/>
+  <symbol minX="1231" maxX="1271" minY="333" maxY="373" name="subway-ekb-m"/>
+  <symbol minX="1271" maxX="1311" minY="333" maxY="373" name="subway-panama-m"/>
+  <symbol minX="1311" maxX="1351" minY="333" maxY="373" name="subway-oslo-m"/>
+  <symbol minX="1351" maxX="1390" minY="333" maxY="373" name="subway-nnov-m"/>
+  <symbol minX="1390" maxX="1430" minY="333" maxY="373" name="subway-newyork-m"/>
+  <symbol minX="1430" maxX="1470" minY="333" maxY="373" name="subway-nagoya-m"/>
+  <symbol minX="1470" maxX="1510" minY="333" maxY="373" name="subway-minatomirai-m"/>
+  <symbol minX="1510" maxX="1550" minY="333" maxY="373" name="subway-milan-m"/>
+  <symbol minX="1550" maxX="1589" minY="333" maxY="373" name="subway-mexico-m"/>
+  <symbol minX="1589" maxX="1629" minY="333" maxY="373" name="subway-medellin-m"/>
+  <symbol minX="1629" maxX="1669" minY="333" maxY="373" name="subway-mecca-m"/>
+  <symbol minX="1669" maxX="1709" minY="333" maxY="373" name="department_store-m"/>
+  <symbol minX="1709" maxX="1749" minY="333" maxY="373" name="fire_station-m"/>
+  <symbol minX="1749" maxX="1789" minY="333" maxY="373" name="fastfood-m"/>
+  <symbol minX="1789" maxX="1829" minY="333" maxY="373" name="erotic-m"/>
+  <symbol minX="1829" maxX="1869" minY="333" maxY="373" name="equestrian-m"/>
+  <symbol minX="1869" maxX="1909" minY="333" maxY="373" name="emergency-phone-m"/>
+  <symbol minX="1909" maxX="1949" minY="333" maxY="373" name="embassy-m"/>
+  <symbol minX="1949" maxX="1989" minY="333" maxY="373" name="electronics-m"/>
+  <symbol minX="1989" maxX="2029" minY="333" maxY="373" name="electrician-m"/>
+  <symbol minX="0" maxX="40" minY="373" maxY="413" name="dump-station-m"/>
+  <symbol minX="40" maxX="80" minY="373" maxY="413" name="driving_school-m"/>
+  <symbol minX="80" maxX="120" minY="373" maxY="413" name="drinking-water-m"/>
+  <symbol minX="120" maxX="160" minY="373" maxY="413" name="doityourself-m"/>
+  <symbol minX="160" maxX="200" minY="373" maxY="413" name="dog_park-m"/>
+  <symbol minX="200" maxX="240" minY="373" maxY="413" name="diving-m"/>
+  <symbol minX="240" maxX="280" minY="373" maxY="413" name="firehydrant-m"/>
+  <symbol minX="280" maxX="320" minY="373" maxY="413" name="dentist-m"/>
+  <symbol minX="320" maxX="360" minY="373" maxY="413" name="defibrillator-m"/>
+  <symbol minX="360" maxX="400" minY="373" maxY="413" name="curling-m"/>
+  <symbol minX="400" maxX="440" minY="373" maxY="413" name="cross-m"/>
+  <symbol minX="440" maxX="480" minY="373" maxY="413" name="cricket-m"/>
+  <symbol minX="480" maxX="520" minY="373" maxY="413" name="copyshop-m"/>
+  <symbol minX="520" maxX="560" minY="373" maxY="413" name="convenience-m"/>
+  <symbol minX="560" maxX="600" minY="373" maxY="413" name="computer-m"/>
+  <symbol minX="600" maxX="640" minY="373" maxY="413" name="college-m"/>
+  <symbol minX="640" maxX="680" minY="373" maxY="413" name="clothes-m"/>
+  <symbol minX="680" maxX="720" minY="373" maxY="413" name="climbing-m"/>
+  <symbol minX="720" maxX="760" minY="373" maxY="413" name="cinema-m"/>
+  <symbol minX="760" maxX="800" minY="373" maxY="413" name="christian-m"/>
+  <symbol minX="800" maxX="840" minY="373" maxY="413" name="geyser-l"/>
+  <symbol minX="840" maxX="880" minY="373" maxY="413" name="hindu-m"/>
+  <symbol minX="880" maxX="920" minY="373" maxY="413" name="heliport-m"/>
+  <symbol minX="920" maxX="960" minY="373" maxY="413" name="helipad-m"/>
+  <symbol minX="960" maxX="1000" minY="373" maxY="413" name="handball-m"/>
+  <symbol minX="1000" maxX="1040" minY="373" maxY="413" name="hand-m"/>
+  <symbol minX="1040" maxX="1080" minY="373" maxY="413" name="hairdresser-m"/>
+  <symbol minX="1080" maxX="1120" minY="373" maxY="413" name="gym-m"/>
+  <symbol minX="1120" maxX="1160" minY="373" maxY="413" name="guidepost"/>
+  <symbol minX="1160" maxX="1200" minY="373" maxY="413" name="grocery-m"/>
+  <symbol minX="1200" maxX="1240" minY="373" maxY="413" name="greengrocer-m"/>
+  <symbol minX="1240" maxX="1280" minY="373" maxY="413" name="golf-m"/>
+  <symbol minX="1280" maxX="1320" minY="373" maxY="413" name="gift-m"/>
+  <symbol minX="1320" maxX="1360" minY="373" maxY="413" name="geyser-m"/>
+  <symbol minX="1360" maxX="1400" minY="373" maxY="413" name="chimney-m"/>
+  <symbol minX="1400" maxX="1440" minY="373" maxY="413" name="gate-m"/>
+  <symbol minX="1440" maxX="1480" minY="373" maxY="413" name="garden_center-m"/>
+  <symbol minX="1480" maxX="1520" minY="373" maxY="413" name="garden-outline-m"/>
+  <symbol minX="1520" maxX="1560" minY="373" maxY="413" name="garden-m"/>
+  <symbol minX="1560" maxX="1600" minY="373" maxY="413" name="gallery-m"/>
+  <symbol minX="1600" maxX="1640" minY="373" maxY="413" name="furniture-m"/>
+  <symbol minX="1640" maxX="1680" minY="373" maxY="413" name="funicular-m"/>
+  <symbol minX="1680" maxX="1720" minY="373" maxY="413" name="funeral_directors-m"/>
+  <symbol minX="1720" maxX="1760" minY="373" maxY="413" name="fuel-m"/>
+  <symbol minX="1760" maxX="1800" minY="373" maxY="413" name="fuel-dispenser-m"/>
+  <symbol minX="1800" maxX="1840" minY="373" maxY="413" name="fountain-s"/>
+  <symbol minX="1840" maxX="1880" minY="373" maxY="413" name="fountain-m"/>
+  <symbol minX="1880" maxX="1920" minY="373" maxY="413" name="florist-m"/>
+  <symbol minX="1920" maxX="1960" minY="373" maxY="413" name="bank-l"/>
+  <symbol minX="1960" maxX="2000" minY="373" maxY="413" name="bicycle-m"/>
+  <symbol minX="2000" maxX="2040" minY="373" maxY="413" name="beer-m"/>
+  <symbol minX="0" maxX="40" minY="413" maxY="453" name="beekeeper-m"/>
+  <symbol minX="40" maxX="80" minY="413" maxY="453" name="beauty-m"/>
+  <symbol minX="80" maxX="120" minY="413" maxY="453" name="beach-m"/>
+  <symbol minX="120" maxX="160" minY="413" maxY="453" name="bcontrol-m"/>
+  <symbol minX="160" maxX="200" minY="413" maxY="453" name="bbq-m"/>
+  <symbol minX="200" maxX="240" minY="413" maxY="453" name="basketball-m"/>
+  <symbol minX="240" maxX="280" minY="413" maxY="453" name="baseball-m"/>
+  <symbol minX="280" maxX="320" minY="413" maxY="453" name="bar-m"/>
+  <symbol minX="320" maxX="360" minY="413" maxY="453" name="banknote-m"/>
+  <symbol minX="360" maxX="400" minY="413" maxY="453" name="banknote-l"/>
+  <symbol minX="400" maxX="440" minY="413" maxY="453" name="bank-m"/>
+  <symbol minX="440" maxX="480" minY="413" maxY="453" name="bicycle-repair-station"/>
+  <symbol minX="480" maxX="520" minY="413" maxY="453" name="bakery-m"/>
+  <symbol minX="520" maxX="560" minY="413" maxY="453" name="badminton-m"/>
+  <symbol minX="560" maxX="600" minY="413" maxY="453" name="australian-football-m"/>
+  <symbol minX="600" maxX="640" minY="413" maxY="453" name="audiologist-m"/>
+  <symbol minX="640" maxX="680" minY="413" maxY="453" name="atm-m"/>
+  <symbol minX="680" maxX="720" minY="413" maxY="453" name="archery-m"/>
+  <symbol minX="720" maxX="760" minY="413" maxY="453" name="archaeological-site-m"/>
+  <symbol minX="760" maxX="800" minY="413" maxY="453" name="apartment-m"/>
+  <symbol minX="800" maxX="840" minY="413" maxY="453" name="america-football-m"/>
+  <symbol minX="840" maxX="880" minY="413" maxY="453" name="alternative-m"/>
+  <symbol minX="880" maxX="920" minY="413" maxY="453" name="alpine_hut-m"/>
+  <symbol minX="920" maxX="960" minY="413" maxY="453" name="alcohol-m"/>
+  <symbol minX="960" maxX="1000" minY="413" maxY="453" name="airport-m"/>
+  <symbol minX="1000" maxX="1040" minY="413" maxY="453" name="car-part-m"/>
+  <symbol minX="1040" maxX="1080" minY="413" maxY="453" name="chess-m"/>
+  <symbol minX="1080" maxX="1120" minY="413" maxY="453" name="chemist-m"/>
+  <symbol minX="1120" maxX="1160" minY="413" maxY="453" name="charity_shop-m"/>
+  <symbol minX="1160" maxX="1200" minY="413" maxY="453" name="charging-station-m"/>
+  <symbol minX="1200" maxX="1240" minY="413" maxY="453" name="cemetery-m"/>
+  <symbol minX="1240" maxX="1280" minY="413" maxY="453" name="casino-m"/>
+  <symbol minX="1280" maxX="1320" minY="413" maxY="453" name="carpenter-m"/>
+  <symbol minX="1320" maxX="1360" minY="413" maxY="453" name="caravan_site-m"/>
+  <symbol minX="1360" maxX="1400" minY="413" maxY="453" name="caravan-shop-m"/>
+  <symbol minX="1400" maxX="1440" minY="413" maxY="453" name="car_shop-m"/>
+  <symbol minX="1440" maxX="1480" minY="413" maxY="453" name="car_sharing-m"/>
+  <symbol minX="1480" maxX="1520" minY="413" maxY="453" name="car-wash-m"/>
+  <symbol minX="1520" maxX="1560" minY="413" maxY="453" name="car-repair-m"/>
+  <symbol minX="1560" maxX="1600" minY="413" maxY="453" name="restaurant-m"/>
+  <symbol minX="1600" maxX="1640" minY="413" maxY="453" name="campsite-m"/>
+  <symbol minX="1640" maxX="1680" minY="413" maxY="453" name="cafe-m"/>
+  <symbol minX="1680" maxX="1720" minY="413" maxY="453" name="cable-car-m"/>
+  <symbol minX="1720" maxX="1760" minY="413" maxY="453" name="butcher-m"/>
+  <symbol minX="1760" maxX="1800" minY="413" maxY="453" name="bus-m"/>
+  <symbol minX="1800" maxX="1840" minY="413" maxY="453" name="buddhist-m"/>
+  <symbol minX="1840" maxX="1880" minY="413" maxY="453" name="brewery-m"/>
+  <symbol minX="1880" maxX="1920" minY="413" maxY="453" name="bowling_alley-m"/>
+  <symbol minX="1920" maxX="1960" minY="413" maxY="453" name="bowling-m"/>
+  <symbol minX="1960" maxX="2000" minY="413" maxY="453" name="bookmaker-m"/>
+  <symbol minX="2000" maxX="2040" minY="413" maxY="453" name="book-shop-m"/>
+  <symbol minX="0" maxX="40" minY="453" maxY="493" name="blood_donation-m"/>
+  <symbol minX="40" maxX="80" minY="453" maxY="493" name="blacksmith-m"/>
+  <symbol minX="80" maxX="120" minY="453" maxY="493" name="parking-meter-m"/>
+  <symbol minX="120" maxX="160" minY="453" maxY="493" name="painter-m"/>
+  <symbol minX="160" maxX="200" minY="453" maxY="493" name="nightclub-m"/>
+  <symbol minX="200" maxX="240" minY="453" maxY="493" name="marina-m"/>
+  <symbol minX="240" maxX="280" minY="453" maxY="493" name="park-m"/>
+  <symbol minX="280" maxX="320" minY="453" maxY="493" name="mail-m"/>
+  <symbol minX="320" maxX="360" minY="453" maxY="493" name="npark-m"/>
+  <symbol minX="360" maxX="400" minY="453" maxY="493" name="park-outline-m"/>
+  <symbol minX="400" maxX="440" minY="453" maxY="493" name="lighthouse-m"/>
+  <symbol minX="440" maxX="480" minY="453" maxY="493" name="lift_gate-m"/>
+  <symbol minX="480" maxX="520" minY="453" maxY="493" name="library-m"/>
+  <symbol minX="520" maxX="560" minY="453" maxY="493" name="office-m"/>
+  <symbol minX="560" maxX="600" minY="453" maxY="493" name="lawyer-m"/>
+  <symbol minX="600" maxX="640" minY="453" maxY="493" name="laundry-m"/>
+  <symbol minX="640" maxX="680" minY="453" maxY="493" name="pelota-m"/>
+  <symbol minX="680" maxX="720" minY="453" maxY="493" name="language_school-m"/>
+  <symbol minX="720" maxX="760" minY="453" maxY="493" name="petshop-m"/>
+  <symbol minX="760" maxX="800" minY="453" maxY="493" name="nparkf-m"/>
+  <symbol minX="800" maxX="840" minY="453" maxY="493" name="kiosk-m"/>
+  <symbol minX="840" maxX="880" minY="453" maxY="493" name="kindergarten-m"/>
+  <symbol minX="880" maxX="920" minY="453" maxY="493" name="pharmacy-m"/>
+  <symbol minX="920" maxX="960" minY="453" maxY="493" name="monument-m"/>
+  <symbol minX="960" maxX="1000" minY="453" maxY="493" name="musical-instrument-m"/>
+  <symbol minX="1000" maxX="1040" minY="453" maxY="493" name="optometrist-m"/>
+  <symbol minX="1040" maxX="1080" minY="453" maxY="493" name="muslim-m"/>
+  <symbol minX="1080" maxX="1120" minY="453" maxY="493" name="music_school-m"/>
+  <symbol minX="1120" maxX="1160" minY="453" maxY="493" name="music-m"/>
+  <symbol minX="1160" maxX="1200" minY="453" maxY="493" name="historic-ship-m"/>
+  <symbol minX="1200" maxX="1240" minY="453" maxY="493" name="museum-m"/>
+  <symbol minX="1240" maxX="1280" minY="453" maxY="493" name="motorcycle_shop-m"/>
+  <symbol minX="1280" maxX="1320" minY="453" maxY="493" name="needle_and_thread-m"/>
+  <symbol minX="1320" maxX="1360" minY="453" maxY="493" name="nparkf-outline-m"/>
+  <symbol minX="1360" maxX="1400" minY="453" maxY="493" name="optician-m"/>
+  <symbol minX="1400" maxX="1440" minY="453" maxY="493" name="outdoor-shop-m"/>
+  <symbol minX="1440" maxX="1480" minY="453" maxY="493" name="mobile_phone-m"/>
+  <symbol minX="1480" maxX="1520" minY="453" maxY="493" name="military-m"/>
+  <symbol minX="1520" maxX="1560" minY="453" maxY="493" name="metal_construction-m"/>
+  <symbol minX="1560" maxX="1600" minY="453" maxY="493" name="media-m"/>
+  <symbol minX="1600" maxX="1640" minY="453" maxY="493" name="newsagent_shop-m"/>
+  <symbol minX="1640" maxX="1680" minY="453" maxY="493" name="marketplace-m"/>
+  <symbol minX="1680" maxX="1720" minY="453" maxY="493" name="padel-m"/>
   <symbol minX="1720" maxX="1760" minY="453" maxY="493" name="power-m"/>
-  <symbol minX="1760" maxX="1800" minY="453" maxY="493" name="postbox-m"/>
-  <symbol minX="1800" maxX="1840" minY="453" maxY="493" name="police-m"/>
-  <symbol minX="1840" maxX="1880" minY="453" maxY="493" name="alpine_hut-m"/>
-  <symbol minX="1880" maxX="1920" minY="453" maxY="493" name="podiatrist-m"/>
-  <symbol minX="1920" maxX="1960" minY="453" maxY="493" name="alternative-m"/>
-  <symbol minX="1960" maxX="2000" minY="453" maxY="493" name="plumber-m"/>
-  <symbol minX="2000" maxX="2040" minY="453" maxY="493" name="bowling-m"/>
-  <symbol minX="0" maxX="40" minY="493" maxY="533" name="america-football-m"/>
-  <symbol minX="40" maxX="80" minY="493" maxY="533" name="antiques-m"/>
-  <symbol minX="80" maxX="120" minY="493" maxY="533" name="apartment-m"/>
-  <symbol minX="120" maxX="160" minY="493" maxY="533" name="place-of-worship-m"/>
-  <symbol minX="160" maxX="200" minY="493" maxY="533" name="pitch-m"/>
-  <symbol minX="200" maxX="240" minY="493" maxY="533" name="picnic_table-m"/>
-  <symbol minX="240" maxX="280" minY="493" maxY="533" name="picnic-m"/>
-  <symbol minX="280" maxX="320" minY="493" maxY="533" name="physiotherapist-m"/>
-  <symbol minX="320" maxX="360" minY="493" maxY="533" name="archaeological-site-m"/>
-  <symbol minX="360" maxX="400" minY="493" maxY="533" name="photo-shop-m"/>
-  <symbol minX="400" maxX="440" minY="493" maxY="533" name="phone-m"/>
-  <symbol minX="440" maxX="480" minY="493" maxY="533" name="archery-m"/>
-  <symbol minX="480" maxX="520" minY="493" maxY="533" name="art-m"/>
-  <symbol minX="520" maxX="560" minY="493" maxY="533" name="bowling_alley-m"/>
-  <symbol minX="560" maxX="600" minY="493" maxY="533" name="needle_and_thread-m"/>
-  <symbol minX="600" maxX="640" minY="493" maxY="533" name="newsagent_shop-m"/>
-  <symbol minX="640" maxX="680" minY="493" maxY="533" name="nightclub-m"/>
-  <symbol minX="680" maxX="720" minY="493" maxY="533" name="bicycle-m"/>
-  <symbol minX="720" maxX="760" minY="493" maxY="533" name="bookmaker-m"/>
-  <symbol minX="760" maxX="800" minY="493" maxY="533" name="npark-m"/>
-  <symbol minX="800" maxX="840" minY="493" maxY="533" name="book-shop-m"/>
-  <symbol minX="840" maxX="880" minY="493" maxY="533" name="nparkf-m"/>
-  <symbol minX="880" maxX="920" minY="493" maxY="533" name="blood_donation-m"/>
-  <symbol minX="920" maxX="960" minY="493" maxY="533" name="blacksmith-m"/>
-  <symbol minX="960" maxX="1000" minY="493" maxY="533" name="bicycle-repair-station"/>
-  <symbol minX="1000" maxX="1040" minY="493" maxY="533" name="nparkf-outline-m"/>
-  <symbol minX="1040" maxX="1080" minY="493" maxY="532" name="subway-marseille-m"/>
-  <symbol minX="1080" maxX="1119" minY="493" maxY="532" name="subway-spb-m"/>
-  <symbol minX="1119" maxX="1159" minY="493" maxY="532" name="subway-maracaibo-m"/>
-  <symbol minX="1159" maxX="1199" minY="493" maxY="532" name="subway-shanghai-m"/>
-  <symbol minX="1199" maxX="1238" minY="493" maxY="532" name="subway-southkorea-s"/>
-  <symbol minX="1238" maxX="1277" minY="493" maxY="532" name="subway-ekb-s"/>
-  <symbol minX="1277" maxX="1316" minY="493" maxY="532" name="subway-montreal-m"/>
-  <symbol minX="1316" maxX="1356" minY="493" maxY="531" name="subway-dalian-m"/>
-  <symbol minX="1356" maxX="1396" minY="493" maxY="531" name="subway-sapporo-m"/>
-  <symbol minX="1396" maxX="1433" minY="493" maxY="530" name="subway-stlouis-s"/>
-  <symbol minX="1433" maxX="1469" minY="493" maxY="530" name="subway-warsaw-m"/>
-  <symbol minX="1469" maxX="1506" minY="493" maxY="530" name="subway-algeria-s"/>
-  <symbol minX="1506" maxX="1543" minY="493" maxY="530" name="subway-entrance-m"/>
-  <symbol minX="1543" maxX="1583" minY="493" maxY="530" name="subway-izmir-m"/>
-  <symbol minX="1583" maxX="1619" minY="493" maxY="529" name="lightrail-berlin-m"/>
-  <symbol minX="1619" maxX="1655" minY="493" maxY="529" name="search-result"/>
-  <symbol minX="1655" maxX="1686" minY="493" maxY="529" name="subway-istanbul-s"/>
-  <symbol minX="1686" maxX="1722" minY="493" maxY="529" name="subway-pittsburgh-s"/>
-  <symbol minX="1722" maxX="1756" minY="493" maxY="527" name="bike-parking-m"/>
-  <symbol minX="1756" maxX="1790" minY="493" maxY="527" name="subway-sapporo-s"/>
-  <symbol minX="1790" maxX="1821" minY="493" maxY="527" name="subway-brescia-s"/>
-  <symbol minX="1821" maxX="1855" minY="493" maxY="527" name="parking-disabled-m"/>
-  <symbol minX="1855" maxX="1888" minY="493" maxY="527" name="subway-mashhad-s"/>
-  <symbol minX="1888" maxX="1922" minY="493" maxY="527" name="parking-m"/>
-  <symbol minX="1922" maxX="1962" minY="493" maxY="527" name="subway-rotterdam-m"/>
-  <symbol minX="1962" maxX="2002" minY="493" maxY="527" name="subway-taoyuan-m"/>
-  <symbol minX="2002" maxX="2042" minY="493" maxY="527" name="subway-tbilisi-m"/>
-  <symbol minX="0" maxX="34" minY="533" maxY="567" name="parking_entrance-m"/>
-  <symbol minX="34" maxX="68" minY="533" maxY="567" name="parking_pay-m"/>
-  <symbol minX="68" maxX="108" minY="533" maxY="567" name="subway-almaty-m"/>
-  <symbol minX="108" maxX="142" minY="533" maxY="567" name="non-found-search-result"/>
-  <symbol minX="142" maxX="176" minY="533" maxY="567" name="motorcycle-parking-m"/>
-  <symbol minX="176" maxX="210" minY="533" maxY="567" name="speedcam-m"/>
-  <symbol minX="210" maxX="246" minY="533" maxY="567" name="subway-izmir-s"/>
-  <symbol minX="246" maxX="280" minY="533" maxY="567" name="subway-isfahan-s"/>
-  <symbol minX="280" maxX="314" minY="533" maxY="567" name="subway-medellin-s"/>
-  <symbol minX="314" maxX="348" minY="533" maxY="567" name="subway-panama-s"/>
-  <symbol minX="348" maxX="382" minY="533" maxY="567" name="bicycle-rental"/>
-  <symbol minX="382" maxX="416" minY="533" maxY="567" name="subway-cairo-s"/>
-  <symbol minX="416" maxX="482" minY="533" maxY="567" name="coloredmark-bg-s"/>
-  <symbol minX="482" maxX="548" minY="533" maxY="567" name="coloredmark-default-s"/>
-  <symbol minX="548" maxX="579" minY="533" maxY="566" name="subway-delhi-s"/>
-  <symbol minX="579" maxX="612" minY="533" maxY="566" name="subway-paris-m"/>
-  <symbol minX="612" maxX="645" minY="533" maxY="566" name="subway-ubahn-m"/>
-  <symbol minX="645" maxX="678" minY="533" maxY="566" name="subway-warszawa-s"/>
-  <symbol minX="678" maxX="709" minY="533" maxY="566" name="subway-tianjin-s"/>
-  <symbol minX="709" maxX="740" minY="533" maxY="566" name="subway-athens-s"/>
-  <symbol minX="740" maxX="763" minY="533" maxY="566" name="bookmark-default-xs"/>
-  <symbol minX="763" maxX="800" minY="533" maxY="566" name="subway-moscow-m"/>
-  <symbol minX="800" maxX="823" minY="533" maxY="566" name="bookmark-bg-xs"/>
-  <symbol minX="823" maxX="859" minY="533" maxY="566" name="subway-seattle-m"/>
-  <symbol minX="859" maxX="890" minY="533" maxY="566" name="subway-porto-s"/>
-  <symbol minX="890" maxX="921" minY="533" maxY="566" name="subway-pyongyang-s"/>
-  <symbol minX="921" maxX="954" minY="533" maxY="566" name="subway-rome-m"/>
-  <symbol minX="954" maxX="987" minY="533" maxY="566" name="subway-hirosima-s"/>
-  <symbol minX="987" maxX="1020" minY="533" maxY="566" name="subway-rennes-s"/>
-  <symbol minX="1020" maxX="1060" minY="533" maxY="565" name="subway-yerevan-m"/>
-  <symbol minX="1060" maxX="1100" minY="533" maxY="565" name="subway-santiago-m"/>
-  <symbol minX="1100" maxX="1140" minY="533" maxY="565" name="subway-dnepro-m"/>
-  <symbol minX="1140" maxX="1180" minY="533" maxY="565" name="subway-lyon-m"/>
-  <symbol minX="1180" maxX="1219" minY="533" maxY="564" name="subway-yerevan-s"/>
-  <symbol minX="1219" maxX="1250" minY="533" maxY="564" name="subway-oslo-s"/>
-  <symbol minX="1250" maxX="1281" minY="533" maxY="564" name="subway-massachusetts-s"/>
-  <symbol minX="1281" maxX="1312" minY="533" maxY="564" name="subway-wuhan-s"/>
-  <symbol minX="1312" maxX="1343" minY="533" maxY="564" name="subway-lisboa-s"/>
-  <symbol minX="1343" maxX="1374" minY="533" maxY="564" name="subway-washington-s"/>
-  <symbol minX="1374" maxX="1405" minY="533" maxY="564" name="subway-guangzhou-s"/>
-  <symbol minX="1405" maxX="1436" minY="533" maxY="564" name="subway-helsinki-s"/>
-  <symbol minX="1436" maxX="1476" minY="533" maxY="564" name="subway-alicante-m"/>
-  <symbol minX="1476" maxX="1504" minY="533" maxY="564" name="subway-warsaw-s"/>
-  <symbol minX="1504" maxX="1535" minY="533" maxY="564" name="subway-bursaray-s"/>
-  <symbol minX="1535" maxX="1566" minY="533" maxY="564" name="subway-reseau-paris-s"/>
-  <symbol minX="1566" maxX="1597" minY="533" maxY="564" name="subway-volgograd-s"/>
-  <symbol minX="1597" maxX="1628" minY="533" maxY="564" name="subway-vienna-s"/>
-  <symbol minX="1628" maxX="1659" minY="533" maxY="564" name="subway-chicago-s"/>
-  <symbol minX="1659" maxX="1699" minY="533" maxY="564" name="subway-omsk-s"/>
-  <symbol minX="1699" maxX="1730" minY="533" maxY="564" name="subway-kazan-s"/>
-  <symbol minX="1730" maxX="1763" minY="533" maxY="564" name="subway-glasgow-s"/>
-  <symbol minX="1763" maxX="1794" minY="533" maxY="564" name="subway-caracas-s"/>
-  <symbol minX="1794" maxX="1833" minY="533" maxY="564" name="subway-fukuoka-s"/>
-  <symbol minX="1833" maxX="1864" minY="533" maxY="564" name="subway-kobe-s"/>
-  <symbol minX="1864" maxX="1895" minY="533" maxY="564" name="subway-milan-s"/>
-  <symbol minX="1895" maxX="1935" minY="533" maxY="564" name="subway-kryvyirih-m"/>
-  <symbol minX="1935" maxX="1966" minY="533" maxY="564" name="subway-foshan-s"/>
-  <symbol minX="1966" maxX="1997" minY="533" maxY="564" name="subway-chengdu-s"/>
-  <symbol minX="1997" maxX="2028" minY="533" maxY="564" name="subway-lima-s"/>
-  <symbol minX="0" maxX="31" minY="567" maxY="598" name="subway-kunming-s"/>
-  <symbol minX="31" maxX="62" minY="567" maxY="598" name="subway-guadalajara-s"/>
-  <symbol minX="62" maxX="93" minY="567" maxY="598" name="subway-minatomirai-s"/>
-  <symbol minX="93" maxX="124" minY="567" maxY="598" name="subway-kyoto-s"/>
-  <symbol minX="124" maxX="155" minY="567" maxY="598" name="subway-nnov-s"/>
-  <symbol minX="155" maxX="186" minY="567" maxY="598" name="subway-catania-s"/>
-  <symbol minX="186" maxX="217" minY="567" maxY="598" name="subway-lille-s"/>
-  <symbol minX="217" maxX="257" minY="567" maxY="598" name="subway-omsk-m"/>
-  <symbol minX="257" maxX="288" minY="567" maxY="598" name="subway-yokohama-s"/>
-  <symbol minX="288" maxX="319" minY="567" maxY="598" name="subway-changchun-s"/>
-  <symbol minX="319" maxX="350" minY="567" maxY="598" name="subway-buenosaires-s"/>
-  <symbol minX="350" maxX="381" minY="567" maxY="598" name="subway-bangkok-s"/>
-  <symbol minX="381" maxX="412" minY="567" maxY="598" name="subway-mecca-s"/>
-  <symbol minX="412" maxX="443" minY="567" maxY="598" name="subway-valencia-s"/>
-  <symbol minX="443" maxX="474" minY="567" maxY="598" name="subway-shiraz-s"/>
-  <symbol minX="474" maxX="505" minY="567" maxY="598" name="subway-shanghai-s"/>
-  <symbol minX="505" maxX="536" minY="567" maxY="598" name="subway-beijing-s"/>
-  <symbol minX="536" maxX="567" minY="567" maxY="598" name="subway-budapest-s"/>
-  <symbol minX="567" maxX="598" minY="567" maxY="598" name="subway-bengaluru-s"/>
-  <symbol minX="598" maxX="629" minY="567" maxY="598" name="subway-sofia-s"/>
-  <symbol minX="629" maxX="660" minY="567" maxY="598" name="subway-saopaulo-s"/>
-  <symbol minX="660" maxX="691" minY="567" maxY="598" name="subway-dubai-s"/>
-  <symbol minX="691" maxX="722" minY="567" maxY="598" name="subway-santodomingo-s"/>
-  <symbol minX="722" maxX="761" minY="567" maxY="598" name="subway-santiago-s"/>
-  <symbol minX="761" maxX="792" minY="567" maxY="598" name="subway-brasilia-s"/>
-  <symbol minX="792" maxX="823" minY="567" maxY="598" name="subway-samara-s"/>
-  <symbol minX="823" maxX="854" minY="567" maxY="598" name="subway-dalian-s"/>
-  <symbol minX="854" maxX="885" minY="567" maxY="598" name="subway-nagoya-s"/>
-  <symbol minX="885" maxX="916" minY="567" maxY="598" name="subway-riodejaneiro-s"/>
-  <symbol minX="916" maxX="947" minY="567" maxY="598" name="subway-tyneandwear-s"/>
-  <symbol minX="947" maxX="978" minY="567" maxY="598" name="subway-tokyo-s"/>
-  <symbol minX="978" maxX="1009" minY="567" maxY="598" name="subway-montreal-s"/>
-  <symbol minX="1009" maxX="1040" minY="567" maxY="598" name="subway-stockholm-s"/>
-  <symbol minX="1040" maxX="1080" minY="567" maxY="598" name="subway-tabriz-m"/>
-  <symbol minX="1080" maxX="1111" minY="567" maxY="598" name="subway-perugia-s"/>
-  <symbol minX="1111" maxX="1142" minY="567" maxY="598" name="subway-tashkent-s"/>
-  <symbol minX="1142" maxX="1178" minY="567" maxY="598" name="subway-taoyuan-s"/>
-  <symbol minX="1178" maxX="1209" minY="567" maxY="598" name="subway-losangeles-s"/>
-  <symbol minX="1209" maxX="1249" minY="567" maxY="598" name="subway-philadelphia-m"/>
-  <symbol minX="1249" maxX="1277" minY="567" maxY="597" name="subway-mexico-s"/>
-  <symbol minX="1277" maxX="1316" minY="567" maxY="597" name="subway-london-m"/>
-  <symbol minX="1316" maxX="1353" minY="567" maxY="597" name="subway-almaty-s"/>
-  <symbol minX="1353" maxX="1381" minY="567" maxY="597" name="subway-amsterdam-s"/>
-  <symbol minX="1381" maxX="1411" minY="567" maxY="597" name="cave-m"/>
-  <symbol minX="1411" maxX="1441" minY="567" maxY="597" name="subway-lausanne-s"/>
-  <symbol minX="1441" maxX="1481" minY="567" maxY="597" name="subway-osaka-m"/>
-  <symbol minX="1481" maxX="1511" minY="567" maxY="597" name="subway-spb-s"/>
-  <symbol minX="1511" maxX="1551" minY="567" maxY="597" name="subway-lucknow-s"/>
-  <symbol minX="1551" maxX="1590" minY="567" maxY="597" name="subway-tabriz-s"/>
-  <symbol minX="1590" maxX="1621" minY="567" maxY="597" name="subway-maracaibo-s"/>
-  <symbol minX="1621" maxX="1661" minY="567" maxY="596" name="subway-barcelona-m"/>
-  <symbol minX="1661" maxX="1701" minY="567" maxY="596" name="subway-madrid-m"/>
-  <symbol minX="1701" maxX="1729" minY="567" maxY="595" name="christian-s"/>
-  <symbol minX="1729" maxX="1757" minY="567" maxY="595" name="airport-s"/>
-  <symbol minX="1757" maxX="1785" minY="567" maxY="595" name="college-s"/>
-  <symbol minX="1785" maxX="1813" minY="567" maxY="595" name="drinking-water-s"/>
-  <symbol minX="1813" maxX="1841" minY="567" maxY="595" name="waste-basket-s"/>
-  <symbol minX="1841" maxX="1869" minY="567" maxY="595" name="waterfall-s"/>
-  <symbol minX="1869" maxX="1897" minY="567" maxY="595" name="bus-s"/>
-  <symbol minX="1897" maxX="1925" minY="567" maxY="595" name="zoo-s"/>
-  <symbol minX="1925" maxX="1953" minY="567" maxY="595" name="cable-car-s"/>
-  <symbol minX="1953" maxX="1981" minY="567" maxY="595" name="charging-station-s"/>
-  <symbol minX="1981" maxX="2009" minY="567" maxY="595" name="buddhist-s"/>
-  <symbol minX="2009" maxX="2037" minY="567" maxY="595" name="car-repair-s"/>
-  <symbol minX="0" maxX="28" minY="598" maxY="626" name="viewpoint-s"/>
-  <symbol minX="28" maxX="56" minY="598" maxY="626" name="hospital-s"/>
-  <symbol minX="56" maxX="87" minY="598" maxY="626" name="subway-tbilisi-s"/>
-  <symbol minX="87" maxX="115" minY="598" maxY="626" name="shop-s"/>
-  <symbol minX="115" maxX="143" minY="598" maxY="626" name="hotel-s"/>
-  <symbol minX="143" maxX="171" minY="598" maxY="626" name="subway-s"/>
-  <symbol minX="171" maxX="202" minY="598" maxY="626" name="subway-rotterdam-s"/>
-  <symbol minX="202" maxX="230" minY="598" maxY="626" name="jewish-s"/>
-  <symbol minX="230" maxX="266" minY="598" maxY="626" name="subway-philadelphia-s"/>
-  <symbol minX="266" maxX="305" minY="598" maxY="626" name="subway-palma-s"/>
-  <symbol minX="305" maxX="345" minY="598" maxY="626" name="subway-palma-m"/>
-  <symbol minX="345" maxX="379" minY="598" maxY="626" name="subway-osaka-s"/>
-  <symbol minX="379" maxX="407" minY="598" maxY="626" name="subway-newyork-s"/>
-  <symbol minX="407" maxX="435" minY="598" maxY="626" name="lighthouse-s"/>
-  <symbol minX="435" maxX="463" minY="598" maxY="626" name="place-of-worship-s"/>
-  <symbol minX="463" maxX="491" minY="598" maxY="626" name="remains-s"/>
-  <symbol minX="491" maxX="519" minY="598" maxY="626" name="stadium-s"/>
-  <symbol minX="519" maxX="559" minY="598" maxY="626" name="subway-lucknow-m"/>
-  <symbol minX="559" maxX="587" minY="598" maxY="626" name="monument-s"/>
-  <symbol minX="587" maxX="627" minY="598" maxY="626" name="subway-kolkata-m"/>
-  <symbol minX="627" maxX="655" minY="598" maxY="626" name="museum-s"/>
-  <symbol minX="655" maxX="683" minY="598" maxY="626" name="muslim-s"/>
-  <symbol minX="683" maxX="711" minY="598" maxY="626" name="subway-entrance-s"/>
-  <symbol minX="711" maxX="748" minY="598" maxY="626" name="subway-dnepro-s"/>
-  <symbol minX="748" maxX="776" minY="598" maxY="626" name="nparkf-outline-s"/>
-  <symbol minX="776" maxX="804" minY="598" maxY="626" name="nparkf-s"/>
-  <symbol minX="804" maxX="832" minY="598" maxY="626" name="park-outline-s"/>
-  <symbol minX="832" maxX="860" minY="598" maxY="626" name="park-s"/>
-  <symbol minX="860" maxX="900" minY="598" maxY="626" name="subway-bilbao-m"/>
-  <symbol minX="900" maxX="928" minY="598" maxY="626" name="geyser-s"/>
-  <symbol minX="928" maxX="956" minY="598" maxY="626" name="tram-s"/>
-  <symbol minX="956" maxX="984" minY="598" maxY="626" name="train-s"/>
-  <symbol minX="984" maxX="1015" minY="598" maxY="626" name="transfer_arrow"/>
-  <symbol minX="1015" maxX="1037" minY="598" maxY="626" name="transit_light_rail-m"/>
-  <symbol minX="1037" maxX="1065" minY="598" maxY="626" name="shinto-s"/>
-  <symbol minX="1065" maxX="1093" minY="598" maxY="626" name="tourism-s"/>
-  <symbol minX="1093" maxX="1121" minY="598" maxY="626" name="toll_booth-s"/>
-  <symbol minX="1121" maxX="1149" minY="598" maxY="626" name="theme_park-s"/>
-  <symbol minX="1149" maxX="1177" minY="598" maxY="626" name="theatre-s"/>
-  <symbol minX="1177" maxX="1205" minY="598" maxY="626" name="taoist-s"/>
-  <symbol minX="1205" maxX="1227" minY="598" maxY="626" name="transit_train-m"/>
-  <symbol minX="1227" maxX="1255" minY="598" maxY="626" name="ship-s"/>
-  <symbol minX="1255" maxX="1283" minY="598" maxY="626" name="fuel-s"/>
-  <symbol minX="1283" maxX="1311" minY="598" maxY="626" name="hindu-s"/>
-  <symbol minX="1311" maxX="1351" minY="598" maxY="625" name="subway-kharkiv-s"/>
-  <symbol minX="1351" maxX="1390" minY="598" maxY="625" name="subway-kiev-m"/>
-  <symbol minX="1390" maxX="1426" minY="598" maxY="625" name="subway-madrid-s"/>
-  <symbol minX="1426" maxX="1466" minY="598" maxY="625" name="subway-fukuoka-m"/>
-  <symbol minX="1466" maxX="1488" minY="598" maxY="625" name="transit_monorail-m"/>
-  <symbol minX="1488" maxX="1522" minY="598" maxY="625" name="subway-kryvyirih-s"/>
-  <symbol minX="1522" maxX="1558" minY="598" maxY="625" name="subway-barcelona-s"/>
-  <symbol minX="1558" maxX="1598" minY="598" maxY="625" name="subway-bucharest-m"/>
-  <symbol minX="1598" maxX="1638" minY="598" maxY="625" name="subway-brussel-s"/>
-  <symbol minX="1638" maxX="1669" minY="598" maxY="625" name="subway-lyon-s"/>
-  <symbol minX="1669" maxX="1696" minY="598" maxY="625" name="lightrail-berlin-s"/>
-  <symbol minX="1696" maxX="1723" minY="598" maxY="625" name="subway-paris-s"/>
-  <symbol minX="1723" maxX="1763" minY="598" maxY="625" name="subway-sanfrancisco-m"/>
-  <symbol minX="1763" maxX="1802" minY="598" maxY="625" name="subway-novosibirsk-s"/>
-  <symbol minX="1802" maxX="1829" minY="598" maxY="625" name="elevator"/>
-  <symbol minX="1829" maxX="1869" minY="598" maxY="625" name="subway-novosibirsk-m"/>
-  <symbol minX="1869" maxX="1909" minY="598" maxY="625" name="subway-sanfrancisco-s"/>
-  <symbol minX="1909" maxX="1949" minY="598" maxY="624" name="subway-sendai-m"/>
-  <symbol minX="1949" maxX="1974" minY="598" maxY="623" name="transit_subway-m"/>
-  <symbol minX="1974" maxX="1999" minY="598" maxY="623" name="storage-tank"/>
-  <symbol minX="1999" maxX="2039" minY="598" maxY="623" name="subway-kharkiv-m"/>
-  <symbol minX="0" maxX="40" minY="626" maxY="651" name="subway-haagse-s"/>
-  <symbol minX="40" maxX="67" minY="626" maxY="651" name="subway-moscow-s"/>
-  <symbol minX="67" maxX="92" minY="626" maxY="651" name="board"/>
-  <symbol minX="92" maxX="125" minY="626" maxY="651" name="subway-alicante-s"/>
-  <symbol minX="125" maxX="144" minY="626" maxY="651" name="transit_train-s"/>
-  <symbol minX="144" maxX="183" minY="626" maxY="651" name="subway-bucharest-s"/>
-  <symbol minX="183" maxX="223" minY="626" maxY="651" name="subway-sendai-s"/>
-  <symbol minX="223" maxX="263" minY="626" maxY="651" name="subway-brussel-m"/>
-  <symbol minX="263" maxX="288" minY="626" maxY="651" name="map"/>
-  <symbol minX="288" maxX="328" minY="626" maxY="651" name="subway-manila-m"/>
-  <symbol minX="328" maxX="362" minY="626" maxY="650" name="subway-bilbao-s"/>
-  <symbol minX="362" maxX="401" minY="626" maxY="650" name="subway-manila-s"/>
-  <symbol minX="401" maxX="426" minY="626" maxY="650" name="subway-seattle-s"/>
-  <symbol minX="426" maxX="466" minY="626" maxY="650" name="subway-edmonton-s"/>
-  <symbol minX="466" maxX="490" minY="626" maxY="650" name="cave-s"/>
-  <symbol minX="490" maxX="514" minY="626" maxY="650" name="subway-ubahn-s"/>
-  <symbol minX="514" maxX="544" minY="626" maxY="650" name="subway-london-s"/>
-  <symbol minX="544" maxX="584" minY="626" maxY="650" name="subway-taipei-s"/>
-  <symbol minX="584" maxX="608" minY="626" maxY="650" name="subway-rome-s"/>
-  <symbol minX="608" maxX="648" minY="626" maxY="649" name="subway-haagse-m"/>
-  <symbol minX="648" maxX="670" minY="626" maxY="648" name="subway-xs"/>
-  <symbol minX="670" maxX="692" minY="626" maxY="648" name="speedcam-s"/>
-  <symbol minX="692" maxX="716" minY="626" maxY="648" name="main_entrance-s"/>
-  <symbol minX="716" maxX="750" minY="626" maxY="648" name="railway-crossing-l"/>
-  <symbol minX="750" maxX="772" minY="626" maxY="648" name="transit_subway-s"/>
-  <symbol minX="772" maxX="799" minY="626" maxY="648" name="bench"/>
-  <symbol minX="799" maxX="821" minY="626" maxY="648" name="parking-s"/>
-  <symbol minX="821" maxX="836" minY="626" maxY="648" name="entrance-s"/>
-  <symbol minX="836" maxX="858" minY="626" maxY="648" name="subway-newyork-xs"/>
-  <symbol minX="858" maxX="877" minY="626" maxY="648" name="transit_monorail-s"/>
-  <symbol minX="877" maxX="899" minY="626" maxY="648" name="star-l"/>
-  <symbol minX="899" maxX="921" minY="626" maxY="648" name="gate-s"/>
-  <symbol minX="921" maxX="940" minY="626" maxY="648" name="transit_light_rail-s"/>
-  <symbol minX="940" maxX="979" minY="626" maxY="647" name="subway-malaga-s"/>
-  <symbol minX="979" maxX="1000" minY="626" maxY="647" name="star-m"/>
-  <symbol minX="1000" maxX="1024" minY="626" maxY="647" name="volcano-m"/>
-  <symbol minX="1024" maxX="1064" minY="626" maxY="647" name="subway-edmonton-m"/>
-  <symbol minX="1064" maxX="1097" minY="626" maxY="647" name="subway-kiev-s"/>
-  <symbol minX="1097" maxX="1137" minY="626" maxY="647" name="subway-malaga-m"/>
-  <symbol minX="1137" maxX="1167" minY="626" maxY="647" name="subway-kolkata-s"/>
-  <symbol minX="1167" maxX="1207" minY="626" maxY="646" name="subway-taipei-m"/>
-  <symbol minX="1207" maxX="1246" minY="626" maxY="645" name="subway-baku-s"/>
-  <symbol minX="1246" maxX="1276" minY="626" maxY="645" name="railway-crossing-m"/>
-  <symbol minX="1276" maxX="1298" minY="626" maxY="645" name="plaque"/>
-  <symbol minX="1298" maxX="1331" minY="626" maxY="645" name="subway-minsk-m"/>
-  <symbol minX="1331" maxX="1349" minY="626" maxY="644" name="star-s"/>
-  <symbol minX="1349" maxX="1379" minY="626" maxY="644" name="subway-minsk-s"/>
-  <symbol minX="1379" maxX="1419" minY="626" maxY="644" name="subway-baku-m"/>
-  <symbol minX="1419" maxX="1459" minY="626" maxY="643" name="subway-chongqing-s"/>
-  <symbol minX="1459" maxX="1499" minY="626" maxY="643" name="subway-chongqing-m"/>
-  <symbol minX="1499" maxX="1527" minY="626" maxY="642" name="mountain-pass"/>
-  <symbol minX="1527" maxX="1563" minY="626" maxY="642" name="arrow-m"/>
-  <symbol minX="1563" maxX="1581" minY="626" maxY="642" name="peakt-m"/>
-  <symbol minX="1581" maxX="1599" minY="626" maxY="642" name="volcano-s"/>
-  <symbol minX="1599" maxX="1614" minY="626" maxY="641" name="zero-icon"/>
-  <symbol minX="1614" maxX="1629" minY="626" maxY="639" name="peakt-s"/>
-  <symbol minX="1629" maxX="1656" minY="626" maxY="638" name="arrow-s"/>
-  <symbol minX="1656" maxX="1668" minY="626" maxY="638" name="dot-m"/>
-  <symbol minX="1668" maxX="1686" minY="626" maxY="635" name="arrow-xs"/>
+  <symbol minX="1760" maxX="1800" minY="453" maxY="493" name="pitch-m"/>
+  <symbol minX="1800" maxX="1840" minY="453" maxY="493" name="ice_cream-m"/>
+  <symbol minX="1840" maxX="1880" minY="453" maxY="493" name="place-of-worship-m"/>
+  <symbol minX="1880" maxX="1920" minY="453" maxY="493" name="playground-m"/>
+  <symbol minX="1920" maxX="1960" minY="453" maxY="493" name="plumber-m"/>
+  <symbol minX="1960" maxX="2000" minY="453" maxY="493" name="podiatrist-m"/>
+  <symbol minX="2000" maxX="2040" minY="453" maxY="493" name="police-m"/>
+  <symbol minX="0" maxX="40" minY="493" maxY="533" name="postbox-m"/>
+  <symbol minX="40" maxX="80" minY="493" maxY="533" name="hunting-tower-m"/>
+  <symbol minX="80" maxX="120" minY="493" maxY="533" name="jewish-m"/>
+  <symbol minX="120" maxX="160" minY="493" maxY="533" name="prison-m"/>
+  <symbol minX="160" maxX="200" minY="493" maxY="533" name="home-m"/>
+  <symbol minX="200" maxX="240" minY="493" maxY="533" name="hotel-m"/>
+  <symbol minX="240" maxX="280" minY="493" maxY="533" name="psychotherapist-m"/>
+  <symbol minX="280" maxX="320" minY="493" maxY="533" name="remains-m"/>
+  <symbol minX="320" maxX="360" minY="493" maxY="533" name="public-building-m"/>
+  <symbol minX="360" maxX="400" minY="493" maxY="533" name="hostel-m"/>
+  <symbol minX="400" maxX="440" minY="493" maxY="533" name="recycling-m"/>
+  <symbol minX="440" maxX="480" minY="493" maxY="533" name="hospital-m"/>
+  <symbol minX="480" maxX="520" minY="493" maxY="533" name="picnic-m"/>
+  <symbol minX="520" maxX="560" minY="493" maxY="533" name="internet_cafe-m"/>
+  <symbol minX="560" maxX="600" minY="493" maxY="533" name="physiotherapist-m"/>
+  <symbol minX="600" maxX="640" minY="493" maxY="533" name="sample_collection-m"/>
+  <symbol minX="640" maxX="680" minY="493" maxY="533" name="photo-shop-m"/>
+  <symbol minX="680" maxX="720" minY="493" maxY="533" name="hockey-m"/>
+  <symbol minX="720" maxX="760" minY="493" maxY="533" name="picnic_table-m"/>
+  <symbol minX="760" maxX="800" minY="493" maxY="533" name="information-m"/>
+  <symbol minX="800" maxX="840" minY="493" maxY="533" name="phone-m"/>
+  <symbol minX="840" maxX="880" minY="493" maxY="533" name="jewelry-m"/>
+  <symbol minX="880" maxX="919" minY="493" maxY="532" name="subway-spb-m"/>
+  <symbol minX="919" maxX="959" minY="493" maxY="532" name="subway-marseille-m"/>
+  <symbol minX="959" maxX="998" minY="493" maxY="532" name="subway-ekb-s"/>
+  <symbol minX="998" maxX="1038" minY="493" maxY="532" name="subway-shanghai-m"/>
+  <symbol minX="1038" maxX="1078" minY="493" maxY="532" name="subway-maracaibo-m"/>
+  <symbol minX="1078" maxX="1117" minY="493" maxY="532" name="subway-southkorea-s"/>
+  <symbol minX="1117" maxX="1156" minY="493" maxY="532" name="subway-montreal-m"/>
+  <symbol minX="1156" maxX="1196" minY="493" maxY="531" name="subway-dalian-m"/>
+  <symbol minX="1196" maxX="1236" minY="493" maxY="531" name="subway-sapporo-m"/>
+  <symbol minX="1236" maxX="1273" minY="493" maxY="530" name="subway-stlouis-s"/>
+  <symbol minX="1273" maxX="1310" minY="493" maxY="530" name="subway-algeria-s"/>
+  <symbol minX="1310" maxX="1347" minY="493" maxY="530" name="subway-entrance-m"/>
+  <symbol minX="1347" maxX="1387" minY="493" maxY="530" name="subway-izmir-m"/>
+  <symbol minX="1387" maxX="1423" minY="493" maxY="530" name="subway-warsaw-m"/>
+  <symbol minX="1423" maxX="1454" minY="493" maxY="529" name="subway-istanbul-s"/>
+  <symbol minX="1454" maxX="1490" minY="493" maxY="529" name="subway-pittsburgh-s"/>
+  <symbol minX="1490" maxX="1526" minY="493" maxY="529" name="lightrail-berlin-m"/>
+  <symbol minX="1526" maxX="1562" minY="493" maxY="529" name="search-result"/>
+  <symbol minX="1562" maxX="1596" minY="493" maxY="527" name="subway-isfahan-s"/>
+  <symbol minX="1596" maxX="1630" minY="493" maxY="527" name="subway-sapporo-s"/>
+  <symbol minX="1630" maxX="1670" minY="493" maxY="527" name="subway-almaty-m"/>
+  <symbol minX="1670" maxX="1701" minY="493" maxY="527" name="subway-brescia-s"/>
+  <symbol minX="1701" maxX="1741" minY="493" maxY="527" name="subway-rotterdam-m"/>
+  <symbol minX="1741" maxX="1777" minY="493" maxY="527" name="subway-izmir-s"/>
+  <symbol minX="1777" maxX="1811" minY="493" maxY="527" name="speedcam-m"/>
+  <symbol minX="1811" maxX="1851" minY="493" maxY="527" name="subway-taoyuan-m"/>
+  <symbol minX="1851" maxX="1885" minY="493" maxY="527" name="parking_entrance-m"/>
+  <symbol minX="1885" maxX="1919" minY="493" maxY="527" name="subway-medellin-s"/>
+  <symbol minX="1919" maxX="1953" minY="493" maxY="527" name="parking-m"/>
+  <symbol minX="1953" maxX="1987" minY="493" maxY="527" name="bicycle-rental"/>
+  <symbol minX="1987" maxX="2021" minY="493" maxY="527" name="parking_pay-m"/>
+  <symbol minX="0" maxX="34" minY="533" maxY="567" name="parking-disabled-m"/>
+  <symbol minX="34" maxX="67" minY="533" maxY="567" name="subway-mashhad-s"/>
+  <symbol minX="67" maxX="101" minY="533" maxY="567" name="bike-parking-m"/>
+  <symbol minX="101" maxX="135" minY="533" maxY="567" name="subway-cairo-s"/>
+  <symbol minX="135" maxX="169" minY="533" maxY="567" name="non-found-search-result"/>
+  <symbol minX="169" maxX="203" minY="533" maxY="567" name="motorcycle-parking-m"/>
+  <symbol minX="203" maxX="269" minY="533" maxY="567" name="coloredmark-bg-s"/>
+  <symbol minX="269" maxX="303" minY="533" maxY="567" name="subway-panama-s"/>
+  <symbol minX="303" maxX="343" minY="533" maxY="567" name="subway-tbilisi-m"/>
+  <symbol minX="343" maxX="409" minY="533" maxY="567" name="coloredmark-default-s"/>
+  <symbol minX="409" maxX="432" minY="533" maxY="566" name="bookmark-bg-xs"/>
+  <symbol minX="432" maxX="463" minY="533" maxY="566" name="subway-tianjin-s"/>
+  <symbol minX="463" maxX="494" minY="533" maxY="566" name="subway-athens-s"/>
+  <symbol minX="494" maxX="530" minY="533" maxY="566" name="subway-seattle-m"/>
+  <symbol minX="530" maxX="563" minY="533" maxY="566" name="subway-warszawa-s"/>
+  <symbol minX="563" maxX="596" minY="533" maxY="566" name="subway-ubahn-m"/>
+  <symbol minX="596" maxX="629" minY="533" maxY="566" name="subway-hirosima-s"/>
+  <symbol minX="629" maxX="652" minY="533" maxY="566" name="bookmark-default-xs"/>
+  <symbol minX="652" maxX="685" minY="533" maxY="566" name="subway-rome-m"/>
+  <symbol minX="685" maxX="716" minY="533" maxY="566" name="subway-delhi-s"/>
+  <symbol minX="716" maxX="749" minY="533" maxY="566" name="subway-rennes-s"/>
+  <symbol minX="749" maxX="780" minY="533" maxY="566" name="subway-pyongyang-s"/>
+  <symbol minX="780" maxX="811" minY="533" maxY="566" name="subway-porto-s"/>
+  <symbol minX="811" maxX="848" minY="533" maxY="566" name="subway-moscow-m"/>
+  <symbol minX="848" maxX="881" minY="533" maxY="566" name="subway-paris-m"/>
+  <symbol minX="881" maxX="921" minY="533" maxY="565" name="subway-santiago-m"/>
+  <symbol minX="921" maxX="961" minY="533" maxY="565" name="subway-yerevan-m"/>
+  <symbol minX="961" maxX="1001" minY="533" maxY="565" name="subway-dnepro-m"/>
+  <symbol minX="1001" maxX="1040" minY="533" maxY="564" name="subway-yerevan-s"/>
+  <symbol minX="1040" maxX="1071" minY="533" maxY="564" name="subway-yokohama-s"/>
+  <symbol minX="1071" maxX="1102" minY="533" maxY="564" name="subway-riodejaneiro-s"/>
+  <symbol minX="1102" maxX="1133" minY="533" maxY="564" name="subway-wuhan-s"/>
+  <symbol minX="1133" maxX="1169" minY="533" maxY="564" name="subway-taoyuan-s"/>
+  <symbol minX="1169" maxX="1200" minY="533" maxY="564" name="subway-washington-s"/>
+  <symbol minX="1200" maxX="1228" minY="533" maxY="564" name="subway-warsaw-s"/>
+  <symbol minX="1228" maxX="1259" minY="533" maxY="564" name="subway-tashkent-s"/>
+  <symbol minX="1259" maxX="1290" minY="533" maxY="564" name="subway-volgograd-s"/>
+  <symbol minX="1290" maxX="1321" minY="533" maxY="564" name="subway-vienna-s"/>
+  <symbol minX="1321" maxX="1352" minY="533" maxY="564" name="subway-valencia-s"/>
+  <symbol minX="1352" maxX="1383" minY="533" maxY="564" name="subway-tokyo-s"/>
+  <symbol minX="1383" maxX="1423" minY="533" maxY="564" name="subway-alicante-m"/>
+  <symbol minX="1423" maxX="1454" minY="533" maxY="564" name="subway-tyneandwear-s"/>
+  <symbol minX="1454" maxX="1485" minY="533" maxY="564" name="subway-losangeles-s"/>
+  <symbol minX="1485" maxX="1516" minY="533" maxY="564" name="subway-caracas-s"/>
+  <symbol minX="1516" maxX="1547" minY="533" maxY="564" name="subway-nagoya-s"/>
+  <symbol minX="1547" maxX="1578" minY="533" maxY="564" name="subway-catania-s"/>
+  <symbol minX="1578" maxX="1609" minY="533" maxY="564" name="subway-montreal-s"/>
+  <symbol minX="1609" maxX="1640" minY="533" maxY="564" name="subway-changchun-s"/>
+  <symbol minX="1640" maxX="1671" minY="533" maxY="564" name="subway-minatomirai-s"/>
+  <symbol minX="1671" maxX="1702" minY="533" maxY="564" name="subway-chengdu-s"/>
+  <symbol minX="1702" maxX="1733" minY="533" maxY="564" name="subway-milan-s"/>
+  <symbol minX="1733" maxX="1764" minY="533" maxY="564" name="subway-chicago-s"/>
+  <symbol minX="1764" maxX="1795" minY="533" maxY="564" name="subway-mecca-s"/>
+  <symbol minX="1795" maxX="1826" minY="533" maxY="564" name="subway-massachusetts-s"/>
+  <symbol minX="1826" maxX="1857" minY="533" maxY="564" name="subway-dalian-s"/>
+  <symbol minX="1857" maxX="1888" minY="533" maxY="564" name="subway-dubai-s"/>
+  <symbol minX="1888" maxX="1919" minY="533" maxY="564" name="subway-lyon-s"/>
+  <symbol minX="1919" maxX="1959" minY="533" maxY="564" name="subway-tabriz-m"/>
+  <symbol minX="1959" maxX="1990" minY="533" maxY="564" name="subway-lisboa-s"/>
+  <symbol minX="1990" maxX="2021" minY="533" maxY="564" name="subway-lima-s"/>
+  <symbol minX="0" maxX="31" minY="567" maxY="598" name="subway-lille-s"/>
+  <symbol minX="31" maxX="62" minY="567" maxY="598" name="subway-foshan-s"/>
+  <symbol minX="62" maxX="93" minY="567" maxY="598" name="subway-kyoto-s"/>
+  <symbol minX="93" maxX="132" minY="567" maxY="598" name="subway-fukuoka-s"/>
+  <symbol minX="132" maxX="163" minY="567" maxY="598" name="subway-kunming-s"/>
+  <symbol minX="163" maxX="196" minY="567" maxY="598" name="subway-glasgow-s"/>
+  <symbol minX="196" maxX="236" minY="567" maxY="598" name="subway-kryvyirih-m"/>
+  <symbol minX="236" maxX="267" minY="567" maxY="598" name="subway-kobe-s"/>
+  <symbol minX="267" maxX="298" minY="567" maxY="598" name="subway-guadalajara-s"/>
+  <symbol minX="298" maxX="329" minY="567" maxY="598" name="subway-guangzhou-s"/>
+  <symbol minX="329" maxX="360" minY="567" maxY="598" name="subway-kazan-s"/>
+  <symbol minX="360" maxX="391" minY="567" maxY="598" name="subway-helsinki-s"/>
+  <symbol minX="391" maxX="422" minY="567" maxY="598" name="subway-reseau-paris-s"/>
+  <symbol minX="422" maxX="453" minY="567" maxY="598" name="subway-saopaulo-s"/>
+  <symbol minX="453" maxX="484" minY="567" maxY="598" name="subway-bangkok-s"/>
+  <symbol minX="484" maxX="515" minY="567" maxY="598" name="subway-santodomingo-s"/>
+  <symbol minX="515" maxX="554" minY="567" maxY="598" name="subway-santiago-s"/>
+  <symbol minX="554" maxX="585" minY="567" maxY="598" name="subway-nnov-s"/>
+  <symbol minX="585" maxX="616" minY="567" maxY="598" name="subway-beijing-s"/>
+  <symbol minX="616" maxX="647" minY="567" maxY="598" name="subway-shanghai-s"/>
+  <symbol minX="647" maxX="678" minY="567" maxY="598" name="subway-samara-s"/>
+  <symbol minX="678" maxX="709" minY="567" maxY="598" name="subway-shiraz-s"/>
+  <symbol minX="709" maxX="740" minY="567" maxY="598" name="subway-bengaluru-s"/>
+  <symbol minX="740" maxX="771" minY="567" maxY="598" name="subway-sofia-s"/>
+  <symbol minX="771" maxX="802" minY="567" maxY="598" name="subway-brasilia-s"/>
+  <symbol minX="802" maxX="842" minY="567" maxY="598" name="subway-philadelphia-m"/>
+  <symbol minX="842" maxX="873" minY="567" maxY="598" name="subway-perugia-s"/>
+  <symbol minX="873" maxX="904" minY="567" maxY="598" name="subway-stockholm-s"/>
+  <symbol minX="904" maxX="935" minY="567" maxY="598" name="subway-budapest-s"/>
+  <symbol minX="935" maxX="966" minY="567" maxY="598" name="subway-oslo-s"/>
+  <symbol minX="966" maxX="997" minY="567" maxY="598" name="subway-buenosaires-s"/>
+  <symbol minX="997" maxX="1037" minY="567" maxY="598" name="subway-omsk-s"/>
+  <symbol minX="1037" maxX="1077" minY="567" maxY="598" name="subway-omsk-m"/>
+  <symbol minX="1077" maxX="1108" minY="567" maxY="598" name="subway-bursaray-s"/>
+  <symbol minX="1108" maxX="1147" minY="567" maxY="597" name="subway-london-m"/>
+  <symbol minX="1147" maxX="1177" minY="567" maxY="597" name="subway-spb-s"/>
+  <symbol minX="1177" maxX="1216" minY="567" maxY="597" name="subway-tabriz-s"/>
+  <symbol minX="1216" maxX="1244" minY="567" maxY="597" name="subway-amsterdam-s"/>
+  <symbol minX="1244" maxX="1274" minY="567" maxY="597" name="subway-lausanne-s"/>
+  <symbol minX="1274" maxX="1311" minY="567" maxY="597" name="subway-almaty-s"/>
+  <symbol minX="1311" maxX="1341" minY="567" maxY="597" name="cave-m"/>
+  <symbol minX="1341" maxX="1381" minY="567" maxY="597" name="subway-lucknow-s"/>
+  <symbol minX="1381" maxX="1412" minY="567" maxY="597" name="subway-maracaibo-s"/>
+  <symbol minX="1412" maxX="1440" minY="567" maxY="597" name="subway-mexico-s"/>
+  <symbol minX="1440" maxX="1480" minY="567" maxY="597" name="subway-osaka-m"/>
+  <symbol minX="1480" maxX="1520" minY="567" maxY="596" name="subway-barcelona-m"/>
+  <symbol minX="1520" maxX="1560" minY="567" maxY="596" name="subway-madrid-m"/>
+  <symbol minX="1560" maxX="1588" minY="567" maxY="595" name="waterfall-s"/>
+  <symbol minX="1588" maxX="1616" minY="567" maxY="595" name="waste-basket-s"/>
+  <symbol minX="1616" maxX="1644" minY="567" maxY="595" name="viewpoint-s"/>
+  <symbol minX="1644" maxX="1672" minY="567" maxY="595" name="zoo-s"/>
+  <symbol minX="1672" maxX="1700" minY="567" maxY="595" name="airport-s"/>
+  <symbol minX="1700" maxX="1728" minY="567" maxY="595" name="shop-s"/>
+  <symbol minX="1728" maxX="1756" minY="567" maxY="595" name="nparkf-outline-s"/>
+  <symbol minX="1756" maxX="1784" minY="567" maxY="595" name="nparkf-s"/>
+  <symbol minX="1784" maxX="1812" minY="567" maxY="595" name="park-outline-s"/>
+  <symbol minX="1812" maxX="1840" minY="567" maxY="595" name="park-s"/>
+  <symbol minX="1840" maxX="1868" minY="567" maxY="595" name="place-of-worship-s"/>
+  <symbol minX="1868" maxX="1896" minY="567" maxY="595" name="remains-s"/>
+  <symbol minX="1896" maxX="1924" minY="567" maxY="595" name="shinto-s"/>
+  <symbol minX="1924" maxX="1952" minY="567" maxY="595" name="ship-s"/>
+  <symbol minX="1952" maxX="1980" minY="567" maxY="595" name="muslim-s"/>
+  <symbol minX="1980" maxX="2008" minY="567" maxY="595" name="stadium-s"/>
+  <symbol minX="2008" maxX="2048" minY="567" maxY="595" name="subway-bilbao-m"/>
+  <symbol minX="0" maxX="37" minY="598" maxY="626" name="subway-dnepro-s"/>
+  <symbol minX="37" maxX="65" minY="598" maxY="626" name="subway-entrance-s"/>
+  <symbol minX="65" maxX="105" minY="598" maxY="626" name="subway-kolkata-m"/>
+  <symbol minX="105" maxX="145" minY="598" maxY="626" name="subway-lucknow-m"/>
+  <symbol minX="145" maxX="173" minY="598" maxY="626" name="subway-newyork-s"/>
+  <symbol minX="173" maxX="207" minY="598" maxY="626" name="subway-osaka-s"/>
+  <symbol minX="207" maxX="235" minY="598" maxY="626" name="fuel-s"/>
+  <symbol minX="235" maxX="263" minY="598" maxY="626" name="buddhist-s"/>
+  <symbol minX="263" maxX="291" minY="598" maxY="626" name="bus-s"/>
+  <symbol minX="291" maxX="319" minY="598" maxY="626" name="cable-car-s"/>
+  <symbol minX="319" maxX="347" minY="598" maxY="626" name="car-repair-s"/>
+  <symbol minX="347" maxX="375" minY="598" maxY="626" name="charging-station-s"/>
+  <symbol minX="375" maxX="403" minY="598" maxY="626" name="christian-s"/>
+  <symbol minX="403" maxX="431" minY="598" maxY="626" name="college-s"/>
+  <symbol minX="431" maxX="459" minY="598" maxY="626" name="drinking-water-s"/>
+  <symbol minX="459" maxX="481" minY="598" maxY="626" name="transit_train-m"/>
+  <symbol minX="481" maxX="509" minY="598" maxY="626" name="geyser-s"/>
+  <symbol minX="509" maxX="537" minY="598" maxY="626" name="hindu-s"/>
+  <symbol minX="537" maxX="565" minY="598" maxY="626" name="hospital-s"/>
+  <symbol minX="565" maxX="593" minY="598" maxY="626" name="hotel-s"/>
+  <symbol minX="593" maxX="621" minY="598" maxY="626" name="jewish-s"/>
+  <symbol minX="621" maxX="649" minY="598" maxY="626" name="lighthouse-s"/>
+  <symbol minX="649" maxX="677" minY="598" maxY="626" name="monument-s"/>
+  <symbol minX="677" maxX="705" minY="598" maxY="626" name="museum-s"/>
+  <symbol minX="705" maxX="733" minY="598" maxY="626" name="taoist-s"/>
+  <symbol minX="733" maxX="764" minY="598" maxY="626" name="subway-rotterdam-s"/>
+  <symbol minX="764" maxX="792" minY="598" maxY="626" name="subway-s"/>
+  <symbol minX="792" maxX="828" minY="598" maxY="626" name="subway-philadelphia-s"/>
+  <symbol minX="828" maxX="850" minY="598" maxY="626" name="transit_light_rail-m"/>
+  <symbol minX="850" maxX="881" minY="598" maxY="626" name="transfer_arrow"/>
+  <symbol minX="881" maxX="909" minY="598" maxY="626" name="tram-s"/>
+  <symbol minX="909" maxX="937" minY="598" maxY="626" name="train-s"/>
+  <symbol minX="937" maxX="977" minY="598" maxY="626" name="subway-palma-m"/>
+  <symbol minX="977" maxX="1005" minY="598" maxY="626" name="tourism-s"/>
+  <symbol minX="1005" maxX="1033" minY="598" maxY="626" name="toll_booth-s"/>
+  <symbol minX="1033" maxX="1061" minY="598" maxY="626" name="theme_park-s"/>
+  <symbol minX="1061" maxX="1100" minY="598" maxY="626" name="subway-palma-s"/>
+  <symbol minX="1100" maxX="1128" minY="598" maxY="626" name="theatre-s"/>
+  <symbol minX="1128" maxX="1159" minY="598" maxY="626" name="subway-tbilisi-s"/>
+  <symbol minX="1159" maxX="1199" minY="598" maxY="625" name="subway-sanfrancisco-s"/>
+  <symbol minX="1199" maxX="1239" minY="598" maxY="625" name="subway-sanfrancisco-m"/>
+  <symbol minX="1239" maxX="1266" minY="598" maxY="625" name="lightrail-berlin-s"/>
+  <symbol minX="1266" maxX="1302" minY="598" maxY="625" name="subway-barcelona-s"/>
+  <symbol minX="1302" maxX="1342" minY="598" maxY="625" name="subway-brussel-s"/>
+  <symbol minX="1342" maxX="1382" minY="598" maxY="625" name="subway-bucharest-m"/>
+  <symbol minX="1382" maxX="1409" minY="598" maxY="625" name="elevator"/>
+  <symbol minX="1409" maxX="1448" minY="598" maxY="625" name="subway-novosibirsk-s"/>
+  <symbol minX="1448" maxX="1470" minY="598" maxY="625" name="transit_monorail-m"/>
+  <symbol minX="1470" maxX="1510" minY="598" maxY="625" name="subway-fukuoka-m"/>
+  <symbol minX="1510" maxX="1546" minY="598" maxY="625" name="subway-madrid-s"/>
+  <symbol minX="1546" maxX="1586" minY="598" maxY="625" name="subway-novosibirsk-m"/>
+  <symbol minX="1586" maxX="1613" minY="598" maxY="625" name="subway-paris-s"/>
+  <symbol minX="1613" maxX="1647" minY="598" maxY="625" name="subway-kryvyirih-s"/>
+  <symbol minX="1647" maxX="1686" minY="598" maxY="625" name="subway-kiev-m"/>
+  <symbol minX="1686" maxX="1726" minY="598" maxY="625" name="subway-kharkiv-s"/>
+  <symbol minX="1726" maxX="1766" minY="598" maxY="624" name="subway-sendai-m"/>
+  <symbol minX="1766" maxX="1806" minY="598" maxY="623" name="subway-kharkiv-m"/>
+  <symbol minX="1806" maxX="1846" minY="598" maxY="623" name="subway-manila-m"/>
+  <symbol minX="1846" maxX="1886" minY="598" maxY="623" name="subway-sendai-s"/>
+  <symbol minX="1886" maxX="1911" minY="598" maxY="623" name="transit_subway-m"/>
+  <symbol minX="1911" maxX="1951" minY="598" maxY="623" name="subway-haagse-s"/>
+  <symbol minX="1951" maxX="1976" minY="598" maxY="623" name="storage-tank"/>
+  <symbol minX="1976" maxX="2009" minY="598" maxY="623" name="subway-alicante-s"/>
+  <symbol minX="2009" maxX="2028" minY="598" maxY="623" name="transit_train-s"/>
+  <symbol minX="0" maxX="25" minY="626" maxY="651" name="board"/>
+  <symbol minX="25" maxX="52" minY="626" maxY="651" name="subway-moscow-s"/>
+  <symbol minX="52" maxX="77" minY="626" maxY="651" name="map"/>
+  <symbol minX="77" maxX="117" minY="626" maxY="651" name="subway-brussel-m"/>
+  <symbol minX="117" maxX="156" minY="626" maxY="651" name="subway-bucharest-s"/>
+  <symbol minX="156" maxX="196" minY="626" maxY="650" name="subway-taipei-s"/>
+  <symbol minX="196" maxX="235" minY="626" maxY="650" name="subway-manila-s"/>
+  <symbol minX="235" maxX="259" minY="626" maxY="650" name="subway-ubahn-s"/>
+  <symbol minX="259" maxX="283" minY="626" maxY="650" name="subway-rome-s"/>
+  <symbol minX="283" maxX="308" minY="626" maxY="650" name="subway-seattle-s"/>
+  <symbol minX="308" maxX="338" minY="626" maxY="650" name="subway-london-s"/>
+  <symbol minX="338" maxX="362" minY="626" maxY="650" name="cave-s"/>
+  <symbol minX="362" maxX="396" minY="626" maxY="650" name="subway-bilbao-s"/>
+  <symbol minX="396" maxX="436" minY="626" maxY="650" name="subway-edmonton-s"/>
+  <symbol minX="436" maxX="476" minY="626" maxY="649" name="subway-haagse-m"/>
+  <symbol minX="476" maxX="498" minY="626" maxY="648" name="transit_subway-s"/>
+  <symbol minX="498" maxX="513" minY="626" maxY="648" name="entrance-s"/>
+  <symbol minX="513" maxX="532" minY="626" maxY="648" name="transit_monorail-s"/>
+  <symbol minX="532" maxX="556" minY="626" maxY="648" name="main_entrance-s"/>
+  <symbol minX="556" maxX="583" minY="626" maxY="648" name="bench"/>
+  <symbol minX="583" maxX="602" minY="626" maxY="648" name="transit_light_rail-s"/>
+  <symbol minX="602" maxX="624" minY="626" maxY="648" name="speedcam-s"/>
+  <symbol minX="624" maxX="646" minY="626" maxY="648" name="parking-s"/>
+  <symbol minX="646" maxX="668" minY="626" maxY="648" name="subway-xs"/>
+  <symbol minX="668" maxX="690" minY="626" maxY="648" name="star-l"/>
+  <symbol minX="690" maxX="724" minY="626" maxY="648" name="railway-crossing-l"/>
+  <symbol minX="724" maxX="746" minY="626" maxY="648" name="subway-newyork-xs"/>
+  <symbol minX="746" maxX="785" minY="626" maxY="647" name="subway-malaga-s"/>
+  <symbol minX="785" maxX="825" minY="626" maxY="647" name="subway-edmonton-m"/>
+  <symbol minX="825" maxX="849" minY="626" maxY="647" name="volcano-m"/>
+  <symbol minX="849" maxX="882" minY="626" maxY="647" name="subway-kiev-s"/>
+  <symbol minX="882" maxX="912" minY="626" maxY="647" name="subway-kolkata-s"/>
+  <symbol minX="912" maxX="952" minY="626" maxY="647" name="subway-malaga-m"/>
+  <symbol minX="952" maxX="973" minY="626" maxY="647" name="star-m"/>
+  <symbol minX="973" maxX="1013" minY="626" maxY="646" name="subway-taipei-m"/>
+  <symbol minX="1013" maxX="1052" minY="626" maxY="645" name="subway-baku-s"/>
+  <symbol minX="1052" maxX="1082" minY="626" maxY="645" name="railway-crossing-m"/>
+  <symbol minX="1082" maxX="1104" minY="626" maxY="645" name="plaque"/>
+  <symbol minX="1104" maxX="1137" minY="626" maxY="645" name="subway-minsk-m"/>
+  <symbol minX="1137" maxX="1155" minY="626" maxY="644" name="star-s"/>
+  <symbol minX="1155" maxX="1195" minY="626" maxY="644" name="subway-baku-m"/>
+  <symbol minX="1195" maxX="1225" minY="626" maxY="644" name="subway-minsk-s"/>
+  <symbol minX="1225" maxX="1265" minY="626" maxY="643" name="subway-chongqing-m"/>
+  <symbol minX="1265" maxX="1305" minY="626" maxY="643" name="subway-chongqing-s"/>
+  <symbol minX="1305" maxX="1323" minY="626" maxY="642" name="volcano-s"/>
+  <symbol minX="1323" maxX="1341" minY="626" maxY="642" name="peakt-m"/>
+  <symbol minX="1341" maxX="1369" minY="626" maxY="642" name="mountain-pass"/>
+  <symbol minX="1369" maxX="1405" minY="626" maxY="642" name="arrow-m"/>
+  <symbol minX="1405" maxX="1420" minY="626" maxY="641" name="zero-icon"/>
+  <symbol minX="1420" maxX="1435" minY="626" maxY="639" name="peakt-s"/>
+  <symbol minX="1435" maxX="1447" minY="626" maxY="638" name="dot-m"/>
+  <symbol minX="1447" maxX="1474" minY="626" maxY="638" name="arrow-s"/>
+  <symbol minX="1474" maxX="1492" minY="626" maxY="635" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index ec74988e84..61fd2948fc 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index 077bc180fc..2afb130bc2 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -3,699 +3,694 @@
  <file width="2048" height="1024">
   <symbol minX="0" maxX="152" minY="0" maxY="92" name="route-arrow"/>
   <symbol minX="152" maxX="236" minY="0" maxY="84" name="compass-image"/>
-  <symbol minX="236" maxX="304" minY="0" maxY="80" name="shield-us-i-thin-scaled"/>
-  <symbol minX="304" maxX="384" minY="0" maxY="80" name="cross_geoposition"/>
-  <symbol minX="384" maxX="468" minY="0" maxY="80" name="route-point-finish"/>
-  <symbol minX="468" maxX="548" minY="0" maxY="80" name="shield-us-i-wide-scaled"/>
-  <symbol minX="548" maxX="624" minY="0" maxY="76" name="search-result-playground"/>
+  <symbol minX="236" maxX="320" minY="0" maxY="80" name="route-point-finish"/>
+  <symbol minX="320" maxX="400" minY="0" maxY="80" name="cross_geoposition"/>
+  <symbol minX="400" maxX="480" minY="0" maxY="80" name="shield-us-i-wide-scaled"/>
+  <symbol minX="480" maxX="548" minY="0" maxY="80" name="shield-us-i-thin-scaled"/>
+  <symbol minX="548" maxX="624" minY="0" maxY="76" name="search-result-shop-cosmetics"/>
   <symbol minX="624" maxX="700" minY="0" maxY="76" name="search-result-shop-sports"/>
-  <symbol minX="700" maxX="776" minY="0" maxY="76" name="search-result-nightclub"/>
-  <symbol minX="776" maxX="852" minY="0" maxY="76" name="search-result-water-park"/>
-  <symbol minX="852" maxX="928" minY="0" maxY="76" name="search-result-marketplace"/>
-  <symbol minX="928" maxX="1004" minY="0" maxY="76" name="search-result-fastfood"/>
-  <symbol minX="1004" maxX="1080" minY="0" maxY="76" name="search-result-cinema"/>
-  <symbol minX="1080" maxX="1156" minY="0" maxY="76" name="search-result-casino"/>
-  <symbol minX="1156" maxX="1232" minY="0" maxY="76" name="search-result-cafe"/>
-  <symbol minX="1232" maxX="1308" minY="0" maxY="76" name="search-result-bar"/>
-  <symbol minX="1308" maxX="1384" minY="0" maxY="76" name="search-result-zoo"/>
-  <symbol minX="1384" maxX="1460" minY="0" maxY="76" name="search-result-bakery"/>
-  <symbol minX="1460" maxX="1540" minY="0" maxY="76" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="1540" maxX="1616" minY="0" maxY="76" name="search-result-restaurant"/>
-  <symbol minX="1616" maxX="1692" minY="0" maxY="76" name="search-result-shop-shoes"/>
-  <symbol minX="1692" maxX="1768" minY="0" maxY="76" name="search-result-shop-supermarket"/>
-  <symbol minX="1768" maxX="1844" minY="0" maxY="76" name="search-result-shop-seafood"/>
-  <symbol minX="1844" maxX="1920" minY="0" maxY="76" name="search-result-shop-toys"/>
-  <symbol minX="1920" maxX="1996" minY="0" maxY="76" name="search-result-shop-mall"/>
-  <symbol minX="0" maxX="76" minY="92" maxY="168" name="search-result-shop-jewelry"/>
-  <symbol minX="76" maxX="152" minY="92" maxY="168" name="search-result-shop-greengrocer"/>
-  <symbol minX="152" maxX="228" minY="92" maxY="168" name="search-result-shop-gift"/>
-  <symbol minX="228" maxX="304" minY="92" maxY="168" name="search-result-shop-department_store"/>
-  <symbol minX="304" maxX="380" minY="92" maxY="168" name="search-result-shop-cosmetics"/>
-  <symbol minX="380" maxX="456" minY="92" maxY="168" name="search-result-shop-convenience"/>
-  <symbol minX="456" maxX="532" minY="92" maxY="168" name="search-result-shop-confectionery"/>
-  <symbol minX="532" maxX="608" minY="92" maxY="168" name="search-result-shop-clothes"/>
-  <symbol minX="608" maxX="684" minY="92" maxY="168" name="search-result-shop-butcher"/>
-  <symbol minX="684" maxX="760" minY="92" maxY="168" name="search-result-shop-alcohol"/>
-  <symbol minX="760" maxX="836" minY="92" maxY="168" name="search-result-theme-park"/>
-  <symbol minX="836" maxX="912" minY="92" maxY="168" name="search-result-pub"/>
+  <symbol minX="700" maxX="776" minY="0" maxY="76" name="search-result-shop-confectionery"/>
+  <symbol minX="776" maxX="852" minY="0" maxY="76" name="search-result-cinema"/>
+  <symbol minX="852" maxX="928" minY="0" maxY="76" name="search-result-fastfood"/>
+  <symbol minX="928" maxX="1004" minY="0" maxY="76" name="search-result-shop-clothes"/>
+  <symbol minX="1004" maxX="1080" minY="0" maxY="76" name="search-result-marketplace"/>
+  <symbol minX="1080" maxX="1156" minY="0" maxY="76" name="search-result-shop-department_store"/>
+  <symbol minX="1156" maxX="1232" minY="0" maxY="76" name="search-result-shop-supermarket"/>
+  <symbol minX="1232" maxX="1308" minY="0" maxY="76" name="search-result-nightclub"/>
+  <symbol minX="1308" maxX="1384" minY="0" maxY="76" name="search-result-playground"/>
+  <symbol minX="1384" maxX="1464" minY="0" maxY="76" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="1464" maxX="1540" minY="0" maxY="76" name="search-result-shop-toys"/>
+  <symbol minX="1540" maxX="1616" minY="0" maxY="76" name="search-result-shop-convenience"/>
+  <symbol minX="1616" maxX="1692" minY="0" maxY="76" name="search-result-pub"/>
+  <symbol minX="1692" maxX="1768" minY="0" maxY="76" name="search-result-shop-greengrocer"/>
+  <symbol minX="1768" maxX="1844" minY="0" maxY="76" name="search-result-restaurant"/>
+  <symbol minX="1844" maxX="1920" minY="0" maxY="76" name="search-result-shop-butcher"/>
+  <symbol minX="1920" maxX="1996" minY="0" maxY="76" name="search-result-zoo"/>
+  <symbol minX="0" maxX="76" minY="92" maxY="168" name="search-result-shop-shoes"/>
+  <symbol minX="76" maxX="152" minY="92" maxY="168" name="search-result-shop-alcohol"/>
+  <symbol minX="152" maxX="228" minY="92" maxY="168" name="search-result-water-park"/>
+  <symbol minX="228" maxX="304" minY="92" maxY="168" name="search-result-theme-park"/>
+  <symbol minX="304" maxX="380" minY="92" maxY="168" name="search-result-bakery"/>
+  <symbol minX="380" maxX="456" minY="92" maxY="168" name="search-result-shop-seafood"/>
+  <symbol minX="456" maxX="532" minY="92" maxY="168" name="search-result-shop-gift"/>
+  <symbol minX="532" maxX="608" minY="92" maxY="168" name="search-result-bar"/>
+  <symbol minX="608" maxX="684" minY="92" maxY="168" name="search-result-shop-mall"/>
+  <symbol minX="684" maxX="760" minY="92" maxY="168" name="search-result-shop-jewelry"/>
+  <symbol minX="760" maxX="836" minY="92" maxY="168" name="search-result-cafe"/>
+  <symbol minX="836" maxX="912" minY="92" maxY="168" name="search-result-casino"/>
   <symbol minX="912" maxX="980" minY="92" maxY="164" name="shield-us-hw-thin-scaled"/>
   <symbol minX="980" maxX="1036" minY="92" maxY="162" name="unpaved_road"/>
-  <symbol minX="1036" maxX="1092" minY="92" maxY="162" name="paid_road"/>
-  <symbol minX="1092" maxX="1148" minY="92" maxY="162" name="ferry"/>
+  <symbol minX="1036" maxX="1092" minY="92" maxY="162" name="ferry"/>
+  <symbol minX="1092" maxX="1148" minY="92" maxY="162" name="paid_road"/>
   <symbol minX="1148" maxX="1216" minY="92" maxY="160" name="infosign"/>
   <symbol minX="1216" maxX="1284" minY="92" maxY="160" name="track_marker_selected"/>
-  <symbol minX="1284" maxX="1330" minY="92" maxY="157" name="bookmark-shop-m"/>
-  <symbol minX="1330" maxX="1376" minY="92" maxY="157" name="bookmark-judaism-m"/>
-  <symbol minX="1376" maxX="1422" minY="92" maxY="157" name="bookmark-medicine-m"/>
-  <symbol minX="1422" maxX="1468" minY="92" maxY="157" name="bookmark-mountain-m"/>
-  <symbol minX="1468" maxX="1514" minY="92" maxY="157" name="bookmark-museum-m"/>
-  <symbol minX="1514" maxX="1560" minY="92" maxY="157" name="bookmark-park-m"/>
-  <symbol minX="1560" maxX="1606" minY="92" maxY="157" name="bookmark-parking-m"/>
-  <symbol minX="1606" maxX="1652" minY="92" maxY="157" name="bookmark-gas-m"/>
-  <symbol minX="1652" maxX="1698" minY="92" maxY="157" name="bookmark-water-m"/>
-  <symbol minX="1698" maxX="1744" minY="92" maxY="157" name="bookmark-viewpoint-m"/>
-  <symbol minX="1744" maxX="1790" minY="92" maxY="157" name="bookmark-transport-m"/>
-  <symbol minX="1790" maxX="1836" minY="92" maxY="157" name="bookmark-swim-m"/>
-  <symbol minX="1836" maxX="1882" minY="92" maxY="157" name="bookmark-start-m"/>
-  <symbol minX="1882" maxX="1928" minY="92" maxY="157" name="bookmark-sport-m"/>
-  <symbol minX="1928" maxX="1974" minY="92" maxY="157" name="bookmark-sights-m"/>
-  <symbol minX="1974" maxX="2020" minY="92" maxY="157" name="bookmark-islam-m"/>
-  <symbol minX="0" maxX="46" minY="168" maxY="233" name="bookmark-hotel-m"/>
-  <symbol minX="46" maxX="92" minY="168" maxY="233" name="bookmark-food-m"/>
-  <symbol minX="92" maxX="138" minY="168" maxY="233" name="bookmark-finish-m"/>
-  <symbol minX="138" maxX="184" minY="168" maxY="233" name="bookmark-exchange-m"/>
-  <symbol minX="184" maxX="230" minY="168" maxY="233" name="bookmark-entertainment-m"/>
-  <symbol minX="230" maxX="276" minY="168" maxY="233" name="bookmark-default-m"/>
-  <symbol minX="276" maxX="322" minY="168" maxY="233" name="bookmark-christianity-m"/>
-  <symbol minX="322" maxX="368" minY="168" maxY="233" name="bookmark-building-m"/>
-  <symbol minX="368" maxX="414" minY="168" maxY="233" name="bookmark-buddhism-m"/>
-  <symbol minX="414" maxX="460" minY="168" maxY="233" name="bookmark-bg-m"/>
-  <symbol minX="460" maxX="506" minY="168" maxY="233" name="bookmark-bar-m"/>
-  <symbol minX="506" maxX="552" minY="168" maxY="233" name="bookmark-animals-m"/>
+  <symbol minX="1284" maxX="1330" minY="92" maxY="157" name="bookmark-food-m"/>
+  <symbol minX="1330" maxX="1376" minY="92" maxY="157" name="bookmark-entertainment-m"/>
+  <symbol minX="1376" maxX="1422" minY="92" maxY="157" name="bookmark-mountain-m"/>
+  <symbol minX="1422" maxX="1468" minY="92" maxY="157" name="bookmark-finish-m"/>
+  <symbol minX="1468" maxX="1514" minY="92" maxY="157" name="bookmark-buddhism-m"/>
+  <symbol minX="1514" maxX="1560" minY="92" maxY="157" name="bookmark-building-m"/>
+  <symbol minX="1560" maxX="1606" minY="92" maxY="157" name="bookmark-christianity-m"/>
+  <symbol minX="1606" maxX="1652" minY="92" maxY="157" name="bookmark-water-m"/>
+  <symbol minX="1652" maxX="1698" minY="92" maxY="157" name="bookmark-gas-m"/>
+  <symbol minX="1698" maxX="1744" minY="92" maxY="157" name="bookmark-hotel-m"/>
+  <symbol minX="1744" maxX="1790" minY="92" maxY="157" name="bookmark-islam-m"/>
+  <symbol minX="1790" maxX="1836" minY="92" maxY="157" name="bookmark-judaism-m"/>
+  <symbol minX="1836" maxX="1882" minY="92" maxY="157" name="bookmark-default-m"/>
+  <symbol minX="1882" maxX="1928" minY="92" maxY="157" name="bookmark-exchange-m"/>
+  <symbol minX="1928" maxX="1974" minY="92" maxY="157" name="bookmark-medicine-m"/>
+  <symbol minX="1974" maxX="2020" minY="92" maxY="157" name="bookmark-park-m"/>
+  <symbol minX="0" maxX="46" minY="168" maxY="233" name="bookmark-museum-m"/>
+  <symbol minX="46" maxX="92" minY="168" maxY="233" name="bookmark-transport-m"/>
+  <symbol minX="92" maxX="138" minY="168" maxY="233" name="bookmark-parking-m"/>
+  <symbol minX="138" maxX="184" minY="168" maxY="233" name="bookmark-bg-m"/>
+  <symbol minX="184" maxX="230" minY="168" maxY="233" name="bookmark-shop-m"/>
+  <symbol minX="230" maxX="276" minY="168" maxY="233" name="bookmark-viewpoint-m"/>
+  <symbol minX="276" maxX="322" minY="168" maxY="233" name="bookmark-bar-m"/>
+  <symbol minX="322" maxX="368" minY="168" maxY="233" name="bookmark-swim-m"/>
+  <symbol minX="368" maxX="414" minY="168" maxY="233" name="bookmark-start-m"/>
+  <symbol minX="414" maxX="460" minY="168" maxY="233" name="bookmark-sport-m"/>
+  <symbol minX="460" maxX="506" minY="168" maxY="233" name="bookmark-animals-m"/>
+  <symbol minX="506" maxX="552" minY="168" maxY="233" name="bookmark-sights-m"/>
   <symbol minX="552" maxX="612" minY="168" maxY="228" name="route-point-7"/>
-  <symbol minX="612" maxX="696" minY="168" maxY="228" name="norating-default-l"/>
-  <symbol minX="696" maxX="756" minY="168" maxY="228" name="route-point-19"/>
-  <symbol minX="756" maxX="840" minY="168" maxY="228" name="norating-bg-l"/>
-  <symbol minX="840" maxX="900" minY="168" maxY="228" name="route-point-1"/>
-  <symbol minX="900" maxX="960" minY="168" maxY="228" name="route-point-10"/>
-  <symbol minX="960" maxX="1020" minY="168" maxY="228" name="route-point-11"/>
-  <symbol minX="1020" maxX="1080" minY="168" maxY="228" name="route-point-12"/>
-  <symbol minX="1080" maxX="1140" minY="168" maxY="228" name="route-point-13"/>
-  <symbol minX="1140" maxX="1200" minY="168" maxY="228" name="route-point-14"/>
-  <symbol minX="1200" maxX="1260" minY="168" maxY="228" name="route-point-15"/>
-  <symbol minX="1260" maxX="1320" minY="168" maxY="228" name="route-point-16"/>
-  <symbol minX="1320" maxX="1380" minY="168" maxY="228" name="route-point-17"/>
-  <symbol minX="1380" maxX="1440" minY="168" maxY="228" name="route-point-18"/>
-  <symbol minX="1440" maxX="1500" minY="168" maxY="228" name="route-point-start"/>
-  <symbol minX="1500" maxX="1560" minY="168" maxY="228" name="route-point-2"/>
-  <symbol minX="1560" maxX="1620" minY="168" maxY="228" name="route-point-20"/>
-  <symbol minX="1620" maxX="1680" minY="168" maxY="228" name="route-point-3"/>
-  <symbol minX="1680" maxX="1740" minY="168" maxY="228" name="route-point-4"/>
-  <symbol minX="1740" maxX="1800" minY="168" maxY="228" name="route-point-5"/>
-  <symbol minX="1800" maxX="1860" minY="168" maxY="228" name="route-point-6"/>
-  <symbol minX="1860" maxX="1920" minY="168" maxY="228" name="route-point-8"/>
-  <symbol minX="1920" maxX="1980" minY="168" maxY="228" name="route-point-9"/>
-  <symbol minX="0" maxX="84" minY="233" maxY="293" name="coloredmark-default-l"/>
-  <symbol minX="84" maxX="168" minY="233" maxY="293" name="coloredmark-bg-l"/>
-  <symbol minX="168" maxX="212" minY="233" maxY="285" name="shield-us-i-thin"/>
-  <symbol minX="212" maxX="268" minY="233" maxY="285" name="shield-us-i-wide"/>
-  <symbol minX="268" maxX="316" minY="233" maxY="281" name="shield-us-hw-thin"/>
-  <symbol minX="316" maxX="372" minY="233" maxY="281" name="shield-us-hw-wide"/>
-  <symbol minX="372" maxX="405" minY="233" maxY="279" name="bookmark-default-s"/>
-  <symbol minX="405" maxX="438" minY="233" maxY="279" name="bookmark-bg-s"/>
-  <symbol minX="438" maxX="482" minY="233" maxY="277" name="track_marker_deselected"/>
-  <symbol minX="482" maxX="526" minY="233" maxY="277" name="current-position"/>
-  <symbol minX="526" maxX="564" minY="233" maxY="273" name="subway-delhi-m"/>
-  <symbol minX="564" maxX="604" minY="233" maxY="273" name="subway-foshan-m"/>
-  <symbol minX="604" maxX="644" minY="233" maxY="273" name="bank-m"/>
-  <symbol minX="644" maxX="684" minY="233" maxY="273" name="subway-ekb-m"/>
-  <symbol minX="684" maxX="724" minY="233" maxY="273" name="banknote-m"/>
-  <symbol minX="724" maxX="764" minY="233" maxY="273" name="bar-m"/>
-  <symbol minX="764" maxX="804" minY="233" maxY="273" name="baseball-m"/>
-  <symbol minX="804" maxX="844" minY="233" maxY="273" name="subway-dubai-m"/>
-  <symbol minX="844" maxX="884" minY="233" maxY="273" name="basketball-m"/>
-  <symbol minX="884" maxX="924" minY="233" maxY="273" name="subway-glasgow-m"/>
-  <symbol minX="924" maxX="964" minY="233" maxY="273" name="bbq-m"/>
-  <symbol minX="964" maxX="1004" minY="233" maxY="273" name="bcontrol-m"/>
-  <symbol minX="1004" maxX="1044" minY="233" maxY="273" name="beach-m"/>
-  <symbol minX="1044" maxX="1084" minY="233" maxY="273" name="beauty-m"/>
-  <symbol minX="1084" maxX="1124" minY="233" maxY="273" name="subway-chicago-m"/>
-  <symbol minX="1124" maxX="1164" minY="233" maxY="273" name="beekeeper-m"/>
-  <symbol minX="1164" maxX="1204" minY="233" maxY="273" name="subway-chengdu-m"/>
-  <symbol minX="1204" maxX="1244" minY="233" maxY="273" name="beer-m"/>
-  <symbol minX="1244" maxX="1284" minY="233" maxY="273" name="art-m"/>
-  <symbol minX="1284" maxX="1324" minY="233" maxY="273" name="subway-kobe-m"/>
-  <symbol minX="1324" maxX="1364" minY="233" maxY="273" name="apartment-m"/>
-  <symbol minX="1364" maxX="1404" minY="233" maxY="273" name="archaeological-site-m"/>
-  <symbol minX="1404" maxX="1444" minY="233" maxY="273" name="archery-m"/>
-  <symbol minX="1444" maxX="1484" minY="233" maxY="273" name="subway-kazan-m"/>
-  <symbol minX="1484" maxX="1517" minY="233" maxY="273" name="subway-istanbul-m"/>
-  <symbol minX="1517" maxX="1557" minY="233" maxY="273" name="subway-isfahan-m"/>
-  <symbol minX="1557" maxX="1597" minY="233" maxY="273" name="subway-hirosima-m"/>
-  <symbol minX="1597" maxX="1637" minY="233" maxY="273" name="subway-helsinki-m"/>
-  <symbol minX="1637" maxX="1677" minY="233" maxY="273" name="bakery-m"/>
-  <symbol minX="1677" maxX="1717" minY="233" maxY="273" name="airport-m"/>
-  <symbol minX="1717" maxX="1757" minY="233" maxY="273" name="subway-guangzhou-m"/>
-  <symbol minX="1757" maxX="1797" minY="233" maxY="273" name="atm-m"/>
-  <symbol minX="1797" maxX="1837" minY="233" maxY="273" name="subway-guadalajara-m"/>
-  <symbol minX="1837" maxX="1877" minY="233" maxY="273" name="audiologist-m"/>
-  <symbol minX="1877" maxX="1917" minY="233" maxY="273" name="subway-catania-m"/>
-  <symbol minX="1917" maxX="1957" minY="233" maxY="273" name="australian-football-m"/>
-  <symbol minX="1957" maxX="1997" minY="233" maxY="273" name="badminton-m"/>
-  <symbol minX="1997" maxX="2037" minY="233" maxY="273" name="campsite-m"/>
-  <symbol minX="0" maxX="40" minY="293" maxY="333" name="subway-bangkok-m"/>
-  <symbol minX="40" maxX="80" minY="293" maxY="333" name="bus-m"/>
-  <symbol minX="80" maxX="118" minY="293" maxY="333" name="subway-athens-m"/>
-  <symbol minX="118" maxX="158" minY="293" maxY="333" name="subway-ankara-s"/>
-  <symbol minX="158" maxX="198" minY="293" maxY="333" name="subway-ankara-m"/>
-  <symbol minX="198" maxX="238" minY="293" maxY="333" name="butcher-m"/>
-  <symbol minX="238" maxX="274" minY="293" maxY="333" name="subway-amsterdam-m"/>
-  <symbol minX="274" maxX="314" minY="293" maxY="333" name="cable-car-m"/>
-  <symbol minX="314" maxX="354" minY="293" maxY="333" name="cafe-m"/>
-  <symbol minX="354" maxX="394" minY="293" maxY="333" name="buddhist-m"/>
-  <symbol minX="394" maxX="434" minY="293" maxY="333" name="subway-algeria-m"/>
-  <symbol minX="434" maxX="474" minY="293" maxY="333" name="subway-adana-s"/>
-  <symbol minX="474" maxX="514" minY="293" maxY="333" name="subway-adana-m"/>
-  <symbol minX="514" maxX="554" minY="293" maxY="333" name="car-part-m"/>
-  <symbol minX="554" maxX="594" minY="293" maxY="333" name="stationery_shop-m"/>
-  <symbol minX="594" maxX="634" minY="293" maxY="333" name="car-repair-m"/>
-  <symbol minX="634" maxX="674" minY="293" maxY="333" name="car-wash-m"/>
-  <symbol minX="674" maxX="714" minY="293" maxY="333" name="car_sharing-m"/>
-  <symbol minX="714" maxX="754" minY="293" maxY="333" name="stadium-m"/>
-  <symbol minX="754" maxX="794" minY="293" maxY="333" name="blood_donation-m"/>
-  <symbol minX="794" maxX="834" minY="293" maxY="333" name="bicycle-m"/>
-  <symbol minX="834" maxX="874" minY="293" maxY="333" name="antiques-m"/>
-  <symbol minX="874" maxX="914" minY="293" maxY="333" name="subway-caracas-m"/>
-  <symbol minX="914" maxX="954" minY="293" maxY="333" name="subway-cairo-m"/>
-  <symbol minX="954" maxX="994" minY="293" maxY="333" name="subway-bursaray-m"/>
-  <symbol minX="994" maxX="1034" minY="293" maxY="333" name="subway-buenosaires-m"/>
-  <symbol minX="1034" maxX="1074" minY="293" maxY="333" name="bicycle-repair-station"/>
-  <symbol minX="1074" maxX="1114" minY="293" maxY="333" name="subway-budapest-m"/>
-  <symbol minX="1114" maxX="1154" minY="293" maxY="333" name="blacksmith-m"/>
-  <symbol minX="1154" maxX="1194" minY="293" maxY="333" name="subway-changchun-m"/>
-  <symbol minX="1194" maxX="1231" minY="293" maxY="333" name="subway-brescia-m"/>
-  <symbol minX="1231" maxX="1271" minY="293" maxY="333" name="subway-brasilia-m"/>
-  <symbol minX="1271" maxX="1311" minY="293" maxY="333" name="book-shop-m"/>
-  <symbol minX="1311" maxX="1351" minY="293" maxY="333" name="bookmaker-m"/>
-  <symbol minX="1351" maxX="1391" minY="293" maxY="333" name="subway-bengaluru-m"/>
-  <symbol minX="1391" maxX="1431" minY="293" maxY="333" name="bowling-m"/>
-  <symbol minX="1431" maxX="1471" minY="293" maxY="333" name="subway-beijing-m"/>
-  <symbol minX="1471" maxX="1511" minY="293" maxY="333" name="bowling_alley-m"/>
-  <symbol minX="1511" maxX="1551" minY="293" maxY="333" name="brewery-m"/>
-  <symbol minX="1551" maxX="1591" minY="293" maxY="333" name="swimming-m"/>
-  <symbol minX="1591" maxX="1631" minY="293" maxY="333" name="subway-warszawa-m"/>
-  <symbol minX="1631" maxX="1671" minY="293" maxY="333" name="subway-perugia-m"/>
-  <symbol minX="1671" maxX="1711" minY="293" maxY="333" name="subway-panama-m"/>
-  <symbol minX="1711" maxX="1751" minY="293" maxY="333" name="subway-washington-m"/>
-  <symbol minX="1751" maxX="1791" minY="293" maxY="333" name="subway-wuhan-m"/>
-  <symbol minX="1791" maxX="1831" minY="293" maxY="333" name="subway-oslo-m"/>
-  <symbol minX="1831" maxX="1871" minY="293" maxY="333" name="subway-yokohama-m"/>
-  <symbol minX="1871" maxX="1911" minY="293" maxY="333" name="survey_point-m"/>
-  <symbol minX="1911" maxX="1951" minY="293" maxY="333" name="sweets-m"/>
-  <symbol minX="1951" maxX="1990" minY="293" maxY="333" name="subway-nnov-m"/>
-  <symbol minX="1990" maxX="2030" minY="293" maxY="333" name="subway-pittsburgh-m"/>
-  <symbol minX="0" maxX="40" minY="333" maxY="373" name="table-tennis-m"/>
-  <symbol minX="40" maxX="80" minY="333" maxY="373" name="subway-newyork-m"/>
-  <symbol minX="80" maxX="120" minY="333" maxY="373" name="taoist-m"/>
-  <symbol minX="120" maxX="160" minY="333" maxY="373" name="subway-nagoya-m"/>
-  <symbol minX="160" maxX="200" minY="333" maxY="373" name="taxi-m"/>
-  <symbol minX="200" maxX="240" minY="333" maxY="373" name="tennis-m"/>
-  <symbol minX="240" maxX="280" minY="333" maxY="373" name="theatre-m"/>
-  <symbol minX="280" maxX="320" minY="333" maxY="373" name="theme_park-m"/>
-  <symbol minX="320" maxX="360" minY="333" maxY="373" name="ticket-shop-m"/>
-  <symbol minX="360" maxX="400" minY="333" maxY="373" name="subway-tyneandwear-m"/>
-  <symbol minX="400" maxX="440" minY="333" maxY="373" name="subway-stockholm-m"/>
-  <symbol minX="440" maxX="480" minY="333" maxY="373" name="subway-stlouis-m"/>
-  <symbol minX="480" maxX="520" minY="333" maxY="373" name="subway-southkorea-m"/>
-  <symbol minX="520" maxX="560" minY="333" maxY="373" name="subway-sofia-m"/>
-  <symbol minX="560" maxX="600" minY="333" maxY="373" name="subway-tashkent-m"/>
-  <symbol minX="600" maxX="640" minY="333" maxY="373" name="subway-shiraz-m"/>
-  <symbol minX="640" maxX="680" minY="333" maxY="373" name="subway-tianjin-m"/>
-  <symbol minX="680" maxX="720" minY="333" maxY="373" name="subway-tokyo-m"/>
-  <symbol minX="720" maxX="760" minY="333" maxY="373" name="subway-saopaulo-m"/>
-  <symbol minX="760" maxX="800" minY="333" maxY="373" name="subway-santodomingo-m"/>
-  <symbol minX="800" maxX="840" minY="333" maxY="373" name="subway-minatomirai-m"/>
-  <symbol minX="840" maxX="880" minY="333" maxY="373" name="subway-valencia-m"/>
-  <symbol minX="880" maxX="920" minY="333" maxY="373" name="subway-samara-m"/>
-  <symbol minX="920" maxX="960" minY="333" maxY="373" name="subway-vienna-m"/>
-  <symbol minX="960" maxX="1000" minY="333" maxY="373" name="subway-volgograd-m"/>
-  <symbol minX="1000" maxX="1040" minY="333" maxY="373" name="subway-riodejaneiro-m"/>
-  <symbol minX="1040" maxX="1080" minY="333" maxY="373" name="subway-reseau-paris-m"/>
-  <symbol minX="1080" maxX="1120" minY="333" maxY="373" name="subway-rennes-m"/>
-  <symbol minX="1120" maxX="1160" minY="333" maxY="373" name="subway-pyongyang-m"/>
-  <symbol minX="1160" maxX="1198" minY="333" maxY="373" name="subway-porto-m"/>
-  <symbol minX="1198" maxX="1238" minY="333" maxY="373" name="zoo-m"/>
-  <symbol minX="1238" maxX="1278" minY="333" maxY="373" name="viewpoint-m"/>
-  <symbol minX="1278" maxX="1318" minY="333" maxY="373" name="volleyball-m"/>
-  <symbol minX="1318" maxX="1358" minY="333" maxY="373" name="waste-basket-m"/>
-  <symbol minX="1358" maxX="1398" minY="333" maxY="373" name="subway-losangeles-m"/>
-  <symbol minX="1398" maxX="1438" minY="333" maxY="373" name="waterfall-m"/>
-  <symbol minX="1438" maxX="1478" minY="333" maxY="373" name="wayside_shrine-m"/>
-  <symbol minX="1478" maxX="1518" minY="333" maxY="373" name="windmill-m"/>
-  <symbol minX="1518" maxX="1558" minY="333" maxY="373" name="subway-lisboa-m"/>
-  <symbol minX="1558" maxX="1598" minY="333" maxY="373" name="yoga-m"/>
-  <symbol minX="1598" maxX="1638" minY="333" maxY="373" name="subway-lima-m"/>
-  <symbol minX="1638" maxX="1678" minY="333" maxY="373" name="video-games-m"/>
-  <symbol minX="1678" maxX="1718" minY="333" maxY="373" name="subway-lille-m"/>
-  <symbol minX="1718" maxX="1758" minY="333" maxY="373" name="airport_gate-m"/>
-  <symbol minX="1758" maxX="1798" minY="333" maxY="373" name="subway-lausanne-m"/>
-  <symbol minX="1798" maxX="1838" minY="333" maxY="373" name="alcohol-m"/>
-  <symbol minX="1838" maxX="1878" minY="333" maxY="373" name="subway-kyoto-m"/>
-  <symbol minX="1878" maxX="1918" minY="333" maxY="373" name="alpine_hut-m"/>
-  <symbol minX="1918" maxX="1958" minY="333" maxY="373" name="subway-kunming-m"/>
-  <symbol minX="1958" maxX="1998" minY="333" maxY="373" name="alternative-m"/>
-  <symbol minX="1998" maxX="2038" minY="333" maxY="373" name="america-football-m"/>
-  <symbol minX="0" maxX="40" minY="373" maxY="413" name="subway-mashhad-m"/>
-  <symbol minX="40" maxX="80" minY="373" maxY="413" name="tire-repair-m"/>
-  <symbol minX="80" maxX="120" minY="373" maxY="413" name="subway-milan-m"/>
-  <symbol minX="120" maxX="160" minY="373" maxY="413" name="toilets-m"/>
-  <symbol minX="160" maxX="199" minY="373" maxY="413" name="subway-mexico-m"/>
-  <symbol minX="199" maxX="239" minY="373" maxY="413" name="subway-medellin-m"/>
-  <symbol minX="239" maxX="279" minY="373" maxY="413" name="toll_booth-m"/>
-  <symbol minX="279" maxX="319" minY="373" maxY="413" name="subway-mecca-m"/>
-  <symbol minX="319" maxX="359" minY="373" maxY="413" name="tomb-m"/>
-  <symbol minX="359" maxX="399" minY="373" maxY="413" name="subway-massachusetts-m"/>
-  <symbol minX="399" maxX="439" minY="373" maxY="413" name="electronics-m"/>
-  <symbol minX="439" maxX="479" minY="373" maxY="413" name="subway-marseille-s"/>
-  <symbol minX="479" maxX="519" minY="373" maxY="413" name="tourism-m"/>
-  <symbol minX="519" maxX="559" minY="373" maxY="413" name="toys-m"/>
-  <symbol minX="559" maxX="599" minY="373" maxY="413" name="train-m"/>
-  <symbol minX="599" maxX="639" minY="373" maxY="413" name="tram-m"/>
-  <symbol minX="639" maxX="679" minY="373" maxY="413" name="travel_agency_shop-m"/>
-  <symbol minX="679" maxX="719" minY="373" maxY="413" name="vending-m"/>
-  <symbol minX="719" maxX="759" minY="373" maxY="413" name="veterinary-m"/>
-  <symbol minX="759" maxX="799" minY="373" maxY="413" name="subway-m"/>
-  <symbol minX="799" maxX="839" minY="373" maxY="413" name="defibrillator-m"/>
-  <symbol minX="839" maxX="879" minY="373" maxY="413" name="mail-m"/>
-  <symbol minX="879" maxX="919" minY="373" maxY="413" name="cross-m"/>
-  <symbol minX="919" maxX="959" minY="373" maxY="413" name="curling-m"/>
-  <symbol minX="959" maxX="999" minY="373" maxY="413" name="lighthouse-m"/>
-  <symbol minX="999" maxX="1039" minY="373" maxY="413" name="lift_gate-m"/>
-  <symbol minX="1039" maxX="1079" minY="373" maxY="413" name="library-m"/>
-  <symbol minX="1079" maxX="1119" minY="373" maxY="413" name="lawyer-m"/>
-  <symbol minX="1119" maxX="1159" minY="373" maxY="413" name="laundry-m"/>
-  <symbol minX="1159" maxX="1199" minY="373" maxY="413" name="language_school-m"/>
-  <symbol minX="1199" maxX="1239" minY="373" maxY="413" name="kiosk-m"/>
-  <symbol minX="1239" maxX="1279" minY="373" maxY="413" name="kindergarten-m"/>
-  <symbol minX="1279" maxX="1319" minY="373" maxY="413" name="cricket-m"/>
-  <symbol minX="1319" maxX="1359" minY="373" maxY="413" name="jewish-m"/>
-  <symbol minX="1359" maxX="1399" minY="373" maxY="413" name="jewelry-m"/>
-  <symbol minX="1399" maxX="1439" minY="373" maxY="413" name="internet_cafe-m"/>
-  <symbol minX="1439" maxX="1479" minY="373" maxY="413" name="interior_decoration-m"/>
-  <symbol minX="1479" maxX="1519" minY="373" maxY="413" name="information-m"/>
-  <symbol minX="1519" maxX="1559" minY="373" maxY="413" name="ice_cream-m"/>
-  <symbol minX="1559" maxX="1599" minY="373" maxY="413" name="hunting-tower-m"/>
-  <symbol minX="1599" maxX="1639" minY="373" maxY="413" name="dentist-m"/>
-  <symbol minX="1639" maxX="1679" minY="373" maxY="413" name="hotel-m"/>
-  <symbol minX="1679" maxX="1719" minY="373" maxY="413" name="hostel-m"/>
-  <symbol minX="1719" maxX="1759" minY="373" maxY="413" name="motel-m"/>
-  <symbol minX="1759" maxX="1799" minY="373" maxY="413" name="newsagent_shop-m"/>
-  <symbol minX="1799" maxX="1839" minY="373" maxY="413" name="needle_and_thread-m"/>
-  <symbol minX="1839" maxX="1879" minY="373" maxY="413" name="climbing-m"/>
-  <symbol minX="1879" maxX="1919" minY="373" maxY="413" name="muslim-m"/>
-  <symbol minX="1919" maxX="1959" minY="373" maxY="413" name="musical-instrument-m"/>
-  <symbol minX="1959" maxX="1999" minY="373" maxY="413" name="music_school-m"/>
-  <symbol minX="1999" maxX="2039" minY="373" maxY="413" name="music-m"/>
-  <symbol minX="0" maxX="40" minY="413" maxY="453" name="clothes-m"/>
-  <symbol minX="40" maxX="80" minY="413" maxY="453" name="museum-m"/>
-  <symbol minX="80" maxX="120" minY="413" maxY="453" name="college-m"/>
-  <symbol minX="120" maxX="160" minY="413" maxY="453" name="motorcycle_shop-m"/>
-  <symbol minX="160" maxX="200" minY="413" maxY="453" name="department_store-m"/>
-  <symbol minX="200" maxX="240" minY="413" maxY="453" name="computer-m"/>
-  <symbol minX="240" maxX="280" minY="413" maxY="453" name="monument-m"/>
-  <symbol minX="280" maxX="320" minY="413" maxY="453" name="mobile_phone-m"/>
-  <symbol minX="320" maxX="360" minY="413" maxY="453" name="military-m"/>
-  <symbol minX="360" maxX="400" minY="413" maxY="453" name="metal_construction-m"/>
-  <symbol minX="400" maxX="440" minY="413" maxY="453" name="media_shop-m"/>
-  <symbol minX="440" maxX="480" minY="413" maxY="453" name="media-m"/>
-  <symbol minX="480" maxX="520" minY="413" maxY="453" name="marketplace-m"/>
-  <symbol minX="520" maxX="560" minY="413" maxY="453" name="marina-m"/>
-  <symbol minX="560" maxX="600" minY="413" maxY="453" name="copyshop-m"/>
-  <symbol minX="600" maxX="640" minY="413" maxY="453" name="florist-m"/>
-  <symbol minX="640" maxX="680" minY="413" maxY="453" name="garden-outline-m"/>
-  <symbol minX="680" maxX="720" minY="413" maxY="453" name="garden-m"/>
-  <symbol minX="720" maxX="760" minY="413" maxY="453" name="gallery-m"/>
-  <symbol minX="760" maxX="800" minY="413" maxY="453" name="furniture-m"/>
-  <symbol minX="800" maxX="840" minY="413" maxY="453" name="funicular-m"/>
-  <symbol minX="840" maxX="880" minY="413" maxY="453" name="funeral_directors-m"/>
-  <symbol minX="880" maxX="920" minY="413" maxY="453" name="drinking-water-m"/>
-  <symbol minX="920" maxX="960" minY="413" maxY="453" name="fuel-m"/>
-  <symbol minX="960" maxX="1000" minY="413" maxY="453" name="fuel-dispenser-m"/>
-  <symbol minX="1000" maxX="1040" minY="413" maxY="453" name="fountain-s"/>
-  <symbol minX="1040" maxX="1080" minY="413" maxY="453" name="fountain-m"/>
-  <symbol minX="1080" maxX="1120" minY="413" maxY="453" name="garden_center-m"/>
-  <symbol minX="1120" maxX="1160" minY="413" maxY="453" name="firehydrant-m"/>
-  <symbol minX="1160" maxX="1200" minY="413" maxY="453" name="fire_station-m"/>
-  <symbol minX="1200" maxX="1240" minY="413" maxY="453" name="fastfood-m"/>
-  <symbol minX="1240" maxX="1280" minY="413" maxY="453" name="erotic-m"/>
-  <symbol minX="1280" maxX="1320" minY="413" maxY="453" name="equestrian-m"/>
-  <symbol minX="1320" maxX="1360" minY="413" maxY="453" name="driving_school-m"/>
-  <symbol minX="1360" maxX="1400" minY="413" maxY="453" name="emergency-phone-m"/>
-  <symbol minX="1400" maxX="1440" minY="413" maxY="453" name="embassy-m"/>
-  <symbol minX="1440" maxX="1480" minY="413" maxY="453" name="dump-station-m"/>
-  <symbol minX="1480" maxX="1520" minY="413" maxY="453" name="electrician-m"/>
-  <symbol minX="1520" maxX="1560" minY="413" maxY="453" name="hairdresser-m"/>
-  <symbol minX="1560" maxX="1600" minY="413" maxY="453" name="hospital-m"/>
-  <symbol minX="1600" maxX="1640" minY="413" maxY="453" name="home-m"/>
-  <symbol minX="1640" maxX="1680" minY="413" maxY="453" name="hockey-m"/>
-  <symbol minX="1680" maxX="1720" minY="413" maxY="453" name="historic-ship-m"/>
-  <symbol minX="1720" maxX="1760" minY="413" maxY="453" name="diving-m"/>
-  <symbol minX="1760" maxX="1800" minY="413" maxY="453" name="hindu-m"/>
-  <symbol minX="1800" maxX="1840" minY="413" maxY="453" name="heliport-m"/>
-  <symbol minX="1840" maxX="1880" minY="413" maxY="453" name="helipad-m"/>
-  <symbol minX="1880" maxX="1920" minY="413" maxY="453" name="handball-m"/>
-  <symbol minX="1920" maxX="1960" minY="413" maxY="453" name="hand-m"/>
-  <symbol minX="1960" maxX="2000" minY="413" maxY="453" name="car_shop-m"/>
-  <symbol minX="2000" maxX="2040" minY="413" maxY="453" name="gym-m"/>
-  <symbol minX="0" maxX="40" minY="453" maxY="493" name="guidepost"/>
-  <symbol minX="40" maxX="80" minY="453" maxY="493" name="grocery-m"/>
-  <symbol minX="80" maxX="120" minY="453" maxY="493" name="greengrocer-m"/>
-  <symbol minX="120" maxX="160" minY="453" maxY="493" name="golf-m"/>
-  <symbol minX="160" maxX="200" minY="453" maxY="493" name="gift-m"/>
-  <symbol minX="200" maxX="240" minY="453" maxY="493" name="dog_park-m"/>
-  <symbol minX="240" maxX="280" minY="453" maxY="493" name="geyser-m"/>
-  <symbol minX="280" maxX="320" minY="453" maxY="493" name="geyser-l"/>
-  <symbol minX="320" maxX="360" minY="453" maxY="493" name="doityourself-m"/>
-  <symbol minX="360" maxX="400" minY="453" maxY="493" name="cemetery-m"/>
-  <symbol minX="400" maxX="440" minY="453" maxY="493" name="power-m"/>
-  <symbol minX="440" maxX="480" minY="453" maxY="493" name="postbox-m"/>
-  <symbol minX="480" maxX="520" minY="453" maxY="493" name="shop-m"/>
-  <symbol minX="520" maxX="560" minY="453" maxY="493" name="police-m"/>
-  <symbol minX="560" maxX="600" minY="453" maxY="493" name="podiatrist-m"/>
-  <symbol minX="600" maxX="640" minY="453" maxY="493" name="plumber-m"/>
-  <symbol minX="640" maxX="680" minY="453" maxY="493" name="playground-m"/>
-  <symbol minX="680" maxX="720" minY="453" maxY="493" name="caravan-shop-m"/>
-  <symbol minX="720" maxX="760" minY="453" maxY="493" name="shower-m"/>
-  <symbol minX="760" maxX="800" minY="453" maxY="493" name="shop-bicycle-m"/>
-  <symbol minX="800" maxX="840" minY="453" maxY="493" name="charging-station-m"/>
-  <symbol minX="840" maxX="880" minY="453" maxY="493" name="place-of-worship-m"/>
-  <symbol minX="880" maxX="920" minY="453" maxY="493" name="skateboard-m"/>
-  <symbol minX="920" maxX="960" minY="453" maxY="493" name="pitch-m"/>
-  <symbol minX="960" maxX="1000" minY="453" maxY="493" name="picnic_table-m"/>
-  <symbol minX="1000" maxX="1040" minY="453" maxY="493" name="physiotherapist-m"/>
-  <symbol minX="1040" maxX="1080" minY="453" maxY="493" name="photo-shop-m"/>
-  <symbol minX="1080" maxX="1120" minY="453" maxY="493" name="phone-m"/>
-  <symbol minX="1120" maxX="1160" minY="453" maxY="493" name="pharmacy-m"/>
-  <symbol minX="1160" maxX="1200" minY="453" maxY="493" name="ship-m"/>
-  <symbol minX="1200" maxX="1240" minY="453" maxY="493" name="seafood-shop-m"/>
-  <symbol minX="1240" maxX="1280" minY="453" maxY="493" name="school-m"/>
-  <symbol minX="1280" maxX="1320" minY="453" maxY="493" name="second_hand_shop-m"/>
-  <symbol minX="1320" maxX="1360" minY="453" maxY="493" name="sawmill-m"/>
-  <symbol minX="1360" maxX="1400" minY="453" maxY="493" name="sauna-m"/>
-  <symbol minX="1400" maxX="1440" minY="453" maxY="493" name="shelter-m"/>
-  <symbol minX="1440" maxX="1480" minY="453" maxY="493" name="sample_collection-m"/>
-  <symbol minX="1480" maxX="1520" minY="453" maxY="493" name="restaurant-m"/>
-  <symbol minX="1520" maxX="1560" minY="453" maxY="493" name="shinto-m"/>
-  <symbol minX="1560" maxX="1600" minY="453" maxY="493" name="picnic-m"/>
-  <symbol minX="1600" maxX="1640" minY="453" maxY="493" name="caravan_site-m"/>
-  <symbol minX="1640" maxX="1680" minY="453" maxY="493" name="carpenter-m"/>
-  <symbol minX="1680" maxX="1720" minY="453" maxY="493" name="remains-m"/>
-  <symbol minX="1720" maxX="1760" minY="453" maxY="493" name="recycling-m"/>
-  <symbol minX="1760" maxX="1800" minY="453" maxY="493" name="casino-m"/>
-  <symbol minX="1800" maxX="1840" minY="453" maxY="493" name="public-building-m"/>
-  <symbol minX="1840" maxX="1880" minY="453" maxY="493" name="shoes-m"/>
-  <symbol minX="1880" maxX="1920" minY="453" maxY="493" name="psychotherapist-m"/>
-  <symbol minX="1920" maxX="1960" minY="453" maxY="493" name="prison-m"/>
-  <symbol minX="1960" maxX="2000" minY="453" maxY="493" name="optician-m"/>
-  <symbol minX="2000" maxX="2040" minY="453" maxY="493" name="chess-m"/>
-  <symbol minX="0" maxX="40" minY="493" maxY="533" name="chimney-m"/>
-  <symbol minX="40" maxX="80" minY="493" maxY="533" name="petshop-m"/>
-  <symbol minX="80" maxX="120" minY="493" maxY="533" name="park-m"/>
-  <symbol minX="120" maxX="160" minY="493" maxY="533" name="painter-m"/>
-  <symbol minX="160" maxX="200" minY="493" maxY="533" name="padel-m"/>
-  <symbol minX="200" maxX="240" minY="493" maxY="533" name="outdoor-shop-m"/>
-  <symbol minX="240" maxX="280" minY="493" maxY="533" name="optometrist-m"/>
-  <symbol minX="280" maxX="320" minY="493" maxY="533" name="park-outline-m"/>
-  <symbol minX="320" maxX="360" minY="493" maxY="533" name="office-m"/>
-  <symbol minX="360" maxX="400" minY="493" maxY="533" name="christian-m"/>
-  <symbol minX="400" maxX="440" minY="493" maxY="533" name="cinema-m"/>
-  <symbol minX="440" maxX="480" minY="493" maxY="533" name="nparkf-outline-m"/>
-  <symbol minX="480" maxX="520" minY="493" maxY="533" name="nparkf-m"/>
-  <symbol minX="520" maxX="560" minY="493" maxY="533" name="npark-m"/>
-  <symbol minX="560" maxX="600" minY="493" maxY="533" name="nightclub-m"/>
-  <symbol minX="600" maxX="640" minY="493" maxY="533" name="sports-m"/>
-  <symbol minX="640" maxX="680" minY="493" maxY="533" name="skiing-m"/>
-  <symbol minX="680" maxX="720" minY="493" maxY="533" name="pelota-m"/>
-  <symbol minX="720" maxX="760" minY="493" maxY="533" name="charity_shop-m"/>
-  <symbol minX="760" maxX="800" minY="493" maxY="533" name="cheese-m"/>
-  <symbol minX="800" maxX="840" minY="493" maxY="533" name="speedcam-alert-l"/>
-  <symbol minX="840" maxX="880" minY="493" maxY="533" name="soccer-m"/>
-  <symbol minX="880" maxX="920" minY="493" maxY="533" name="speech_therapist-m"/>
-  <symbol minX="920" maxX="960" minY="493" maxY="533" name="chemist-m"/>
-  <symbol minX="960" maxX="1000" minY="493" maxY="533" name="parking-meter-m"/>
-  <symbol minX="1000" maxX="1039" minY="493" maxY="532" name="subway-ekb-s"/>
-  <symbol minX="1039" maxX="1078" minY="493" maxY="532" name="subway-southkorea-s"/>
-  <symbol minX="1078" maxX="1118" minY="493" maxY="532" name="subway-maracaibo-m"/>
-  <symbol minX="1118" maxX="1158" minY="493" maxY="532" name="subway-marseille-m"/>
-  <symbol minX="1158" maxX="1197" minY="493" maxY="532" name="subway-montreal-m"/>
-  <symbol minX="1197" maxX="1237" minY="493" maxY="532" name="subway-shanghai-m"/>
-  <symbol minX="1237" maxX="1276" minY="493" maxY="532" name="subway-spb-m"/>
-  <symbol minX="1276" maxX="1316" minY="493" maxY="531" name="subway-dalian-m"/>
-  <symbol minX="1316" maxX="1356" minY="493" maxY="531" name="subway-sapporo-m"/>
-  <symbol minX="1356" maxX="1393" minY="493" maxY="530" name="subway-algeria-s"/>
-  <symbol minX="1393" maxX="1430" minY="493" maxY="530" name="subway-entrance-m"/>
-  <symbol minX="1430" maxX="1466" minY="493" maxY="530" name="subway-warsaw-m"/>
-  <symbol minX="1466" maxX="1506" minY="493" maxY="530" name="subway-izmir-m"/>
-  <symbol minX="1506" maxX="1543" minY="493" maxY="530" name="subway-stlouis-s"/>
-  <symbol minX="1543" maxX="1579" minY="493" maxY="529" name="lightrail-berlin-m"/>
-  <symbol minX="1579" maxX="1610" minY="493" maxY="529" name="subway-istanbul-s"/>
-  <symbol minX="1610" maxX="1646" minY="493" maxY="529" name="subway-pittsburgh-s"/>
-  <symbol minX="1646" maxX="1682" minY="493" maxY="529" name="search-result"/>
-  <symbol minX="1682" maxX="1722" minY="493" maxY="527" name="subway-tbilisi-m"/>
-  <symbol minX="1722" maxX="1762" minY="493" maxY="527" name="subway-almaty-m"/>
-  <symbol minX="1762" maxX="1796" minY="493" maxY="527" name="speedcam-m"/>
-  <symbol minX="1796" maxX="1830" minY="493" maxY="527" name="subway-isfahan-s"/>
-  <symbol minX="1830" maxX="1864" minY="493" maxY="527" name="subway-sapporo-s"/>
-  <symbol minX="1864" maxX="1904" minY="493" maxY="527" name="subway-rotterdam-m"/>
-  <symbol minX="1904" maxX="1944" minY="493" maxY="527" name="subway-taoyuan-m"/>
-  <symbol minX="1944" maxX="1978" minY="493" maxY="527" name="parking-m"/>
-  <symbol minX="1978" maxX="2012" minY="493" maxY="527" name="subway-cairo-s"/>
-  <symbol minX="0" maxX="66" minY="533" maxY="567" name="coloredmark-bg-s"/>
-  <symbol minX="66" maxX="100" minY="533" maxY="567" name="non-found-search-result"/>
-  <symbol minX="100" maxX="134" minY="533" maxY="567" name="subway-medellin-s"/>
-  <symbol minX="134" maxX="167" minY="533" maxY="567" name="subway-mashhad-s"/>
-  <symbol minX="167" maxX="198" minY="533" maxY="567" name="subway-brescia-s"/>
-  <symbol minX="198" maxX="232" minY="533" maxY="567" name="parking_pay-m"/>
-  <symbol minX="232" maxX="266" minY="533" maxY="567" name="parking_entrance-m"/>
-  <symbol minX="266" maxX="300" minY="533" maxY="567" name="parking-disabled-m"/>
-  <symbol minX="300" maxX="334" minY="533" maxY="567" name="motorcycle-parking-m"/>
-  <symbol minX="334" maxX="368" minY="533" maxY="567" name="bicycle-rental"/>
-  <symbol minX="368" maxX="434" minY="533" maxY="567" name="coloredmark-default-s"/>
-  <symbol minX="434" maxX="468" minY="533" maxY="567" name="subway-panama-s"/>
-  <symbol minX="468" maxX="504" minY="533" maxY="567" name="subway-izmir-s"/>
-  <symbol minX="504" maxX="538" minY="533" maxY="567" name="bike-parking-m"/>
-  <symbol minX="538" maxX="569" minY="533" maxY="566" name="subway-delhi-s"/>
-  <symbol minX="569" maxX="605" minY="533" maxY="566" name="subway-seattle-m"/>
-  <symbol minX="605" maxX="636" minY="533" maxY="566" name="subway-tianjin-s"/>
-  <symbol minX="636" maxX="669" minY="533" maxY="566" name="subway-warszawa-s"/>
-  <symbol minX="669" maxX="692" minY="533" maxY="566" name="bookmark-bg-xs"/>
-  <symbol minX="692" maxX="715" minY="533" maxY="566" name="bookmark-default-xs"/>
-  <symbol minX="715" maxX="748" minY="533" maxY="566" name="subway-hirosima-s"/>
-  <symbol minX="748" maxX="781" minY="533" maxY="566" name="subway-rome-m"/>
-  <symbol minX="781" maxX="814" minY="533" maxY="566" name="subway-rennes-s"/>
-  <symbol minX="814" maxX="845" minY="533" maxY="566" name="subway-pyongyang-s"/>
-  <symbol minX="845" maxX="876" minY="533" maxY="566" name="subway-porto-s"/>
-  <symbol minX="876" maxX="907" minY="533" maxY="566" name="subway-athens-s"/>
-  <symbol minX="907" maxX="940" minY="533" maxY="566" name="subway-paris-m"/>
-  <symbol minX="940" maxX="977" minY="533" maxY="566" name="subway-moscow-m"/>
-  <symbol minX="977" maxX="1010" minY="533" maxY="566" name="subway-ubahn-m"/>
-  <symbol minX="1010" maxX="1050" minY="533" maxY="565" name="subway-yerevan-m"/>
-  <symbol minX="1050" maxX="1090" minY="533" maxY="565" name="subway-lyon-m"/>
-  <symbol minX="1090" maxX="1130" minY="533" maxY="565" name="subway-santiago-m"/>
-  <symbol minX="1130" maxX="1170" minY="533" maxY="565" name="subway-dnepro-m"/>
-  <symbol minX="1170" maxX="1198" minY="533" maxY="564" name="subway-warsaw-s"/>
-  <symbol minX="1198" maxX="1229" minY="533" maxY="564" name="subway-tashkent-s"/>
-  <symbol minX="1229" maxX="1260" minY="533" maxY="564" name="subway-washington-s"/>
-  <symbol minX="1260" maxX="1291" minY="533" maxY="564" name="subway-wuhan-s"/>
-  <symbol minX="1291" maxX="1331" minY="533" maxY="564" name="subway-tabriz-m"/>
-  <symbol minX="1331" maxX="1367" minY="533" maxY="564" name="subway-taoyuan-s"/>
-  <symbol minX="1367" maxX="1398" minY="533" maxY="564" name="subway-guangzhou-s"/>
-  <symbol minX="1398" maxX="1429" minY="533" maxY="564" name="subway-volgograd-s"/>
-  <symbol minX="1429" maxX="1468" minY="533" maxY="564" name="subway-yerevan-s"/>
-  <symbol minX="1468" maxX="1499" minY="533" maxY="564" name="subway-vienna-s"/>
-  <symbol minX="1499" maxX="1530" minY="533" maxY="564" name="subway-yokohama-s"/>
-  <symbol minX="1530" maxX="1561" minY="533" maxY="564" name="subway-valencia-s"/>
-  <symbol minX="1561" maxX="1592" minY="533" maxY="564" name="subway-tokyo-s"/>
-  <symbol minX="1592" maxX="1623" minY="533" maxY="564" name="subway-tyneandwear-s"/>
-  <symbol minX="1623" maxX="1654" minY="533" maxY="564" name="subway-bursaray-s"/>
-  <symbol minX="1654" maxX="1685" minY="533" maxY="564" name="subway-foshan-s"/>
-  <symbol minX="1685" maxX="1716" minY="533" maxY="564" name="subway-dubai-s"/>
-  <symbol minX="1716" maxX="1747" minY="533" maxY="564" name="subway-oslo-s"/>
-  <symbol minX="1747" maxX="1778" minY="533" maxY="564" name="subway-dalian-s"/>
-  <symbol minX="1778" maxX="1809" minY="533" maxY="564" name="subway-chicago-s"/>
-  <symbol minX="1809" maxX="1849" minY="533" maxY="564" name="subway-omsk-s"/>
-  <symbol minX="1849" maxX="1889" minY="533" maxY="564" name="subway-omsk-m"/>
-  <symbol minX="1889" maxX="1920" minY="533" maxY="564" name="subway-chengdu-s"/>
-  <symbol minX="1920" maxX="1951" minY="533" maxY="564" name="subway-changchun-s"/>
-  <symbol minX="1951" maxX="1982" minY="533" maxY="564" name="subway-nnov-s"/>
-  <symbol minX="1982" maxX="2013" minY="533" maxY="564" name="subway-catania-s"/>
-  <symbol minX="2013" maxX="2044" minY="533" maxY="564" name="subway-caracas-s"/>
-  <symbol minX="0" maxX="31" minY="567" maxY="598" name="subway-nagoya-s"/>
-  <symbol minX="31" maxX="62" minY="567" maxY="598" name="subway-losangeles-s"/>
-  <symbol minX="62" maxX="93" minY="567" maxY="598" name="subway-buenosaires-s"/>
-  <symbol minX="93" maxX="124" minY="567" maxY="598" name="subway-montreal-s"/>
-  <symbol minX="124" maxX="155" minY="567" maxY="598" name="subway-budapest-s"/>
-  <symbol minX="155" maxX="186" minY="567" maxY="598" name="subway-brasilia-s"/>
-  <symbol minX="186" maxX="217" minY="567" maxY="598" name="subway-bengaluru-s"/>
-  <symbol minX="217" maxX="248" minY="567" maxY="598" name="subway-beijing-s"/>
-  <symbol minX="248" maxX="279" minY="567" maxY="598" name="subway-minatomirai-s"/>
-  <symbol minX="279" maxX="310" minY="567" maxY="598" name="subway-milan-s"/>
-  <symbol minX="310" maxX="341" minY="567" maxY="598" name="subway-bangkok-s"/>
-  <symbol minX="341" maxX="372" minY="567" maxY="598" name="subway-mecca-s"/>
-  <symbol minX="372" maxX="403" minY="567" maxY="598" name="subway-massachusetts-s"/>
-  <symbol minX="403" maxX="443" minY="567" maxY="598" name="subway-alicante-m"/>
-  <symbol minX="443" maxX="474" minY="567" maxY="598" name="subway-santodomingo-s"/>
-  <symbol minX="474" maxX="505" minY="567" maxY="598" name="subway-kobe-s"/>
-  <symbol minX="505" maxX="536" minY="567" maxY="598" name="subway-stockholm-s"/>
-  <symbol minX="536" maxX="576" minY="567" maxY="598" name="subway-kryvyirih-m"/>
-  <symbol minX="576" maxX="607" minY="567" maxY="598" name="subway-kazan-s"/>
-  <symbol minX="607" maxX="638" minY="567" maxY="598" name="subway-sofia-s"/>
-  <symbol minX="638" maxX="669" minY="567" maxY="598" name="subway-shiraz-s"/>
-  <symbol minX="669" maxX="700" minY="567" maxY="598" name="subway-shanghai-s"/>
-  <symbol minX="700" maxX="731" minY="567" maxY="598" name="subway-kunming-s"/>
-  <symbol minX="731" maxX="762" minY="567" maxY="598" name="subway-kyoto-s"/>
-  <symbol minX="762" maxX="793" minY="567" maxY="598" name="subway-helsinki-s"/>
-  <symbol minX="793" maxX="824" minY="567" maxY="598" name="subway-saopaulo-s"/>
-  <symbol minX="824" maxX="855" minY="567" maxY="598" name="subway-perugia-s"/>
-  <symbol minX="855" maxX="894" minY="567" maxY="598" name="subway-santiago-s"/>
-  <symbol minX="894" maxX="925" minY="567" maxY="598" name="subway-lille-s"/>
-  <symbol minX="925" maxX="956" minY="567" maxY="598" name="subway-guadalajara-s"/>
-  <symbol minX="956" maxX="987" minY="567" maxY="598" name="subway-lima-s"/>
-  <symbol minX="987" maxX="1018" minY="567" maxY="598" name="subway-samara-s"/>
-  <symbol minX="1018" maxX="1049" minY="567" maxY="598" name="subway-lisboa-s"/>
-  <symbol minX="1049" maxX="1082" minY="567" maxY="598" name="subway-glasgow-s"/>
-  <symbol minX="1082" maxX="1113" minY="567" maxY="598" name="subway-riodejaneiro-s"/>
-  <symbol minX="1113" maxX="1144" minY="567" maxY="598" name="subway-reseau-paris-s"/>
-  <symbol minX="1144" maxX="1183" minY="567" maxY="598" name="subway-fukuoka-s"/>
-  <symbol minX="1183" maxX="1223" minY="567" maxY="598" name="subway-philadelphia-m"/>
-  <symbol minX="1223" maxX="1253" minY="567" maxY="597" name="subway-lausanne-s"/>
-  <symbol minX="1253" maxX="1292" minY="567" maxY="597" name="subway-london-m"/>
-  <symbol minX="1292" maxX="1332" minY="567" maxY="597" name="subway-lucknow-s"/>
-  <symbol minX="1332" maxX="1360" minY="567" maxY="597" name="subway-amsterdam-s"/>
-  <symbol minX="1360" maxX="1397" minY="567" maxY="597" name="subway-almaty-s"/>
-  <symbol minX="1397" maxX="1436" minY="567" maxY="597" name="subway-tabriz-s"/>
-  <symbol minX="1436" maxX="1467" minY="567" maxY="597" name="subway-maracaibo-s"/>
-  <symbol minX="1467" maxX="1495" minY="567" maxY="597" name="subway-mexico-s"/>
-  <symbol minX="1495" maxX="1525" minY="567" maxY="597" name="subway-spb-s"/>
-  <symbol minX="1525" maxX="1565" minY="567" maxY="597" name="subway-osaka-m"/>
-  <symbol minX="1565" maxX="1595" minY="567" maxY="597" name="cave-m"/>
-  <symbol minX="1595" maxX="1635" minY="567" maxY="596" name="subway-barcelona-m"/>
-  <symbol minX="1635" maxX="1675" minY="567" maxY="596" name="subway-madrid-m"/>
-  <symbol minX="1675" maxX="1703" minY="567" maxY="595" name="hotel-s"/>
-  <symbol minX="1703" maxX="1731" minY="567" maxY="595" name="airport-s"/>
-  <symbol minX="1731" maxX="1759" minY="567" maxY="595" name="hospital-s"/>
-  <symbol minX="1759" maxX="1787" minY="567" maxY="595" name="hindu-s"/>
-  <symbol minX="1787" maxX="1815" minY="567" maxY="595" name="geyser-s"/>
-  <symbol minX="1815" maxX="1843" minY="567" maxY="595" name="fuel-s"/>
-  <symbol minX="1843" maxX="1871" minY="567" maxY="595" name="drinking-water-s"/>
-  <symbol minX="1871" maxX="1899" minY="567" maxY="595" name="college-s"/>
-  <symbol minX="1899" maxX="1927" minY="567" maxY="595" name="christian-s"/>
-  <symbol minX="1927" maxX="1955" minY="567" maxY="595" name="charging-station-s"/>
-  <symbol minX="1955" maxX="1983" minY="567" maxY="595" name="car-repair-s"/>
-  <symbol minX="1983" maxX="2011" minY="567" maxY="595" name="cable-car-s"/>
-  <symbol minX="2011" maxX="2039" minY="567" maxY="595" name="bus-s"/>
-  <symbol minX="0" maxX="28" minY="598" maxY="626" name="buddhist-s"/>
-  <symbol minX="28" maxX="56" minY="598" maxY="626" name="stadium-s"/>
-  <symbol minX="56" maxX="84" minY="598" maxY="626" name="nparkf-s"/>
-  <symbol minX="84" maxX="112" minY="598" maxY="626" name="shop-s"/>
-  <symbol minX="112" maxX="140" minY="598" maxY="626" name="ship-s"/>
-  <symbol minX="140" maxX="168" minY="598" maxY="626" name="shinto-s"/>
-  <symbol minX="168" maxX="208" minY="598" maxY="626" name="subway-bilbao-m"/>
-  <symbol minX="208" maxX="236" minY="598" maxY="626" name="remains-s"/>
-  <symbol minX="236" maxX="264" minY="598" maxY="626" name="place-of-worship-s"/>
-  <symbol minX="264" maxX="292" minY="598" maxY="626" name="park-s"/>
-  <symbol minX="292" maxX="320" minY="598" maxY="626" name="park-outline-s"/>
-  <symbol minX="320" maxX="348" minY="598" maxY="626" name="subway-entrance-s"/>
-  <symbol minX="348" maxX="376" minY="598" maxY="626" name="nparkf-outline-s"/>
-  <symbol minX="376" maxX="404" minY="598" maxY="626" name="muslim-s"/>
-  <symbol minX="404" maxX="432" minY="598" maxY="626" name="museum-s"/>
-  <symbol minX="432" maxX="460" minY="598" maxY="626" name="monument-s"/>
-  <symbol minX="460" maxX="488" minY="598" maxY="626" name="lighthouse-s"/>
-  <symbol minX="488" maxX="525" minY="598" maxY="626" name="subway-dnepro-s"/>
-  <symbol minX="525" maxX="553" minY="598" maxY="626" name="jewish-s"/>
-  <symbol minX="553" maxX="581" minY="598" maxY="626" name="theme_park-s"/>
-  <symbol minX="581" maxX="612" minY="598" maxY="626" name="subway-tbilisi-s"/>
-  <symbol minX="612" maxX="640" minY="598" maxY="626" name="viewpoint-s"/>
-  <symbol minX="640" maxX="662" minY="598" maxY="626" name="transit_train-m"/>
-  <symbol minX="662" maxX="684" minY="598" maxY="626" name="transit_light_rail-m"/>
-  <symbol minX="684" maxX="712" minY="598" maxY="626" name="tram-s"/>
-  <symbol minX="712" maxX="740" minY="598" maxY="626" name="train-s"/>
-  <symbol minX="740" maxX="768" minY="598" maxY="626" name="subway-s"/>
-  <symbol minX="768" maxX="796" minY="598" maxY="626" name="tourism-s"/>
-  <symbol minX="796" maxX="824" minY="598" maxY="626" name="toll_booth-s"/>
-  <symbol minX="824" maxX="855" minY="598" maxY="626" name="transfer_arrow"/>
-  <symbol minX="855" maxX="883" minY="598" maxY="626" name="theatre-s"/>
-  <symbol minX="883" maxX="914" minY="598" maxY="626" name="subway-rotterdam-s"/>
-  <symbol minX="914" maxX="950" minY="598" maxY="626" name="subway-philadelphia-s"/>
-  <symbol minX="950" maxX="978" minY="598" maxY="626" name="taoist-s"/>
-  <symbol minX="978" maxX="1006" minY="598" maxY="626" name="subway-newyork-s"/>
-  <symbol minX="1006" maxX="1045" minY="598" maxY="626" name="subway-palma-s"/>
-  <symbol minX="1045" maxX="1079" minY="598" maxY="626" name="subway-osaka-s"/>
-  <symbol minX="1079" maxX="1119" minY="598" maxY="626" name="subway-palma-m"/>
-  <symbol minX="1119" maxX="1159" minY="598" maxY="626" name="subway-kolkata-m"/>
-  <symbol minX="1159" maxX="1187" minY="598" maxY="626" name="waterfall-s"/>
-  <symbol minX="1187" maxX="1215" minY="598" maxY="626" name="waste-basket-s"/>
-  <symbol minX="1215" maxX="1255" minY="598" maxY="626" name="subway-lucknow-m"/>
-  <symbol minX="1255" maxX="1283" minY="598" maxY="626" name="zoo-s"/>
-  <symbol minX="1283" maxX="1310" minY="598" maxY="625" name="subway-paris-s"/>
-  <symbol minX="1310" maxX="1337" minY="598" maxY="625" name="elevator"/>
-  <symbol minX="1337" maxX="1377" minY="598" maxY="625" name="subway-fukuoka-m"/>
-  <symbol minX="1377" maxX="1417" minY="598" maxY="625" name="subway-sanfrancisco-m"/>
-  <symbol minX="1417" maxX="1457" minY="598" maxY="625" name="subway-sanfrancisco-s"/>
-  <symbol minX="1457" maxX="1493" minY="598" maxY="625" name="subway-barcelona-s"/>
-  <symbol minX="1493" maxX="1527" minY="598" maxY="625" name="subway-kryvyirih-s"/>
-  <symbol minX="1527" maxX="1549" minY="598" maxY="625" name="transit_monorail-m"/>
-  <symbol minX="1549" maxX="1589" minY="598" maxY="625" name="subway-brussel-s"/>
-  <symbol minX="1589" maxX="1629" minY="598" maxY="625" name="subway-bucharest-m"/>
-  <symbol minX="1629" maxX="1669" minY="598" maxY="625" name="subway-kharkiv-s"/>
-  <symbol minX="1669" maxX="1709" minY="598" maxY="625" name="subway-novosibirsk-m"/>
-  <symbol minX="1709" maxX="1748" minY="598" maxY="625" name="subway-novosibirsk-s"/>
-  <symbol minX="1748" maxX="1787" minY="598" maxY="625" name="subway-kiev-m"/>
-  <symbol minX="1787" maxX="1823" minY="598" maxY="625" name="subway-madrid-s"/>
-  <symbol minX="1823" maxX="1854" minY="598" maxY="625" name="subway-lyon-s"/>
-  <symbol minX="1854" maxX="1881" minY="598" maxY="625" name="lightrail-berlin-s"/>
-  <symbol minX="1881" maxX="1921" minY="598" maxY="624" name="subway-sendai-m"/>
-  <symbol minX="1921" maxX="1946" minY="598" maxY="623" name="storage-tank"/>
-  <symbol minX="1946" maxX="1973" minY="598" maxY="623" name="subway-moscow-s"/>
-  <symbol minX="1973" maxX="2013" minY="598" maxY="623" name="subway-kharkiv-m"/>
-  <symbol minX="0" maxX="40" minY="626" maxY="651" name="subway-haagse-s"/>
-  <symbol minX="40" maxX="65" minY="626" maxY="651" name="map"/>
-  <symbol minX="65" maxX="90" minY="626" maxY="651" name="board"/>
-  <symbol minX="90" maxX="130" minY="626" maxY="651" name="subway-sendai-s"/>
-  <symbol minX="130" maxX="163" minY="626" maxY="651" name="subway-alicante-s"/>
-  <symbol minX="163" maxX="203" minY="626" maxY="651" name="subway-manila-m"/>
-  <symbol minX="203" maxX="222" minY="626" maxY="651" name="transit_train-s"/>
-  <symbol minX="222" maxX="247" minY="626" maxY="651" name="transit_subway-m"/>
-  <symbol minX="247" maxX="286" minY="626" maxY="651" name="subway-bucharest-s"/>
-  <symbol minX="286" maxX="326" minY="626" maxY="651" name="subway-brussel-m"/>
-  <symbol minX="326" maxX="366" minY="626" maxY="650" name="subway-taipei-s"/>
-  <symbol minX="366" maxX="405" minY="626" maxY="650" name="subway-manila-s"/>
-  <symbol minX="405" maxX="430" minY="626" maxY="650" name="subway-seattle-s"/>
-  <symbol minX="430" maxX="454" minY="626" maxY="650" name="cave-s"/>
-  <symbol minX="454" maxX="494" minY="626" maxY="650" name="subway-edmonton-s"/>
-  <symbol minX="494" maxX="528" minY="626" maxY="650" name="subway-bilbao-s"/>
-  <symbol minX="528" maxX="552" minY="626" maxY="650" name="subway-rome-s"/>
-  <symbol minX="552" maxX="582" minY="626" maxY="650" name="subway-london-s"/>
-  <symbol minX="582" maxX="606" minY="626" maxY="650" name="subway-ubahn-s"/>
-  <symbol minX="606" maxX="646" minY="626" maxY="649" name="subway-haagse-m"/>
-  <symbol minX="646" maxX="668" minY="626" maxY="648" name="transit_subway-s"/>
-  <symbol minX="668" maxX="695" minY="626" maxY="648" name="bench"/>
-  <symbol minX="695" maxX="717" minY="626" maxY="648" name="star-l"/>
-  <symbol minX="717" maxX="741" minY="626" maxY="648" name="main_entrance-s"/>
-  <symbol minX="741" maxX="763" minY="626" maxY="648" name="speedcam-s"/>
-  <symbol minX="763" maxX="785" minY="626" maxY="648" name="subway-xs"/>
-  <symbol minX="785" maxX="807" minY="626" maxY="648" name="gate-s"/>
-  <symbol minX="807" maxX="829" minY="626" maxY="648" name="subway-newyork-xs"/>
-  <symbol minX="829" maxX="844" minY="626" maxY="648" name="entrance-s"/>
-  <symbol minX="844" maxX="863" minY="626" maxY="648" name="transit_monorail-s"/>
-  <symbol minX="863" maxX="885" minY="626" maxY="648" name="parking-s"/>
-  <symbol minX="885" maxX="904" minY="626" maxY="648" name="transit_light_rail-s"/>
-  <symbol minX="904" maxX="938" minY="626" maxY="648" name="railway-crossing-l"/>
-  <symbol minX="938" maxX="968" minY="626" maxY="647" name="subway-kolkata-s"/>
-  <symbol minX="968" maxX="1001" minY="626" maxY="647" name="subway-kiev-s"/>
-  <symbol minX="1001" maxX="1041" minY="626" maxY="647" name="subway-edmonton-m"/>
-  <symbol minX="1041" maxX="1065" minY="626" maxY="647" name="volcano-m"/>
-  <symbol minX="1065" maxX="1105" minY="626" maxY="647" name="subway-malaga-m"/>
-  <symbol minX="1105" maxX="1144" minY="626" maxY="647" name="subway-malaga-s"/>
-  <symbol minX="1144" maxX="1165" minY="626" maxY="647" name="star-m"/>
-  <symbol minX="1165" maxX="1205" minY="626" maxY="646" name="subway-taipei-m"/>
-  <symbol minX="1205" maxX="1238" minY="626" maxY="645" name="subway-minsk-m"/>
-  <symbol minX="1238" maxX="1260" minY="626" maxY="645" name="plaque"/>
-  <symbol minX="1260" maxX="1299" minY="626" maxY="645" name="subway-baku-s"/>
-  <symbol minX="1299" maxX="1329" minY="626" maxY="645" name="railway-crossing-m"/>
-  <symbol minX="1329" maxX="1347" minY="626" maxY="644" name="star-s"/>
-  <symbol minX="1347" maxX="1377" minY="626" maxY="644" name="subway-minsk-s"/>
-  <symbol minX="1377" maxX="1417" minY="626" maxY="644" name="subway-baku-m"/>
-  <symbol minX="1417" maxX="1457" minY="626" maxY="643" name="subway-chongqing-m"/>
-  <symbol minX="1457" maxX="1497" minY="626" maxY="643" name="subway-chongqing-s"/>
-  <symbol minX="1497" maxX="1515" minY="626" maxY="642" name="volcano-s"/>
-  <symbol minX="1515" maxX="1533" minY="626" maxY="642" name="peakt-m"/>
-  <symbol minX="1533" maxX="1569" minY="626" maxY="642" name="arrow-m"/>
-  <symbol minX="1569" maxX="1597" minY="626" maxY="642" name="mountain-pass"/>
-  <symbol minX="1597" maxX="1612" minY="626" maxY="641" name="zero-icon"/>
-  <symbol minX="1612" maxX="1627" minY="626" maxY="639" name="peakt-s"/>
-  <symbol minX="1627" maxX="1639" minY="626" maxY="638" name="dot-m"/>
-  <symbol minX="1639" maxX="1666" minY="626" maxY="638" name="arrow-s"/>
-  <symbol minX="1666" maxX="1684" minY="626" maxY="635" name="arrow-xs"/>
+  <symbol minX="612" maxX="672" minY="168" maxY="228" name="route-point-16"/>
+  <symbol minX="672" maxX="732" minY="168" maxY="228" name="route-point-11"/>
+  <symbol minX="732" maxX="816" minY="168" maxY="228" name="norating-bg-l"/>
+  <symbol minX="816" maxX="876" minY="168" maxY="228" name="route-point-12"/>
+  <symbol minX="876" maxX="936" minY="168" maxY="228" name="route-point-13"/>
+  <symbol minX="936" maxX="996" minY="168" maxY="228" name="route-point-14"/>
+  <symbol minX="996" maxX="1056" minY="168" maxY="228" name="route-point-start"/>
+  <symbol minX="1056" maxX="1116" minY="168" maxY="228" name="route-point-15"/>
+  <symbol minX="1116" maxX="1200" minY="168" maxY="228" name="norating-default-l"/>
+  <symbol minX="1200" maxX="1260" minY="168" maxY="228" name="route-point-2"/>
+  <symbol minX="1260" maxX="1320" minY="168" maxY="228" name="route-point-3"/>
+  <symbol minX="1320" maxX="1380" minY="168" maxY="228" name="route-point-8"/>
+  <symbol minX="1380" maxX="1440" minY="168" maxY="228" name="route-point-20"/>
+  <symbol minX="1440" maxX="1524" minY="168" maxY="228" name="coloredmark-default-l"/>
+  <symbol minX="1524" maxX="1584" minY="168" maxY="228" name="route-point-4"/>
+  <symbol minX="1584" maxX="1668" minY="168" maxY="228" name="coloredmark-bg-l"/>
+  <symbol minX="1668" maxX="1728" minY="168" maxY="228" name="route-point-1"/>
+  <symbol minX="1728" maxX="1788" minY="168" maxY="228" name="route-point-5"/>
+  <symbol minX="1788" maxX="1848" minY="168" maxY="228" name="route-point-9"/>
+  <symbol minX="1848" maxX="1908" minY="168" maxY="228" name="route-point-6"/>
+  <symbol minX="1908" maxX="1968" minY="168" maxY="228" name="route-point-10"/>
+  <symbol minX="1968" maxX="2028" minY="168" maxY="228" name="route-point-19"/>
+  <symbol minX="0" maxX="60" minY="233" maxY="293" name="route-point-18"/>
+  <symbol minX="60" maxX="120" minY="233" maxY="293" name="route-point-17"/>
+  <symbol minX="120" maxX="176" minY="233" maxY="285" name="shield-us-i-wide"/>
+  <symbol minX="176" maxX="220" minY="233" maxY="285" name="shield-us-i-thin"/>
+  <symbol minX="220" maxX="268" minY="233" maxY="281" name="shield-us-hw-thin"/>
+  <symbol minX="268" maxX="324" minY="233" maxY="281" name="shield-us-hw-wide"/>
+  <symbol minX="324" maxX="357" minY="233" maxY="279" name="bookmark-default-s"/>
+  <symbol minX="357" maxX="390" minY="233" maxY="279" name="bookmark-bg-s"/>
+  <symbol minX="390" maxX="434" minY="233" maxY="277" name="track_marker_deselected"/>
+  <symbol minX="434" maxX="478" minY="233" maxY="277" name="current-position"/>
+  <symbol minX="478" maxX="516" minY="233" maxY="273" name="subway-delhi-m"/>
+  <symbol minX="516" maxX="556" minY="233" maxY="273" name="subway-chengdu-m"/>
+  <symbol minX="556" maxX="596" minY="233" maxY="273" name="subway-cairo-m"/>
+  <symbol minX="596" maxX="636" minY="233" maxY="273" name="subway-bursaray-m"/>
+  <symbol minX="636" maxX="676" minY="233" maxY="273" name="subway-bangkok-m"/>
+  <symbol minX="676" maxX="716" minY="233" maxY="273" name="subway-changchun-m"/>
+  <symbol minX="716" maxX="756" minY="233" maxY="273" name="subway-dubai-m"/>
+  <symbol minX="756" maxX="796" minY="233" maxY="273" name="subway-chicago-m"/>
+  <symbol minX="796" maxX="836" minY="233" maxY="273" name="subway-catania-m"/>
+  <symbol minX="836" maxX="876" minY="233" maxY="273" name="subway-caracas-m"/>
+  <symbol minX="876" maxX="916" minY="233" maxY="273" name="ship-m"/>
+  <symbol minX="916" maxX="956" minY="233" maxY="273" name="speech_therapist-m"/>
+  <symbol minX="956" maxX="996" minY="233" maxY="273" name="soccer-m"/>
+  <symbol minX="996" maxX="1036" minY="233" maxY="273" name="skiing-m"/>
+  <symbol minX="1036" maxX="1076" minY="233" maxY="273" name="skateboard-m"/>
+  <symbol minX="1076" maxX="1116" minY="233" maxY="273" name="shower-m"/>
+  <symbol minX="1116" maxX="1156" minY="233" maxY="273" name="shop-m"/>
+  <symbol minX="1156" maxX="1196" minY="233" maxY="273" name="shop-bicycle-m"/>
+  <symbol minX="1196" maxX="1236" minY="233" maxY="273" name="shoes-m"/>
+  <symbol minX="1236" maxX="1276" minY="233" maxY="273" name="speedcam-alert-l"/>
+  <symbol minX="1276" maxX="1316" minY="233" maxY="273" name="shinto-m"/>
+  <symbol minX="1316" maxX="1356" minY="233" maxY="273" name="shelter-m"/>
+  <symbol minX="1356" maxX="1396" minY="233" maxY="273" name="second_hand_shop-m"/>
+  <symbol minX="1396" maxX="1436" minY="233" maxY="273" name="seafood-shop-m"/>
+  <symbol minX="1436" maxX="1476" minY="233" maxY="273" name="school-m"/>
+  <symbol minX="1476" maxX="1516" minY="233" maxY="273" name="sawmill-m"/>
+  <symbol minX="1516" maxX="1556" minY="233" maxY="273" name="travel_agency_shop-m"/>
+  <symbol minX="1556" maxX="1596" minY="233" maxY="273" name="subway-ankara-m"/>
+  <symbol minX="1596" maxX="1636" minY="233" maxY="273" name="subway-budapest-m"/>
+  <symbol minX="1636" maxX="1673" minY="233" maxY="273" name="subway-brescia-m"/>
+  <symbol minX="1673" maxX="1713" minY="233" maxY="273" name="subway-brasilia-m"/>
+  <symbol minX="1713" maxX="1753" minY="233" maxY="273" name="subway-bengaluru-m"/>
+  <symbol minX="1753" maxX="1793" minY="233" maxY="273" name="subway-beijing-m"/>
+  <symbol minX="1793" maxX="1833" minY="233" maxY="273" name="sauna-m"/>
+  <symbol minX="1833" maxX="1871" minY="233" maxY="273" name="subway-athens-m"/>
+  <symbol minX="1871" maxX="1911" minY="233" maxY="273" name="subway-ankara-s"/>
+  <symbol minX="1911" maxX="1951" minY="233" maxY="273" name="subway-buenosaires-m"/>
+  <symbol minX="1951" maxX="1987" minY="233" maxY="273" name="subway-amsterdam-m"/>
+  <symbol minX="1987" maxX="2027" minY="233" maxY="273" name="subway-algeria-m"/>
+  <symbol minX="0" maxX="40" minY="293" maxY="333" name="subway-adana-s"/>
+  <symbol minX="40" maxX="80" minY="293" maxY="333" name="subway-adana-m"/>
+  <symbol minX="80" maxX="120" minY="293" maxY="333" name="stationery_shop-m"/>
+  <symbol minX="120" maxX="160" minY="293" maxY="333" name="stadium-m"/>
+  <symbol minX="160" maxX="200" minY="293" maxY="333" name="sports-m"/>
+  <symbol minX="200" maxX="240" minY="293" maxY="333" name="subway-warszawa-m"/>
+  <symbol minX="240" maxX="280" minY="293" maxY="333" name="tennis-m"/>
+  <symbol minX="280" maxX="320" minY="293" maxY="333" name="taxi-m"/>
+  <symbol minX="320" maxX="360" minY="293" maxY="333" name="taoist-m"/>
+  <symbol minX="360" maxX="400" minY="293" maxY="333" name="table-tennis-m"/>
+  <symbol minX="400" maxX="440" minY="293" maxY="333" name="swimming-m"/>
+  <symbol minX="440" maxX="480" minY="293" maxY="333" name="sweets-m"/>
+  <symbol minX="480" maxX="520" minY="293" maxY="333" name="survey_point-m"/>
+  <symbol minX="520" maxX="560" minY="293" maxY="333" name="subway-yokohama-m"/>
+  <symbol minX="560" maxX="600" minY="293" maxY="333" name="subway-wuhan-m"/>
+  <symbol minX="600" maxX="640" minY="293" maxY="333" name="subway-washington-m"/>
+  <symbol minX="640" maxX="680" minY="293" maxY="333" name="theatre-m"/>
+  <symbol minX="680" maxX="720" minY="293" maxY="333" name="subway-volgograd-m"/>
+  <symbol minX="720" maxX="760" minY="293" maxY="333" name="subway-vienna-m"/>
+  <symbol minX="760" maxX="800" minY="293" maxY="333" name="subway-valencia-m"/>
+  <symbol minX="800" maxX="840" minY="293" maxY="333" name="subway-tyneandwear-m"/>
+  <symbol minX="840" maxX="880" minY="293" maxY="333" name="subway-tokyo-m"/>
+  <symbol minX="880" maxX="920" minY="293" maxY="333" name="subway-tianjin-m"/>
+  <symbol minX="920" maxX="960" minY="293" maxY="333" name="subway-tashkent-m"/>
+  <symbol minX="960" maxX="1000" minY="293" maxY="333" name="subway-stockholm-m"/>
+  <symbol minX="1000" maxX="1040" minY="293" maxY="333" name="subway-stlouis-m"/>
+  <symbol minX="1040" maxX="1080" minY="293" maxY="333" name="subway-southkorea-m"/>
+  <symbol minX="1080" maxX="1120" minY="293" maxY="333" name="wayside_shrine-m"/>
+  <symbol minX="1120" maxX="1160" minY="293" maxY="333" name="vending-m"/>
+  <symbol minX="1160" maxX="1200" minY="293" maxY="333" name="veterinary-m"/>
+  <symbol minX="1200" maxX="1240" minY="293" maxY="333" name="video-games-m"/>
+  <symbol minX="1240" maxX="1280" minY="293" maxY="333" name="viewpoint-m"/>
+  <symbol minX="1280" maxX="1320" minY="293" maxY="333" name="volleyball-m"/>
+  <symbol minX="1320" maxX="1360" minY="293" maxY="333" name="waste-basket-m"/>
+  <symbol minX="1360" maxX="1400" minY="293" maxY="333" name="waterfall-m"/>
+  <symbol minX="1400" maxX="1440" minY="293" maxY="333" name="tram-m"/>
+  <symbol minX="1440" maxX="1480" minY="293" maxY="333" name="train-m"/>
+  <symbol minX="1480" maxX="1520" minY="293" maxY="333" name="toys-m"/>
+  <symbol minX="1520" maxX="1560" minY="293" maxY="333" name="subway-sofia-m"/>
+  <symbol minX="1560" maxX="1600" minY="293" maxY="333" name="tourism-m"/>
+  <symbol minX="1600" maxX="1640" minY="293" maxY="333" name="tomb-m"/>
+  <symbol minX="1640" maxX="1680" minY="293" maxY="333" name="windmill-m"/>
+  <symbol minX="1680" maxX="1720" minY="293" maxY="333" name="toll_booth-m"/>
+  <symbol minX="1720" maxX="1760" minY="293" maxY="333" name="toilets-m"/>
+  <symbol minX="1760" maxX="1800" minY="293" maxY="333" name="tire-repair-m"/>
+  <symbol minX="1800" maxX="1840" minY="293" maxY="333" name="ticket-shop-m"/>
+  <symbol minX="1840" maxX="1880" minY="293" maxY="333" name="yoga-m"/>
+  <symbol minX="1880" maxX="1920" minY="293" maxY="333" name="theme_park-m"/>
+  <symbol minX="1920" maxX="1960" minY="293" maxY="333" name="zoo-m"/>
+  <symbol minX="1960" maxX="2000" minY="293" maxY="333" name="subway-kunming-m"/>
+  <symbol minX="2000" maxX="2040" minY="293" maxY="333" name="subway-mashhad-m"/>
+  <symbol minX="0" maxX="40" minY="333" maxY="373" name="subway-marseille-s"/>
+  <symbol minX="40" maxX="80" minY="333" maxY="373" name="subway-m"/>
+  <symbol minX="80" maxX="120" minY="333" maxY="373" name="subway-lyon-m"/>
+  <symbol minX="120" maxX="160" minY="333" maxY="373" name="subway-losangeles-m"/>
+  <symbol minX="160" maxX="200" minY="333" maxY="373" name="subway-lisboa-m"/>
+  <symbol minX="200" maxX="240" minY="333" maxY="373" name="subway-lima-m"/>
+  <symbol minX="240" maxX="280" minY="333" maxY="373" name="subway-lille-m"/>
+  <symbol minX="280" maxX="320" minY="333" maxY="373" name="subway-lausanne-m"/>
+  <symbol minX="320" maxX="360" minY="333" maxY="373" name="subway-kyoto-m"/>
+  <symbol minX="360" maxX="400" minY="333" maxY="373" name="subway-massachusetts-m"/>
+  <symbol minX="400" maxX="440" minY="333" maxY="373" name="subway-kobe-m"/>
+  <symbol minX="440" maxX="480" minY="333" maxY="373" name="subway-kazan-m"/>
+  <symbol minX="480" maxX="513" minY="333" maxY="373" name="subway-istanbul-m"/>
+  <symbol minX="513" maxX="553" minY="333" maxY="373" name="subway-isfahan-m"/>
+  <symbol minX="553" maxX="593" minY="333" maxY="373" name="subway-hirosima-m"/>
+  <symbol minX="593" maxX="633" minY="333" maxY="373" name="subway-helsinki-m"/>
+  <symbol minX="633" maxX="673" minY="333" maxY="373" name="subway-guangzhou-m"/>
+  <symbol minX="673" maxX="713" minY="333" maxY="373" name="subway-guadalajara-m"/>
+  <symbol minX="713" maxX="753" minY="333" maxY="373" name="subway-glasgow-m"/>
+  <symbol minX="753" maxX="793" minY="333" maxY="373" name="subway-foshan-m"/>
+  <symbol minX="793" maxX="833" minY="333" maxY="373" name="subway-perugia-m"/>
+  <symbol minX="833" maxX="873" minY="333" maxY="373" name="subway-shiraz-m"/>
+  <symbol minX="873" maxX="913" minY="333" maxY="373" name="subway-saopaulo-m"/>
+  <symbol minX="913" maxX="953" minY="333" maxY="373" name="subway-santodomingo-m"/>
+  <symbol minX="953" maxX="993" minY="333" maxY="373" name="subway-samara-m"/>
+  <symbol minX="993" maxX="1033" minY="333" maxY="373" name="subway-riodejaneiro-m"/>
+  <symbol minX="1033" maxX="1073" minY="333" maxY="373" name="subway-reseau-paris-m"/>
+  <symbol minX="1073" maxX="1113" minY="333" maxY="373" name="subway-rennes-m"/>
+  <symbol minX="1113" maxX="1153" minY="333" maxY="373" name="subway-pyongyang-m"/>
+  <symbol minX="1153" maxX="1191" minY="333" maxY="373" name="subway-porto-m"/>
+  <symbol minX="1191" maxX="1231" minY="333" maxY="373" name="subway-pittsburgh-m"/>
+  <symbol minX="1231" maxX="1271" minY="333" maxY="373" name="subway-ekb-m"/>
+  <symbol minX="1271" maxX="1311" minY="333" maxY="373" name="subway-panama-m"/>
+  <symbol minX="1311" maxX="1351" minY="333" maxY="373" name="subway-oslo-m"/>
+  <symbol minX="1351" maxX="1390" minY="333" maxY="373" name="subway-nnov-m"/>
+  <symbol minX="1390" maxX="1430" minY="333" maxY="373" name="subway-newyork-m"/>
+  <symbol minX="1430" maxX="1470" minY="333" maxY="373" name="subway-nagoya-m"/>
+  <symbol minX="1470" maxX="1510" minY="333" maxY="373" name="subway-minatomirai-m"/>
+  <symbol minX="1510" maxX="1550" minY="333" maxY="373" name="subway-milan-m"/>
+  <symbol minX="1550" maxX="1589" minY="333" maxY="373" name="subway-mexico-m"/>
+  <symbol minX="1589" maxX="1629" minY="333" maxY="373" name="subway-medellin-m"/>
+  <symbol minX="1629" maxX="1669" minY="333" maxY="373" name="subway-mecca-m"/>
+  <symbol minX="1669" maxX="1709" minY="333" maxY="373" name="doityourself-m"/>
+  <symbol minX="1709" maxX="1749" minY="333" maxY="373" name="fountain-m"/>
+  <symbol minX="1749" maxX="1789" minY="333" maxY="373" name="florist-m"/>
+  <symbol minX="1789" maxX="1829" minY="333" maxY="373" name="firehydrant-m"/>
+  <symbol minX="1829" maxX="1869" minY="333" maxY="373" name="fire_station-m"/>
+  <symbol minX="1869" maxX="1909" minY="333" maxY="373" name="fastfood-m"/>
+  <symbol minX="1909" maxX="1949" minY="333" maxY="373" name="erotic-m"/>
+  <symbol minX="1949" maxX="1989" minY="333" maxY="373" name="equestrian-m"/>
+  <symbol minX="1989" maxX="2029" minY="333" maxY="373" name="emergency-phone-m"/>
+  <symbol minX="0" maxX="40" minY="373" maxY="413" name="embassy-m"/>
+  <symbol minX="40" maxX="80" minY="373" maxY="413" name="electronics-m"/>
+  <symbol minX="80" maxX="120" minY="373" maxY="413" name="electrician-m"/>
+  <symbol minX="120" maxX="160" minY="373" maxY="413" name="dump-station-m"/>
+  <symbol minX="160" maxX="200" minY="373" maxY="413" name="driving_school-m"/>
+  <symbol minX="200" maxX="240" minY="373" maxY="413" name="drinking-water-m"/>
+  <symbol minX="240" maxX="280" minY="373" maxY="413" name="fountain-s"/>
+  <symbol minX="280" maxX="320" minY="373" maxY="413" name="dog_park-m"/>
+  <symbol minX="320" maxX="360" minY="373" maxY="413" name="diving-m"/>
+  <symbol minX="360" maxX="400" minY="373" maxY="413" name="department_store-m"/>
+  <symbol minX="400" maxX="440" minY="373" maxY="413" name="dentist-m"/>
+  <symbol minX="440" maxX="480" minY="373" maxY="413" name="defibrillator-m"/>
+  <symbol minX="480" maxX="520" minY="373" maxY="413" name="curling-m"/>
+  <symbol minX="520" maxX="560" minY="373" maxY="413" name="cross-m"/>
+  <symbol minX="560" maxX="600" minY="373" maxY="413" name="cricket-m"/>
+  <symbol minX="600" maxX="640" minY="373" maxY="413" name="copyshop-m"/>
+  <symbol minX="640" maxX="680" minY="373" maxY="413" name="computer-m"/>
+  <symbol minX="680" maxX="720" minY="373" maxY="413" name="college-m"/>
+  <symbol minX="720" maxX="760" minY="373" maxY="413" name="clothes-m"/>
+  <symbol minX="760" maxX="800" minY="373" maxY="413" name="climbing-m"/>
+  <symbol minX="800" maxX="840" minY="373" maxY="413" name="golf-m"/>
+  <symbol minX="840" maxX="880" minY="373" maxY="413" name="home-m"/>
+  <symbol minX="880" maxX="920" minY="373" maxY="413" name="hockey-m"/>
+  <symbol minX="920" maxX="960" minY="373" maxY="413" name="historic-ship-m"/>
+  <symbol minX="960" maxX="1000" minY="373" maxY="413" name="hindu-m"/>
+  <symbol minX="1000" maxX="1040" minY="373" maxY="413" name="heliport-m"/>
+  <symbol minX="1040" maxX="1080" minY="373" maxY="413" name="helipad-m"/>
+  <symbol minX="1080" maxX="1120" minY="373" maxY="413" name="handball-m"/>
+  <symbol minX="1120" maxX="1160" minY="373" maxY="413" name="hand-m"/>
+  <symbol minX="1160" maxX="1200" minY="373" maxY="413" name="hairdresser-m"/>
+  <symbol minX="1200" maxX="1240" minY="373" maxY="413" name="gym-m"/>
+  <symbol minX="1240" maxX="1280" minY="373" maxY="413" name="guidepost"/>
+  <symbol minX="1280" maxX="1320" minY="373" maxY="413" name="grocery-m"/>
+  <symbol minX="1320" maxX="1360" minY="373" maxY="413" name="greengrocer-m"/>
+  <symbol minX="1360" maxX="1400" minY="373" maxY="413" name="cinema-m"/>
+  <symbol minX="1400" maxX="1440" minY="373" maxY="413" name="gift-m"/>
+  <symbol minX="1440" maxX="1480" minY="373" maxY="413" name="geyser-m"/>
+  <symbol minX="1480" maxX="1520" minY="373" maxY="413" name="geyser-l"/>
+  <symbol minX="1520" maxX="1560" minY="373" maxY="413" name="gate-m"/>
+  <symbol minX="1560" maxX="1600" minY="373" maxY="413" name="garden_center-m"/>
+  <symbol minX="1600" maxX="1640" minY="373" maxY="413" name="garden-outline-m"/>
+  <symbol minX="1640" maxX="1680" minY="373" maxY="413" name="garden-m"/>
+  <symbol minX="1680" maxX="1720" minY="373" maxY="413" name="gallery-m"/>
+  <symbol minX="1720" maxX="1760" minY="373" maxY="413" name="furniture-m"/>
+  <symbol minX="1760" maxX="1800" minY="373" maxY="413" name="funicular-m"/>
+  <symbol minX="1800" maxX="1840" minY="373" maxY="413" name="funeral_directors-m"/>
+  <symbol minX="1840" maxX="1880" minY="373" maxY="413" name="fuel-m"/>
+  <symbol minX="1880" maxX="1920" minY="373" maxY="413" name="fuel-dispenser-m"/>
+  <symbol minX="1920" maxX="1960" minY="373" maxY="413" name="bank-m"/>
+  <symbol minX="1960" maxX="2000" minY="373" maxY="413" name="blacksmith-m"/>
+  <symbol minX="2000" maxX="2040" minY="373" maxY="413" name="bicycle-repair-station"/>
+  <symbol minX="0" maxX="40" minY="413" maxY="453" name="bicycle-m"/>
+  <symbol minX="40" maxX="80" minY="413" maxY="453" name="beer-m"/>
+  <symbol minX="80" maxX="120" minY="413" maxY="453" name="beekeeper-m"/>
+  <symbol minX="120" maxX="160" minY="413" maxY="453" name="beauty-m"/>
+  <symbol minX="160" maxX="200" minY="413" maxY="453" name="beach-m"/>
+  <symbol minX="200" maxX="240" minY="413" maxY="453" name="bcontrol-m"/>
+  <symbol minX="240" maxX="280" minY="413" maxY="453" name="bbq-m"/>
+  <symbol minX="280" maxX="320" minY="413" maxY="453" name="basketball-m"/>
+  <symbol minX="320" maxX="360" minY="413" maxY="453" name="baseball-m"/>
+  <symbol minX="360" maxX="400" minY="413" maxY="453" name="bar-m"/>
+  <symbol minX="400" maxX="440" minY="413" maxY="453" name="banknote-m"/>
+  <symbol minX="440" maxX="480" minY="413" maxY="453" name="blood_donation-m"/>
+  <symbol minX="480" maxX="520" minY="413" maxY="453" name="bakery-m"/>
+  <symbol minX="520" maxX="560" minY="413" maxY="453" name="badminton-m"/>
+  <symbol minX="560" maxX="600" minY="413" maxY="453" name="australian-football-m"/>
+  <symbol minX="600" maxX="640" minY="413" maxY="453" name="audiologist-m"/>
+  <symbol minX="640" maxX="680" minY="413" maxY="453" name="atm-m"/>
+  <symbol minX="680" maxX="720" minY="413" maxY="453" name="archery-m"/>
+  <symbol minX="720" maxX="760" minY="413" maxY="453" name="archaeological-site-m"/>
+  <symbol minX="760" maxX="800" minY="413" maxY="453" name="apartment-m"/>
+  <symbol minX="800" maxX="840" minY="413" maxY="453" name="america-football-m"/>
+  <symbol minX="840" maxX="880" minY="413" maxY="453" name="alternative-m"/>
+  <symbol minX="880" maxX="920" minY="413" maxY="453" name="alpine_hut-m"/>
+  <symbol minX="920" maxX="960" minY="413" maxY="453" name="alcohol-m"/>
+  <symbol minX="960" maxX="1000" minY="413" maxY="453" name="airport-m"/>
+  <symbol minX="1000" maxX="1040" minY="413" maxY="453" name="car-wash-m"/>
+  <symbol minX="1040" maxX="1080" minY="413" maxY="453" name="christian-m"/>
+  <symbol minX="1080" maxX="1120" minY="413" maxY="453" name="chimney-m"/>
+  <symbol minX="1120" maxX="1160" minY="413" maxY="453" name="chess-m"/>
+  <symbol minX="1160" maxX="1200" minY="413" maxY="453" name="chemist-m"/>
+  <symbol minX="1200" maxX="1240" minY="413" maxY="453" name="charity_shop-m"/>
+  <symbol minX="1240" maxX="1280" minY="413" maxY="453" name="charging-station-m"/>
+  <symbol minX="1280" maxX="1320" minY="413" maxY="453" name="cemetery-m"/>
+  <symbol minX="1320" maxX="1360" minY="413" maxY="453" name="casino-m"/>
+  <symbol minX="1360" maxX="1400" minY="413" maxY="453" name="carpenter-m"/>
+  <symbol minX="1400" maxX="1440" minY="413" maxY="453" name="caravan_site-m"/>
+  <symbol minX="1440" maxX="1480" minY="413" maxY="453" name="caravan-shop-m"/>
+  <symbol minX="1480" maxX="1520" minY="413" maxY="453" name="car_shop-m"/>
+  <symbol minX="1520" maxX="1560" minY="413" maxY="453" name="car_sharing-m"/>
+  <symbol minX="1560" maxX="1600" minY="413" maxY="453" name="restaurant-m"/>
+  <symbol minX="1600" maxX="1640" minY="413" maxY="453" name="car-repair-m"/>
+  <symbol minX="1640" maxX="1680" minY="413" maxY="453" name="car-part-m"/>
+  <symbol minX="1680" maxX="1720" minY="413" maxY="453" name="campsite-m"/>
+  <symbol minX="1720" maxX="1760" minY="413" maxY="453" name="cafe-m"/>
+  <symbol minX="1760" maxX="1800" minY="413" maxY="453" name="cable-car-m"/>
+  <symbol minX="1800" maxX="1840" minY="413" maxY="453" name="butcher-m"/>
+  <symbol minX="1840" maxX="1880" minY="413" maxY="453" name="bus-m"/>
+  <symbol minX="1880" maxX="1920" minY="413" maxY="453" name="buddhist-m"/>
+  <symbol minX="1920" maxX="1960" minY="413" maxY="453" name="brewery-m"/>
+  <symbol minX="1960" maxX="2000" minY="413" maxY="453" name="bowling_alley-m"/>
+  <symbol minX="2000" maxX="2040" minY="413" maxY="453" name="bowling-m"/>
+  <symbol minX="0" maxX="40" minY="453" maxY="493" name="bookmaker-m"/>
+  <symbol minX="40" maxX="80" minY="453" maxY="493" name="book-shop-m"/>
+  <symbol minX="80" maxX="120" minY="453" maxY="493" name="parking-meter-m"/>
+  <symbol minX="120" maxX="160" minY="453" maxY="493" name="npark-m"/>
+  <symbol minX="160" maxX="200" minY="453" maxY="493" name="media_shop-m"/>
+  <symbol minX="200" maxX="240" minY="453" maxY="493" name="park-m"/>
+  <symbol minX="240" maxX="280" minY="453" maxY="493" name="media-m"/>
+  <symbol minX="280" maxX="320" minY="453" maxY="493" name="marketplace-m"/>
+  <symbol minX="320" maxX="360" minY="453" maxY="493" name="park-outline-m"/>
+  <symbol minX="360" maxX="400" minY="453" maxY="493" name="marina-m"/>
+  <symbol minX="400" maxX="440" minY="453" maxY="493" name="nparkf-m"/>
+  <symbol minX="440" maxX="480" minY="453" maxY="493" name="mail-m"/>
+  <symbol minX="480" maxX="520" minY="453" maxY="493" name="painter-m"/>
+  <symbol minX="520" maxX="560" minY="453" maxY="493" name="lift_gate-m"/>
+  <symbol minX="560" maxX="600" minY="453" maxY="493" name="pelota-m"/>
+  <symbol minX="600" maxX="640" minY="453" maxY="493" name="library-m"/>
+  <symbol minX="640" maxX="680" minY="453" maxY="493" name="petshop-m"/>
+  <symbol minX="680" maxX="720" minY="453" maxY="493" name="nparkf-outline-m"/>
+  <symbol minX="720" maxX="760" minY="453" maxY="493" name="lawyer-m"/>
+  <symbol minX="760" maxX="800" minY="453" maxY="493" name="laundry-m"/>
+  <symbol minX="800" maxX="840" minY="453" maxY="493" name="pharmacy-m"/>
+  <symbol minX="840" maxX="880" minY="453" maxY="493" name="language_school-m"/>
+  <symbol minX="880" maxX="920" minY="453" maxY="493" name="motorcycle_shop-m"/>
+  <symbol minX="920" maxX="960" minY="453" maxY="493" name="muslim-m"/>
+  <symbol minX="960" maxX="1000" minY="453" maxY="493" name="outdoor-shop-m"/>
+  <symbol minX="1000" maxX="1040" minY="453" maxY="493" name="musical-instrument-m"/>
+  <symbol minX="1040" maxX="1080" minY="453" maxY="493" name="music_school-m"/>
+  <symbol minX="1080" maxX="1120" minY="453" maxY="493" name="needle_and_thread-m"/>
+  <symbol minX="1120" maxX="1160" minY="453" maxY="493" name="optometrist-m"/>
+  <symbol minX="1160" maxX="1200" minY="453" maxY="493" name="music-m"/>
+  <symbol minX="1200" maxX="1240" minY="453" maxY="493" name="museum-m"/>
+  <symbol minX="1240" maxX="1280" minY="453" maxY="493" name="newsagent_shop-m"/>
+  <symbol minX="1280" maxX="1320" minY="453" maxY="493" name="lighthouse-m"/>
+  <symbol minX="1320" maxX="1360" minY="453" maxY="493" name="motel-m"/>
+  <symbol minX="1360" maxX="1400" minY="453" maxY="493" name="optician-m"/>
+  <symbol minX="1400" maxX="1440" minY="453" maxY="493" name="monument-m"/>
+  <symbol minX="1440" maxX="1480" minY="453" maxY="493" name="mobile_phone-m"/>
+  <symbol minX="1480" maxX="1520" minY="453" maxY="493" name="military-m"/>
+  <symbol minX="1520" maxX="1560" minY="453" maxY="493" name="office-m"/>
+  <symbol minX="1560" maxX="1600" minY="453" maxY="493" name="metal_construction-m"/>
+  <symbol minX="1600" maxX="1640" minY="453" maxY="493" name="padel-m"/>
+  <symbol minX="1640" maxX="1680" minY="453" maxY="493" name="nightclub-m"/>
+  <symbol minX="1680" maxX="1720" minY="453" maxY="493" name="prison-m"/>
+  <symbol minX="1720" maxX="1760" minY="453" maxY="493" name="jewelry-m"/>
+  <symbol minX="1760" maxX="1800" minY="453" maxY="493" name="pitch-m"/>
+  <symbol minX="1800" maxX="1840" minY="453" maxY="493" name="place-of-worship-m"/>
+  <symbol minX="1840" maxX="1880" minY="453" maxY="493" name="playground-m"/>
+  <symbol minX="1880" maxX="1920" minY="453" maxY="493" name="plumber-m"/>
+  <symbol minX="1920" maxX="1960" minY="453" maxY="493" name="podiatrist-m"/>
+  <symbol minX="1960" maxX="2000" minY="453" maxY="493" name="internet_cafe-m"/>
+  <symbol minX="2000" maxX="2040" minY="453" maxY="493" name="postbox-m"/>
+  <symbol minX="0" maxX="40" minY="493" maxY="533" name="power-m"/>
+  <symbol minX="40" maxX="80" minY="493" maxY="533" name="information-m"/>
+  <symbol minX="80" maxX="120" minY="493" maxY="533" name="police-m"/>
+  <symbol minX="120" maxX="160" minY="493" maxY="533" name="psychotherapist-m"/>
+  <symbol minX="160" maxX="200" minY="493" maxY="533" name="public-building-m"/>
+  <symbol minX="200" maxX="240" minY="493" maxY="533" name="ice_cream-m"/>
+  <symbol minX="240" maxX="280" minY="493" maxY="533" name="recycling-m"/>
+  <symbol minX="280" maxX="320" minY="493" maxY="533" name="hunting-tower-m"/>
+  <symbol minX="320" maxX="360" minY="493" maxY="533" name="hotel-m"/>
+  <symbol minX="360" maxX="400" minY="493" maxY="533" name="remains-m"/>
+  <symbol minX="400" maxX="440" minY="493" maxY="533" name="hostel-m"/>
+  <symbol minX="440" maxX="480" minY="493" maxY="533" name="sample_collection-m"/>
+  <symbol minX="480" maxX="520" minY="493" maxY="533" name="hospital-m"/>
+  <symbol minX="520" maxX="560" minY="493" maxY="533" name="kiosk-m"/>
+  <symbol minX="560" maxX="600" minY="493" maxY="533" name="phone-m"/>
+  <symbol minX="600" maxX="640" minY="493" maxY="533" name="kindergarten-m"/>
+  <symbol minX="640" maxX="680" minY="493" maxY="533" name="photo-shop-m"/>
+  <symbol minX="680" maxX="720" minY="493" maxY="533" name="picnic_table-m"/>
+  <symbol minX="720" maxX="760" minY="493" maxY="533" name="physiotherapist-m"/>
+  <symbol minX="760" maxX="800" minY="493" maxY="533" name="jewish-m"/>
+  <symbol minX="800" maxX="840" minY="493" maxY="533" name="picnic-m"/>
+  <symbol minX="840" maxX="880" minY="493" maxY="532" name="subway-shanghai-m"/>
+  <symbol minX="880" maxX="919" minY="493" maxY="532" name="subway-ekb-s"/>
+  <symbol minX="919" maxX="959" minY="493" maxY="532" name="subway-maracaibo-m"/>
+  <symbol minX="959" maxX="999" minY="493" maxY="532" name="subway-marseille-m"/>
+  <symbol minX="999" maxX="1038" minY="493" maxY="532" name="subway-spb-m"/>
+  <symbol minX="1038" maxX="1077" minY="493" maxY="532" name="subway-southkorea-s"/>
+  <symbol minX="1077" maxX="1116" minY="493" maxY="532" name="subway-montreal-m"/>
+  <symbol minX="1116" maxX="1156" minY="493" maxY="531" name="subway-sapporo-m"/>
+  <symbol minX="1156" maxX="1196" minY="493" maxY="531" name="subway-dalian-m"/>
+  <symbol minX="1196" maxX="1233" minY="493" maxY="530" name="subway-stlouis-s"/>
+  <symbol minX="1233" maxX="1270" minY="493" maxY="530" name="subway-algeria-s"/>
+  <symbol minX="1270" maxX="1307" minY="493" maxY="530" name="subway-entrance-m"/>
+  <symbol minX="1307" maxX="1347" minY="493" maxY="530" name="subway-izmir-m"/>
+  <symbol minX="1347" maxX="1383" minY="493" maxY="530" name="subway-warsaw-m"/>
+  <symbol minX="1383" maxX="1419" minY="493" maxY="529" name="search-result"/>
+  <symbol minX="1419" maxX="1455" minY="493" maxY="529" name="lightrail-berlin-m"/>
+  <symbol minX="1455" maxX="1486" minY="493" maxY="529" name="subway-istanbul-s"/>
+  <symbol minX="1486" maxX="1522" minY="493" maxY="529" name="subway-pittsburgh-s"/>
+  <symbol minX="1522" maxX="1553" minY="493" maxY="527" name="subway-brescia-s"/>
+  <symbol minX="1553" maxX="1587" minY="493" maxY="527" name="parking-disabled-m"/>
+  <symbol minX="1587" maxX="1621" minY="493" maxY="527" name="motorcycle-parking-m"/>
+  <symbol minX="1621" maxX="1655" minY="493" maxY="527" name="subway-sapporo-s"/>
+  <symbol minX="1655" maxX="1689" minY="493" maxY="527" name="bike-parking-m"/>
+  <symbol minX="1689" maxX="1725" minY="493" maxY="527" name="subway-izmir-s"/>
+  <symbol minX="1725" maxX="1765" minY="493" maxY="527" name="subway-rotterdam-m"/>
+  <symbol minX="1765" maxX="1799" minY="493" maxY="527" name="subway-isfahan-s"/>
+  <symbol minX="1799" maxX="1839" minY="493" maxY="527" name="subway-almaty-m"/>
+  <symbol minX="1839" maxX="1873" minY="493" maxY="527" name="parking-m"/>
+  <symbol minX="1873" maxX="1906" minY="493" maxY="527" name="subway-mashhad-s"/>
+  <symbol minX="1906" maxX="1940" minY="493" maxY="527" name="subway-medellin-s"/>
+  <symbol minX="1940" maxX="1974" minY="493" maxY="527" name="non-found-search-result"/>
+  <symbol minX="1974" maxX="2008" minY="493" maxY="527" name="subway-cairo-s"/>
+  <symbol minX="2008" maxX="2042" minY="493" maxY="527" name="speedcam-m"/>
+  <symbol minX="0" maxX="34" minY="533" maxY="567" name="parking_entrance-m"/>
+  <symbol minX="34" maxX="68" minY="533" maxY="567" name="parking_pay-m"/>
+  <symbol minX="68" maxX="134" minY="533" maxY="567" name="coloredmark-bg-s"/>
+  <symbol minX="134" maxX="174" minY="533" maxY="567" name="subway-tbilisi-m"/>
+  <symbol minX="174" maxX="208" minY="533" maxY="567" name="subway-panama-s"/>
+  <symbol minX="208" maxX="274" minY="533" maxY="567" name="coloredmark-default-s"/>
+  <symbol minX="274" maxX="308" minY="533" maxY="567" name="bicycle-rental"/>
+  <symbol minX="308" maxX="348" minY="533" maxY="567" name="subway-taoyuan-m"/>
+  <symbol minX="348" maxX="379" minY="533" maxY="566" name="subway-tianjin-s"/>
+  <symbol minX="379" maxX="402" minY="533" maxY="566" name="bookmark-bg-xs"/>
+  <symbol minX="402" maxX="433" minY="533" maxY="566" name="subway-athens-s"/>
+  <symbol minX="433" maxX="466" minY="533" maxY="566" name="subway-ubahn-m"/>
+  <symbol minX="466" maxX="502" minY="533" maxY="566" name="subway-seattle-m"/>
+  <symbol minX="502" maxX="525" minY="533" maxY="566" name="bookmark-default-xs"/>
+  <symbol minX="525" maxX="558" minY="533" maxY="566" name="subway-warszawa-s"/>
+  <symbol minX="558" maxX="591" minY="533" maxY="566" name="subway-paris-m"/>
+  <symbol minX="591" maxX="628" minY="533" maxY="566" name="subway-moscow-m"/>
+  <symbol minX="628" maxX="659" minY="533" maxY="566" name="subway-porto-s"/>
+  <symbol minX="659" maxX="690" minY="533" maxY="566" name="subway-pyongyang-s"/>
+  <symbol minX="690" maxX="723" minY="533" maxY="566" name="subway-rennes-s"/>
+  <symbol minX="723" maxX="754" minY="533" maxY="566" name="subway-delhi-s"/>
+  <symbol minX="754" maxX="787" minY="533" maxY="566" name="subway-hirosima-s"/>
+  <symbol minX="787" maxX="820" minY="533" maxY="566" name="subway-rome-m"/>
+  <symbol minX="820" maxX="860" minY="533" maxY="565" name="subway-dnepro-m"/>
+  <symbol minX="860" maxX="900" minY="533" maxY="565" name="subway-santiago-m"/>
+  <symbol minX="900" maxX="940" minY="533" maxY="565" name="subway-yerevan-m"/>
+  <symbol minX="940" maxX="971" minY="533" maxY="564" name="subway-yokohama-s"/>
+  <symbol minX="971" maxX="1010" minY="533" maxY="564" name="subway-yerevan-s"/>
+  <symbol minX="1010" maxX="1041" minY="533" maxY="564" name="subway-wuhan-s"/>
+  <symbol minX="1041" maxX="1072" minY="533" maxY="564" name="subway-riodejaneiro-s"/>
+  <symbol minX="1072" maxX="1103" minY="533" maxY="564" name="subway-washington-s"/>
+  <symbol minX="1103" maxX="1139" minY="533" maxY="564" name="subway-taoyuan-s"/>
+  <symbol minX="1139" maxX="1167" minY="533" maxY="564" name="subway-warsaw-s"/>
+  <symbol minX="1167" maxX="1198" minY="533" maxY="564" name="subway-tashkent-s"/>
+  <symbol minX="1198" maxX="1229" minY="533" maxY="564" name="subway-volgograd-s"/>
+  <symbol minX="1229" maxX="1260" minY="533" maxY="564" name="subway-vienna-s"/>
+  <symbol minX="1260" maxX="1300" minY="533" maxY="564" name="subway-alicante-m"/>
+  <symbol minX="1300" maxX="1331" minY="533" maxY="564" name="subway-valencia-s"/>
+  <symbol minX="1331" maxX="1362" minY="533" maxY="564" name="subway-tokyo-s"/>
+  <symbol minX="1362" maxX="1393" minY="533" maxY="564" name="subway-tyneandwear-s"/>
+  <symbol minX="1393" maxX="1424" minY="533" maxY="564" name="subway-losangeles-s"/>
+  <symbol minX="1424" maxX="1455" minY="533" maxY="564" name="subway-caracas-s"/>
+  <symbol minX="1455" maxX="1486" minY="533" maxY="564" name="subway-catania-s"/>
+  <symbol minX="1486" maxX="1517" minY="533" maxY="564" name="subway-nagoya-s"/>
+  <symbol minX="1517" maxX="1548" minY="533" maxY="564" name="subway-changchun-s"/>
+  <symbol minX="1548" maxX="1579" minY="533" maxY="564" name="subway-montreal-s"/>
+  <symbol minX="1579" maxX="1610" minY="533" maxY="564" name="subway-chengdu-s"/>
+  <symbol minX="1610" maxX="1641" minY="533" maxY="564" name="subway-minatomirai-s"/>
+  <symbol minX="1641" maxX="1672" minY="533" maxY="564" name="subway-milan-s"/>
+  <symbol minX="1672" maxX="1703" minY="533" maxY="564" name="subway-chicago-s"/>
+  <symbol minX="1703" maxX="1734" minY="533" maxY="564" name="subway-mecca-s"/>
+  <symbol minX="1734" maxX="1765" minY="533" maxY="564" name="subway-massachusetts-s"/>
+  <symbol minX="1765" maxX="1796" minY="533" maxY="564" name="subway-dalian-s"/>
+  <symbol minX="1796" maxX="1827" minY="533" maxY="564" name="subway-dubai-s"/>
+  <symbol minX="1827" maxX="1858" minY="533" maxY="564" name="subway-lyon-s"/>
+  <symbol minX="1858" maxX="1898" minY="533" maxY="564" name="subway-tabriz-m"/>
+  <symbol minX="1898" maxX="1929" minY="533" maxY="564" name="subway-lisboa-s"/>
+  <symbol minX="1929" maxX="1960" minY="533" maxY="564" name="subway-lima-s"/>
+  <symbol minX="1960" maxX="1991" minY="533" maxY="564" name="subway-foshan-s"/>
+  <symbol minX="1991" maxX="2022" minY="533" maxY="564" name="subway-lille-s"/>
+  <symbol minX="0" maxX="39" minY="567" maxY="598" name="subway-fukuoka-s"/>
+  <symbol minX="39" maxX="70" minY="567" maxY="598" name="subway-kyoto-s"/>
+  <symbol minX="70" maxX="101" minY="567" maxY="598" name="subway-kunming-s"/>
+  <symbol minX="101" maxX="134" minY="567" maxY="598" name="subway-glasgow-s"/>
+  <symbol minX="134" maxX="174" minY="567" maxY="598" name="subway-kryvyirih-m"/>
+  <symbol minX="174" maxX="205" minY="567" maxY="598" name="subway-guadalajara-s"/>
+  <symbol minX="205" maxX="236" minY="567" maxY="598" name="subway-kobe-s"/>
+  <symbol minX="236" maxX="267" minY="567" maxY="598" name="subway-guangzhou-s"/>
+  <symbol minX="267" maxX="298" minY="567" maxY="598" name="subway-kazan-s"/>
+  <symbol minX="298" maxX="329" minY="567" maxY="598" name="subway-helsinki-s"/>
+  <symbol minX="329" maxX="369" minY="567" maxY="598" name="subway-omsk-m"/>
+  <symbol minX="369" maxX="400" minY="567" maxY="598" name="subway-saopaulo-s"/>
+  <symbol minX="400" maxX="431" minY="567" maxY="598" name="subway-santodomingo-s"/>
+  <symbol minX="431" maxX="462" minY="567" maxY="598" name="subway-shanghai-s"/>
+  <symbol minX="462" maxX="493" minY="567" maxY="598" name="subway-beijing-s"/>
+  <symbol minX="493" maxX="524" minY="567" maxY="598" name="subway-nnov-s"/>
+  <symbol minX="524" maxX="563" minY="567" maxY="598" name="subway-santiago-s"/>
+  <symbol minX="563" maxX="594" minY="567" maxY="598" name="subway-bangkok-s"/>
+  <symbol minX="594" maxX="625" minY="567" maxY="598" name="subway-bengaluru-s"/>
+  <symbol minX="625" maxX="656" minY="567" maxY="598" name="subway-shiraz-s"/>
+  <symbol minX="656" maxX="687" minY="567" maxY="598" name="subway-samara-s"/>
+  <symbol minX="687" maxX="718" minY="567" maxY="598" name="subway-sofia-s"/>
+  <symbol minX="718" maxX="749" minY="567" maxY="598" name="subway-reseau-paris-s"/>
+  <symbol minX="749" maxX="780" minY="567" maxY="598" name="subway-brasilia-s"/>
+  <symbol minX="780" maxX="820" minY="567" maxY="598" name="subway-philadelphia-m"/>
+  <symbol minX="820" maxX="851" minY="567" maxY="598" name="subway-stockholm-s"/>
+  <symbol minX="851" maxX="882" minY="567" maxY="598" name="subway-perugia-s"/>
+  <symbol minX="882" maxX="913" minY="567" maxY="598" name="subway-budapest-s"/>
+  <symbol minX="913" maxX="944" minY="567" maxY="598" name="subway-buenosaires-s"/>
+  <symbol minX="944" maxX="975" minY="567" maxY="598" name="subway-oslo-s"/>
+  <symbol minX="975" maxX="1006" minY="567" maxY="598" name="subway-bursaray-s"/>
+  <symbol minX="1006" maxX="1046" minY="567" maxY="598" name="subway-omsk-s"/>
+  <symbol minX="1046" maxX="1076" minY="567" maxY="597" name="subway-spb-s"/>
+  <symbol minX="1076" maxX="1115" minY="567" maxY="597" name="subway-tabriz-s"/>
+  <symbol minX="1115" maxX="1154" minY="567" maxY="597" name="subway-london-m"/>
+  <symbol minX="1154" maxX="1182" minY="567" maxY="597" name="subway-amsterdam-s"/>
+  <symbol minX="1182" maxX="1212" minY="567" maxY="597" name="cave-m"/>
+  <symbol minX="1212" maxX="1242" minY="567" maxY="597" name="subway-lausanne-s"/>
+  <symbol minX="1242" maxX="1279" minY="567" maxY="597" name="subway-almaty-s"/>
+  <symbol minX="1279" maxX="1319" minY="567" maxY="597" name="subway-lucknow-s"/>
+  <symbol minX="1319" maxX="1350" minY="567" maxY="597" name="subway-maracaibo-s"/>
+  <symbol minX="1350" maxX="1378" minY="567" maxY="597" name="subway-mexico-s"/>
+  <symbol minX="1378" maxX="1418" minY="567" maxY="597" name="subway-osaka-m"/>
+  <symbol minX="1418" maxX="1458" minY="567" maxY="596" name="subway-barcelona-m"/>
+  <symbol minX="1458" maxX="1498" minY="567" maxY="596" name="subway-madrid-m"/>
+  <symbol minX="1498" maxX="1526" minY="567" maxY="595" name="waterfall-s"/>
+  <symbol minX="1526" maxX="1554" minY="567" maxY="595" name="waste-basket-s"/>
+  <symbol minX="1554" maxX="1582" minY="567" maxY="595" name="viewpoint-s"/>
+  <symbol minX="1582" maxX="1610" minY="567" maxY="595" name="zoo-s"/>
+  <symbol minX="1610" maxX="1638" minY="567" maxY="595" name="airport-s"/>
+  <symbol minX="1638" maxX="1666" minY="567" maxY="595" name="shop-s"/>
+  <symbol minX="1666" maxX="1694" minY="567" maxY="595" name="nparkf-outline-s"/>
+  <symbol minX="1694" maxX="1722" minY="567" maxY="595" name="nparkf-s"/>
+  <symbol minX="1722" maxX="1750" minY="567" maxY="595" name="park-outline-s"/>
+  <symbol minX="1750" maxX="1778" minY="567" maxY="595" name="park-s"/>
+  <symbol minX="1778" maxX="1806" minY="567" maxY="595" name="place-of-worship-s"/>
+  <symbol minX="1806" maxX="1834" minY="567" maxY="595" name="remains-s"/>
+  <symbol minX="1834" maxX="1862" minY="567" maxY="595" name="shinto-s"/>
+  <symbol minX="1862" maxX="1890" minY="567" maxY="595" name="ship-s"/>
+  <symbol minX="1890" maxX="1918" minY="567" maxY="595" name="muslim-s"/>
+  <symbol minX="1918" maxX="1946" minY="567" maxY="595" name="stadium-s"/>
+  <symbol minX="1946" maxX="1986" minY="567" maxY="595" name="subway-bilbao-m"/>
+  <symbol minX="1986" maxX="2023" minY="567" maxY="595" name="subway-dnepro-s"/>
+  <symbol minX="0" maxX="28" minY="598" maxY="626" name="subway-entrance-s"/>
+  <symbol minX="28" maxX="68" minY="598" maxY="626" name="subway-kolkata-m"/>
+  <symbol minX="68" maxX="108" minY="598" maxY="626" name="subway-lucknow-m"/>
+  <symbol minX="108" maxX="136" minY="598" maxY="626" name="subway-newyork-s"/>
+  <symbol minX="136" maxX="170" minY="598" maxY="626" name="subway-osaka-s"/>
+  <symbol minX="170" maxX="198" minY="598" maxY="626" name="fuel-s"/>
+  <symbol minX="198" maxX="226" minY="598" maxY="626" name="buddhist-s"/>
+  <symbol minX="226" maxX="254" minY="598" maxY="626" name="bus-s"/>
+  <symbol minX="254" maxX="282" minY="598" maxY="626" name="cable-car-s"/>
+  <symbol minX="282" maxX="310" minY="598" maxY="626" name="car-repair-s"/>
+  <symbol minX="310" maxX="338" minY="598" maxY="626" name="charging-station-s"/>
+  <symbol minX="338" maxX="366" minY="598" maxY="626" name="christian-s"/>
+  <symbol minX="366" maxX="394" minY="598" maxY="626" name="college-s"/>
+  <symbol minX="394" maxX="422" minY="598" maxY="626" name="drinking-water-s"/>
+  <symbol minX="422" maxX="444" minY="598" maxY="626" name="transit_train-m"/>
+  <symbol minX="444" maxX="472" minY="598" maxY="626" name="geyser-s"/>
+  <symbol minX="472" maxX="500" minY="598" maxY="626" name="hindu-s"/>
+  <symbol minX="500" maxX="528" minY="598" maxY="626" name="hospital-s"/>
+  <symbol minX="528" maxX="556" minY="598" maxY="626" name="hotel-s"/>
+  <symbol minX="556" maxX="584" minY="598" maxY="626" name="jewish-s"/>
+  <symbol minX="584" maxX="612" minY="598" maxY="626" name="lighthouse-s"/>
+  <symbol minX="612" maxX="640" minY="598" maxY="626" name="monument-s"/>
+  <symbol minX="640" maxX="668" minY="598" maxY="626" name="museum-s"/>
+  <symbol minX="668" maxX="696" minY="598" maxY="626" name="taoist-s"/>
+  <symbol minX="696" maxX="727" minY="598" maxY="626" name="subway-rotterdam-s"/>
+  <symbol minX="727" maxX="755" minY="598" maxY="626" name="subway-s"/>
+  <symbol minX="755" maxX="791" minY="598" maxY="626" name="subway-philadelphia-s"/>
+  <symbol minX="791" maxX="813" minY="598" maxY="626" name="transit_light_rail-m"/>
+  <symbol minX="813" maxX="844" minY="598" maxY="626" name="transfer_arrow"/>
+  <symbol minX="844" maxX="872" minY="598" maxY="626" name="tram-s"/>
+  <symbol minX="872" maxX="900" minY="598" maxY="626" name="train-s"/>
+  <symbol minX="900" maxX="940" minY="598" maxY="626" name="subway-palma-m"/>
+  <symbol minX="940" maxX="968" minY="598" maxY="626" name="tourism-s"/>
+  <symbol minX="968" maxX="996" minY="598" maxY="626" name="toll_booth-s"/>
+  <symbol minX="996" maxX="1024" minY="598" maxY="626" name="theme_park-s"/>
+  <symbol minX="1024" maxX="1063" minY="598" maxY="626" name="subway-palma-s"/>
+  <symbol minX="1063" maxX="1091" minY="598" maxY="626" name="theatre-s"/>
+  <symbol minX="1091" maxX="1122" minY="598" maxY="626" name="subway-tbilisi-s"/>
+  <symbol minX="1122" maxX="1162" minY="598" maxY="625" name="subway-sanfrancisco-s"/>
+  <symbol minX="1162" maxX="1202" minY="598" maxY="625" name="subway-sanfrancisco-m"/>
+  <symbol minX="1202" maxX="1229" minY="598" maxY="625" name="lightrail-berlin-s"/>
+  <symbol minX="1229" maxX="1265" minY="598" maxY="625" name="subway-barcelona-s"/>
+  <symbol minX="1265" maxX="1305" minY="598" maxY="625" name="subway-brussel-s"/>
+  <symbol minX="1305" maxX="1345" minY="598" maxY="625" name="subway-bucharest-m"/>
+  <symbol minX="1345" maxX="1372" minY="598" maxY="625" name="elevator"/>
+  <symbol minX="1372" maxX="1411" minY="598" maxY="625" name="subway-novosibirsk-s"/>
+  <symbol minX="1411" maxX="1433" minY="598" maxY="625" name="transit_monorail-m"/>
+  <symbol minX="1433" maxX="1473" minY="598" maxY="625" name="subway-fukuoka-m"/>
+  <symbol minX="1473" maxX="1509" minY="598" maxY="625" name="subway-madrid-s"/>
+  <symbol minX="1509" maxX="1549" minY="598" maxY="625" name="subway-novosibirsk-m"/>
+  <symbol minX="1549" maxX="1576" minY="598" maxY="625" name="subway-paris-s"/>
+  <symbol minX="1576" maxX="1610" minY="598" maxY="625" name="subway-kryvyirih-s"/>
+  <symbol minX="1610" maxX="1649" minY="598" maxY="625" name="subway-kiev-m"/>
+  <symbol minX="1649" maxX="1689" minY="598" maxY="625" name="subway-kharkiv-s"/>
+  <symbol minX="1689" maxX="1729" minY="598" maxY="624" name="subway-sendai-m"/>
+  <symbol minX="1729" maxX="1769" minY="598" maxY="623" name="subway-kharkiv-m"/>
+  <symbol minX="1769" maxX="1809" minY="598" maxY="623" name="subway-manila-m"/>
+  <symbol minX="1809" maxX="1849" minY="598" maxY="623" name="subway-sendai-s"/>
+  <symbol minX="1849" maxX="1874" minY="598" maxY="623" name="transit_subway-m"/>
+  <symbol minX="1874" maxX="1914" minY="598" maxY="623" name="subway-haagse-s"/>
+  <symbol minX="1914" maxX="1939" minY="598" maxY="623" name="storage-tank"/>
+  <symbol minX="1939" maxX="1972" minY="598" maxY="623" name="subway-alicante-s"/>
+  <symbol minX="1972" maxX="1991" minY="598" maxY="623" name="transit_train-s"/>
+  <symbol minX="1991" maxX="2016" minY="598" maxY="623" name="board"/>
+  <symbol minX="2016" maxX="2043" minY="598" maxY="623" name="subway-moscow-s"/>
+  <symbol minX="0" maxX="25" minY="626" maxY="651" name="map"/>
+  <symbol minX="25" maxX="65" minY="626" maxY="651" name="subway-brussel-m"/>
+  <symbol minX="65" maxX="104" minY="626" maxY="651" name="subway-bucharest-s"/>
+  <symbol minX="104" maxX="144" minY="626" maxY="650" name="subway-taipei-s"/>
+  <symbol minX="144" maxX="183" minY="626" maxY="650" name="subway-manila-s"/>
+  <symbol minX="183" maxX="207" minY="626" maxY="650" name="subway-ubahn-s"/>
+  <symbol minX="207" maxX="231" minY="626" maxY="650" name="subway-rome-s"/>
+  <symbol minX="231" maxX="256" minY="626" maxY="650" name="subway-seattle-s"/>
+  <symbol minX="256" maxX="286" minY="626" maxY="650" name="subway-london-s"/>
+  <symbol minX="286" maxX="310" minY="626" maxY="650" name="cave-s"/>
+  <symbol minX="310" maxX="344" minY="626" maxY="650" name="subway-bilbao-s"/>
+  <symbol minX="344" maxX="384" minY="626" maxY="650" name="subway-edmonton-s"/>
+  <symbol minX="384" maxX="424" minY="626" maxY="649" name="subway-haagse-m"/>
+  <symbol minX="424" maxX="446" minY="626" maxY="648" name="transit_subway-s"/>
+  <symbol minX="446" maxX="461" minY="626" maxY="648" name="entrance-s"/>
+  <symbol minX="461" maxX="480" minY="626" maxY="648" name="transit_monorail-s"/>
+  <symbol minX="480" maxX="504" minY="626" maxY="648" name="main_entrance-s"/>
+  <symbol minX="504" maxX="531" minY="626" maxY="648" name="bench"/>
+  <symbol minX="531" maxX="550" minY="626" maxY="648" name="transit_light_rail-s"/>
+  <symbol minX="550" maxX="572" minY="626" maxY="648" name="speedcam-s"/>
+  <symbol minX="572" maxX="594" minY="626" maxY="648" name="parking-s"/>
+  <symbol minX="594" maxX="616" minY="626" maxY="648" name="subway-xs"/>
+  <symbol minX="616" maxX="638" minY="626" maxY="648" name="star-l"/>
+  <symbol minX="638" maxX="672" minY="626" maxY="648" name="railway-crossing-l"/>
+  <symbol minX="672" maxX="694" minY="626" maxY="648" name="subway-newyork-xs"/>
+  <symbol minX="694" maxX="733" minY="626" maxY="647" name="subway-malaga-s"/>
+  <symbol minX="733" maxX="773" minY="626" maxY="647" name="subway-edmonton-m"/>
+  <symbol minX="773" maxX="797" minY="626" maxY="647" name="volcano-m"/>
+  <symbol minX="797" maxX="830" minY="626" maxY="647" name="subway-kiev-s"/>
+  <symbol minX="830" maxX="860" minY="626" maxY="647" name="subway-kolkata-s"/>
+  <symbol minX="860" maxX="900" minY="626" maxY="647" name="subway-malaga-m"/>
+  <symbol minX="900" maxX="921" minY="626" maxY="647" name="star-m"/>
+  <symbol minX="921" maxX="961" minY="626" maxY="646" name="subway-taipei-m"/>
+  <symbol minX="961" maxX="1000" minY="626" maxY="645" name="subway-baku-s"/>
+  <symbol minX="1000" maxX="1030" minY="626" maxY="645" name="railway-crossing-m"/>
+  <symbol minX="1030" maxX="1052" minY="626" maxY="645" name="plaque"/>
+  <symbol minX="1052" maxX="1085" minY="626" maxY="645" name="subway-minsk-m"/>
+  <symbol minX="1085" maxX="1103" minY="626" maxY="644" name="star-s"/>
+  <symbol minX="1103" maxX="1143" minY="626" maxY="644" name="subway-baku-m"/>
+  <symbol minX="1143" maxX="1173" minY="626" maxY="644" name="subway-minsk-s"/>
+  <symbol minX="1173" maxX="1213" minY="626" maxY="643" name="subway-chongqing-m"/>
+  <symbol minX="1213" maxX="1253" minY="626" maxY="643" name="subway-chongqing-s"/>
+  <symbol minX="1253" maxX="1271" minY="626" maxY="642" name="volcano-s"/>
+  <symbol minX="1271" maxX="1289" minY="626" maxY="642" name="peakt-m"/>
+  <symbol minX="1289" maxX="1317" minY="626" maxY="642" name="mountain-pass"/>
+  <symbol minX="1317" maxX="1353" minY="626" maxY="642" name="arrow-m"/>
+  <symbol minX="1353" maxX="1368" minY="626" maxY="641" name="zero-icon"/>
+  <symbol minX="1368" maxX="1383" minY="626" maxY="639" name="peakt-s"/>
+  <symbol minX="1383" maxX="1395" minY="626" maxY="638" name="dot-m"/>
+  <symbol minX="1395" maxX="1422" minY="626" maxY="638" name="arrow-s"/>
+  <symbol minX="1422" maxX="1440" minY="626" maxY="635" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 5f4489b23d..199180c821 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index e2ecc52d07..5431ad360e 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -3,700 +3,695 @@
  <file width="2048" height="2048">
   <symbol minX="0" maxX="226" minY="0" maxY="136" name="route-arrow"/>
   <symbol minX="226" maxX="350" minY="0" maxY="124" name="compass-image"/>
-  <symbol minX="350" maxX="468" minY="0" maxY="118" name="cross_geoposition"/>
-  <symbol minX="468" maxX="592" minY="0" maxY="118" name="route-point-finish"/>
-  <symbol minX="592" maxX="710" minY="0" maxY="118" name="shield-us-i-wide-scaled"/>
-  <symbol minX="710" maxX="810" minY="0" maxY="118" name="shield-us-i-thin-scaled"/>
-  <symbol minX="810" maxX="922" minY="0" maxY="112" name="search-result-shop-department_store"/>
-  <symbol minX="922" maxX="1034" minY="0" maxY="112" name="search-result-marketplace"/>
-  <symbol minX="1034" maxX="1146" minY="0" maxY="112" name="search-result-shop-cosmetics"/>
+  <symbol minX="350" maxX="450" minY="0" maxY="118" name="shield-us-i-thin-scaled"/>
+  <symbol minX="450" maxX="568" minY="0" maxY="118" name="cross_geoposition"/>
+  <symbol minX="568" maxX="686" minY="0" maxY="118" name="shield-us-i-wide-scaled"/>
+  <symbol minX="686" maxX="810" minY="0" maxY="118" name="route-point-finish"/>
+  <symbol minX="810" maxX="922" minY="0" maxY="112" name="search-result-marketplace"/>
+  <symbol minX="922" maxX="1034" minY="0" maxY="112" name="search-result-shop-shoes"/>
+  <symbol minX="1034" maxX="1146" minY="0" maxY="112" name="search-result-theme-park"/>
   <symbol minX="1146" maxX="1258" minY="0" maxY="112" name="search-result-shop-convenience"/>
-  <symbol minX="1258" maxX="1370" minY="0" maxY="112" name="search-result-shop-confectionery"/>
-  <symbol minX="1370" maxX="1482" minY="0" maxY="112" name="search-result-shop-clothes"/>
-  <symbol minX="1482" maxX="1594" minY="0" maxY="112" name="search-result-shop-butcher"/>
-  <symbol minX="1594" maxX="1706" minY="0" maxY="112" name="search-result-shop-alcohol"/>
-  <symbol minX="1706" maxX="1818" minY="0" maxY="112" name="search-result-restaurant"/>
-  <symbol minX="1818" maxX="1930" minY="0" maxY="112" name="search-result-pub"/>
-  <symbol minX="1930" maxX="2042" minY="0" maxY="112" name="search-result-playground"/>
+  <symbol minX="1258" maxX="1370" minY="0" maxY="112" name="search-result-restaurant"/>
+  <symbol minX="1370" maxX="1482" minY="0" maxY="112" name="search-result-pub"/>
+  <symbol minX="1482" maxX="1594" minY="0" maxY="112" name="search-result-cinema"/>
+  <symbol minX="1594" maxX="1706" minY="0" maxY="112" name="search-result-fastfood"/>
+  <symbol minX="1706" maxX="1818" minY="0" maxY="112" name="search-result-shop-sports"/>
+  <symbol minX="1818" maxX="1930" minY="0" maxY="112" name="search-result-shop-cosmetics"/>
+  <symbol minX="1930" maxX="2042" minY="0" maxY="112" name="search-result-zoo"/>
   <symbol minX="0" maxX="112" minY="136" maxY="248" name="search-result-nightclub"/>
-  <symbol minX="112" maxX="224" minY="136" maxY="248" name="search-result-fastfood"/>
-  <symbol minX="224" maxX="336" minY="136" maxY="248" name="search-result-cinema"/>
-  <symbol minX="336" maxX="448" minY="136" maxY="248" name="search-result-casino"/>
-  <symbol minX="448" maxX="560" minY="136" maxY="248" name="search-result-cafe"/>
-  <symbol minX="560" maxX="672" minY="136" maxY="248" name="search-result-bar"/>
-  <symbol minX="672" maxX="784" minY="136" maxY="248" name="search-result-bakery"/>
-  <symbol minX="784" maxX="896" minY="136" maxY="248" name="search-result-shop-greengrocer"/>
-  <symbol minX="896" maxX="1014" minY="136" maxY="248" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="1014" maxX="1126" minY="136" maxY="248" name="search-result-zoo"/>
-  <symbol minX="1126" maxX="1238" minY="136" maxY="248" name="search-result-shop-gift"/>
-  <symbol minX="1238" maxX="1350" minY="136" maxY="248" name="search-result-water-park"/>
-  <symbol minX="1350" maxX="1462" minY="136" maxY="248" name="search-result-theme-park"/>
-  <symbol minX="1462" maxX="1574" minY="136" maxY="248" name="search-result-shop-toys"/>
-  <symbol minX="1574" maxX="1686" minY="136" maxY="248" name="search-result-shop-supermarket"/>
-  <symbol minX="1686" maxX="1798" minY="136" maxY="248" name="search-result-shop-sports"/>
-  <symbol minX="1798" maxX="1910" minY="136" maxY="248" name="search-result-shop-shoes"/>
-  <symbol minX="1910" maxX="2022" minY="136" maxY="248" name="search-result-shop-seafood"/>
-  <symbol minX="0" maxX="112" minY="248" maxY="360" name="search-result-shop-mall"/>
-  <symbol minX="112" maxX="224" minY="248" maxY="360" name="search-result-shop-jewelry"/>
+  <symbol minX="112" maxX="224" minY="136" maxY="248" name="search-result-shop-butcher"/>
+  <symbol minX="224" maxX="336" minY="136" maxY="248" name="search-result-playground"/>
+  <symbol minX="336" maxX="448" minY="136" maxY="248" name="search-result-shop-toys"/>
+  <symbol minX="448" maxX="560" minY="136" maxY="248" name="search-result-shop-confectionery"/>
+  <symbol minX="560" maxX="672" minY="136" maxY="248" name="search-result-shop-clothes"/>
+  <symbol minX="672" maxX="784" minY="136" maxY="248" name="search-result-shop-supermarket"/>
+  <symbol minX="784" maxX="902" minY="136" maxY="248" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="902" maxX="1014" minY="136" maxY="248" name="search-result-shop-gift"/>
+  <symbol minX="1014" maxX="1126" minY="136" maxY="248" name="search-result-water-park"/>
+  <symbol minX="1126" maxX="1238" minY="136" maxY="248" name="search-result-shop-greengrocer"/>
+  <symbol minX="1238" maxX="1350" minY="136" maxY="248" name="search-result-bakery"/>
+  <symbol minX="1350" maxX="1462" minY="136" maxY="248" name="search-result-bar"/>
+  <symbol minX="1462" maxX="1574" minY="136" maxY="248" name="search-result-shop-jewelry"/>
+  <symbol minX="1574" maxX="1686" minY="136" maxY="248" name="search-result-shop-mall"/>
+  <symbol minX="1686" maxX="1798" minY="136" maxY="248" name="search-result-shop-seafood"/>
+  <symbol minX="1798" maxX="1910" minY="136" maxY="248" name="search-result-cafe"/>
+  <symbol minX="1910" maxX="2022" minY="136" maxY="248" name="search-result-shop-department_store"/>
+  <symbol minX="0" maxX="112" minY="248" maxY="360" name="search-result-shop-alcohol"/>
+  <symbol minX="112" maxX="224" minY="248" maxY="360" name="search-result-casino"/>
   <symbol minX="224" maxX="324" minY="248" maxY="354" name="shield-us-hw-thin-scaled"/>
   <symbol minX="324" maxX="406" minY="248" maxY="351" name="ferry"/>
-  <symbol minX="406" maxX="488" minY="248" maxY="351" name="unpaved_road"/>
-  <symbol minX="488" maxX="570" minY="248" maxY="351" name="paid_road"/>
-  <symbol minX="570" maxX="670" minY="248" maxY="348" name="infosign"/>
-  <symbol minX="670" maxX="770" minY="248" maxY="348" name="track_marker_selected"/>
-  <symbol minX="770" maxX="836" minY="248" maxY="343" name="bookmark-parking-m"/>
-  <symbol minX="836" maxX="902" minY="248" maxY="343" name="bookmark-museum-m"/>
-  <symbol minX="902" maxX="968" minY="248" maxY="343" name="bookmark-building-m"/>
-  <symbol minX="968" maxX="1034" minY="248" maxY="343" name="bookmark-water-m"/>
-  <symbol minX="1034" maxX="1100" minY="248" maxY="343" name="bookmark-buddhism-m"/>
-  <symbol minX="1100" maxX="1166" minY="248" maxY="343" name="bookmark-animals-m"/>
-  <symbol minX="1166" maxX="1232" minY="248" maxY="343" name="bookmark-viewpoint-m"/>
-  <symbol minX="1232" maxX="1298" minY="248" maxY="343" name="bookmark-transport-m"/>
-  <symbol minX="1298" maxX="1364" minY="248" maxY="343" name="bookmark-swim-m"/>
-  <symbol minX="1364" maxX="1430" minY="248" maxY="343" name="bookmark-start-m"/>
-  <symbol minX="1430" maxX="1496" minY="248" maxY="343" name="bookmark-sport-m"/>
-  <symbol minX="1496" maxX="1562" minY="248" maxY="343" name="bookmark-sights-m"/>
-  <symbol minX="1562" maxX="1628" minY="248" maxY="343" name="bookmark-shop-m"/>
-  <symbol minX="1628" maxX="1694" minY="248" maxY="343" name="bookmark-bg-m"/>
-  <symbol minX="1694" maxX="1760" minY="248" maxY="343" name="bookmark-park-m"/>
-  <symbol minX="1760" maxX="1826" minY="248" maxY="343" name="bookmark-mountain-m"/>
-  <symbol minX="1826" maxX="1892" minY="248" maxY="343" name="bookmark-medicine-m"/>
-  <symbol minX="1892" maxX="1958" minY="248" maxY="343" name="bookmark-judaism-m"/>
-  <symbol minX="1958" maxX="2024" minY="248" maxY="343" name="bookmark-islam-m"/>
-  <symbol minX="0" maxX="66" minY="360" maxY="455" name="bookmark-hotel-m"/>
-  <symbol minX="66" maxX="132" minY="360" maxY="455" name="bookmark-gas-m"/>
-  <symbol minX="132" maxX="198" minY="360" maxY="455" name="bookmark-food-m"/>
-  <symbol minX="198" maxX="264" minY="360" maxY="455" name="bookmark-finish-m"/>
-  <symbol minX="264" maxX="330" minY="360" maxY="455" name="bookmark-exchange-m"/>
-  <symbol minX="330" maxX="396" minY="360" maxY="455" name="bookmark-entertainment-m"/>
-  <symbol minX="396" maxX="462" minY="360" maxY="455" name="bookmark-default-m"/>
-  <symbol minX="462" maxX="528" minY="360" maxY="455" name="bookmark-bar-m"/>
-  <symbol minX="528" maxX="594" minY="360" maxY="455" name="bookmark-christianity-m"/>
-  <symbol minX="594" maxX="718" minY="360" maxY="448" name="norating-bg-l"/>
-  <symbol minX="718" maxX="806" minY="360" maxY="448" name="route-point-start"/>
-  <symbol minX="806" maxX="894" minY="360" maxY="448" name="route-point-9"/>
-  <symbol minX="894" maxX="982" minY="360" maxY="448" name="route-point-8"/>
-  <symbol minX="982" maxX="1070" minY="360" maxY="448" name="route-point-7"/>
-  <symbol minX="1070" maxX="1158" minY="360" maxY="448" name="route-point-6"/>
-  <symbol minX="1158" maxX="1246" minY="360" maxY="448" name="route-point-5"/>
-  <symbol minX="1246" maxX="1334" minY="360" maxY="448" name="route-point-4"/>
-  <symbol minX="1334" maxX="1422" minY="360" maxY="448" name="route-point-3"/>
-  <symbol minX="1422" maxX="1510" minY="360" maxY="448" name="route-point-20"/>
-  <symbol minX="1510" maxX="1598" minY="360" maxY="448" name="route-point-2"/>
-  <symbol minX="1598" maxX="1686" minY="360" maxY="448" name="route-point-19"/>
-  <symbol minX="1686" maxX="1774" minY="360" maxY="448" name="route-point-18"/>
-  <symbol minX="1774" maxX="1862" minY="360" maxY="448" name="route-point-17"/>
-  <symbol minX="1862" maxX="1950" minY="360" maxY="448" name="route-point-16"/>
-  <symbol minX="1950" maxX="2038" minY="360" maxY="448" name="route-point-15"/>
-  <symbol minX="0" maxX="88" minY="455" maxY="543" name="route-point-14"/>
-  <symbol minX="88" maxX="176" minY="455" maxY="543" name="route-point-13"/>
-  <symbol minX="176" maxX="264" minY="455" maxY="543" name="route-point-12"/>
-  <symbol minX="264" maxX="352" minY="455" maxY="543" name="route-point-11"/>
-  <symbol minX="352" maxX="440" minY="455" maxY="543" name="route-point-10"/>
-  <symbol minX="440" maxX="528" minY="455" maxY="543" name="route-point-1"/>
-  <symbol minX="528" maxX="652" minY="455" maxY="543" name="norating-default-l"/>
-  <symbol minX="652" maxX="776" minY="455" maxY="543" name="coloredmark-bg-l"/>
-  <symbol minX="776" maxX="900" minY="455" maxY="543" name="coloredmark-default-l"/>
-  <symbol minX="900" maxX="964" minY="455" maxY="531" name="shield-us-i-thin"/>
-  <symbol minX="964" maxX="1046" minY="455" maxY="531" name="shield-us-i-wide"/>
-  <symbol minX="1046" maxX="1116" minY="455" maxY="525" name="shield-us-hw-thin"/>
-  <symbol minX="1116" maxX="1198" minY="455" maxY="525" name="shield-us-hw-wide"/>
-  <symbol minX="1198" maxX="1245" minY="455" maxY="521" name="bookmark-default-s"/>
-  <symbol minX="1245" maxX="1292" minY="455" maxY="521" name="bookmark-bg-s"/>
-  <symbol minX="1292" maxX="1356" minY="455" maxY="519" name="track_marker_deselected"/>
-  <symbol minX="1356" maxX="1420" minY="455" maxY="519" name="current-position"/>
-  <symbol minX="1420" maxX="1478" minY="455" maxY="513" name="subway-chengdu-m"/>
-  <symbol minX="1478" maxX="1536" minY="455" maxY="513" name="subway-guadalajara-m"/>
-  <symbol minX="1536" maxX="1594" minY="455" maxY="513" name="subway-glasgow-m"/>
-  <symbol minX="1594" maxX="1652" minY="455" maxY="513" name="subway-foshan-m"/>
-  <symbol minX="1652" maxX="1710" minY="455" maxY="513" name="subway-ekb-m"/>
-  <symbol minX="1710" maxX="1768" minY="455" maxY="513" name="subway-dubai-m"/>
-  <symbol minX="1768" maxX="1824" minY="455" maxY="513" name="subway-delhi-m"/>
-  <symbol minX="1824" maxX="1882" minY="455" maxY="513" name="subway-chicago-m"/>
-  <symbol minX="1882" maxX="1940" minY="455" maxY="513" name="airport-m"/>
-  <symbol minX="1940" maxX="1998" minY="455" maxY="513" name="subway-changchun-m"/>
-  <symbol minX="0" maxX="58" minY="543" maxY="601" name="subway-catania-m"/>
-  <symbol minX="58" maxX="116" minY="543" maxY="601" name="subway-caracas-m"/>
-  <symbol minX="116" maxX="174" minY="543" maxY="601" name="subway-cairo-m"/>
-  <symbol minX="174" maxX="232" minY="543" maxY="601" name="subway-bursaray-m"/>
-  <symbol minX="232" maxX="290" minY="543" maxY="601" name="subway-buenosaires-m"/>
-  <symbol minX="290" maxX="348" minY="543" maxY="601" name="subway-budapest-m"/>
-  <symbol minX="348" maxX="401" minY="543" maxY="601" name="subway-brescia-m"/>
-  <symbol minX="401" maxX="459" minY="543" maxY="601" name="subway-helsinki-m"/>
-  <symbol minX="459" maxX="517" minY="543" maxY="601" name="subway-hirosima-m"/>
-  <symbol minX="517" maxX="575" minY="543" maxY="601" name="subway-isfahan-m"/>
-  <symbol minX="575" maxX="622" minY="543" maxY="601" name="subway-istanbul-m"/>
-  <symbol minX="622" maxX="680" minY="543" maxY="601" name="subway-kazan-m"/>
-  <symbol minX="680" maxX="738" minY="543" maxY="601" name="subway-kobe-m"/>
-  <symbol minX="738" maxX="796" minY="543" maxY="601" name="subway-kunming-m"/>
-  <symbol minX="796" maxX="854" minY="543" maxY="601" name="subway-kyoto-m"/>
-  <symbol minX="854" maxX="912" minY="543" maxY="601" name="subway-lausanne-m"/>
-  <symbol minX="912" maxX="970" minY="543" maxY="601" name="subway-lille-m"/>
-  <symbol minX="970" maxX="1028" minY="543" maxY="601" name="subway-lima-m"/>
-  <symbol minX="1028" maxX="1086" minY="543" maxY="601" name="subway-lisboa-m"/>
-  <symbol minX="1086" maxX="1144" minY="543" maxY="601" name="subway-losangeles-m"/>
-  <symbol minX="1144" maxX="1202" minY="543" maxY="601" name="subway-m"/>
-  <symbol minX="1202" maxX="1260" minY="543" maxY="601" name="subway-marseille-s"/>
-  <symbol minX="1260" maxX="1316" minY="543" maxY="601" name="subway-mashhad-m"/>
-  <symbol minX="1316" maxX="1374" minY="543" maxY="601" name="second_hand_shop-m"/>
-  <symbol minX="1374" maxX="1432" minY="543" maxY="601" name="skateboard-m"/>
-  <symbol minX="1432" maxX="1490" minY="543" maxY="601" name="shower-m"/>
-  <symbol minX="1490" maxX="1548" minY="543" maxY="601" name="shop-m"/>
-  <symbol minX="1548" maxX="1606" minY="543" maxY="601" name="shop-bicycle-m"/>
-  <symbol minX="1606" maxX="1664" minY="543" maxY="601" name="shoes-m"/>
-  <symbol minX="1664" maxX="1722" minY="543" maxY="601" name="ship-m"/>
-  <symbol minX="1722" maxX="1780" minY="543" maxY="601" name="shinto-m"/>
-  <symbol minX="1780" maxX="1838" minY="543" maxY="601" name="shelter-m"/>
-  <symbol minX="1838" maxX="1896" minY="543" maxY="601" name="skiing-m"/>
-  <symbol minX="1896" maxX="1954" minY="543" maxY="601" name="seafood-shop-m"/>
-  <symbol minX="1954" maxX="2012" minY="543" maxY="601" name="school-m"/>
-  <symbol minX="0" maxX="58" minY="601" maxY="659" name="sawmill-m"/>
-  <symbol minX="58" maxX="116" minY="601" maxY="659" name="sauna-m"/>
-  <symbol minX="116" maxX="174" minY="601" maxY="659" name="sample_collection-m"/>
-  <symbol minX="174" maxX="232" minY="601" maxY="659" name="subway-guangzhou-m"/>
-  <symbol minX="232" maxX="290" minY="601" maxY="659" name="restaurant-m"/>
-  <symbol minX="290" maxX="348" minY="601" maxY="659" name="subway-adana-s"/>
-  <symbol minX="348" maxX="406" minY="601" maxY="659" name="subway-bengaluru-m"/>
-  <symbol minX="406" maxX="464" minY="601" maxY="659" name="subway-beijing-m"/>
-  <symbol minX="464" maxX="522" minY="601" maxY="659" name="subway-bangkok-m"/>
-  <symbol minX="522" maxX="578" minY="601" maxY="659" name="subway-athens-m"/>
-  <symbol minX="578" maxX="636" minY="601" maxY="659" name="subway-ankara-s"/>
-  <symbol minX="636" maxX="694" minY="601" maxY="659" name="subway-ankara-m"/>
-  <symbol minX="694" maxX="745" minY="601" maxY="659" name="subway-amsterdam-m"/>
-  <symbol minX="745" maxX="803" minY="601" maxY="659" name="subway-algeria-m"/>
-  <symbol minX="803" maxX="861" minY="601" maxY="659" name="subway-brasilia-m"/>
-  <symbol minX="861" maxX="919" minY="601" maxY="659" name="subway-adana-m"/>
-  <symbol minX="919" maxX="977" minY="601" maxY="659" name="stationery_shop-m"/>
-  <symbol minX="977" maxX="1035" minY="601" maxY="659" name="stadium-m"/>
-  <symbol minX="1035" maxX="1093" minY="601" maxY="659" name="sports-m"/>
-  <symbol minX="1093" maxX="1151" minY="601" maxY="659" name="speedcam-alert-l"/>
-  <symbol minX="1151" maxX="1209" minY="601" maxY="659" name="speech_therapist-m"/>
-  <symbol minX="1209" maxX="1267" minY="601" maxY="659" name="soccer-m"/>
-  <symbol minX="1267" maxX="1325" minY="601" maxY="659" name="taoist-m"/>
-  <symbol minX="1325" maxX="1383" minY="601" maxY="659" name="toll_booth-m"/>
-  <symbol minX="1383" maxX="1441" minY="601" maxY="659" name="toilets-m"/>
-  <symbol minX="1441" maxX="1499" minY="601" maxY="659" name="tire-repair-m"/>
-  <symbol minX="1499" maxX="1557" minY="601" maxY="659" name="ticket-shop-m"/>
-  <symbol minX="1557" maxX="1615" minY="601" maxY="659" name="theme_park-m"/>
-  <symbol minX="1615" maxX="1673" minY="601" maxY="659" name="theatre-m"/>
-  <symbol minX="1673" maxX="1731" minY="601" maxY="659" name="tennis-m"/>
-  <symbol minX="1731" maxX="1789" minY="601" maxY="659" name="taxi-m"/>
-  <symbol minX="1789" maxX="1847" minY="601" maxY="659" name="tomb-m"/>
-  <symbol minX="1847" maxX="1905" minY="601" maxY="659" name="table-tennis-m"/>
-  <symbol minX="1905" maxX="1963" minY="601" maxY="659" name="swimming-m"/>
-  <symbol minX="1963" maxX="2021" minY="601" maxY="659" name="sweets-m"/>
-  <symbol minX="0" maxX="58" minY="659" maxY="717" name="survey_point-m"/>
-  <symbol minX="58" maxX="116" minY="659" maxY="717" name="subway-yokohama-m"/>
-  <symbol minX="116" maxX="174" minY="659" maxY="717" name="subway-wuhan-m"/>
-  <symbol minX="174" maxX="232" minY="659" maxY="717" name="subway-washington-m"/>
-  <symbol minX="232" maxX="290" minY="659" maxY="717" name="video-games-m"/>
-  <symbol minX="290" maxX="348" minY="659" maxY="717" name="zoo-m"/>
-  <symbol minX="348" maxX="406" minY="659" maxY="717" name="yoga-m"/>
-  <symbol minX="406" maxX="464" minY="659" maxY="717" name="windmill-m"/>
-  <symbol minX="464" maxX="522" minY="659" maxY="717" name="wayside_shrine-m"/>
-  <symbol minX="522" maxX="580" minY="659" maxY="717" name="waterfall-m"/>
-  <symbol minX="580" maxX="638" minY="659" maxY="717" name="waste-basket-m"/>
-  <symbol minX="638" maxX="696" minY="659" maxY="717" name="volleyball-m"/>
-  <symbol minX="696" maxX="754" minY="659" maxY="717" name="viewpoint-m"/>
-  <symbol minX="754" maxX="812" minY="659" maxY="717" name="subway-warszawa-m"/>
-  <symbol minX="812" maxX="870" minY="659" maxY="717" name="veterinary-m"/>
-  <symbol minX="870" maxX="928" minY="659" maxY="717" name="vending-m"/>
-  <symbol minX="928" maxX="986" minY="659" maxY="717" name="travel_agency_shop-m"/>
-  <symbol minX="986" maxX="1044" minY="659" maxY="717" name="tram-m"/>
-  <symbol minX="1044" maxX="1102" minY="659" maxY="717" name="train-m"/>
-  <symbol minX="1102" maxX="1160" minY="659" maxY="717" name="toys-m"/>
-  <symbol minX="1160" maxX="1218" minY="659" maxY="717" name="tourism-m"/>
-  <symbol minX="1218" maxX="1274" minY="659" maxY="717" name="subway-nnov-m"/>
-  <symbol minX="1274" maxX="1332" minY="659" maxY="717" name="subway-reseau-paris-m"/>
-  <symbol minX="1332" maxX="1390" minY="659" maxY="717" name="subway-rennes-m"/>
-  <symbol minX="1390" maxX="1448" minY="659" maxY="717" name="subway-pyongyang-m"/>
-  <symbol minX="1448" maxX="1504" minY="659" maxY="717" name="subway-porto-m"/>
-  <symbol minX="1504" maxX="1562" minY="659" maxY="717" name="subway-pittsburgh-m"/>
-  <symbol minX="1562" maxX="1620" minY="659" maxY="717" name="subway-perugia-m"/>
-  <symbol minX="1620" maxX="1678" minY="659" maxY="717" name="subway-panama-m"/>
-  <symbol minX="1678" maxX="1736" minY="659" maxY="717" name="subway-oslo-m"/>
-  <symbol minX="1736" maxX="1794" minY="659" maxY="717" name="subway-riodejaneiro-m"/>
-  <symbol minX="1794" maxX="1852" minY="659" maxY="717" name="subway-newyork-m"/>
-  <symbol minX="1852" maxX="1910" minY="659" maxY="717" name="subway-nagoya-m"/>
-  <symbol minX="1910" maxX="1968" minY="659" maxY="717" name="subway-minatomirai-m"/>
-  <symbol minX="1968" maxX="2026" minY="659" maxY="717" name="subway-milan-m"/>
-  <symbol minX="0" maxX="56" minY="717" maxY="775" name="subway-mexico-m"/>
-  <symbol minX="56" maxX="114" minY="717" maxY="775" name="subway-medellin-m"/>
-  <symbol minX="114" maxX="172" minY="717" maxY="775" name="subway-mecca-m"/>
-  <symbol minX="172" maxX="230" minY="717" maxY="775" name="subway-massachusetts-m"/>
-  <symbol minX="230" maxX="288" minY="717" maxY="775" name="subway-samara-m"/>
-  <symbol minX="288" maxX="346" minY="717" maxY="775" name="subway-santodomingo-m"/>
-  <symbol minX="346" maxX="404" minY="717" maxY="775" name="subway-saopaulo-m"/>
-  <symbol minX="404" maxX="462" minY="717" maxY="775" name="subway-shiraz-m"/>
-  <symbol minX="462" maxX="520" minY="717" maxY="775" name="subway-sofia-m"/>
-  <symbol minX="520" maxX="578" minY="717" maxY="775" name="subway-southkorea-m"/>
-  <symbol minX="578" maxX="636" minY="717" maxY="775" name="subway-stlouis-m"/>
-  <symbol minX="636" maxX="694" minY="717" maxY="775" name="subway-stockholm-m"/>
-  <symbol minX="694" maxX="752" minY="717" maxY="775" name="subway-tashkent-m"/>
-  <symbol minX="752" maxX="810" minY="717" maxY="775" name="subway-tianjin-m"/>
-  <symbol minX="810" maxX="868" minY="717" maxY="775" name="subway-tokyo-m"/>
-  <symbol minX="868" maxX="926" minY="717" maxY="775" name="subway-tyneandwear-m"/>
-  <symbol minX="926" maxX="984" minY="717" maxY="775" name="subway-valencia-m"/>
-  <symbol minX="984" maxX="1042" minY="717" maxY="775" name="subway-vienna-m"/>
-  <symbol minX="1042" maxX="1100" minY="717" maxY="775" name="subway-volgograd-m"/>
-  <symbol minX="1100" maxX="1158" minY="717" maxY="775" name="laundry-m"/>
-  <symbol minX="1158" maxX="1216" minY="717" maxY="775" name="casino-m"/>
-  <symbol minX="1216" maxX="1274" minY="717" maxY="775" name="mail-m"/>
-  <symbol minX="1274" maxX="1332" minY="717" maxY="775" name="cemetery-m"/>
-  <symbol minX="1332" maxX="1390" minY="717" maxY="775" name="charging-station-m"/>
-  <symbol minX="1390" maxX="1448" minY="717" maxY="775" name="charity_shop-m"/>
-  <symbol minX="1448" maxX="1506" minY="717" maxY="775" name="cheese-m"/>
-  <symbol minX="1506" maxX="1564" minY="717" maxY="775" name="lighthouse-m"/>
-  <symbol minX="1564" maxX="1622" minY="717" maxY="775" name="chemist-m"/>
-  <symbol minX="1622" maxX="1680" minY="717" maxY="775" name="chess-m"/>
-  <symbol minX="1680" maxX="1738" minY="717" maxY="775" name="lift_gate-m"/>
-  <symbol minX="1738" maxX="1796" minY="717" maxY="775" name="chimney-m"/>
-  <symbol minX="1796" maxX="1854" minY="717" maxY="775" name="library-m"/>
-  <symbol minX="1854" maxX="1912" minY="717" maxY="775" name="christian-m"/>
-  <symbol minX="1912" maxX="1970" minY="717" maxY="775" name="lawyer-m"/>
-  <symbol minX="1970" maxX="2028" minY="717" maxY="775" name="carpenter-m"/>
-  <symbol minX="0" maxX="58" minY="775" maxY="833" name="language_school-m"/>
-  <symbol minX="58" maxX="116" minY="775" maxY="833" name="kiosk-m"/>
-  <symbol minX="116" maxX="174" minY="775" maxY="833" name="kindergarten-m"/>
-  <symbol minX="174" maxX="232" minY="775" maxY="833" name="cinema-m"/>
-  <symbol minX="232" maxX="290" minY="775" maxY="833" name="jewish-m"/>
-  <symbol minX="290" maxX="348" minY="775" maxY="833" name="climbing-m"/>
-  <symbol minX="348" maxX="406" minY="775" maxY="833" name="clothes-m"/>
+  <symbol minX="406" maxX="488" minY="248" maxY="351" name="paid_road"/>
+  <symbol minX="488" maxX="570" minY="248" maxY="351" name="unpaved_road"/>
+  <symbol minX="570" maxX="670" minY="248" maxY="348" name="track_marker_selected"/>
+  <symbol minX="670" maxX="770" minY="248" maxY="348" name="infosign"/>
+  <symbol minX="770" maxX="836" minY="248" maxY="343" name="bookmark-building-m"/>
+  <symbol minX="836" maxX="902" minY="248" maxY="343" name="bookmark-default-m"/>
+  <symbol minX="902" maxX="968" minY="248" maxY="343" name="bookmark-christianity-m"/>
+  <symbol minX="968" maxX="1034" minY="248" maxY="343" name="bookmark-parking-m"/>
+  <symbol minX="1034" maxX="1100" minY="248" maxY="343" name="bookmark-museum-m"/>
+  <symbol minX="1100" maxX="1166" minY="248" maxY="343" name="bookmark-park-m"/>
+  <symbol minX="1166" maxX="1232" minY="248" maxY="343" name="bookmark-bar-m"/>
+  <symbol minX="1232" maxX="1298" minY="248" maxY="343" name="bookmark-shop-m"/>
+  <symbol minX="1298" maxX="1364" minY="248" maxY="343" name="bookmark-exchange-m"/>
+  <symbol minX="1364" maxX="1430" minY="248" maxY="343" name="bookmark-finish-m"/>
+  <symbol minX="1430" maxX="1496" minY="248" maxY="343" name="bookmark-sights-m"/>
+  <symbol minX="1496" maxX="1562" minY="248" maxY="343" name="bookmark-entertainment-m"/>
+  <symbol minX="1562" maxX="1628" minY="248" maxY="343" name="bookmark-transport-m"/>
+  <symbol minX="1628" maxX="1694" minY="248" maxY="343" name="bookmark-hotel-m"/>
+  <symbol minX="1694" maxX="1760" minY="248" maxY="343" name="bookmark-islam-m"/>
+  <symbol minX="1760" maxX="1826" minY="248" maxY="343" name="bookmark-gas-m"/>
+  <symbol minX="1826" maxX="1892" minY="248" maxY="343" name="bookmark-food-m"/>
+  <symbol minX="1892" maxX="1958" minY="248" maxY="343" name="bookmark-animals-m"/>
+  <symbol minX="1958" maxX="2024" minY="248" maxY="343" name="bookmark-water-m"/>
+  <symbol minX="0" maxX="66" minY="360" maxY="455" name="bookmark-viewpoint-m"/>
+  <symbol minX="66" maxX="132" minY="360" maxY="455" name="bookmark-buddhism-m"/>
+  <symbol minX="132" maxX="198" minY="360" maxY="455" name="bookmark-swim-m"/>
+  <symbol minX="198" maxX="264" minY="360" maxY="455" name="bookmark-start-m"/>
+  <symbol minX="264" maxX="330" minY="360" maxY="455" name="bookmark-sport-m"/>
+  <symbol minX="330" maxX="396" minY="360" maxY="455" name="bookmark-judaism-m"/>
+  <symbol minX="396" maxX="462" minY="360" maxY="455" name="bookmark-bg-m"/>
+  <symbol minX="462" maxX="528" minY="360" maxY="455" name="bookmark-medicine-m"/>
+  <symbol minX="528" maxX="594" minY="360" maxY="455" name="bookmark-mountain-m"/>
+  <symbol minX="594" maxX="682" minY="360" maxY="448" name="route-point-11"/>
+  <symbol minX="682" maxX="770" minY="360" maxY="448" name="route-point-16"/>
+  <symbol minX="770" maxX="858" minY="360" maxY="448" name="route-point-15"/>
+  <symbol minX="858" maxX="946" minY="360" maxY="448" name="route-point-14"/>
+  <symbol minX="946" maxX="1034" minY="360" maxY="448" name="route-point-13"/>
+  <symbol minX="1034" maxX="1122" minY="360" maxY="448" name="route-point-12"/>
+  <symbol minX="1122" maxX="1210" minY="360" maxY="448" name="route-point-18"/>
+  <symbol minX="1210" maxX="1334" minY="360" maxY="448" name="coloredmark-bg-l"/>
+  <symbol minX="1334" maxX="1458" minY="360" maxY="448" name="coloredmark-default-l"/>
+  <symbol minX="1458" maxX="1546" minY="360" maxY="448" name="route-point-10"/>
+  <symbol minX="1546" maxX="1634" minY="360" maxY="448" name="route-point-1"/>
+  <symbol minX="1634" maxX="1758" minY="360" maxY="448" name="norating-bg-l"/>
+  <symbol minX="1758" maxX="1882" minY="360" maxY="448" name="norating-default-l"/>
+  <symbol minX="1882" maxX="1970" minY="360" maxY="448" name="route-point-6"/>
+  <symbol minX="0" maxX="88" minY="455" maxY="543" name="route-point-9"/>
+  <symbol minX="88" maxX="176" minY="455" maxY="543" name="route-point-20"/>
+  <symbol minX="176" maxX="264" minY="455" maxY="543" name="route-point-7"/>
+  <symbol minX="264" maxX="352" minY="455" maxY="543" name="route-point-3"/>
+  <symbol minX="352" maxX="440" minY="455" maxY="543" name="route-point-2"/>
+  <symbol minX="440" maxX="528" minY="455" maxY="543" name="route-point-8"/>
+  <symbol minX="528" maxX="616" minY="455" maxY="543" name="route-point-4"/>
+  <symbol minX="616" maxX="704" minY="455" maxY="543" name="route-point-19"/>
+  <symbol minX="704" maxX="792" minY="455" maxY="543" name="route-point-5"/>
+  <symbol minX="792" maxX="880" minY="455" maxY="543" name="route-point-start"/>
+  <symbol minX="880" maxX="968" minY="455" maxY="543" name="route-point-17"/>
+  <symbol minX="968" maxX="1050" minY="455" maxY="531" name="shield-us-i-wide"/>
+  <symbol minX="1050" maxX="1114" minY="455" maxY="531" name="shield-us-i-thin"/>
+  <symbol minX="1114" maxX="1184" minY="455" maxY="525" name="shield-us-hw-thin"/>
+  <symbol minX="1184" maxX="1266" minY="455" maxY="525" name="shield-us-hw-wide"/>
+  <symbol minX="1266" maxX="1313" minY="455" maxY="521" name="bookmark-default-s"/>
+  <symbol minX="1313" maxX="1360" minY="455" maxY="521" name="bookmark-bg-s"/>
+  <symbol minX="1360" maxX="1424" minY="455" maxY="519" name="track_marker_deselected"/>
+  <symbol minX="1424" maxX="1488" minY="455" maxY="519" name="current-position"/>
+  <symbol minX="1488" maxX="1546" minY="455" maxY="513" name="subway-chengdu-m"/>
+  <symbol minX="1546" maxX="1604" minY="455" maxY="513" name="shop-m"/>
+  <symbol minX="1604" maxX="1662" minY="455" maxY="513" name="shop-bicycle-m"/>
+  <symbol minX="1662" maxX="1720" minY="455" maxY="513" name="subway-catania-m"/>
+  <symbol minX="1720" maxX="1778" minY="455" maxY="513" name="subway-changchun-m"/>
+  <symbol minX="1778" maxX="1836" minY="455" maxY="513" name="shower-m"/>
+  <symbol minX="1836" maxX="1894" minY="455" maxY="513" name="skateboard-m"/>
+  <symbol minX="1894" maxX="1952" minY="455" maxY="513" name="subway-bursaray-m"/>
+  <symbol minX="1952" maxX="2010" minY="455" maxY="513" name="subway-chicago-m"/>
+  <symbol minX="0" maxX="58" minY="543" maxY="601" name="shoes-m"/>
+  <symbol minX="58" maxX="116" minY="543" maxY="601" name="ship-m"/>
+  <symbol minX="116" maxX="172" minY="543" maxY="601" name="subway-delhi-m"/>
+  <symbol minX="172" maxX="230" minY="543" maxY="601" name="shinto-m"/>
+  <symbol minX="230" maxX="288" minY="543" maxY="601" name="shelter-m"/>
+  <symbol minX="288" maxX="346" minY="543" maxY="601" name="second_hand_shop-m"/>
+  <symbol minX="346" maxX="404" minY="543" maxY="601" name="subway-dubai-m"/>
+  <symbol minX="404" maxX="462" minY="543" maxY="601" name="seafood-shop-m"/>
+  <symbol minX="462" maxX="520" minY="543" maxY="601" name="school-m"/>
+  <symbol minX="520" maxX="578" minY="543" maxY="601" name="sawmill-m"/>
+  <symbol minX="578" maxX="636" minY="543" maxY="601" name="travel_agency_shop-m"/>
+  <symbol minX="636" maxX="689" minY="543" maxY="601" name="subway-brescia-m"/>
+  <symbol minX="689" maxX="747" minY="543" maxY="601" name="subway-beijing-m"/>
+  <symbol minX="747" maxX="805" minY="543" maxY="601" name="subway-bangkok-m"/>
+  <symbol minX="805" maxX="863" minY="543" maxY="601" name="sauna-m"/>
+  <symbol minX="863" maxX="919" minY="543" maxY="601" name="subway-athens-m"/>
+  <symbol minX="919" maxX="977" minY="543" maxY="601" name="subway-ankara-s"/>
+  <symbol minX="977" maxX="1035" minY="543" maxY="601" name="subway-ankara-m"/>
+  <symbol minX="1035" maxX="1093" minY="543" maxY="601" name="subway-brasilia-m"/>
+  <symbol minX="1093" maxX="1144" minY="543" maxY="601" name="subway-amsterdam-m"/>
+  <symbol minX="1144" maxX="1202" minY="543" maxY="601" name="subway-algeria-m"/>
+  <symbol minX="1202" maxX="1260" minY="543" maxY="601" name="subway-adana-s"/>
+  <symbol minX="1260" maxX="1318" minY="543" maxY="601" name="subway-adana-m"/>
+  <symbol minX="1318" maxX="1376" minY="543" maxY="601" name="skiing-m"/>
+  <symbol minX="1376" maxX="1434" minY="543" maxY="601" name="stationery_shop-m"/>
+  <symbol minX="1434" maxX="1492" minY="543" maxY="601" name="subway-budapest-m"/>
+  <symbol minX="1492" maxX="1550" minY="543" maxY="601" name="stadium-m"/>
+  <symbol minX="1550" maxX="1608" minY="543" maxY="601" name="sports-m"/>
+  <symbol minX="1608" maxX="1666" minY="543" maxY="601" name="subway-buenosaires-m"/>
+  <symbol minX="1666" maxX="1724" minY="543" maxY="601" name="subway-bengaluru-m"/>
+  <symbol minX="1724" maxX="1782" minY="543" maxY="601" name="subway-cairo-m"/>
+  <symbol minX="1782" maxX="1840" minY="543" maxY="601" name="speedcam-alert-l"/>
+  <symbol minX="1840" maxX="1898" minY="543" maxY="601" name="speech_therapist-m"/>
+  <symbol minX="1898" maxX="1956" minY="543" maxY="601" name="subway-caracas-m"/>
+  <symbol minX="1956" maxX="2014" minY="543" maxY="601" name="soccer-m"/>
+  <symbol minX="0" maxX="58" minY="601" maxY="659" name="subway-warszawa-m"/>
+  <symbol minX="58" maxX="116" minY="601" maxY="659" name="tennis-m"/>
+  <symbol minX="116" maxX="174" minY="601" maxY="659" name="taxi-m"/>
+  <symbol minX="174" maxX="232" minY="601" maxY="659" name="taoist-m"/>
+  <symbol minX="232" maxX="290" minY="601" maxY="659" name="table-tennis-m"/>
+  <symbol minX="290" maxX="348" minY="601" maxY="659" name="swimming-m"/>
+  <symbol minX="348" maxX="406" minY="601" maxY="659" name="sweets-m"/>
+  <symbol minX="406" maxX="464" minY="601" maxY="659" name="survey_point-m"/>
+  <symbol minX="464" maxX="522" minY="601" maxY="659" name="subway-yokohama-m"/>
+  <symbol minX="522" maxX="580" minY="601" maxY="659" name="subway-wuhan-m"/>
+  <symbol minX="580" maxX="638" minY="601" maxY="659" name="subway-washington-m"/>
+  <symbol minX="638" maxX="696" minY="601" maxY="659" name="theatre-m"/>
+  <symbol minX="696" maxX="754" minY="601" maxY="659" name="subway-volgograd-m"/>
+  <symbol minX="754" maxX="812" minY="601" maxY="659" name="subway-vienna-m"/>
+  <symbol minX="812" maxX="870" minY="601" maxY="659" name="subway-valencia-m"/>
+  <symbol minX="870" maxX="928" minY="601" maxY="659" name="subway-tyneandwear-m"/>
+  <symbol minX="928" maxX="986" minY="601" maxY="659" name="subway-tokyo-m"/>
+  <symbol minX="986" maxX="1044" minY="601" maxY="659" name="subway-tianjin-m"/>
+  <symbol minX="1044" maxX="1102" minY="601" maxY="659" name="subway-tashkent-m"/>
+  <symbol minX="1102" maxX="1160" minY="601" maxY="659" name="subway-stockholm-m"/>
+  <symbol minX="1160" maxX="1218" minY="601" maxY="659" name="subway-stlouis-m"/>
+  <symbol minX="1218" maxX="1276" minY="601" maxY="659" name="subway-southkorea-m"/>
+  <symbol minX="1276" maxX="1334" minY="601" maxY="659" name="toys-m"/>
+  <symbol minX="1334" maxX="1392" minY="601" maxY="659" name="vending-m"/>
+  <symbol minX="1392" maxX="1450" minY="601" maxY="659" name="veterinary-m"/>
+  <symbol minX="1450" maxX="1508" minY="601" maxY="659" name="video-games-m"/>
+  <symbol minX="1508" maxX="1566" minY="601" maxY="659" name="viewpoint-m"/>
+  <symbol minX="1566" maxX="1624" minY="601" maxY="659" name="volleyball-m"/>
+  <symbol minX="1624" maxX="1682" minY="601" maxY="659" name="waste-basket-m"/>
+  <symbol minX="1682" maxX="1740" minY="601" maxY="659" name="waterfall-m"/>
+  <symbol minX="1740" maxX="1798" minY="601" maxY="659" name="tram-m"/>
+  <symbol minX="1798" maxX="1856" minY="601" maxY="659" name="wayside_shrine-m"/>
+  <symbol minX="1856" maxX="1914" minY="601" maxY="659" name="train-m"/>
+  <symbol minX="1914" maxX="1972" minY="601" maxY="659" name="subway-sofia-m"/>
+  <symbol minX="1972" maxX="2030" minY="601" maxY="659" name="windmill-m"/>
+  <symbol minX="0" maxX="58" minY="659" maxY="717" name="tourism-m"/>
+  <symbol minX="58" maxX="116" minY="659" maxY="717" name="tomb-m"/>
+  <symbol minX="116" maxX="174" minY="659" maxY="717" name="yoga-m"/>
+  <symbol minX="174" maxX="232" minY="659" maxY="717" name="toll_booth-m"/>
+  <symbol minX="232" maxX="290" minY="659" maxY="717" name="toilets-m"/>
+  <symbol minX="290" maxX="348" minY="659" maxY="717" name="tire-repair-m"/>
+  <symbol minX="348" maxX="406" minY="659" maxY="717" name="ticket-shop-m"/>
+  <symbol minX="406" maxX="464" minY="659" maxY="717" name="zoo-m"/>
+  <symbol minX="464" maxX="522" minY="659" maxY="717" name="theme_park-m"/>
+  <symbol minX="522" maxX="580" minY="659" maxY="717" name="subway-kunming-m"/>
+  <symbol minX="580" maxX="636" minY="659" maxY="717" name="subway-mashhad-m"/>
+  <symbol minX="636" maxX="694" minY="659" maxY="717" name="subway-marseille-s"/>
+  <symbol minX="694" maxX="752" minY="659" maxY="717" name="subway-m"/>
+  <symbol minX="752" maxX="810" minY="659" maxY="717" name="subway-lyon-m"/>
+  <symbol minX="810" maxX="868" minY="659" maxY="717" name="subway-losangeles-m"/>
+  <symbol minX="868" maxX="926" minY="659" maxY="717" name="subway-lisboa-m"/>
+  <symbol minX="926" maxX="984" minY="659" maxY="717" name="subway-lima-m"/>
+  <symbol minX="984" maxX="1042" minY="659" maxY="717" name="subway-lille-m"/>
+  <symbol minX="1042" maxX="1100" minY="659" maxY="717" name="subway-lausanne-m"/>
+  <symbol minX="1100" maxX="1158" minY="659" maxY="717" name="subway-kyoto-m"/>
+  <symbol minX="1158" maxX="1216" minY="659" maxY="717" name="subway-massachusetts-m"/>
+  <symbol minX="1216" maxX="1274" minY="659" maxY="717" name="subway-kobe-m"/>
+  <symbol minX="1274" maxX="1332" minY="659" maxY="717" name="subway-kazan-m"/>
+  <symbol minX="1332" maxX="1379" minY="659" maxY="717" name="subway-istanbul-m"/>
+  <symbol minX="1379" maxX="1437" minY="659" maxY="717" name="subway-isfahan-m"/>
+  <symbol minX="1437" maxX="1495" minY="659" maxY="717" name="subway-hirosima-m"/>
+  <symbol minX="1495" maxX="1553" minY="659" maxY="717" name="subway-helsinki-m"/>
+  <symbol minX="1553" maxX="1611" minY="659" maxY="717" name="subway-guangzhou-m"/>
+  <symbol minX="1611" maxX="1669" minY="659" maxY="717" name="subway-guadalajara-m"/>
+  <symbol minX="1669" maxX="1727" minY="659" maxY="717" name="subway-glasgow-m"/>
+  <symbol minX="1727" maxX="1785" minY="659" maxY="717" name="subway-foshan-m"/>
+  <symbol minX="1785" maxX="1843" minY="659" maxY="717" name="subway-perugia-m"/>
+  <symbol minX="1843" maxX="1901" minY="659" maxY="717" name="subway-shiraz-m"/>
+  <symbol minX="1901" maxX="1959" minY="659" maxY="717" name="subway-saopaulo-m"/>
+  <symbol minX="1959" maxX="2017" minY="659" maxY="717" name="subway-santodomingo-m"/>
+  <symbol minX="0" maxX="58" minY="717" maxY="775" name="subway-samara-m"/>
+  <symbol minX="58" maxX="116" minY="717" maxY="775" name="subway-riodejaneiro-m"/>
+  <symbol minX="116" maxX="174" minY="717" maxY="775" name="subway-reseau-paris-m"/>
+  <symbol minX="174" maxX="232" minY="717" maxY="775" name="subway-rennes-m"/>
+  <symbol minX="232" maxX="290" minY="717" maxY="775" name="subway-pyongyang-m"/>
+  <symbol minX="290" maxX="346" minY="717" maxY="775" name="subway-porto-m"/>
+  <symbol minX="346" maxX="404" minY="717" maxY="775" name="subway-pittsburgh-m"/>
+  <symbol minX="404" maxX="462" minY="717" maxY="775" name="subway-ekb-m"/>
+  <symbol minX="462" maxX="520" minY="717" maxY="775" name="subway-panama-m"/>
+  <symbol minX="520" maxX="578" minY="717" maxY="775" name="subway-oslo-m"/>
+  <symbol minX="578" maxX="634" minY="717" maxY="775" name="subway-nnov-m"/>
+  <symbol minX="634" maxX="692" minY="717" maxY="775" name="subway-newyork-m"/>
+  <symbol minX="692" maxX="750" minY="717" maxY="775" name="subway-nagoya-m"/>
+  <symbol minX="750" maxX="808" minY="717" maxY="775" name="subway-minatomirai-m"/>
+  <symbol minX="808" maxX="866" minY="717" maxY="775" name="subway-milan-m"/>
+  <symbol minX="866" maxX="922" minY="717" maxY="775" name="subway-mexico-m"/>
+  <symbol minX="922" maxX="980" minY="717" maxY="775" name="subway-medellin-m"/>
+  <symbol minX="980" maxX="1038" minY="717" maxY="775" name="subway-mecca-m"/>
+  <symbol minX="1038" maxX="1096" minY="717" maxY="775" name="department_store-m"/>
+  <symbol minX="1096" maxX="1154" minY="717" maxY="775" name="fire_station-m"/>
+  <symbol minX="1154" maxX="1212" minY="717" maxY="775" name="fastfood-m"/>
+  <symbol minX="1212" maxX="1270" minY="717" maxY="775" name="erotic-m"/>
+  <symbol minX="1270" maxX="1328" minY="717" maxY="775" name="equestrian-m"/>
+  <symbol minX="1328" maxX="1386" minY="717" maxY="775" name="emergency-phone-m"/>
+  <symbol minX="1386" maxX="1444" minY="717" maxY="775" name="embassy-m"/>
+  <symbol minX="1444" maxX="1502" minY="717" maxY="775" name="electronics-m"/>
+  <symbol minX="1502" maxX="1560" minY="717" maxY="775" name="electrician-m"/>
+  <symbol minX="1560" maxX="1618" minY="717" maxY="775" name="dump-station-m"/>
+  <symbol minX="1618" maxX="1676" minY="717" maxY="775" name="driving_school-m"/>
+  <symbol minX="1676" maxX="1734" minY="717" maxY="775" name="drinking-water-m"/>
+  <symbol minX="1734" maxX="1792" minY="717" maxY="775" name="doityourself-m"/>
+  <symbol minX="1792" maxX="1850" minY="717" maxY="775" name="dog_park-m"/>
+  <symbol minX="1850" maxX="1908" minY="717" maxY="775" name="diving-m"/>
+  <symbol minX="1908" maxX="1966" minY="717" maxY="775" name="firehydrant-m"/>
+  <symbol minX="1966" maxX="2024" minY="717" maxY="775" name="dentist-m"/>
+  <symbol minX="0" maxX="58" minY="775" maxY="833" name="defibrillator-m"/>
+  <symbol minX="58" maxX="116" minY="775" maxY="833" name="curling-m"/>
+  <symbol minX="116" maxX="174" minY="775" maxY="833" name="cross-m"/>
+  <symbol minX="174" maxX="232" minY="775" maxY="833" name="cricket-m"/>
+  <symbol minX="232" maxX="290" minY="775" maxY="833" name="copyshop-m"/>
+  <symbol minX="290" maxX="348" minY="775" maxY="833" name="convenience-m"/>
+  <symbol minX="348" maxX="406" minY="775" maxY="833" name="computer-m"/>
   <symbol minX="406" maxX="464" minY="775" maxY="833" name="college-m"/>
-  <symbol minX="464" maxX="522" minY="775" maxY="833" name="jewelry-m"/>
-  <symbol minX="522" maxX="580" minY="775" maxY="833" name="computer-m"/>
-  <symbol minX="580" maxX="638" minY="775" maxY="833" name="internet_cafe-m"/>
-  <symbol minX="638" maxX="696" minY="775" maxY="833" name="interior_decoration-m"/>
-  <symbol minX="696" maxX="754" minY="775" maxY="833" name="convenience-m"/>
-  <symbol minX="754" maxX="812" minY="775" maxY="833" name="car-part-m"/>
-  <symbol minX="812" maxX="870" minY="775" maxY="833" name="brewery-m"/>
-  <symbol minX="870" maxX="928" minY="775" maxY="833" name="muslim-m"/>
-  <symbol minX="928" maxX="986" minY="775" maxY="833" name="musical-instrument-m"/>
-  <symbol minX="986" maxX="1044" minY="775" maxY="833" name="music_school-m"/>
-  <symbol minX="1044" maxX="1102" minY="775" maxY="833" name="music-m"/>
-  <symbol minX="1102" maxX="1160" minY="775" maxY="833" name="buddhist-m"/>
-  <symbol minX="1160" maxX="1218" minY="775" maxY="833" name="bus-m"/>
-  <symbol minX="1218" maxX="1276" minY="775" maxY="833" name="butcher-m"/>
-  <symbol minX="1276" maxX="1334" minY="775" maxY="833" name="cable-car-m"/>
-  <symbol minX="1334" maxX="1392" minY="775" maxY="833" name="cafe-m"/>
-  <symbol minX="1392" maxX="1450" minY="775" maxY="833" name="museum-m"/>
-  <symbol minX="1450" maxX="1508" minY="775" maxY="833" name="campsite-m"/>
-  <symbol minX="1508" maxX="1566" minY="775" maxY="833" name="motorcycle_shop-m"/>
-  <symbol minX="1566" maxX="1624" minY="775" maxY="833" name="copyshop-m"/>
-  <symbol minX="1624" maxX="1682" minY="775" maxY="833" name="monument-m"/>
-  <symbol minX="1682" maxX="1740" minY="775" maxY="833" name="car-repair-m"/>
-  <symbol minX="1740" maxX="1798" minY="775" maxY="833" name="mobile_phone-m"/>
-  <symbol minX="1798" maxX="1856" minY="775" maxY="833" name="military-m"/>
-  <symbol minX="1856" maxX="1914" minY="775" maxY="833" name="car-wash-m"/>
-  <symbol minX="1914" maxX="1972" minY="775" maxY="833" name="car_sharing-m"/>
-  <symbol minX="1972" maxX="2030" minY="775" maxY="833" name="car_shop-m"/>
-  <symbol minX="0" maxX="58" minY="833" maxY="891" name="caravan-shop-m"/>
-  <symbol minX="58" maxX="116" minY="833" maxY="891" name="caravan_site-m"/>
-  <symbol minX="116" maxX="174" minY="833" maxY="891" name="metal_construction-m"/>
-  <symbol minX="174" maxX="232" minY="833" maxY="891" name="media-m"/>
-  <symbol minX="232" maxX="290" minY="833" maxY="891" name="marketplace-m"/>
-  <symbol minX="290" maxX="348" minY="833" maxY="891" name="marina-m"/>
-  <symbol minX="348" maxX="406" minY="833" maxY="891" name="funicular-m"/>
-  <symbol minX="406" maxX="464" minY="833" maxY="891" name="greengrocer-m"/>
-  <symbol minX="464" maxX="522" minY="833" maxY="891" name="golf-m"/>
-  <symbol minX="522" maxX="580" minY="833" maxY="891" name="gift-m"/>
-  <symbol minX="580" maxX="638" minY="833" maxY="891" name="driving_school-m"/>
-  <symbol minX="638" maxX="696" minY="833" maxY="891" name="geyser-m"/>
-  <symbol minX="696" maxX="754" minY="833" maxY="891" name="geyser-l"/>
-  <symbol minX="754" maxX="812" minY="833" maxY="891" name="dump-station-m"/>
-  <symbol minX="812" maxX="870" minY="833" maxY="891" name="garden_center-m"/>
-  <symbol minX="870" maxX="928" minY="833" maxY="891" name="electrician-m"/>
-  <symbol minX="928" maxX="986" minY="833" maxY="891" name="garden-outline-m"/>
-  <symbol minX="986" maxX="1044" minY="833" maxY="891" name="garden-m"/>
-  <symbol minX="1044" maxX="1102" minY="833" maxY="891" name="electronics-m"/>
-  <symbol minX="1102" maxX="1160" minY="833" maxY="891" name="gallery-m"/>
-  <symbol minX="1160" maxX="1218" minY="833" maxY="891" name="furniture-m"/>
-  <symbol minX="1218" maxX="1276" minY="833" maxY="891" name="drinking-water-m"/>
-  <symbol minX="1276" maxX="1334" minY="833" maxY="891" name="embassy-m"/>
-  <symbol minX="1334" maxX="1392" minY="833" maxY="891" name="emergency-phone-m"/>
-  <symbol minX="1392" maxX="1450" minY="833" maxY="891" name="equestrian-m"/>
-  <symbol minX="1450" maxX="1508" minY="833" maxY="891" name="erotic-m"/>
-  <symbol minX="1508" maxX="1566" minY="833" maxY="891" name="fastfood-m"/>
-  <symbol minX="1566" maxX="1624" minY="833" maxY="891" name="fire_station-m"/>
-  <symbol minX="1624" maxX="1682" minY="833" maxY="891" name="firehydrant-m"/>
-  <symbol minX="1682" maxX="1740" minY="833" maxY="891" name="funeral_directors-m"/>
-  <symbol minX="1740" maxX="1798" minY="833" maxY="891" name="florist-m"/>
-  <symbol minX="1798" maxX="1856" minY="833" maxY="891" name="fuel-m"/>
-  <symbol minX="1856" maxX="1914" minY="833" maxY="891" name="fuel-dispenser-m"/>
-  <symbol minX="1914" maxX="1972" minY="833" maxY="891" name="fountain-s"/>
-  <symbol minX="1972" maxX="2030" minY="833" maxY="891" name="fountain-m"/>
-  <symbol minX="0" maxX="58" minY="891" maxY="949" name="diving-m"/>
-  <symbol minX="58" maxX="116" minY="891" maxY="949" name="cricket-m"/>
-  <symbol minX="116" maxX="174" minY="891" maxY="949" name="information-m"/>
-  <symbol minX="174" maxX="232" minY="891" maxY="949" name="ice_cream-m"/>
-  <symbol minX="232" maxX="290" minY="891" maxY="949" name="hunting-tower-m"/>
-  <symbol minX="290" maxX="348" minY="891" maxY="949" name="cross-m"/>
-  <symbol minX="348" maxX="406" minY="891" maxY="949" name="hotel-m"/>
-  <symbol minX="406" maxX="464" minY="891" maxY="949" name="curling-m"/>
-  <symbol minX="464" maxX="522" minY="891" maxY="949" name="defibrillator-m"/>
-  <symbol minX="522" maxX="580" minY="891" maxY="949" name="hostel-m"/>
-  <symbol minX="580" maxX="638" minY="891" maxY="949" name="dentist-m"/>
-  <symbol minX="638" maxX="696" minY="891" maxY="949" name="department_store-m"/>
-  <symbol minX="696" maxX="754" minY="891" maxY="949" name="hospital-m"/>
-  <symbol minX="754" maxX="812" minY="891" maxY="949" name="home-m"/>
-  <symbol minX="812" maxX="870" minY="891" maxY="949" name="remains-m"/>
-  <symbol minX="870" maxX="928" minY="891" maxY="949" name="hockey-m"/>
-  <symbol minX="928" maxX="986" minY="891" maxY="949" name="historic-ship-m"/>
-  <symbol minX="986" maxX="1044" minY="891" maxY="949" name="dog_park-m"/>
-  <symbol minX="1044" maxX="1102" minY="891" maxY="949" name="hindu-m"/>
-  <symbol minX="1102" maxX="1160" minY="891" maxY="949" name="heliport-m"/>
-  <symbol minX="1160" maxX="1218" minY="891" maxY="949" name="helipad-m"/>
-  <symbol minX="1218" maxX="1276" minY="891" maxY="949" name="doityourself-m"/>
-  <symbol minX="1276" maxX="1334" minY="891" maxY="949" name="handball-m"/>
-  <symbol minX="1334" maxX="1392" minY="891" maxY="949" name="hand-m"/>
-  <symbol minX="1392" maxX="1450" minY="891" maxY="949" name="hairdresser-m"/>
-  <symbol minX="1450" maxX="1508" minY="891" maxY="949" name="gym-m"/>
-  <symbol minX="1508" maxX="1566" minY="891" maxY="949" name="guidepost"/>
-  <symbol minX="1566" maxX="1624" minY="891" maxY="949" name="grocery-m"/>
-  <symbol minX="1624" maxX="1682" minY="891" maxY="949" name="art-m"/>
-  <symbol minX="1682" maxX="1740" minY="891" maxY="949" name="optometrist-m"/>
-  <symbol minX="1740" maxX="1798" minY="891" maxY="949" name="australian-football-m"/>
-  <symbol minX="1798" maxX="1856" minY="891" maxY="949" name="optician-m"/>
-  <symbol minX="1856" maxX="1914" minY="891" maxY="949" name="pelota-m"/>
-  <symbol minX="1914" maxX="1972" minY="891" maxY="949" name="office-m"/>
-  <symbol minX="1972" maxX="2030" minY="891" maxY="949" name="petshop-m"/>
-  <symbol minX="0" maxX="58" minY="949" maxY="1007" name="audiologist-m"/>
-  <symbol minX="58" maxX="116" minY="949" maxY="1007" name="pharmacy-m"/>
-  <symbol minX="116" maxX="174" minY="949" maxY="1007" name="atm-m"/>
-  <symbol minX="174" maxX="232" minY="949" maxY="1007" name="beer-m"/>
-  <symbol minX="232" maxX="290" minY="949" maxY="1007" name="outdoor-shop-m"/>
-  <symbol minX="290" maxX="348" minY="949" maxY="1007" name="bicycle-m"/>
-  <symbol minX="348" maxX="406" minY="949" maxY="1007" name="archery-m"/>
-  <symbol minX="406" maxX="464" minY="949" maxY="1007" name="phone-m"/>
-  <symbol minX="464" maxX="522" minY="949" maxY="1007" name="photo-shop-m"/>
-  <symbol minX="522" maxX="580" minY="949" maxY="1007" name="bicycle-repair-station"/>
-  <symbol minX="580" maxX="638" minY="949" maxY="1007" name="archaeological-site-m"/>
-  <symbol minX="638" maxX="696" minY="949" maxY="1007" name="nparkf-outline-m"/>
-  <symbol minX="696" maxX="754" minY="949" maxY="1007" name="physiotherapist-m"/>
-  <symbol minX="754" maxX="812" minY="949" maxY="1007" name="blacksmith-m"/>
-  <symbol minX="812" maxX="870" minY="949" maxY="1007" name="bcontrol-m"/>
-  <symbol minX="870" maxX="928" minY="949" maxY="1007" name="parking-meter-m"/>
-  <symbol minX="928" maxX="986" minY="949" maxY="1007" name="banknote-l"/>
-  <symbol minX="986" maxX="1044" minY="949" maxY="1007" name="banknote-m"/>
-  <symbol minX="1044" maxX="1102" minY="949" maxY="1007" name="bank-m"/>
-  <symbol minX="1102" maxX="1160" minY="949" maxY="1007" name="bar-m"/>
-  <symbol minX="1160" maxX="1218" minY="949" maxY="1007" name="bank-l"/>
-  <symbol minX="1218" maxX="1276" minY="949" maxY="1007" name="baseball-m"/>
-  <symbol minX="1276" maxX="1334" minY="949" maxY="1007" name="basketball-m"/>
-  <symbol minX="1334" maxX="1392" minY="949" maxY="1007" name="bbq-m"/>
-  <symbol minX="1392" maxX="1450" minY="949" maxY="1007" name="bowling_alley-m"/>
-  <symbol minX="1450" maxX="1508" minY="949" maxY="1007" name="beach-m"/>
-  <symbol minX="1508" maxX="1566" minY="949" maxY="1007" name="beauty-m"/>
-  <symbol minX="1566" maxX="1624" minY="949" maxY="1007" name="bakery-m"/>
-  <symbol minX="1624" maxX="1682" minY="949" maxY="1007" name="beekeeper-m"/>
-  <symbol minX="1682" maxX="1740" minY="949" maxY="1007" name="park-outline-m"/>
-  <symbol minX="1740" maxX="1798" minY="949" maxY="1007" name="park-m"/>
-  <symbol minX="1798" maxX="1856" minY="949" maxY="1007" name="painter-m"/>
-  <symbol minX="1856" maxX="1914" minY="949" maxY="1007" name="padel-m"/>
-  <symbol minX="1914" maxX="1972" minY="949" maxY="1007" name="badminton-m"/>
-  <symbol minX="1972" maxX="2030" minY="949" maxY="1007" name="recycling-m"/>
-  <symbol minX="0" maxX="58" minY="1007" maxY="1065" name="antiques-m"/>
-  <symbol minX="58" maxX="116" minY="1007" maxY="1065" name="alcohol-m"/>
-  <symbol minX="116" maxX="174" minY="1007" maxY="1065" name="police-m"/>
-  <symbol minX="174" maxX="232" minY="1007" maxY="1065" name="alpine_hut-m"/>
-  <symbol minX="232" maxX="290" minY="1007" maxY="1065" name="america-football-m"/>
-  <symbol minX="290" maxX="348" minY="1007" maxY="1065" name="bowling-m"/>
-  <symbol minX="348" maxX="406" minY="1007" maxY="1065" name="playground-m"/>
-  <symbol minX="406" maxX="464" minY="1007" maxY="1065" name="airport_gate-m"/>
-  <symbol minX="464" maxX="522" minY="1007" maxY="1065" name="newsagent_shop-m"/>
-  <symbol minX="522" maxX="580" minY="1007" maxY="1065" name="book-shop-m"/>
-  <symbol minX="580" maxX="638" minY="1007" maxY="1065" name="bookmaker-m"/>
-  <symbol minX="638" maxX="696" minY="1007" maxY="1065" name="podiatrist-m"/>
-  <symbol minX="696" maxX="754" minY="1007" maxY="1065" name="picnic-m"/>
-  <symbol minX="754" maxX="812" minY="1007" maxY="1065" name="alternative-m"/>
-  <symbol minX="812" maxX="870" minY="1007" maxY="1065" name="plumber-m"/>
-  <symbol minX="870" maxX="928" minY="1007" maxY="1065" name="npark-m"/>
-  <symbol minX="928" maxX="986" minY="1007" maxY="1065" name="apartment-m"/>
-  <symbol minX="986" maxX="1044" minY="1007" maxY="1065" name="postbox-m"/>
-  <symbol minX="1044" maxX="1102" minY="1007" maxY="1065" name="needle_and_thread-m"/>
-  <symbol minX="1102" maxX="1160" minY="1007" maxY="1065" name="nparkf-m"/>
-  <symbol minX="1160" maxX="1218" minY="1007" maxY="1065" name="blood_donation-m"/>
-  <symbol minX="1218" maxX="1276" minY="1007" maxY="1065" name="public-building-m"/>
-  <symbol minX="1276" maxX="1334" minY="1007" maxY="1065" name="psychotherapist-m"/>
-  <symbol minX="1334" maxX="1392" minY="1007" maxY="1065" name="power-m"/>
-  <symbol minX="1392" maxX="1450" minY="1007" maxY="1065" name="place-of-worship-m"/>
-  <symbol minX="1450" maxX="1508" minY="1007" maxY="1065" name="pitch-m"/>
-  <symbol minX="1508" maxX="1566" minY="1007" maxY="1065" name="prison-m"/>
-  <symbol minX="1566" maxX="1624" minY="1007" maxY="1065" name="picnic_table-m"/>
-  <symbol minX="1624" maxX="1682" minY="1007" maxY="1065" name="nightclub-m"/>
-  <symbol minX="1682" maxX="1740" minY="1007" maxY="1063" name="subway-shanghai-m"/>
-  <symbol minX="1740" maxX="1796" minY="1007" maxY="1063" name="subway-spb-m"/>
-  <symbol minX="1796" maxX="1852" minY="1007" maxY="1063" name="subway-southkorea-s"/>
-  <symbol minX="1852" maxX="1910" minY="1007" maxY="1063" name="subway-maracaibo-m"/>
-  <symbol minX="1910" maxX="1966" minY="1007" maxY="1063" name="subway-montreal-m"/>
-  <symbol minX="1966" maxX="2024" minY="1007" maxY="1063" name="subway-sapporo-m"/>
-  <symbol minX="0" maxX="58" minY="1065" maxY="1121" name="subway-dalian-m"/>
-  <symbol minX="58" maxX="114" minY="1065" maxY="1121" name="subway-ekb-s"/>
-  <symbol minX="114" maxX="172" minY="1065" maxY="1120" name="subway-marseille-m"/>
-  <symbol minX="172" maxX="223" minY="1065" maxY="1119" name="subway-warsaw-m"/>
-  <symbol minX="223" maxX="277" minY="1065" maxY="1119" name="subway-stlouis-s"/>
-  <symbol minX="277" maxX="331" minY="1065" maxY="1119" name="subway-algeria-s"/>
-  <symbol minX="331" maxX="385" minY="1065" maxY="1119" name="subway-entrance-m"/>
-  <symbol minX="385" maxX="443" minY="1065" maxY="1118" name="subway-izmir-m"/>
-  <symbol minX="443" maxX="495" minY="1065" maxY="1117" name="search-result"/>
-  <symbol minX="495" maxX="546" minY="1065" maxY="1116" name="subway-pittsburgh-s"/>
-  <symbol minX="546" maxX="597" minY="1065" maxY="1116" name="lightrail-berlin-m"/>
-  <symbol minX="597" maxX="642" minY="1065" maxY="1116" name="subway-istanbul-s"/>
-  <symbol minX="642" maxX="700" minY="1065" maxY="1115" name="subway-taoyuan-m"/>
-  <symbol minX="700" maxX="758" minY="1065" maxY="1114" name="subway-rotterdam-m"/>
-  <symbol minX="758" maxX="807" minY="1065" maxY="1114" name="parking_entrance-m"/>
-  <symbol minX="807" maxX="856" minY="1065" maxY="1114" name="parking_pay-m"/>
-  <symbol minX="856" maxX="905" minY="1065" maxY="1114" name="parking-m"/>
-  <symbol minX="905" maxX="954" minY="1065" maxY="1114" name="subway-sapporo-s"/>
-  <symbol minX="954" maxX="999" minY="1065" maxY="1114" name="subway-brescia-s"/>
-  <symbol minX="999" maxX="1048" minY="1065" maxY="1114" name="subway-isfahan-s"/>
-  <symbol minX="1048" maxX="1097" minY="1065" maxY="1114" name="parking-disabled-m"/>
-  <symbol minX="1097" maxX="1155" minY="1065" maxY="1114" name="subway-tbilisi-m"/>
-  <symbol minX="1155" maxX="1206" minY="1065" maxY="1114" name="subway-izmir-s"/>
-  <symbol minX="1206" maxX="1255" minY="1065" maxY="1114" name="motorcycle-parking-m"/>
-  <symbol minX="1255" maxX="1304" minY="1065" maxY="1114" name="speedcam-m"/>
-  <symbol minX="1304" maxX="1353" minY="1065" maxY="1114" name="non-found-search-result"/>
-  <symbol minX="1353" maxX="1402" minY="1065" maxY="1114" name="bike-parking-m"/>
-  <symbol minX="1402" maxX="1451" minY="1065" maxY="1114" name="subway-medellin-s"/>
-  <symbol minX="1451" maxX="1500" minY="1065" maxY="1114" name="subway-panama-s"/>
-  <symbol minX="1500" maxX="1549" minY="1065" maxY="1114" name="subway-cairo-s"/>
-  <symbol minX="1549" maxX="1598" minY="1065" maxY="1114" name="bicycle-rental"/>
-  <symbol minX="1598" maxX="1695" minY="1065" maxY="1114" name="coloredmark-bg-s"/>
-  <symbol minX="1695" maxX="1742" minY="1065" maxY="1114" name="subway-mashhad-s"/>
-  <symbol minX="1742" maxX="1839" minY="1065" maxY="1114" name="coloredmark-default-s"/>
-  <symbol minX="1839" maxX="1897" minY="1065" maxY="1113" name="subway-almaty-m"/>
-  <symbol minX="1897" maxX="1942" minY="1065" maxY="1112" name="subway-delhi-s"/>
-  <symbol minX="1942" maxX="1987" minY="1065" maxY="1112" name="subway-tianjin-s"/>
-  <symbol minX="1987" maxX="2020" minY="1065" maxY="1112" name="bookmark-default-xs"/>
-  <symbol minX="0" maxX="45" minY="1121" maxY="1168" name="subway-porto-s"/>
-  <symbol minX="45" maxX="96" minY="1121" maxY="1168" name="subway-seattle-m"/>
-  <symbol minX="96" maxX="141" minY="1121" maxY="1168" name="subway-athens-s"/>
-  <symbol minX="141" maxX="199" minY="1121" maxY="1168" name="subway-lyon-m"/>
-  <symbol minX="199" maxX="257" minY="1121" maxY="1168" name="subway-santiago-m"/>
-  <symbol minX="257" maxX="290" minY="1121" maxY="1168" name="bookmark-bg-xs"/>
-  <symbol minX="290" maxX="344" minY="1121" maxY="1168" name="subway-moscow-m"/>
-  <symbol minX="344" maxX="402" minY="1121" maxY="1168" name="subway-yerevan-m"/>
-  <symbol minX="402" maxX="449" minY="1121" maxY="1168" name="subway-warszawa-s"/>
-  <symbol minX="449" maxX="496" minY="1121" maxY="1168" name="subway-rome-m"/>
-  <symbol minX="496" maxX="543" minY="1121" maxY="1168" name="subway-ubahn-m"/>
-  <symbol minX="543" maxX="590" minY="1121" maxY="1168" name="subway-paris-m"/>
-  <symbol minX="590" maxX="637" minY="1121" maxY="1168" name="subway-rennes-s"/>
-  <symbol minX="637" maxX="682" minY="1121" maxY="1168" name="subway-pyongyang-s"/>
-  <symbol minX="682" maxX="729" minY="1121" maxY="1168" name="subway-hirosima-s"/>
-  <symbol minX="729" maxX="774" minY="1121" maxY="1166" name="subway-helsinki-s"/>
-  <symbol minX="774" maxX="825" minY="1121" maxY="1166" name="subway-taoyuan-s"/>
-  <symbol minX="825" maxX="883" minY="1121" maxY="1166" name="subway-tabriz-m"/>
-  <symbol minX="883" maxX="928" minY="1121" maxY="1166" name="subway-tashkent-s"/>
-  <symbol minX="928" maxX="973" minY="1121" maxY="1166" name="subway-tokyo-s"/>
-  <symbol minX="973" maxX="1018" minY="1121" maxY="1166" name="subway-tyneandwear-s"/>
-  <symbol minX="1018" maxX="1063" minY="1121" maxY="1166" name="subway-valencia-s"/>
-  <symbol minX="1063" maxX="1108" minY="1121" maxY="1166" name="subway-vienna-s"/>
-  <symbol minX="1108" maxX="1153" minY="1121" maxY="1166" name="subway-volgograd-s"/>
-  <symbol minX="1153" maxX="1193" minY="1121" maxY="1166" name="subway-warsaw-s"/>
-  <symbol minX="1193" maxX="1251" minY="1121" maxY="1166" name="subway-alicante-m"/>
-  <symbol minX="1251" maxX="1296" minY="1121" maxY="1166" name="subway-washington-s"/>
-  <symbol minX="1296" maxX="1341" minY="1121" maxY="1166" name="subway-wuhan-s"/>
-  <symbol minX="1341" maxX="1397" minY="1121" maxY="1166" name="subway-yerevan-s"/>
-  <symbol minX="1397" maxX="1442" minY="1121" maxY="1166" name="subway-yokohama-s"/>
-  <symbol minX="1442" maxX="1487" minY="1121" maxY="1166" name="subway-milan-s"/>
-  <symbol minX="1487" maxX="1532" minY="1121" maxY="1166" name="subway-oslo-s"/>
-  <symbol minX="1532" maxX="1590" minY="1121" maxY="1166" name="subway-omsk-s"/>
-  <symbol minX="1590" maxX="1648" minY="1121" maxY="1166" name="subway-omsk-m"/>
-  <symbol minX="1648" maxX="1693" minY="1121" maxY="1166" name="subway-nnov-s"/>
-  <symbol minX="1693" maxX="1738" minY="1121" maxY="1166" name="subway-catania-s"/>
-  <symbol minX="1738" maxX="1783" minY="1121" maxY="1166" name="subway-changchun-s"/>
-  <symbol minX="1783" maxX="1841" minY="1121" maxY="1166" name="subway-kryvyirih-m"/>
-  <symbol minX="1841" maxX="1886" minY="1121" maxY="1166" name="subway-nagoya-s"/>
-  <symbol minX="1886" maxX="1931" minY="1121" maxY="1166" name="subway-montreal-s"/>
-  <symbol minX="1931" maxX="1976" minY="1121" maxY="1166" name="subway-chengdu-s"/>
-  <symbol minX="1976" maxX="2021" minY="1121" maxY="1166" name="subway-minatomirai-s"/>
-  <symbol minX="0" maxX="45" minY="1168" maxY="1213" name="subway-foshan-s"/>
-  <symbol minX="45" maxX="90" minY="1168" maxY="1213" name="subway-caracas-s"/>
-  <symbol minX="90" maxX="135" minY="1168" maxY="1213" name="subway-kunming-s"/>
-  <symbol minX="135" maxX="180" minY="1168" maxY="1213" name="subway-chicago-s"/>
-  <symbol minX="180" maxX="225" minY="1168" maxY="1213" name="subway-mecca-s"/>
-  <symbol minX="225" maxX="270" minY="1168" maxY="1213" name="subway-massachusetts-s"/>
-  <symbol minX="270" maxX="315" minY="1168" maxY="1213" name="subway-dalian-s"/>
-  <symbol minX="315" maxX="360" minY="1168" maxY="1213" name="subway-kyoto-s"/>
-  <symbol minX="360" maxX="418" minY="1168" maxY="1213" name="subway-dnepro-m"/>
-  <symbol minX="418" maxX="463" minY="1168" maxY="1213" name="subway-dubai-s"/>
-  <symbol minX="463" maxX="508" minY="1168" maxY="1213" name="subway-lille-s"/>
-  <symbol minX="508" maxX="553" minY="1168" maxY="1213" name="subway-lima-s"/>
-  <symbol minX="553" maxX="598" minY="1168" maxY="1213" name="subway-lisboa-s"/>
-  <symbol minX="598" maxX="643" minY="1168" maxY="1213" name="subway-losangeles-s"/>
-  <symbol minX="643" maxX="688" minY="1168" maxY="1213" name="subway-brasilia-s"/>
-  <symbol minX="688" maxX="733" minY="1168" maxY="1213" name="subway-stockholm-s"/>
-  <symbol minX="733" maxX="778" minY="1168" maxY="1213" name="subway-bangkok-s"/>
-  <symbol minX="778" maxX="823" minY="1168" maxY="1213" name="subway-guangzhou-s"/>
-  <symbol minX="823" maxX="868" minY="1168" maxY="1213" name="subway-guadalajara-s"/>
-  <symbol minX="868" maxX="913" minY="1168" maxY="1213" name="subway-sofia-s"/>
-  <symbol minX="913" maxX="958" minY="1168" maxY="1213" name="subway-shiraz-s"/>
-  <symbol minX="958" maxX="1003" minY="1168" maxY="1213" name="subway-beijing-s"/>
-  <symbol minX="1003" maxX="1048" minY="1168" maxY="1213" name="subway-shanghai-s"/>
-  <symbol minX="1048" maxX="1093" minY="1168" maxY="1213" name="subway-bengaluru-s"/>
-  <symbol minX="1093" maxX="1138" minY="1168" maxY="1213" name="subway-saopaulo-s"/>
-  <symbol minX="1138" maxX="1183" minY="1168" maxY="1213" name="subway-santodomingo-s"/>
-  <symbol minX="1183" maxX="1239" minY="1168" maxY="1213" name="subway-santiago-s"/>
-  <symbol minX="1239" maxX="1284" minY="1168" maxY="1213" name="subway-bursaray-s"/>
-  <symbol minX="1284" maxX="1329" minY="1168" maxY="1213" name="subway-kazan-s"/>
-  <symbol minX="1329" maxX="1374" minY="1168" maxY="1213" name="subway-samara-s"/>
-  <symbol minX="1374" maxX="1419" minY="1168" maxY="1213" name="subway-riodejaneiro-s"/>
-  <symbol minX="1419" maxX="1466" minY="1168" maxY="1213" name="subway-glasgow-s"/>
-  <symbol minX="1466" maxX="1511" minY="1168" maxY="1213" name="subway-reseau-paris-s"/>
-  <symbol minX="1511" maxX="1556" minY="1168" maxY="1213" name="subway-budapest-s"/>
-  <symbol minX="1556" maxX="1601" minY="1168" maxY="1213" name="subway-kobe-s"/>
-  <symbol minX="1601" maxX="1646" minY="1168" maxY="1213" name="subway-buenosaires-s"/>
-  <symbol minX="1646" maxX="1702" minY="1168" maxY="1213" name="subway-fukuoka-s"/>
-  <symbol minX="1702" maxX="1747" minY="1168" maxY="1213" name="subway-perugia-s"/>
-  <symbol minX="1747" maxX="1805" minY="1168" maxY="1212" name="subway-philadelphia-m"/>
-  <symbol minX="1805" maxX="1863" minY="1168" maxY="1211" name="subway-osaka-m"/>
-  <symbol minX="1863" maxX="1905" minY="1168" maxY="1210" name="subway-lausanne-s"/>
-  <symbol minX="1905" maxX="1961" minY="1168" maxY="1210" name="subway-london-m"/>
-  <symbol minX="1961" maxX="2017" minY="1168" maxY="1210" name="subway-tabriz-s"/>
-  <symbol minX="0" maxX="58" minY="1213" maxY="1255" name="subway-lucknow-s"/>
-  <symbol minX="58" maxX="116" minY="1213" maxY="1255" name="subway-madrid-m"/>
-  <symbol minX="116" maxX="174" minY="1213" maxY="1255" name="subway-barcelona-m"/>
-  <symbol minX="174" maxX="219" minY="1213" maxY="1255" name="subway-maracaibo-s"/>
-  <symbol minX="219" maxX="259" minY="1213" maxY="1255" name="subway-mexico-s"/>
-  <symbol minX="259" maxX="301" minY="1213" maxY="1255" name="cave-m"/>
-  <symbol minX="301" maxX="343" minY="1213" maxY="1255" name="subway-spb-s"/>
-  <symbol minX="343" maxX="383" minY="1213" maxY="1255" name="subway-amsterdam-s"/>
-  <symbol minX="383" maxX="437" minY="1213" maxY="1255" name="subway-almaty-s"/>
-  <symbol minX="437" maxX="495" minY="1213" maxY="1254" name="subway-lucknow-m"/>
-  <symbol minX="495" maxX="535" minY="1213" maxY="1253" name="airport-s"/>
-  <symbol minX="535" maxX="575" minY="1213" maxY="1253" name="college-s"/>
-  <symbol minX="575" maxX="615" minY="1213" maxY="1253" name="buddhist-s"/>
-  <symbol minX="615" maxX="655" minY="1213" maxY="1253" name="waste-basket-s"/>
-  <symbol minX="655" maxX="695" minY="1213" maxY="1253" name="bus-s"/>
-  <symbol minX="695" maxX="735" minY="1213" maxY="1253" name="waterfall-s"/>
-  <symbol minX="735" maxX="775" minY="1213" maxY="1253" name="christian-s"/>
-  <symbol minX="775" maxX="815" minY="1213" maxY="1253" name="cable-car-s"/>
-  <symbol minX="815" maxX="855" minY="1213" maxY="1253" name="charging-station-s"/>
-  <symbol minX="855" maxX="895" minY="1213" maxY="1253" name="zoo-s"/>
-  <symbol minX="895" maxX="935" minY="1213" maxY="1253" name="drinking-water-s"/>
-  <symbol minX="935" maxX="975" minY="1213" maxY="1253" name="car-repair-s"/>
-  <symbol minX="975" maxX="1015" minY="1213" maxY="1253" name="subway-s"/>
-  <symbol minX="1015" maxX="1055" minY="1213" maxY="1253" name="taoist-s"/>
-  <symbol minX="1055" maxX="1095" minY="1213" maxY="1253" name="muslim-s"/>
-  <symbol minX="1095" maxX="1135" minY="1213" maxY="1253" name="hindu-s"/>
-  <symbol minX="1135" maxX="1193" minY="1213" maxY="1253" name="subway-bilbao-m"/>
-  <symbol minX="1193" maxX="1233" minY="1213" maxY="1253" name="hospital-s"/>
-  <symbol minX="1233" maxX="1278" minY="1213" maxY="1253" name="subway-tbilisi-s"/>
-  <symbol minX="1278" maxX="1318" minY="1213" maxY="1253" name="park-s"/>
-  <symbol minX="1318" maxX="1358" minY="1213" maxY="1253" name="park-outline-s"/>
-  <symbol minX="1358" maxX="1398" minY="1213" maxY="1253" name="hotel-s"/>
-  <symbol minX="1398" maxX="1438" minY="1213" maxY="1253" name="subway-entrance-s"/>
-  <symbol minX="1438" maxX="1492" minY="1213" maxY="1253" name="subway-dnepro-s"/>
-  <symbol minX="1492" maxX="1532" minY="1213" maxY="1253" name="remains-s"/>
-  <symbol minX="1532" maxX="1577" minY="1213" maxY="1253" name="subway-rotterdam-s"/>
-  <symbol minX="1577" maxX="1617" minY="1213" maxY="1253" name="jewish-s"/>
-  <symbol minX="1617" maxX="1668" minY="1213" maxY="1253" name="subway-philadelphia-s"/>
-  <symbol minX="1668" maxX="1708" minY="1213" maxY="1253" name="nparkf-outline-s"/>
-  <symbol minX="1708" maxX="1764" minY="1213" maxY="1253" name="subway-palma-s"/>
-  <symbol minX="1764" maxX="1822" minY="1213" maxY="1253" name="subway-palma-m"/>
-  <symbol minX="1822" maxX="1871" minY="1213" maxY="1253" name="subway-osaka-s"/>
-  <symbol minX="1871" maxX="1911" minY="1213" maxY="1253" name="nparkf-s"/>
-  <symbol minX="1911" maxX="1951" minY="1213" maxY="1253" name="subway-newyork-s"/>
-  <symbol minX="1951" maxX="1991" minY="1213" maxY="1253" name="lighthouse-s"/>
-  <symbol minX="1991" maxX="2031" minY="1213" maxY="1253" name="geyser-s"/>
-  <symbol minX="0" maxX="40" minY="1255" maxY="1295" name="shinto-s"/>
-  <symbol minX="40" maxX="98" minY="1255" maxY="1295" name="subway-kolkata-m"/>
-  <symbol minX="98" maxX="138" minY="1255" maxY="1295" name="ship-s"/>
-  <symbol minX="138" maxX="169" minY="1255" maxY="1295" name="transit_train-m"/>
-  <symbol minX="169" maxX="209" minY="1255" maxY="1295" name="museum-s"/>
-  <symbol minX="209" maxX="249" minY="1255" maxY="1295" name="shop-s"/>
-  <symbol minX="249" maxX="289" minY="1255" maxY="1295" name="place-of-worship-s"/>
-  <symbol minX="289" maxX="329" minY="1255" maxY="1295" name="theatre-s"/>
-  <symbol minX="329" maxX="360" minY="1255" maxY="1295" name="transit_light_rail-m"/>
-  <symbol minX="360" maxX="400" minY="1255" maxY="1295" name="stadium-s"/>
-  <symbol minX="400" maxX="440" minY="1255" maxY="1295" name="fuel-s"/>
-  <symbol minX="440" maxX="485" minY="1255" maxY="1295" name="transfer_arrow"/>
-  <symbol minX="485" maxX="525" minY="1255" maxY="1295" name="tram-s"/>
-  <symbol minX="525" maxX="565" minY="1255" maxY="1295" name="train-s"/>
-  <symbol minX="565" maxX="605" minY="1255" maxY="1295" name="tourism-s"/>
-  <symbol minX="605" maxX="645" minY="1255" maxY="1295" name="toll_booth-s"/>
-  <symbol minX="645" maxX="685" minY="1255" maxY="1295" name="monument-s"/>
-  <symbol minX="685" maxX="725" minY="1255" maxY="1295" name="viewpoint-s"/>
-  <symbol minX="725" maxX="765" minY="1255" maxY="1295" name="theme_park-s"/>
-  <symbol minX="765" maxX="823" minY="1255" maxY="1294" name="subway-novosibirsk-m"/>
-  <symbol minX="823" maxX="881" minY="1255" maxY="1294" name="subway-bucharest-m"/>
-  <symbol minX="881" maxX="939" minY="1255" maxY="1294" name="subway-sanfrancisco-m"/>
-  <symbol minX="939" maxX="997" minY="1255" maxY="1294" name="subway-fukuoka-m"/>
-  <symbol minX="997" maxX="1055" minY="1255" maxY="1293" name="subway-kharkiv-s"/>
-  <symbol minX="1055" maxX="1093" minY="1255" maxY="1293" name="lightrail-berlin-s"/>
-  <symbol minX="1093" maxX="1144" minY="1255" maxY="1293" name="subway-madrid-s"/>
-  <symbol minX="1144" maxX="1193" minY="1255" maxY="1293" name="subway-kryvyirih-s"/>
-  <symbol minX="1193" maxX="1238" minY="1255" maxY="1293" name="subway-lyon-s"/>
-  <symbol minX="1238" maxX="1294" minY="1255" maxY="1293" name="subway-kiev-m"/>
-  <symbol minX="1294" maxX="1350" minY="1255" maxY="1293" name="subway-novosibirsk-s"/>
-  <symbol minX="1350" maxX="1388" minY="1255" maxY="1293" name="subway-paris-s"/>
-  <symbol minX="1388" maxX="1446" minY="1255" maxY="1293" name="subway-brussel-s"/>
-  <symbol minX="1446" maxX="1504" minY="1255" maxY="1293" name="subway-sanfrancisco-s"/>
-  <symbol minX="1504" maxX="1535" minY="1255" maxY="1293" name="transit_monorail-m"/>
-  <symbol minX="1535" maxX="1573" minY="1255" maxY="1293" name="elevator"/>
-  <symbol minX="1573" maxX="1631" minY="1255" maxY="1293" name="subway-sendai-m"/>
-  <symbol minX="1631" maxX="1682" minY="1255" maxY="1293" name="subway-barcelona-s"/>
-  <symbol minX="1682" maxX="1738" minY="1255" maxY="1291" name="subway-bucharest-s"/>
-  <symbol minX="1738" maxX="1765" minY="1255" maxY="1291" name="transit_train-s"/>
-  <symbol minX="1765" maxX="1801" minY="1255" maxY="1291" name="transit_subway-m"/>
-  <symbol minX="1801" maxX="1859" minY="1255" maxY="1291" name="subway-kharkiv-m"/>
-  <symbol minX="1859" maxX="1895" minY="1255" maxY="1291" name="storage-tank"/>
-  <symbol minX="1895" maxX="1942" minY="1255" maxY="1291" name="subway-alicante-s"/>
-  <symbol minX="1942" maxX="2000" minY="1255" maxY="1291" name="subway-sendai-s"/>
-  <symbol minX="0" maxX="58" minY="1295" maxY="1331" name="subway-haagse-s"/>
-  <symbol minX="58" maxX="116" minY="1295" maxY="1331" name="subway-brussel-m"/>
-  <symbol minX="116" maxX="152" minY="1295" maxY="1331" name="board"/>
-  <symbol minX="152" maxX="188" minY="1295" maxY="1331" name="map"/>
-  <symbol minX="188" maxX="226" minY="1295" maxY="1331" name="subway-moscow-s"/>
-  <symbol minX="226" maxX="284" minY="1295" maxY="1330" name="subway-manila-m"/>
-  <symbol minX="284" maxX="317" minY="1295" maxY="1328" name="subway-ubahn-s"/>
-  <symbol minX="317" maxX="359" minY="1295" maxY="1328" name="subway-london-s"/>
-  <symbol minX="359" maxX="408" minY="1295" maxY="1328" name="subway-bilbao-s"/>
-  <symbol minX="408" maxX="466" minY="1295" maxY="1328" name="subway-haagse-m"/>
-  <symbol minX="466" maxX="524" minY="1295" maxY="1328" name="subway-taipei-s"/>
-  <symbol minX="524" maxX="580" minY="1295" maxY="1328" name="subway-manila-s"/>
-  <symbol minX="580" maxX="638" minY="1295" maxY="1328" name="subway-edmonton-s"/>
-  <symbol minX="638" maxX="674" minY="1295" maxY="1328" name="subway-seattle-s"/>
-  <symbol minX="674" maxX="707" minY="1295" maxY="1328" name="subway-rome-s"/>
-  <symbol minX="707" maxX="740" minY="1295" maxY="1328" name="cave-s"/>
-  <symbol minX="740" maxX="760" minY="1295" maxY="1326" name="entrance-s"/>
-  <symbol minX="760" maxX="791" minY="1295" maxY="1326" name="subway-xs"/>
-  <symbol minX="791" maxX="822" minY="1295" maxY="1326" name="parking-s"/>
-  <symbol minX="822" maxX="853" minY="1295" maxY="1326" name="subway-newyork-xs"/>
-  <symbol minX="853" maxX="884" minY="1295" maxY="1326" name="gate-s"/>
-  <symbol minX="884" maxX="922" minY="1295" maxY="1326" name="bench"/>
-  <symbol minX="922" maxX="953" minY="1295" maxY="1326" name="star-l"/>
-  <symbol minX="953" maxX="986" minY="1295" maxY="1326" name="main_entrance-s"/>
-  <symbol minX="986" maxX="1017" minY="1295" maxY="1326" name="speedcam-s"/>
-  <symbol minX="1017" maxX="1044" minY="1295" maxY="1326" name="transit_light_rail-s"/>
-  <symbol minX="1044" maxX="1071" minY="1295" maxY="1326" name="transit_monorail-s"/>
-  <symbol minX="1071" maxX="1102" minY="1295" maxY="1326" name="transit_subway-s"/>
-  <symbol minX="1102" maxX="1151" minY="1295" maxY="1326" name="railway-crossing-l"/>
-  <symbol minX="1151" maxX="1209" minY="1295" maxY="1325" name="subway-edmonton-m"/>
-  <symbol minX="1209" maxX="1238" minY="1295" maxY="1324" name="star-m"/>
-  <symbol minX="1238" maxX="1280" minY="1295" maxY="1324" name="subway-kolkata-s"/>
-  <symbol minX="1280" maxX="1327" minY="1295" maxY="1324" name="subway-kiev-s"/>
-  <symbol minX="1327" maxX="1383" minY="1295" maxY="1324" name="subway-malaga-s"/>
-  <symbol minX="1383" maxX="1416" minY="1295" maxY="1324" name="volcano-m"/>
-  <symbol minX="1416" maxX="1474" minY="1295" maxY="1323" name="subway-taipei-m"/>
-  <symbol minX="1474" maxX="1532" minY="1295" maxY="1323" name="subway-malaga-m"/>
-  <symbol minX="1532" maxX="1574" minY="1295" maxY="1322" name="railway-crossing-m"/>
-  <symbol minX="1574" maxX="1621" minY="1295" maxY="1322" name="subway-minsk-m"/>
-  <symbol minX="1621" maxX="1652" minY="1295" maxY="1322" name="plaque"/>
-  <symbol minX="1652" maxX="1708" minY="1295" maxY="1322" name="subway-baku-s"/>
-  <symbol minX="1708" maxX="1766" minY="1295" maxY="1321" name="subway-baku-m"/>
-  <symbol minX="1766" maxX="1824" minY="1295" maxY="1320" name="subway-chongqing-s"/>
-  <symbol minX="1824" maxX="1866" minY="1295" maxY="1319" name="subway-minsk-s"/>
-  <symbol minX="1866" maxX="1890" minY="1295" maxY="1319" name="star-s"/>
-  <symbol minX="1890" maxX="1948" minY="1295" maxY="1318" name="subway-chongqing-m"/>
-  <symbol minX="1948" maxX="1999" minY="1295" maxY="1317" name="arrow-m"/>
-  <symbol minX="1999" maxX="2039" minY="1295" maxY="1317" name="mountain-pass"/>
-  <symbol minX="0" maxX="24" minY="1331" maxY="1353" name="peakt-m"/>
-  <symbol minX="24" maxX="48" minY="1331" maxY="1353" name="volcano-s"/>
-  <symbol minX="48" maxX="68" minY="1331" maxY="1351" name="zero-icon"/>
-  <symbol minX="68" maxX="88" minY="1331" maxY="1349" name="peakt-s"/>
-  <symbol minX="88" maxX="126" minY="1331" maxY="1346" name="arrow-s"/>
-  <symbol minX="126" maxX="141" minY="1331" maxY="1346" name="dot-m"/>
-  <symbol minX="141" maxX="165" minY="1331" maxY="1342" name="arrow-xs"/>
+  <symbol minX="464" maxX="522" minY="775" maxY="833" name="clothes-m"/>
+  <symbol minX="522" maxX="580" minY="775" maxY="833" name="climbing-m"/>
+  <symbol minX="580" maxX="638" minY="775" maxY="833" name="cinema-m"/>
+  <symbol minX="638" maxX="696" minY="775" maxY="833" name="christian-m"/>
+  <symbol minX="696" maxX="754" minY="775" maxY="833" name="geyser-l"/>
+  <symbol minX="754" maxX="812" minY="775" maxY="833" name="hindu-m"/>
+  <symbol minX="812" maxX="870" minY="775" maxY="833" name="heliport-m"/>
+  <symbol minX="870" maxX="928" minY="775" maxY="833" name="helipad-m"/>
+  <symbol minX="928" maxX="986" minY="775" maxY="833" name="handball-m"/>
+  <symbol minX="986" maxX="1044" minY="775" maxY="833" name="hand-m"/>
+  <symbol minX="1044" maxX="1102" minY="775" maxY="833" name="hairdresser-m"/>
+  <symbol minX="1102" maxX="1160" minY="775" maxY="833" name="gym-m"/>
+  <symbol minX="1160" maxX="1218" minY="775" maxY="833" name="guidepost"/>
+  <symbol minX="1218" maxX="1276" minY="775" maxY="833" name="grocery-m"/>
+  <symbol minX="1276" maxX="1334" minY="775" maxY="833" name="greengrocer-m"/>
+  <symbol minX="1334" maxX="1392" minY="775" maxY="833" name="golf-m"/>
+  <symbol minX="1392" maxX="1450" minY="775" maxY="833" name="gift-m"/>
+  <symbol minX="1450" maxX="1508" minY="775" maxY="833" name="geyser-m"/>
+  <symbol minX="1508" maxX="1566" minY="775" maxY="833" name="chimney-m"/>
+  <symbol minX="1566" maxX="1624" minY="775" maxY="833" name="gate-m"/>
+  <symbol minX="1624" maxX="1682" minY="775" maxY="833" name="garden_center-m"/>
+  <symbol minX="1682" maxX="1740" minY="775" maxY="833" name="garden-outline-m"/>
+  <symbol minX="1740" maxX="1798" minY="775" maxY="833" name="garden-m"/>
+  <symbol minX="1798" maxX="1856" minY="775" maxY="833" name="gallery-m"/>
+  <symbol minX="1856" maxX="1914" minY="775" maxY="833" name="furniture-m"/>
+  <symbol minX="1914" maxX="1972" minY="775" maxY="833" name="funicular-m"/>
+  <symbol minX="1972" maxX="2030" minY="775" maxY="833" name="funeral_directors-m"/>
+  <symbol minX="0" maxX="58" minY="833" maxY="891" name="fuel-m"/>
+  <symbol minX="58" maxX="116" minY="833" maxY="891" name="fuel-dispenser-m"/>
+  <symbol minX="116" maxX="174" minY="833" maxY="891" name="fountain-s"/>
+  <symbol minX="174" maxX="232" minY="833" maxY="891" name="fountain-m"/>
+  <symbol minX="232" maxX="290" minY="833" maxY="891" name="florist-m"/>
+  <symbol minX="290" maxX="348" minY="833" maxY="891" name="bank-l"/>
+  <symbol minX="348" maxX="406" minY="833" maxY="891" name="bicycle-m"/>
+  <symbol minX="406" maxX="464" minY="833" maxY="891" name="beer-m"/>
+  <symbol minX="464" maxX="522" minY="833" maxY="891" name="beekeeper-m"/>
+  <symbol minX="522" maxX="580" minY="833" maxY="891" name="beauty-m"/>
+  <symbol minX="580" maxX="638" minY="833" maxY="891" name="beach-m"/>
+  <symbol minX="638" maxX="696" minY="833" maxY="891" name="bcontrol-m"/>
+  <symbol minX="696" maxX="754" minY="833" maxY="891" name="bbq-m"/>
+  <symbol minX="754" maxX="812" minY="833" maxY="891" name="basketball-m"/>
+  <symbol minX="812" maxX="870" minY="833" maxY="891" name="baseball-m"/>
+  <symbol minX="870" maxX="928" minY="833" maxY="891" name="bar-m"/>
+  <symbol minX="928" maxX="986" minY="833" maxY="891" name="banknote-m"/>
+  <symbol minX="986" maxX="1044" minY="833" maxY="891" name="banknote-l"/>
+  <symbol minX="1044" maxX="1102" minY="833" maxY="891" name="bank-m"/>
+  <symbol minX="1102" maxX="1160" minY="833" maxY="891" name="bicycle-repair-station"/>
+  <symbol minX="1160" maxX="1218" minY="833" maxY="891" name="bakery-m"/>
+  <symbol minX="1218" maxX="1276" minY="833" maxY="891" name="badminton-m"/>
+  <symbol minX="1276" maxX="1334" minY="833" maxY="891" name="australian-football-m"/>
+  <symbol minX="1334" maxX="1392" minY="833" maxY="891" name="audiologist-m"/>
+  <symbol minX="1392" maxX="1450" minY="833" maxY="891" name="atm-m"/>
+  <symbol minX="1450" maxX="1508" minY="833" maxY="891" name="archery-m"/>
+  <symbol minX="1508" maxX="1566" minY="833" maxY="891" name="archaeological-site-m"/>
+  <symbol minX="1566" maxX="1624" minY="833" maxY="891" name="apartment-m"/>
+  <symbol minX="1624" maxX="1682" minY="833" maxY="891" name="america-football-m"/>
+  <symbol minX="1682" maxX="1740" minY="833" maxY="891" name="alternative-m"/>
+  <symbol minX="1740" maxX="1798" minY="833" maxY="891" name="alpine_hut-m"/>
+  <symbol minX="1798" maxX="1856" minY="833" maxY="891" name="alcohol-m"/>
+  <symbol minX="1856" maxX="1914" minY="833" maxY="891" name="airport-m"/>
+  <symbol minX="1914" maxX="1972" minY="833" maxY="891" name="car-part-m"/>
+  <symbol minX="1972" maxX="2030" minY="833" maxY="891" name="chess-m"/>
+  <symbol minX="0" maxX="58" minY="891" maxY="949" name="chemist-m"/>
+  <symbol minX="58" maxX="116" minY="891" maxY="949" name="charity_shop-m"/>
+  <symbol minX="116" maxX="174" minY="891" maxY="949" name="charging-station-m"/>
+  <symbol minX="174" maxX="232" minY="891" maxY="949" name="cemetery-m"/>
+  <symbol minX="232" maxX="290" minY="891" maxY="949" name="casino-m"/>
+  <symbol minX="290" maxX="348" minY="891" maxY="949" name="carpenter-m"/>
+  <symbol minX="348" maxX="406" minY="891" maxY="949" name="caravan_site-m"/>
+  <symbol minX="406" maxX="464" minY="891" maxY="949" name="caravan-shop-m"/>
+  <symbol minX="464" maxX="522" minY="891" maxY="949" name="car_shop-m"/>
+  <symbol minX="522" maxX="580" minY="891" maxY="949" name="car_sharing-m"/>
+  <symbol minX="580" maxX="638" minY="891" maxY="949" name="car-wash-m"/>
+  <symbol minX="638" maxX="696" minY="891" maxY="949" name="car-repair-m"/>
+  <symbol minX="696" maxX="754" minY="891" maxY="949" name="restaurant-m"/>
+  <symbol minX="754" maxX="812" minY="891" maxY="949" name="campsite-m"/>
+  <symbol minX="812" maxX="870" minY="891" maxY="949" name="cafe-m"/>
+  <symbol minX="870" maxX="928" minY="891" maxY="949" name="cable-car-m"/>
+  <symbol minX="928" maxX="986" minY="891" maxY="949" name="butcher-m"/>
+  <symbol minX="986" maxX="1044" minY="891" maxY="949" name="bus-m"/>
+  <symbol minX="1044" maxX="1102" minY="891" maxY="949" name="buddhist-m"/>
+  <symbol minX="1102" maxX="1160" minY="891" maxY="949" name="brewery-m"/>
+  <symbol minX="1160" maxX="1218" minY="891" maxY="949" name="bowling_alley-m"/>
+  <symbol minX="1218" maxX="1276" minY="891" maxY="949" name="bowling-m"/>
+  <symbol minX="1276" maxX="1334" minY="891" maxY="949" name="bookmaker-m"/>
+  <symbol minX="1334" maxX="1392" minY="891" maxY="949" name="book-shop-m"/>
+  <symbol minX="1392" maxX="1450" minY="891" maxY="949" name="blood_donation-m"/>
+  <symbol minX="1450" maxX="1508" minY="891" maxY="949" name="blacksmith-m"/>
+  <symbol minX="1508" maxX="1566" minY="891" maxY="949" name="library-m"/>
+  <symbol minX="1566" maxX="1624" minY="891" maxY="949" name="media-m"/>
+  <symbol minX="1624" maxX="1682" minY="891" maxY="949" name="marketplace-m"/>
+  <symbol minX="1682" maxX="1740" minY="891" maxY="949" name="outdoor-shop-m"/>
+  <symbol minX="1740" maxX="1798" minY="891" maxY="949" name="padel-m"/>
+  <symbol minX="1798" maxX="1856" minY="891" maxY="949" name="marina-m"/>
+  <symbol minX="1856" maxX="1914" minY="891" maxY="949" name="mail-m"/>
+  <symbol minX="1914" maxX="1972" minY="891" maxY="949" name="painter-m"/>
+  <symbol minX="1972" maxX="2030" minY="891" maxY="949" name="park-m"/>
+  <symbol minX="0" maxX="58" minY="949" maxY="1007" name="lift_gate-m"/>
+  <symbol minX="58" maxX="116" minY="949" maxY="1007" name="park-outline-m"/>
+  <symbol minX="116" maxX="174" minY="949" maxY="1007" name="metal_construction-m"/>
+  <symbol minX="174" maxX="232" minY="949" maxY="1007" name="lawyer-m"/>
+  <symbol minX="232" maxX="290" minY="949" maxY="1007" name="laundry-m"/>
+  <symbol minX="290" maxX="348" minY="949" maxY="1007" name="parking-meter-m"/>
+  <symbol minX="348" maxX="406" minY="949" maxY="1007" name="language_school-m"/>
+  <symbol minX="406" maxX="464" minY="949" maxY="1007" name="pelota-m"/>
+  <symbol minX="464" maxX="522" minY="949" maxY="1007" name="kiosk-m"/>
+  <symbol minX="522" maxX="580" minY="949" maxY="1007" name="kindergarten-m"/>
+  <symbol minX="580" maxX="638" minY="949" maxY="1007" name="petshop-m"/>
+  <symbol minX="638" maxX="696" minY="949" maxY="1007" name="jewish-m"/>
+  <symbol minX="696" maxX="754" minY="949" maxY="1007" name="musical-instrument-m"/>
+  <symbol minX="754" maxX="812" minY="949" maxY="1007" name="nparkf-m"/>
+  <symbol minX="812" maxX="870" minY="949" maxY="1007" name="npark-m"/>
+  <symbol minX="870" maxX="928" minY="949" maxY="1007" name="nightclub-m"/>
+  <symbol minX="928" maxX="986" minY="949" maxY="1007" name="newsagent_shop-m"/>
+  <symbol minX="986" maxX="1044" minY="949" maxY="1007" name="nparkf-outline-m"/>
+  <symbol minX="1044" maxX="1102" minY="949" maxY="1007" name="needle_and_thread-m"/>
+  <symbol minX="1102" maxX="1160" minY="949" maxY="1007" name="office-m"/>
+  <symbol minX="1160" maxX="1218" minY="949" maxY="1007" name="muslim-m"/>
+  <symbol minX="1218" maxX="1276" minY="949" maxY="1007" name="optician-m"/>
+  <symbol minX="1276" maxX="1334" minY="949" maxY="1007" name="lighthouse-m"/>
+  <symbol minX="1334" maxX="1392" minY="949" maxY="1007" name="music_school-m"/>
+  <symbol minX="1392" maxX="1450" minY="949" maxY="1007" name="music-m"/>
+  <symbol minX="1450" maxX="1508" minY="949" maxY="1007" name="museum-m"/>
+  <symbol minX="1508" maxX="1566" minY="949" maxY="1007" name="historic-ship-m"/>
+  <symbol minX="1566" maxX="1624" minY="949" maxY="1007" name="optometrist-m"/>
+  <symbol minX="1624" maxX="1682" minY="949" maxY="1007" name="motorcycle_shop-m"/>
+  <symbol minX="1682" maxX="1740" minY="949" maxY="1007" name="monument-m"/>
+  <symbol minX="1740" maxX="1798" minY="949" maxY="1007" name="mobile_phone-m"/>
+  <symbol minX="1798" maxX="1856" minY="949" maxY="1007" name="military-m"/>
+  <symbol minX="1856" maxX="1914" minY="949" maxY="1007" name="prison-m"/>
+  <symbol minX="1914" maxX="1972" minY="949" maxY="1007" name="information-m"/>
+  <symbol minX="1972" maxX="2030" minY="949" maxY="1007" name="pitch-m"/>
+  <symbol minX="0" maxX="58" minY="1007" maxY="1065" name="ice_cream-m"/>
+  <symbol minX="58" maxX="116" minY="1007" maxY="1065" name="place-of-worship-m"/>
+  <symbol minX="116" maxX="174" minY="1007" maxY="1065" name="playground-m"/>
+  <symbol minX="174" maxX="232" minY="1007" maxY="1065" name="plumber-m"/>
+  <symbol minX="232" maxX="290" minY="1007" maxY="1065" name="podiatrist-m"/>
+  <symbol minX="290" maxX="348" minY="1007" maxY="1065" name="police-m"/>
+  <symbol minX="348" maxX="406" minY="1007" maxY="1065" name="postbox-m"/>
+  <symbol minX="406" maxX="464" minY="1007" maxY="1065" name="hunting-tower-m"/>
+  <symbol minX="464" maxX="522" minY="1007" maxY="1065" name="power-m"/>
+  <symbol minX="522" maxX="580" minY="1007" maxY="1065" name="jewelry-m"/>
+  <symbol minX="580" maxX="638" minY="1007" maxY="1065" name="hotel-m"/>
+  <symbol minX="638" maxX="696" minY="1007" maxY="1065" name="psychotherapist-m"/>
+  <symbol minX="696" maxX="754" minY="1007" maxY="1065" name="public-building-m"/>
+  <symbol minX="754" maxX="812" minY="1007" maxY="1065" name="hostel-m"/>
+  <symbol minX="812" maxX="870" minY="1007" maxY="1065" name="recycling-m"/>
+  <symbol minX="870" maxX="928" minY="1007" maxY="1065" name="hospital-m"/>
+  <symbol minX="928" maxX="986" minY="1007" maxY="1065" name="remains-m"/>
+  <symbol minX="986" maxX="1044" minY="1007" maxY="1065" name="home-m"/>
+  <symbol minX="1044" maxX="1102" minY="1007" maxY="1065" name="hockey-m"/>
+  <symbol minX="1102" maxX="1160" minY="1007" maxY="1065" name="sample_collection-m"/>
+  <symbol minX="1160" maxX="1218" minY="1007" maxY="1065" name="picnic_table-m"/>
+  <symbol minX="1218" maxX="1276" minY="1007" maxY="1065" name="photo-shop-m"/>
+  <symbol minX="1276" maxX="1334" minY="1007" maxY="1065" name="phone-m"/>
+  <symbol minX="1334" maxX="1392" minY="1007" maxY="1065" name="internet_cafe-m"/>
+  <symbol minX="1392" maxX="1450" minY="1007" maxY="1065" name="physiotherapist-m"/>
+  <symbol minX="1450" maxX="1508" minY="1007" maxY="1065" name="pharmacy-m"/>
+  <symbol minX="1508" maxX="1566" minY="1007" maxY="1065" name="picnic-m"/>
+  <symbol minX="1566" maxX="1624" minY="1007" maxY="1063" name="subway-dalian-m"/>
+  <symbol minX="1624" maxX="1680" minY="1007" maxY="1063" name="subway-spb-m"/>
+  <symbol minX="1680" maxX="1738" minY="1007" maxY="1063" name="subway-shanghai-m"/>
+  <symbol minX="1738" maxX="1794" minY="1007" maxY="1063" name="subway-montreal-m"/>
+  <symbol minX="1794" maxX="1852" minY="1007" maxY="1063" name="subway-maracaibo-m"/>
+  <symbol minX="1852" maxX="1908" minY="1007" maxY="1063" name="subway-southkorea-s"/>
+  <symbol minX="1908" maxX="1964" minY="1007" maxY="1063" name="subway-ekb-s"/>
+  <symbol minX="1964" maxX="2022" minY="1007" maxY="1063" name="subway-sapporo-m"/>
+  <symbol minX="0" maxX="58" minY="1065" maxY="1120" name="subway-marseille-m"/>
+  <symbol minX="58" maxX="112" minY="1065" maxY="1119" name="subway-stlouis-s"/>
+  <symbol minX="112" maxX="166" minY="1065" maxY="1119" name="subway-entrance-m"/>
+  <symbol minX="166" maxX="220" minY="1065" maxY="1119" name="subway-algeria-s"/>
+  <symbol minX="220" maxX="271" minY="1065" maxY="1119" name="subway-warsaw-m"/>
+  <symbol minX="271" maxX="329" minY="1065" maxY="1118" name="subway-izmir-m"/>
+  <symbol minX="329" maxX="381" minY="1065" maxY="1117" name="search-result"/>
+  <symbol minX="381" maxX="426" minY="1065" maxY="1116" name="subway-istanbul-s"/>
+  <symbol minX="426" maxX="477" minY="1065" maxY="1116" name="subway-pittsburgh-s"/>
+  <symbol minX="477" maxX="528" minY="1065" maxY="1116" name="lightrail-berlin-m"/>
+  <symbol minX="528" maxX="586" minY="1065" maxY="1115" name="subway-taoyuan-m"/>
+  <symbol minX="586" maxX="683" minY="1065" maxY="1114" name="coloredmark-default-s"/>
+  <symbol minX="683" maxX="741" minY="1065" maxY="1114" name="subway-rotterdam-m"/>
+  <symbol minX="741" maxX="790" minY="1065" maxY="1114" name="parking_pay-m"/>
+  <symbol minX="790" maxX="839" minY="1065" maxY="1114" name="subway-sapporo-s"/>
+  <symbol minX="839" maxX="890" minY="1065" maxY="1114" name="subway-izmir-s"/>
+  <symbol minX="890" maxX="935" minY="1065" maxY="1114" name="subway-brescia-s"/>
+  <symbol minX="935" maxX="984" minY="1065" maxY="1114" name="bike-parking-m"/>
+  <symbol minX="984" maxX="1033" minY="1065" maxY="1114" name="parking-disabled-m"/>
+  <symbol minX="1033" maxX="1130" minY="1065" maxY="1114" name="coloredmark-bg-s"/>
+  <symbol minX="1130" maxX="1179" minY="1065" maxY="1114" name="bicycle-rental"/>
+  <symbol minX="1179" maxX="1228" minY="1065" maxY="1114" name="speedcam-m"/>
+  <symbol minX="1228" maxX="1277" minY="1065" maxY="1114" name="subway-cairo-s"/>
+  <symbol minX="1277" maxX="1326" minY="1065" maxY="1114" name="subway-medellin-s"/>
+  <symbol minX="1326" maxX="1375" minY="1065" maxY="1114" name="non-found-search-result"/>
+  <symbol minX="1375" maxX="1424" minY="1065" maxY="1114" name="subway-isfahan-s"/>
+  <symbol minX="1424" maxX="1473" minY="1065" maxY="1114" name="parking-m"/>
+  <symbol minX="1473" maxX="1522" minY="1065" maxY="1114" name="subway-panama-s"/>
+  <symbol minX="1522" maxX="1571" minY="1065" maxY="1114" name="parking_entrance-m"/>
+  <symbol minX="1571" maxX="1629" minY="1065" maxY="1114" name="subway-tbilisi-m"/>
+  <symbol minX="1629" maxX="1676" minY="1065" maxY="1114" name="subway-mashhad-s"/>
+  <symbol minX="1676" maxX="1725" minY="1065" maxY="1114" name="motorcycle-parking-m"/>
+  <symbol minX="1725" maxX="1783" minY="1065" maxY="1113" name="subway-almaty-m"/>
+  <symbol minX="1783" maxX="1828" minY="1065" maxY="1112" name="subway-tianjin-s"/>
+  <symbol minX="1828" maxX="1879" minY="1065" maxY="1112" name="subway-seattle-m"/>
+  <symbol minX="1879" maxX="1924" minY="1065" maxY="1112" name="subway-athens-s"/>
+  <symbol minX="1924" maxX="1957" minY="1065" maxY="1112" name="bookmark-bg-xs"/>
+  <symbol minX="1957" maxX="2004" minY="1065" maxY="1112" name="subway-hirosima-s"/>
+  <symbol minX="0" maxX="45" minY="1120" maxY="1167" name="subway-pyongyang-s"/>
+  <symbol minX="45" maxX="92" minY="1120" maxY="1167" name="subway-warszawa-s"/>
+  <symbol minX="92" maxX="139" minY="1120" maxY="1167" name="subway-paris-m"/>
+  <symbol minX="139" maxX="197" minY="1120" maxY="1167" name="subway-santiago-m"/>
+  <symbol minX="197" maxX="255" minY="1120" maxY="1167" name="subway-yerevan-m"/>
+  <symbol minX="255" maxX="300" minY="1120" maxY="1167" name="subway-porto-s"/>
+  <symbol minX="300" maxX="347" minY="1120" maxY="1167" name="subway-rennes-s"/>
+  <symbol minX="347" maxX="401" minY="1120" maxY="1167" name="subway-moscow-m"/>
+  <symbol minX="401" maxX="446" minY="1120" maxY="1167" name="subway-delhi-s"/>
+  <symbol minX="446" maxX="493" minY="1120" maxY="1167" name="subway-rome-m"/>
+  <symbol minX="493" maxX="540" minY="1120" maxY="1167" name="subway-ubahn-m"/>
+  <symbol minX="540" maxX="573" minY="1120" maxY="1167" name="bookmark-default-xs"/>
+  <symbol minX="573" maxX="618" minY="1120" maxY="1165" name="subway-tashkent-s"/>
+  <symbol minX="618" maxX="663" minY="1120" maxY="1165" name="subway-riodejaneiro-s"/>
+  <symbol minX="663" maxX="719" minY="1120" maxY="1165" name="subway-yerevan-s"/>
+  <symbol minX="719" maxX="764" minY="1120" maxY="1165" name="subway-wuhan-s"/>
+  <symbol minX="764" maxX="809" minY="1120" maxY="1165" name="subway-washington-s"/>
+  <symbol minX="809" maxX="854" minY="1120" maxY="1165" name="subway-yokohama-s"/>
+  <symbol minX="854" maxX="894" minY="1120" maxY="1165" name="subway-warsaw-s"/>
+  <symbol minX="894" maxX="939" minY="1120" maxY="1165" name="subway-volgograd-s"/>
+  <symbol minX="939" maxX="990" minY="1120" maxY="1165" name="subway-taoyuan-s"/>
+  <symbol minX="990" maxX="1035" minY="1120" maxY="1165" name="subway-vienna-s"/>
+  <symbol minX="1035" maxX="1093" minY="1120" maxY="1165" name="subway-alicante-m"/>
+  <symbol minX="1093" maxX="1138" minY="1120" maxY="1165" name="subway-valencia-s"/>
+  <symbol minX="1138" maxX="1183" minY="1120" maxY="1165" name="subway-tokyo-s"/>
+  <symbol minX="1183" maxX="1228" minY="1120" maxY="1165" name="subway-tyneandwear-s"/>
+  <symbol minX="1228" maxX="1273" minY="1120" maxY="1165" name="subway-dalian-s"/>
+  <symbol minX="1273" maxX="1318" minY="1120" maxY="1165" name="subway-nnov-s"/>
+  <symbol minX="1318" maxX="1363" minY="1120" maxY="1165" name="subway-caracas-s"/>
+  <symbol minX="1363" maxX="1408" minY="1120" maxY="1165" name="subway-catania-s"/>
+  <symbol minX="1408" maxX="1453" minY="1120" maxY="1165" name="subway-nagoya-s"/>
+  <symbol minX="1453" maxX="1498" minY="1120" maxY="1165" name="subway-changchun-s"/>
+  <symbol minX="1498" maxX="1543" minY="1120" maxY="1165" name="subway-montreal-s"/>
+  <symbol minX="1543" maxX="1588" minY="1120" maxY="1165" name="subway-chengdu-s"/>
+  <symbol minX="1588" maxX="1633" minY="1120" maxY="1165" name="subway-minatomirai-s"/>
+  <symbol minX="1633" maxX="1678" minY="1120" maxY="1165" name="subway-milan-s"/>
+  <symbol minX="1678" maxX="1723" minY="1120" maxY="1165" name="subway-chicago-s"/>
+  <symbol minX="1723" maxX="1781" minY="1120" maxY="1165" name="subway-kryvyirih-m"/>
+  <symbol minX="1781" maxX="1826" minY="1120" maxY="1165" name="subway-mecca-s"/>
+  <symbol minX="1826" maxX="1871" minY="1120" maxY="1165" name="subway-massachusetts-s"/>
+  <symbol minX="1871" maxX="1929" minY="1120" maxY="1165" name="subway-omsk-m"/>
+  <symbol minX="1929" maxX="1976" minY="1120" maxY="1165" name="subway-glasgow-s"/>
+  <symbol minX="1976" maxX="2034" minY="1120" maxY="1165" name="subway-dnepro-m"/>
+  <symbol minX="0" maxX="45" minY="1167" maxY="1212" name="subway-dubai-s"/>
+  <symbol minX="45" maxX="90" minY="1167" maxY="1212" name="subway-kunming-s"/>
+  <symbol minX="90" maxX="146" minY="1167" maxY="1212" name="subway-fukuoka-s"/>
+  <symbol minX="146" maxX="191" minY="1167" maxY="1212" name="subway-lyon-s"/>
+  <symbol minX="191" maxX="236" minY="1167" maxY="1212" name="subway-kyoto-s"/>
+  <symbol minX="236" maxX="281" minY="1167" maxY="1212" name="subway-losangeles-s"/>
+  <symbol minX="281" maxX="326" minY="1167" maxY="1212" name="subway-foshan-s"/>
+  <symbol minX="326" maxX="371" minY="1167" maxY="1212" name="subway-lisboa-s"/>
+  <symbol minX="371" maxX="416" minY="1167" maxY="1212" name="subway-lima-s"/>
+  <symbol minX="416" maxX="461" minY="1167" maxY="1212" name="subway-lille-s"/>
+  <symbol minX="461" maxX="506" minY="1167" maxY="1212" name="subway-kobe-s"/>
+  <symbol minX="506" maxX="564" minY="1167" maxY="1212" name="subway-tabriz-m"/>
+  <symbol minX="564" maxX="609" minY="1167" maxY="1212" name="subway-stockholm-s"/>
+  <symbol minX="609" maxX="654" minY="1167" maxY="1212" name="subway-helsinki-s"/>
+  <symbol minX="654" maxX="699" minY="1167" maxY="1212" name="subway-sofia-s"/>
+  <symbol minX="699" maxX="744" minY="1167" maxY="1212" name="subway-shiraz-s"/>
+  <symbol minX="744" maxX="789" minY="1167" maxY="1212" name="subway-bangkok-s"/>
+  <symbol minX="789" maxX="834" minY="1167" maxY="1212" name="subway-shanghai-s"/>
+  <symbol minX="834" maxX="879" minY="1167" maxY="1212" name="subway-kazan-s"/>
+  <symbol minX="879" maxX="924" minY="1167" maxY="1212" name="subway-guangzhou-s"/>
+  <symbol minX="924" maxX="969" minY="1167" maxY="1212" name="subway-guadalajara-s"/>
+  <symbol minX="969" maxX="1014" minY="1167" maxY="1212" name="subway-saopaulo-s"/>
+  <symbol minX="1014" maxX="1059" minY="1167" maxY="1212" name="subway-santodomingo-s"/>
+  <symbol minX="1059" maxX="1104" minY="1167" maxY="1212" name="subway-beijing-s"/>
+  <symbol minX="1104" maxX="1162" minY="1167" maxY="1212" name="subway-omsk-s"/>
+  <symbol minX="1162" maxX="1218" minY="1167" maxY="1212" name="subway-santiago-s"/>
+  <symbol minX="1218" maxX="1263" minY="1167" maxY="1212" name="subway-samara-s"/>
+  <symbol minX="1263" maxX="1308" minY="1167" maxY="1212" name="subway-bengaluru-s"/>
+  <symbol minX="1308" maxX="1353" minY="1167" maxY="1212" name="subway-reseau-paris-s"/>
+  <symbol minX="1353" maxX="1398" minY="1167" maxY="1212" name="subway-brasilia-s"/>
+  <symbol minX="1398" maxX="1443" minY="1167" maxY="1212" name="subway-perugia-s"/>
+  <symbol minX="1443" maxX="1488" minY="1167" maxY="1212" name="subway-budapest-s"/>
+  <symbol minX="1488" maxX="1533" minY="1167" maxY="1212" name="subway-buenosaires-s"/>
+  <symbol minX="1533" maxX="1578" minY="1167" maxY="1212" name="subway-oslo-s"/>
+  <symbol minX="1578" maxX="1623" minY="1167" maxY="1212" name="subway-bursaray-s"/>
+  <symbol minX="1623" maxX="1681" minY="1167" maxY="1211" name="subway-philadelphia-m"/>
+  <symbol minX="1681" maxX="1739" minY="1167" maxY="1210" name="subway-osaka-m"/>
+  <symbol minX="1739" maxX="1781" minY="1167" maxY="1209" name="subway-lausanne-s"/>
+  <symbol minX="1781" maxX="1837" minY="1167" maxY="1209" name="subway-tabriz-s"/>
+  <symbol minX="1837" maxX="1893" minY="1167" maxY="1209" name="subway-london-m"/>
+  <symbol minX="1893" maxX="1951" minY="1167" maxY="1209" name="subway-lucknow-s"/>
+  <symbol minX="1951" maxX="2009" minY="1167" maxY="1209" name="subway-madrid-m"/>
+  <symbol minX="0" maxX="45" minY="1212" maxY="1254" name="subway-maracaibo-s"/>
+  <symbol minX="45" maxX="85" minY="1212" maxY="1254" name="subway-mexico-s"/>
+  <symbol minX="85" maxX="139" minY="1212" maxY="1254" name="subway-almaty-s"/>
+  <symbol minX="139" maxX="179" minY="1212" maxY="1254" name="subway-amsterdam-s"/>
+  <symbol minX="179" maxX="221" minY="1212" maxY="1254" name="cave-m"/>
+  <symbol minX="221" maxX="279" minY="1212" maxY="1254" name="subway-barcelona-m"/>
+  <symbol minX="279" maxX="321" minY="1212" maxY="1254" name="subway-spb-s"/>
+  <symbol minX="321" maxX="379" minY="1212" maxY="1253" name="subway-lucknow-m"/>
+  <symbol minX="379" maxX="419" minY="1212" maxY="1252" name="zoo-s"/>
+  <symbol minX="419" maxX="459" minY="1212" maxY="1252" name="waterfall-s"/>
+  <symbol minX="459" maxX="499" minY="1212" maxY="1252" name="waste-basket-s"/>
+  <symbol minX="499" maxX="539" minY="1212" maxY="1252" name="viewpoint-s"/>
+  <symbol minX="539" maxX="579" minY="1212" maxY="1252" name="airport-s"/>
+  <symbol minX="579" maxX="619" minY="1212" maxY="1252" name="cable-car-s"/>
+  <symbol minX="619" maxX="659" minY="1212" maxY="1252" name="park-s"/>
+  <symbol minX="659" maxX="699" minY="1212" maxY="1252" name="car-repair-s"/>
+  <symbol minX="699" maxX="739" minY="1212" maxY="1252" name="place-of-worship-s"/>
+  <symbol minX="739" maxX="779" minY="1212" maxY="1252" name="remains-s"/>
+  <symbol minX="779" maxX="819" minY="1212" maxY="1252" name="shinto-s"/>
+  <symbol minX="819" maxX="859" minY="1212" maxY="1252" name="ship-s"/>
+  <symbol minX="859" maxX="899" minY="1212" maxY="1252" name="shop-s"/>
+  <symbol minX="899" maxX="939" minY="1212" maxY="1252" name="stadium-s"/>
+  <symbol minX="939" maxX="979" minY="1212" maxY="1252" name="park-outline-s"/>
+  <symbol minX="979" maxX="1037" minY="1212" maxY="1252" name="subway-bilbao-m"/>
+  <symbol minX="1037" maxX="1077" minY="1212" maxY="1252" name="bus-s"/>
+  <symbol minX="1077" maxX="1131" minY="1212" maxY="1252" name="subway-dnepro-s"/>
+  <symbol minX="1131" maxX="1171" minY="1212" maxY="1252" name="subway-entrance-s"/>
+  <symbol minX="1171" maxX="1229" minY="1212" maxY="1252" name="subway-kolkata-m"/>
+  <symbol minX="1229" maxX="1269" minY="1212" maxY="1252" name="buddhist-s"/>
+  <symbol minX="1269" maxX="1309" minY="1212" maxY="1252" name="subway-newyork-s"/>
+  <symbol minX="1309" maxX="1358" minY="1212" maxY="1252" name="subway-osaka-s"/>
+  <symbol minX="1358" maxX="1398" minY="1212" maxY="1252" name="jewish-s"/>
+  <symbol minX="1398" maxX="1438" minY="1212" maxY="1252" name="college-s"/>
+  <symbol minX="1438" maxX="1478" minY="1212" maxY="1252" name="christian-s"/>
+  <symbol minX="1478" maxX="1518" minY="1212" maxY="1252" name="drinking-water-s"/>
+  <symbol minX="1518" maxX="1558" minY="1212" maxY="1252" name="fuel-s"/>
+  <symbol minX="1558" maxX="1598" minY="1212" maxY="1252" name="geyser-s"/>
+  <symbol minX="1598" maxX="1638" minY="1212" maxY="1252" name="hindu-s"/>
+  <symbol minX="1638" maxX="1678" minY="1212" maxY="1252" name="hospital-s"/>
+  <symbol minX="1678" maxX="1718" minY="1212" maxY="1252" name="hotel-s"/>
+  <symbol minX="1718" maxX="1749" minY="1212" maxY="1252" name="transit_train-m"/>
+  <symbol minX="1749" maxX="1789" minY="1212" maxY="1252" name="lighthouse-s"/>
+  <symbol minX="1789" maxX="1829" minY="1212" maxY="1252" name="monument-s"/>
+  <symbol minX="1829" maxX="1869" minY="1212" maxY="1252" name="charging-station-s"/>
+  <symbol minX="1869" maxX="1909" minY="1212" maxY="1252" name="museum-s"/>
+  <symbol minX="1909" maxX="1949" minY="1212" maxY="1252" name="muslim-s"/>
+  <symbol minX="1949" maxX="1989" minY="1212" maxY="1252" name="nparkf-outline-s"/>
+  <symbol minX="1989" maxX="2029" minY="1212" maxY="1252" name="nparkf-s"/>
+  <symbol minX="0" maxX="56" minY="1254" maxY="1294" name="subway-palma-s"/>
+  <symbol minX="56" maxX="96" minY="1254" maxY="1294" name="theme_park-s"/>
+  <symbol minX="96" maxX="136" minY="1254" maxY="1294" name="theatre-s"/>
+  <symbol minX="136" maxX="181" minY="1254" maxY="1294" name="subway-rotterdam-s"/>
+  <symbol minX="181" maxX="221" minY="1254" maxY="1294" name="toll_booth-s"/>
+  <symbol minX="221" maxX="261" minY="1254" maxY="1294" name="tourism-s"/>
+  <symbol minX="261" maxX="301" minY="1254" maxY="1294" name="train-s"/>
+  <symbol minX="301" maxX="341" minY="1254" maxY="1294" name="taoist-s"/>
+  <symbol minX="341" maxX="381" minY="1254" maxY="1294" name="tram-s"/>
+  <symbol minX="381" maxX="426" minY="1254" maxY="1294" name="subway-tbilisi-s"/>
+  <symbol minX="426" maxX="466" minY="1254" maxY="1294" name="subway-s"/>
+  <symbol minX="466" maxX="511" minY="1254" maxY="1294" name="transfer_arrow"/>
+  <symbol minX="511" maxX="542" minY="1254" maxY="1294" name="transit_light_rail-m"/>
+  <symbol minX="542" maxX="593" minY="1254" maxY="1294" name="subway-philadelphia-s"/>
+  <symbol minX="593" maxX="651" minY="1254" maxY="1294" name="subway-palma-m"/>
+  <symbol minX="651" maxX="709" minY="1254" maxY="1293" name="subway-sanfrancisco-m"/>
+  <symbol minX="709" maxX="767" minY="1254" maxY="1293" name="subway-bucharest-m"/>
+  <symbol minX="767" maxX="825" minY="1254" maxY="1293" name="subway-novosibirsk-m"/>
+  <symbol minX="825" maxX="883" minY="1254" maxY="1293" name="subway-fukuoka-m"/>
+  <symbol minX="883" maxX="941" minY="1254" maxY="1292" name="subway-sendai-m"/>
+  <symbol minX="941" maxX="999" minY="1254" maxY="1292" name="subway-brussel-s"/>
+  <symbol minX="999" maxX="1057" minY="1254" maxY="1292" name="subway-sanfrancisco-s"/>
+  <symbol minX="1057" maxX="1108" minY="1254" maxY="1292" name="subway-barcelona-s"/>
+  <symbol minX="1108" maxX="1166" minY="1254" maxY="1292" name="subway-kharkiv-s"/>
+  <symbol minX="1166" maxX="1222" minY="1254" maxY="1292" name="subway-kiev-m"/>
+  <symbol minX="1222" maxX="1271" minY="1254" maxY="1292" name="subway-kryvyirih-s"/>
+  <symbol minX="1271" maxX="1322" minY="1254" maxY="1292" name="subway-madrid-s"/>
+  <symbol minX="1322" maxX="1360" minY="1254" maxY="1292" name="lightrail-berlin-s"/>
+  <symbol minX="1360" maxX="1391" minY="1254" maxY="1292" name="transit_monorail-m"/>
+  <symbol minX="1391" maxX="1429" minY="1254" maxY="1292" name="elevator"/>
+  <symbol minX="1429" maxX="1467" minY="1254" maxY="1292" name="subway-paris-s"/>
+  <symbol minX="1467" maxX="1523" minY="1254" maxY="1292" name="subway-novosibirsk-s"/>
+  <symbol minX="1523" maxX="1559" minY="1254" maxY="1290" name="board"/>
+  <symbol minX="1559" maxX="1595" minY="1254" maxY="1290" name="map"/>
+  <symbol minX="1595" maxX="1653" minY="1254" maxY="1290" name="subway-sendai-s"/>
+  <symbol minX="1653" maxX="1689" minY="1254" maxY="1290" name="storage-tank"/>
+  <symbol minX="1689" maxX="1725" minY="1254" maxY="1290" name="transit_subway-m"/>
+  <symbol minX="1725" maxX="1772" minY="1254" maxY="1290" name="subway-alicante-s"/>
+  <symbol minX="1772" maxX="1830" minY="1254" maxY="1290" name="subway-kharkiv-m"/>
+  <symbol minX="1830" maxX="1857" minY="1254" maxY="1290" name="transit_train-s"/>
+  <symbol minX="1857" maxX="1913" minY="1254" maxY="1290" name="subway-bucharest-s"/>
+  <symbol minX="1913" maxX="1971" minY="1254" maxY="1290" name="subway-haagse-s"/>
+  <symbol minX="1971" maxX="2009" minY="1254" maxY="1290" name="subway-moscow-s"/>
+  <symbol minX="0" maxX="58" minY="1294" maxY="1330" name="subway-brussel-m"/>
+  <symbol minX="58" maxX="116" minY="1294" maxY="1329" name="subway-manila-m"/>
+  <symbol minX="116" maxX="152" minY="1294" maxY="1327" name="subway-seattle-s"/>
+  <symbol minX="152" maxX="201" minY="1294" maxY="1327" name="subway-bilbao-s"/>
+  <symbol minX="201" maxX="259" minY="1294" maxY="1327" name="subway-haagse-m"/>
+  <symbol minX="259" maxX="317" minY="1294" maxY="1327" name="subway-edmonton-s"/>
+  <symbol minX="317" maxX="375" minY="1294" maxY="1327" name="subway-taipei-s"/>
+  <symbol minX="375" maxX="408" minY="1294" maxY="1327" name="subway-rome-s"/>
+  <symbol minX="408" maxX="464" minY="1294" maxY="1327" name="subway-manila-s"/>
+  <symbol minX="464" maxX="497" minY="1294" maxY="1327" name="cave-s"/>
+  <symbol minX="497" maxX="530" minY="1294" maxY="1327" name="subway-ubahn-s"/>
+  <symbol minX="530" maxX="572" minY="1294" maxY="1327" name="subway-london-s"/>
+  <symbol minX="572" maxX="599" minY="1294" maxY="1325" name="transit_light_rail-s"/>
+  <symbol minX="599" maxX="632" minY="1294" maxY="1325" name="main_entrance-s"/>
+  <symbol minX="632" maxX="663" minY="1294" maxY="1325" name="transit_subway-s"/>
+  <symbol minX="663" maxX="701" minY="1294" maxY="1325" name="bench"/>
+  <symbol minX="701" maxX="728" minY="1294" maxY="1325" name="transit_monorail-s"/>
+  <symbol minX="728" maxX="748" minY="1294" maxY="1325" name="entrance-s"/>
+  <symbol minX="748" maxX="779" minY="1294" maxY="1325" name="subway-newyork-xs"/>
+  <symbol minX="779" maxX="810" minY="1294" maxY="1325" name="parking-s"/>
+  <symbol minX="810" maxX="841" minY="1294" maxY="1325" name="star-l"/>
+  <symbol minX="841" maxX="872" minY="1294" maxY="1325" name="subway-xs"/>
+  <symbol minX="872" maxX="903" minY="1294" maxY="1325" name="speedcam-s"/>
+  <symbol minX="903" maxX="952" minY="1294" maxY="1325" name="railway-crossing-l"/>
+  <symbol minX="952" maxX="1010" minY="1294" maxY="1324" name="subway-edmonton-m"/>
+  <symbol minX="1010" maxX="1066" minY="1294" maxY="1323" name="subway-malaga-s"/>
+  <symbol minX="1066" maxX="1113" minY="1294" maxY="1323" name="subway-kiev-s"/>
+  <symbol minX="1113" maxX="1146" minY="1294" maxY="1323" name="volcano-m"/>
+  <symbol minX="1146" maxX="1188" minY="1294" maxY="1323" name="subway-kolkata-s"/>
+  <symbol minX="1188" maxX="1217" minY="1294" maxY="1323" name="star-m"/>
+  <symbol minX="1217" maxX="1275" minY="1294" maxY="1322" name="subway-taipei-m"/>
+  <symbol minX="1275" maxX="1333" minY="1294" maxY="1322" name="subway-malaga-m"/>
+  <symbol minX="1333" maxX="1364" minY="1294" maxY="1321" name="plaque"/>
+  <symbol minX="1364" maxX="1406" minY="1294" maxY="1321" name="railway-crossing-m"/>
+  <symbol minX="1406" maxX="1453" minY="1294" maxY="1321" name="subway-minsk-m"/>
+  <symbol minX="1453" maxX="1509" minY="1294" maxY="1321" name="subway-baku-s"/>
+  <symbol minX="1509" maxX="1567" minY="1294" maxY="1320" name="subway-baku-m"/>
+  <symbol minX="1567" maxX="1625" minY="1294" maxY="1319" name="subway-chongqing-s"/>
+  <symbol minX="1625" maxX="1649" minY="1294" maxY="1318" name="star-s"/>
+  <symbol minX="1649" maxX="1691" minY="1294" maxY="1318" name="subway-minsk-s"/>
+  <symbol minX="1691" maxX="1749" minY="1294" maxY="1317" name="subway-chongqing-m"/>
+  <symbol minX="1749" maxX="1789" minY="1294" maxY="1316" name="mountain-pass"/>
+  <symbol minX="1789" maxX="1813" minY="1294" maxY="1316" name="peakt-m"/>
+  <symbol minX="1813" maxX="1837" minY="1294" maxY="1316" name="volcano-s"/>
+  <symbol minX="1837" maxX="1888" minY="1294" maxY="1316" name="arrow-m"/>
+  <symbol minX="1888" maxX="1908" minY="1294" maxY="1314" name="zero-icon"/>
+  <symbol minX="1908" maxX="1928" minY="1294" maxY="1312" name="peakt-s"/>
+  <symbol minX="1928" maxX="1943" minY="1294" maxY="1309" name="dot-m"/>
+  <symbol minX="1943" maxX="1981" minY="1294" maxY="1309" name="arrow-s"/>
+  <symbol minX="1981" maxX="2005" minY="1294" maxY="1305" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index d3662ea5b7..4de7f332f7 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index 2e5b24c469..47c45ab361 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -3,699 +3,694 @@
  <file width="2048" height="2048">
   <symbol minX="0" maxX="226" minY="0" maxY="136" name="route-arrow"/>
   <symbol minX="226" maxX="350" minY="0" maxY="124" name="compass-image"/>
-  <symbol minX="350" maxX="450" minY="0" maxY="118" name="shield-us-i-thin-scaled"/>
-  <symbol minX="450" maxX="574" minY="0" maxY="118" name="route-point-finish"/>
-  <symbol minX="574" maxX="692" minY="0" maxY="118" name="cross_geoposition"/>
-  <symbol minX="692" maxX="810" minY="0" maxY="118" name="shield-us-i-wide-scaled"/>
-  <symbol minX="810" maxX="922" minY="0" maxY="112" name="search-result-shop-toys"/>
-  <symbol minX="922" maxX="1034" minY="0" maxY="112" name="search-result-shop-clothes"/>
+  <symbol minX="350" maxX="468" minY="0" maxY="118" name="cross_geoposition"/>
+  <symbol minX="468" maxX="568" minY="0" maxY="118" name="shield-us-i-thin-scaled"/>
+  <symbol minX="568" maxX="686" minY="0" maxY="118" name="shield-us-i-wide-scaled"/>
+  <symbol minX="686" maxX="810" minY="0" maxY="118" name="route-point-finish"/>
+  <symbol minX="810" maxX="922" minY="0" maxY="112" name="search-result-shop-sports"/>
+  <symbol minX="922" maxX="1034" minY="0" maxY="112" name="search-result-shop-cosmetics"/>
   <symbol minX="1034" maxX="1146" minY="0" maxY="112" name="search-result-shop-convenience"/>
-  <symbol minX="1146" maxX="1258" minY="0" maxY="112" name="search-result-shop-supermarket"/>
-  <symbol minX="1258" maxX="1370" minY="0" maxY="112" name="search-result-shop-cosmetics"/>
-  <symbol minX="1370" maxX="1482" minY="0" maxY="112" name="search-result-shop-department_store"/>
-  <symbol minX="1482" maxX="1594" minY="0" maxY="112" name="search-result-shop-sports"/>
-  <symbol minX="1594" maxX="1706" minY="0" maxY="112" name="search-result-shop-gift"/>
-  <symbol minX="1706" maxX="1818" minY="0" maxY="112" name="search-result-shop-shoes"/>
-  <symbol minX="1818" maxX="1930" minY="0" maxY="112" name="search-result-shop-seafood"/>
-  <symbol minX="1930" maxX="2048" minY="0" maxY="112" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="0" maxX="112" minY="136" maxY="248" name="search-result-shop-mall"/>
-  <symbol minX="112" maxX="224" minY="136" maxY="248" name="search-result-shop-greengrocer"/>
-  <symbol minX="224" maxX="336" minY="136" maxY="248" name="search-result-shop-jewelry"/>
-  <symbol minX="336" maxX="448" minY="136" maxY="248" name="search-result-theme-park"/>
-  <symbol minX="448" maxX="560" minY="136" maxY="248" name="search-result-water-park"/>
-  <symbol minX="560" maxX="672" minY="136" maxY="248" name="search-result-bakery"/>
-  <symbol minX="672" maxX="784" minY="136" maxY="248" name="search-result-bar"/>
-  <symbol minX="784" maxX="896" minY="136" maxY="248" name="search-result-cafe"/>
-  <symbol minX="896" maxX="1008" minY="136" maxY="248" name="search-result-casino"/>
-  <symbol minX="1008" maxX="1120" minY="136" maxY="248" name="search-result-cinema"/>
-  <symbol minX="1120" maxX="1232" minY="136" maxY="248" name="search-result-fastfood"/>
-  <symbol minX="1232" maxX="1344" minY="136" maxY="248" name="search-result-marketplace"/>
-  <symbol minX="1344" maxX="1456" minY="136" maxY="248" name="search-result-nightclub"/>
-  <symbol minX="1456" maxX="1568" minY="136" maxY="248" name="search-result-shop-confectionery"/>
-  <symbol minX="1568" maxX="1680" minY="136" maxY="248" name="search-result-playground"/>
-  <symbol minX="1680" maxX="1792" minY="136" maxY="248" name="search-result-pub"/>
-  <symbol minX="1792" maxX="1904" minY="136" maxY="248" name="search-result-restaurant"/>
-  <symbol minX="1904" maxX="2016" minY="136" maxY="248" name="search-result-shop-alcohol"/>
-  <symbol minX="0" maxX="112" minY="248" maxY="360" name="search-result-zoo"/>
-  <symbol minX="112" maxX="224" minY="248" maxY="360" name="search-result-shop-butcher"/>
+  <symbol minX="1146" maxX="1258" minY="0" maxY="112" name="search-result-shop-shoes"/>
+  <symbol minX="1258" maxX="1370" minY="0" maxY="112" name="search-result-theme-park"/>
+  <symbol minX="1370" maxX="1482" minY="0" maxY="112" name="search-result-cinema"/>
+  <symbol minX="1482" maxX="1594" minY="0" maxY="112" name="search-result-fastfood"/>
+  <symbol minX="1594" maxX="1706" minY="0" maxY="112" name="search-result-restaurant"/>
+  <symbol minX="1706" maxX="1818" minY="0" maxY="112" name="search-result-marketplace"/>
+  <symbol minX="1818" maxX="1930" minY="0" maxY="112" name="search-result-zoo"/>
+  <symbol minX="1930" maxX="2042" minY="0" maxY="112" name="search-result-pub"/>
+  <symbol minX="0" maxX="112" minY="136" maxY="248" name="search-result-shop-confectionery"/>
+  <symbol minX="112" maxX="224" minY="136" maxY="248" name="search-result-nightclub"/>
+  <symbol minX="224" maxX="336" minY="136" maxY="248" name="search-result-playground"/>
+  <symbol minX="336" maxX="448" minY="136" maxY="248" name="search-result-shop-clothes"/>
+  <symbol minX="448" maxX="566" minY="136" maxY="248" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="566" maxX="678" minY="136" maxY="248" name="search-result-shop-toys"/>
+  <symbol minX="678" maxX="790" minY="136" maxY="248" name="search-result-shop-butcher"/>
+  <symbol minX="790" maxX="902" minY="136" maxY="248" name="search-result-shop-supermarket"/>
+  <symbol minX="902" maxX="1014" minY="136" maxY="248" name="search-result-shop-greengrocer"/>
+  <symbol minX="1014" maxX="1126" minY="136" maxY="248" name="search-result-shop-department_store"/>
+  <symbol minX="1126" maxX="1238" minY="136" maxY="248" name="search-result-casino"/>
+  <symbol minX="1238" maxX="1350" minY="136" maxY="248" name="search-result-bakery"/>
+  <symbol minX="1350" maxX="1462" minY="136" maxY="248" name="search-result-cafe"/>
+  <symbol minX="1462" maxX="1574" minY="136" maxY="248" name="search-result-bar"/>
+  <symbol minX="1574" maxX="1686" minY="136" maxY="248" name="search-result-shop-seafood"/>
+  <symbol minX="1686" maxX="1798" minY="136" maxY="248" name="search-result-shop-gift"/>
+  <symbol minX="1798" maxX="1910" minY="136" maxY="248" name="search-result-shop-jewelry"/>
+  <symbol minX="1910" maxX="2022" minY="136" maxY="248" name="search-result-water-park"/>
+  <symbol minX="0" maxX="112" minY="248" maxY="360" name="search-result-shop-alcohol"/>
+  <symbol minX="112" maxX="224" minY="248" maxY="360" name="search-result-shop-mall"/>
   <symbol minX="224" maxX="324" minY="248" maxY="354" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="324" maxX="406" minY="248" maxY="351" name="unpaved_road"/>
+  <symbol minX="324" maxX="406" minY="248" maxY="351" name="ferry"/>
   <symbol minX="406" maxX="488" minY="248" maxY="351" name="paid_road"/>
-  <symbol minX="488" maxX="570" minY="248" maxY="351" name="ferry"/>
+  <symbol minX="488" maxX="570" minY="248" maxY="351" name="unpaved_road"/>
   <symbol minX="570" maxX="670" minY="248" maxY="348" name="track_marker_selected"/>
   <symbol minX="670" maxX="770" minY="248" maxY="348" name="infosign"/>
-  <symbol minX="770" maxX="836" minY="248" maxY="343" name="bookmark-entertainment-m"/>
-  <symbol minX="836" maxX="902" minY="248" maxY="343" name="bookmark-hotel-m"/>
-  <symbol minX="902" maxX="968" minY="248" maxY="343" name="bookmark-animals-m"/>
-  <symbol minX="968" maxX="1034" minY="248" maxY="343" name="bookmark-bar-m"/>
-  <symbol minX="1034" maxX="1100" minY="248" maxY="343" name="bookmark-water-m"/>
-  <symbol minX="1100" maxX="1166" minY="248" maxY="343" name="bookmark-bg-m"/>
-  <symbol minX="1166" maxX="1232" minY="248" maxY="343" name="bookmark-buddhism-m"/>
-  <symbol minX="1232" maxX="1298" minY="248" maxY="343" name="bookmark-viewpoint-m"/>
-  <symbol minX="1298" maxX="1364" minY="248" maxY="343" name="bookmark-building-m"/>
-  <symbol minX="1364" maxX="1430" minY="248" maxY="343" name="bookmark-transport-m"/>
-  <symbol minX="1430" maxX="1496" minY="248" maxY="343" name="bookmark-christianity-m"/>
-  <symbol minX="1496" maxX="1562" minY="248" maxY="343" name="bookmark-default-m"/>
-  <symbol minX="1562" maxX="1628" minY="248" maxY="343" name="bookmark-parking-m"/>
-  <symbol minX="1628" maxX="1694" minY="248" maxY="343" name="bookmark-exchange-m"/>
-  <symbol minX="1694" maxX="1760" minY="248" maxY="343" name="bookmark-swim-m"/>
-  <symbol minX="1760" maxX="1826" minY="248" maxY="343" name="bookmark-finish-m"/>
-  <symbol minX="1826" maxX="1892" minY="248" maxY="343" name="bookmark-food-m"/>
-  <symbol minX="1892" maxX="1958" minY="248" maxY="343" name="bookmark-start-m"/>
-  <symbol minX="1958" maxX="2024" minY="248" maxY="343" name="bookmark-gas-m"/>
-  <symbol minX="0" maxX="66" minY="360" maxY="455" name="bookmark-sport-m"/>
-  <symbol minX="66" maxX="132" minY="360" maxY="455" name="bookmark-islam-m"/>
-  <symbol minX="132" maxX="198" minY="360" maxY="455" name="bookmark-sights-m"/>
-  <symbol minX="198" maxX="264" minY="360" maxY="455" name="bookmark-shop-m"/>
-  <symbol minX="264" maxX="330" minY="360" maxY="455" name="bookmark-judaism-m"/>
-  <symbol minX="330" maxX="396" minY="360" maxY="455" name="bookmark-medicine-m"/>
-  <symbol minX="396" maxX="462" minY="360" maxY="455" name="bookmark-mountain-m"/>
-  <symbol minX="462" maxX="528" minY="360" maxY="455" name="bookmark-museum-m"/>
-  <symbol minX="528" maxX="594" minY="360" maxY="455" name="bookmark-park-m"/>
-  <symbol minX="594" maxX="682" minY="360" maxY="448" name="route-point-8"/>
-  <symbol minX="682" maxX="770" minY="360" maxY="448" name="route-point-4"/>
-  <symbol minX="770" maxX="858" minY="360" maxY="448" name="route-point-3"/>
-  <symbol minX="858" maxX="946" minY="360" maxY="448" name="route-point-20"/>
-  <symbol minX="946" maxX="1034" minY="360" maxY="448" name="route-point-2"/>
-  <symbol minX="1034" maxX="1122" minY="360" maxY="448" name="route-point-19"/>
-  <symbol minX="1122" maxX="1210" minY="360" maxY="448" name="route-point-18"/>
-  <symbol minX="1210" maxX="1298" minY="360" maxY="448" name="route-point-17"/>
-  <symbol minX="1298" maxX="1386" minY="360" maxY="448" name="route-point-5"/>
-  <symbol minX="1386" maxX="1474" minY="360" maxY="448" name="route-point-16"/>
-  <symbol minX="1474" maxX="1562" minY="360" maxY="448" name="route-point-15"/>
-  <symbol minX="1562" maxX="1650" minY="360" maxY="448" name="route-point-14"/>
-  <symbol minX="1650" maxX="1738" minY="360" maxY="448" name="route-point-6"/>
-  <symbol minX="1738" maxX="1826" minY="360" maxY="448" name="route-point-13"/>
-  <symbol minX="1826" maxX="1914" minY="360" maxY="448" name="route-point-7"/>
-  <symbol minX="1914" maxX="2038" minY="360" maxY="448" name="coloredmark-default-l"/>
-  <symbol minX="0" maxX="88" minY="455" maxY="543" name="route-point-9"/>
-  <symbol minX="88" maxX="212" minY="455" maxY="543" name="coloredmark-bg-l"/>
-  <symbol minX="212" maxX="336" minY="455" maxY="543" name="norating-bg-l"/>
-  <symbol minX="336" maxX="460" minY="455" maxY="543" name="norating-default-l"/>
-  <symbol minX="460" maxX="548" minY="455" maxY="543" name="route-point-1"/>
-  <symbol minX="548" maxX="636" minY="455" maxY="543" name="route-point-10"/>
-  <symbol minX="636" maxX="724" minY="455" maxY="543" name="route-point-11"/>
-  <symbol minX="724" maxX="812" minY="455" maxY="543" name="route-point-12"/>
-  <symbol minX="812" maxX="900" minY="455" maxY="543" name="route-point-start"/>
-  <symbol minX="900" maxX="964" minY="455" maxY="531" name="shield-us-i-thin"/>
-  <symbol minX="964" maxX="1046" minY="455" maxY="531" name="shield-us-i-wide"/>
-  <symbol minX="1046" maxX="1128" minY="455" maxY="525" name="shield-us-hw-wide"/>
-  <symbol minX="1128" maxX="1198" minY="455" maxY="525" name="shield-us-hw-thin"/>
-  <symbol minX="1198" maxX="1245" minY="455" maxY="521" name="bookmark-bg-s"/>
-  <symbol minX="1245" maxX="1292" minY="455" maxY="521" name="bookmark-default-s"/>
-  <symbol minX="1292" maxX="1356" minY="455" maxY="519" name="track_marker_deselected"/>
-  <symbol minX="1356" maxX="1420" minY="455" maxY="519" name="current-position"/>
-  <symbol minX="1420" maxX="1478" minY="455" maxY="513" name="sauna-m"/>
-  <symbol minX="1478" maxX="1536" minY="455" maxY="513" name="shinto-m"/>
-  <symbol minX="1536" maxX="1594" minY="455" maxY="513" name="shelter-m"/>
-  <symbol minX="1594" maxX="1652" minY="455" maxY="513" name="second_hand_shop-m"/>
-  <symbol minX="1652" maxX="1710" minY="455" maxY="513" name="subway-tyneandwear-m"/>
-  <symbol minX="1710" maxX="1768" minY="455" maxY="513" name="subway-bangkok-m"/>
-  <symbol minX="1768" maxX="1826" minY="455" maxY="513" name="seafood-shop-m"/>
-  <symbol minX="1826" maxX="1884" minY="455" maxY="513" name="school-m"/>
-  <symbol minX="1884" maxX="1942" minY="455" maxY="513" name="subway-samara-m"/>
-  <symbol minX="1942" maxX="2000" minY="455" maxY="513" name="sawmill-m"/>
-  <symbol minX="0" maxX="58" minY="543" maxY="601" name="subway-beijing-m"/>
-  <symbol minX="58" maxX="116" minY="543" maxY="601" name="subway-valencia-m"/>
-  <symbol minX="116" maxX="174" minY="543" maxY="601" name="subway-bengaluru-m"/>
-  <symbol minX="174" maxX="232" minY="543" maxY="601" name="subway-vienna-m"/>
-  <symbol minX="232" maxX="290" minY="543" maxY="601" name="subway-southkorea-m"/>
-  <symbol minX="290" maxX="348" minY="543" maxY="601" name="sample_collection-m"/>
-  <symbol minX="348" maxX="406" minY="543" maxY="601" name="subway-brasilia-m"/>
-  <symbol minX="406" maxX="464" minY="543" maxY="601" name="subway-stlouis-m"/>
-  <symbol minX="464" maxX="522" minY="543" maxY="601" name="subway-riodejaneiro-m"/>
-  <symbol minX="522" maxX="580" minY="543" maxY="601" name="subway-volgograd-m"/>
-  <symbol minX="580" maxX="633" minY="543" maxY="601" name="subway-brescia-m"/>
-  <symbol minX="633" maxX="691" minY="543" maxY="601" name="subway-reseau-paris-m"/>
-  <symbol minX="691" maxX="749" minY="543" maxY="601" name="restaurant-m"/>
-  <symbol minX="749" maxX="807" minY="543" maxY="601" name="subway-rennes-m"/>
-  <symbol minX="807" maxX="865" minY="543" maxY="601" name="subway-pyongyang-m"/>
-  <symbol minX="865" maxX="921" minY="543" maxY="601" name="subway-porto-m"/>
-  <symbol minX="921" maxX="979" minY="543" maxY="601" name="subway-bursaray-m"/>
-  <symbol minX="979" maxX="1037" minY="543" maxY="601" name="subway-tokyo-m"/>
-  <symbol minX="1037" maxX="1095" minY="543" maxY="601" name="speedcam-alert-l"/>
-  <symbol minX="1095" maxX="1153" minY="543" maxY="601" name="sports-m"/>
-  <symbol minX="1153" maxX="1211" minY="543" maxY="601" name="stadium-m"/>
-  <symbol minX="1211" maxX="1269" minY="543" maxY="601" name="subway-tianjin-m"/>
-  <symbol minX="1269" maxX="1327" minY="543" maxY="601" name="subway-saopaulo-m"/>
-  <symbol minX="1327" maxX="1385" minY="543" maxY="601" name="speech_therapist-m"/>
-  <symbol minX="1385" maxX="1443" minY="543" maxY="601" name="subway-shiraz-m"/>
-  <symbol minX="1443" maxX="1501" minY="543" maxY="601" name="subway-sofia-m"/>
-  <symbol minX="1501" maxX="1559" minY="543" maxY="601" name="soccer-m"/>
-  <symbol minX="1559" maxX="1617" minY="543" maxY="601" name="stationery_shop-m"/>
-  <symbol minX="1617" maxX="1675" minY="543" maxY="601" name="skiing-m"/>
-  <symbol minX="1675" maxX="1733" minY="543" maxY="601" name="subway-adana-m"/>
-  <symbol minX="1733" maxX="1791" minY="543" maxY="601" name="subway-adana-s"/>
-  <symbol minX="1791" maxX="1849" minY="543" maxY="601" name="subway-tashkent-m"/>
-  <symbol minX="1849" maxX="1907" minY="543" maxY="601" name="subway-santodomingo-m"/>
-  <symbol minX="1907" maxX="1965" minY="543" maxY="601" name="subway-algeria-m"/>
-  <symbol minX="1965" maxX="2023" minY="543" maxY="601" name="skateboard-m"/>
-  <symbol minX="0" maxX="58" minY="601" maxY="659" name="shower-m"/>
-  <symbol minX="58" maxX="116" minY="601" maxY="659" name="shop-m"/>
-  <symbol minX="116" maxX="174" minY="601" maxY="659" name="shop-bicycle-m"/>
-  <symbol minX="174" maxX="225" minY="601" maxY="659" name="subway-amsterdam-m"/>
-  <symbol minX="225" maxX="283" minY="601" maxY="659" name="shoes-m"/>
-  <symbol minX="283" maxX="341" minY="601" maxY="659" name="ship-m"/>
-  <symbol minX="341" maxX="399" minY="601" maxY="659" name="subway-ankara-m"/>
-  <symbol minX="399" maxX="457" minY="601" maxY="659" name="subway-ankara-s"/>
-  <symbol minX="457" maxX="513" minY="601" maxY="659" name="subway-athens-m"/>
-  <symbol minX="513" maxX="571" minY="601" maxY="659" name="subway-mecca-m"/>
-  <symbol minX="571" maxX="629" minY="601" maxY="659" name="toys-m"/>
-  <symbol minX="629" maxX="687" minY="601" maxY="659" name="tourism-m"/>
-  <symbol minX="687" maxX="745" minY="601" maxY="659" name="subway-kunming-m"/>
-  <symbol minX="745" maxX="803" minY="601" maxY="659" name="tomb-m"/>
-  <symbol minX="803" maxX="861" minY="601" maxY="659" name="subway-marseille-s"/>
-  <symbol minX="861" maxX="917" minY="601" maxY="659" name="subway-mashhad-m"/>
-  <symbol minX="917" maxX="975" minY="601" maxY="659" name="subway-massachusetts-m"/>
-  <symbol minX="975" maxX="1033" minY="601" maxY="659" name="subway-kobe-m"/>
-  <symbol minX="1033" maxX="1091" minY="601" maxY="659" name="toll_booth-m"/>
-  <symbol minX="1091" maxX="1149" minY="601" maxY="659" name="train-m"/>
-  <symbol minX="1149" maxX="1207" minY="601" maxY="659" name="toilets-m"/>
-  <symbol minX="1207" maxX="1265" minY="601" maxY="659" name="subway-kazan-m"/>
-  <symbol minX="1265" maxX="1312" minY="601" maxY="659" name="subway-istanbul-m"/>
-  <symbol minX="1312" maxX="1370" minY="601" maxY="659" name="subway-isfahan-m"/>
-  <symbol minX="1370" maxX="1428" minY="601" maxY="659" name="subway-hirosima-m"/>
-  <symbol minX="1428" maxX="1486" minY="601" maxY="659" name="subway-medellin-m"/>
-  <symbol minX="1486" maxX="1544" minY="601" maxY="659" name="subway-helsinki-m"/>
-  <symbol minX="1544" maxX="1600" minY="601" maxY="659" name="subway-mexico-m"/>
-  <symbol minX="1600" maxX="1658" minY="601" maxY="659" name="tire-repair-m"/>
-  <symbol minX="1658" maxX="1716" minY="601" maxY="659" name="wayside_shrine-m"/>
-  <symbol minX="1716" maxX="1774" minY="601" maxY="659" name="veterinary-m"/>
-  <symbol minX="1774" maxX="1832" minY="601" maxY="659" name="video-games-m"/>
-  <symbol minX="1832" maxX="1890" minY="601" maxY="659" name="vending-m"/>
-  <symbol minX="1890" maxX="1948" minY="601" maxY="659" name="viewpoint-m"/>
-  <symbol minX="1948" maxX="2006" minY="601" maxY="659" name="volleyball-m"/>
-  <symbol minX="0" maxX="58" minY="659" maxY="717" name="subway-losangeles-m"/>
-  <symbol minX="58" maxX="116" minY="659" maxY="717" name="waste-basket-m"/>
-  <symbol minX="116" maxX="174" minY="659" maxY="717" name="travel_agency_shop-m"/>
-  <symbol minX="174" maxX="232" minY="659" maxY="717" name="waterfall-m"/>
-  <symbol minX="232" maxX="290" minY="659" maxY="717" name="subway-milan-m"/>
-  <symbol minX="290" maxX="348" minY="659" maxY="717" name="subway-lisboa-m"/>
-  <symbol minX="348" maxX="406" minY="659" maxY="717" name="windmill-m"/>
-  <symbol minX="406" maxX="464" minY="659" maxY="717" name="subway-lima-m"/>
-  <symbol minX="464" maxX="522" minY="659" maxY="717" name="yoga-m"/>
-  <symbol minX="522" maxX="580" minY="659" maxY="717" name="subway-lille-m"/>
-  <symbol minX="580" maxX="638" minY="659" maxY="717" name="zoo-m"/>
-  <symbol minX="638" maxX="696" minY="659" maxY="717" name="subway-lausanne-m"/>
-  <symbol minX="696" maxX="754" minY="659" maxY="717" name="tram-m"/>
-  <symbol minX="754" maxX="812" minY="659" maxY="717" name="subway-kyoto-m"/>
-  <symbol minX="812" maxX="870" minY="659" maxY="717" name="subway-panama-m"/>
-  <symbol minX="870" maxX="928" minY="659" maxY="717" name="sweets-m"/>
-  <symbol minX="928" maxX="984" minY="659" maxY="717" name="subway-nnov-m"/>
-  <symbol minX="984" maxX="1042" minY="659" maxY="717" name="survey_point-m"/>
-  <symbol minX="1042" maxX="1100" minY="659" maxY="717" name="subway-yokohama-m"/>
-  <symbol minX="1100" maxX="1158" minY="659" maxY="717" name="subway-wuhan-m"/>
-  <symbol minX="1158" maxX="1216" minY="659" maxY="717" name="subway-chicago-m"/>
-  <symbol minX="1216" maxX="1274" minY="659" maxY="717" name="subway-oslo-m"/>
-  <symbol minX="1274" maxX="1332" minY="659" maxY="717" name="subway-washington-m"/>
-  <symbol minX="1332" maxX="1390" minY="659" maxY="717" name="subway-chengdu-m"/>
-  <symbol minX="1390" maxX="1448" minY="659" maxY="717" name="swimming-m"/>
-  <symbol minX="1448" maxX="1506" minY="659" maxY="717" name="subway-changchun-m"/>
-  <symbol minX="1506" maxX="1564" minY="659" maxY="717" name="subway-catania-m"/>
-  <symbol minX="1564" maxX="1622" minY="659" maxY="717" name="subway-caracas-m"/>
-  <symbol minX="1622" maxX="1680" minY="659" maxY="717" name="subway-cairo-m"/>
-  <symbol minX="1680" maxX="1738" minY="659" maxY="717" name="subway-warszawa-m"/>
-  <symbol minX="1738" maxX="1796" minY="659" maxY="717" name="subway-m"/>
-  <symbol minX="1796" maxX="1854" minY="659" maxY="717" name="subway-buenosaires-m"/>
-  <symbol minX="1854" maxX="1912" minY="659" maxY="717" name="subway-perugia-m"/>
-  <symbol minX="1912" maxX="1970" minY="659" maxY="717" name="subway-budapest-m"/>
-  <symbol minX="1970" maxX="2028" minY="659" maxY="717" name="tennis-m"/>
-  <symbol minX="0" maxX="58" minY="717" maxY="775" name="airport-m"/>
-  <symbol minX="58" maxX="116" minY="717" maxY="775" name="subway-guangzhou-m"/>
-  <symbol minX="116" maxX="174" minY="717" maxY="775" name="ticket-shop-m"/>
-  <symbol minX="174" maxX="232" minY="717" maxY="775" name="subway-guadalajara-m"/>
-  <symbol minX="232" maxX="290" minY="717" maxY="775" name="subway-stockholm-m"/>
-  <symbol minX="290" maxX="348" minY="717" maxY="775" name="subway-minatomirai-m"/>
-  <symbol minX="348" maxX="406" minY="717" maxY="775" name="subway-glasgow-m"/>
-  <symbol minX="406" maxX="464" minY="717" maxY="775" name="theme_park-m"/>
-  <symbol minX="464" maxX="522" minY="717" maxY="775" name="theatre-m"/>
-  <symbol minX="522" maxX="580" minY="717" maxY="775" name="subway-pittsburgh-m"/>
-  <symbol minX="580" maxX="638" minY="717" maxY="775" name="subway-foshan-m"/>
-  <symbol minX="638" maxX="696" minY="717" maxY="775" name="taxi-m"/>
-  <symbol minX="696" maxX="754" minY="717" maxY="775" name="subway-ekb-m"/>
-  <symbol minX="754" maxX="812" minY="717" maxY="775" name="taoist-m"/>
-  <symbol minX="812" maxX="870" minY="717" maxY="775" name="subway-nagoya-m"/>
-  <symbol minX="870" maxX="928" minY="717" maxY="775" name="table-tennis-m"/>
-  <symbol minX="928" maxX="986" minY="717" maxY="775" name="subway-dubai-m"/>
-  <symbol minX="986" maxX="1044" minY="717" maxY="775" name="subway-newyork-m"/>
-  <symbol minX="1044" maxX="1100" minY="717" maxY="775" name="subway-delhi-m"/>
-  <symbol minX="1100" maxX="1158" minY="717" maxY="775" name="copyshop-m"/>
-  <symbol minX="1158" maxX="1216" minY="717" maxY="775" name="dump-station-m"/>
-  <symbol minX="1216" maxX="1274" minY="717" maxY="775" name="driving_school-m"/>
-  <symbol minX="1274" maxX="1332" minY="717" maxY="775" name="drinking-water-m"/>
-  <symbol minX="1332" maxX="1390" minY="717" maxY="775" name="doityourself-m"/>
-  <symbol minX="1390" maxX="1448" minY="717" maxY="775" name="dog_park-m"/>
-  <symbol minX="1448" maxX="1506" minY="717" maxY="775" name="diving-m"/>
-  <symbol minX="1506" maxX="1564" minY="717" maxY="775" name="department_store-m"/>
-  <symbol minX="1564" maxX="1622" minY="717" maxY="775" name="dentist-m"/>
-  <symbol minX="1622" maxX="1680" minY="717" maxY="775" name="defibrillator-m"/>
-  <symbol minX="1680" maxX="1738" minY="717" maxY="775" name="curling-m"/>
-  <symbol minX="1738" maxX="1796" minY="717" maxY="775" name="cross-m"/>
-  <symbol minX="1796" maxX="1854" minY="717" maxY="775" name="cricket-m"/>
-  <symbol minX="1854" maxX="1912" minY="717" maxY="775" name="electrician-m"/>
-  <symbol minX="1912" maxX="1970" minY="717" maxY="775" name="computer-m"/>
-  <symbol minX="1970" maxX="2028" minY="717" maxY="775" name="college-m"/>
-  <symbol minX="0" maxX="58" minY="775" maxY="833" name="clothes-m"/>
-  <symbol minX="58" maxX="116" minY="775" maxY="833" name="climbing-m"/>
-  <symbol minX="116" maxX="174" minY="775" maxY="833" name="cinema-m"/>
-  <symbol minX="174" maxX="232" minY="775" maxY="833" name="christian-m"/>
-  <symbol minX="232" maxX="290" minY="775" maxY="833" name="chimney-m"/>
-  <symbol minX="290" maxX="348" minY="775" maxY="833" name="chess-m"/>
-  <symbol minX="348" maxX="406" minY="775" maxY="833" name="chemist-m"/>
-  <symbol minX="406" maxX="464" minY="775" maxY="833" name="cheese-m"/>
-  <symbol minX="464" maxX="522" minY="775" maxY="833" name="charity_shop-m"/>
-  <symbol minX="522" maxX="580" minY="775" maxY="833" name="charging-station-m"/>
-  <symbol minX="580" maxX="638" minY="775" maxY="833" name="fuel-dispenser-m"/>
-  <symbol minX="638" maxX="696" minY="775" maxY="833" name="golf-m"/>
-  <symbol minX="696" maxX="754" minY="775" maxY="833" name="gift-m"/>
-  <symbol minX="754" maxX="812" minY="775" maxY="833" name="geyser-m"/>
-  <symbol minX="812" maxX="870" minY="775" maxY="833" name="geyser-l"/>
-  <symbol minX="870" maxX="928" minY="775" maxY="833" name="garden_center-m"/>
-  <symbol minX="928" maxX="986" minY="775" maxY="833" name="garden-outline-m"/>
-  <symbol minX="986" maxX="1044" minY="775" maxY="833" name="garden-m"/>
-  <symbol minX="1044" maxX="1102" minY="775" maxY="833" name="gallery-m"/>
-  <symbol minX="1102" maxX="1160" minY="775" maxY="833" name="furniture-m"/>
-  <symbol minX="1160" maxX="1218" minY="775" maxY="833" name="funicular-m"/>
-  <symbol minX="1218" maxX="1276" minY="775" maxY="833" name="funeral_directors-m"/>
-  <symbol minX="1276" maxX="1334" minY="775" maxY="833" name="fuel-m"/>
-  <symbol minX="1334" maxX="1392" minY="775" maxY="833" name="cemetery-m"/>
-  <symbol minX="1392" maxX="1450" minY="775" maxY="833" name="fountain-s"/>
-  <symbol minX="1450" maxX="1508" minY="775" maxY="833" name="fountain-m"/>
-  <symbol minX="1508" maxX="1566" minY="775" maxY="833" name="florist-m"/>
-  <symbol minX="1566" maxX="1624" minY="775" maxY="833" name="firehydrant-m"/>
-  <symbol minX="1624" maxX="1682" minY="775" maxY="833" name="fire_station-m"/>
-  <symbol minX="1682" maxX="1740" minY="775" maxY="833" name="fastfood-m"/>
-  <symbol minX="1740" maxX="1798" minY="775" maxY="833" name="erotic-m"/>
-  <symbol minX="1798" maxX="1856" minY="775" maxY="833" name="equestrian-m"/>
-  <symbol minX="1856" maxX="1914" minY="775" maxY="833" name="emergency-phone-m"/>
-  <symbol minX="1914" maxX="1972" minY="775" maxY="833" name="embassy-m"/>
-  <symbol minX="1972" maxX="2030" minY="775" maxY="833" name="electronics-m"/>
-  <symbol minX="0" maxX="58" minY="833" maxY="891" name="australian-football-m"/>
-  <symbol minX="58" maxX="116" minY="833" maxY="891" name="beekeeper-m"/>
-  <symbol minX="116" maxX="174" minY="833" maxY="891" name="beauty-m"/>
-  <symbol minX="174" maxX="232" minY="833" maxY="891" name="beach-m"/>
-  <symbol minX="232" maxX="290" minY="833" maxY="891" name="bcontrol-m"/>
-  <symbol minX="290" maxX="348" minY="833" maxY="891" name="bbq-m"/>
-  <symbol minX="348" maxX="406" minY="833" maxY="891" name="basketball-m"/>
-  <symbol minX="406" maxX="464" minY="833" maxY="891" name="baseball-m"/>
-  <symbol minX="464" maxX="522" minY="833" maxY="891" name="bar-m"/>
-  <symbol minX="522" maxX="580" minY="833" maxY="891" name="banknote-m"/>
-  <symbol minX="580" maxX="638" minY="833" maxY="891" name="bank-m"/>
-  <symbol minX="638" maxX="696" minY="833" maxY="891" name="bakery-m"/>
-  <symbol minX="696" maxX="754" minY="833" maxY="891" name="badminton-m"/>
-  <symbol minX="754" maxX="812" minY="833" maxY="891" name="beer-m"/>
-  <symbol minX="812" maxX="870" minY="833" maxY="891" name="audiologist-m"/>
-  <symbol minX="870" maxX="928" minY="833" maxY="891" name="atm-m"/>
-  <symbol minX="928" maxX="986" minY="833" maxY="891" name="art-m"/>
-  <symbol minX="986" maxX="1044" minY="833" maxY="891" name="archery-m"/>
-  <symbol minX="1044" maxX="1102" minY="833" maxY="891" name="archaeological-site-m"/>
-  <symbol minX="1102" maxX="1160" minY="833" maxY="891" name="apartment-m"/>
-  <symbol minX="1160" maxX="1218" minY="833" maxY="891" name="antiques-m"/>
-  <symbol minX="1218" maxX="1276" minY="833" maxY="891" name="america-football-m"/>
-  <symbol minX="1276" maxX="1334" minY="833" maxY="891" name="alternative-m"/>
-  <symbol minX="1334" maxX="1392" minY="833" maxY="891" name="alpine_hut-m"/>
-  <symbol minX="1392" maxX="1450" minY="833" maxY="891" name="alcohol-m"/>
-  <symbol minX="1450" maxX="1508" minY="833" maxY="891" name="airport_gate-m"/>
-  <symbol minX="1508" maxX="1566" minY="833" maxY="891" name="butcher-m"/>
-  <symbol minX="1566" maxX="1624" minY="833" maxY="891" name="casino-m"/>
-  <symbol minX="1624" maxX="1682" minY="833" maxY="891" name="carpenter-m"/>
-  <symbol minX="1682" maxX="1740" minY="833" maxY="891" name="caravan_site-m"/>
-  <symbol minX="1740" maxX="1798" minY="833" maxY="891" name="caravan-shop-m"/>
-  <symbol minX="1798" maxX="1856" minY="833" maxY="891" name="car_shop-m"/>
-  <symbol minX="1856" maxX="1914" minY="833" maxY="891" name="car_sharing-m"/>
+  <symbol minX="770" maxX="836" minY="248" maxY="343" name="bookmark-mountain-m"/>
+  <symbol minX="836" maxX="902" minY="248" maxY="343" name="bookmark-judaism-m"/>
+  <symbol minX="902" maxX="968" minY="248" maxY="343" name="bookmark-islam-m"/>
+  <symbol minX="968" maxX="1034" minY="248" maxY="343" name="bookmark-gas-m"/>
+  <symbol minX="1034" maxX="1100" minY="248" maxY="343" name="bookmark-building-m"/>
+  <symbol minX="1100" maxX="1166" minY="248" maxY="343" name="bookmark-park-m"/>
+  <symbol minX="1166" maxX="1232" minY="248" maxY="343" name="bookmark-hotel-m"/>
+  <symbol minX="1232" maxX="1298" minY="248" maxY="343" name="bookmark-medicine-m"/>
+  <symbol minX="1298" maxX="1364" minY="248" maxY="343" name="bookmark-christianity-m"/>
+  <symbol minX="1364" maxX="1430" minY="248" maxY="343" name="bookmark-entertainment-m"/>
+  <symbol minX="1430" maxX="1496" minY="248" maxY="343" name="bookmark-default-m"/>
+  <symbol minX="1496" maxX="1562" minY="248" maxY="343" name="bookmark-finish-m"/>
+  <symbol minX="1562" maxX="1628" minY="248" maxY="343" name="bookmark-museum-m"/>
+  <symbol minX="1628" maxX="1694" minY="248" maxY="343" name="bookmark-food-m"/>
+  <symbol minX="1694" maxX="1760" minY="248" maxY="343" name="bookmark-exchange-m"/>
+  <symbol minX="1760" maxX="1826" minY="248" maxY="343" name="bookmark-shop-m"/>
+  <symbol minX="1826" maxX="1892" minY="248" maxY="343" name="bookmark-animals-m"/>
+  <symbol minX="1892" maxX="1958" minY="248" maxY="343" name="bookmark-water-m"/>
+  <symbol minX="1958" maxX="2024" minY="248" maxY="343" name="bookmark-viewpoint-m"/>
+  <symbol minX="0" maxX="66" minY="360" maxY="455" name="bookmark-transport-m"/>
+  <symbol minX="66" maxX="132" minY="360" maxY="455" name="bookmark-swim-m"/>
+  <symbol minX="132" maxX="198" minY="360" maxY="455" name="bookmark-bar-m"/>
+  <symbol minX="198" maxX="264" minY="360" maxY="455" name="bookmark-start-m"/>
+  <symbol minX="264" maxX="330" minY="360" maxY="455" name="bookmark-sport-m"/>
+  <symbol minX="330" maxX="396" minY="360" maxY="455" name="bookmark-bg-m"/>
+  <symbol minX="396" maxX="462" minY="360" maxY="455" name="bookmark-sights-m"/>
+  <symbol minX="462" maxX="528" minY="360" maxY="455" name="bookmark-buddhism-m"/>
+  <symbol minX="528" maxX="594" minY="360" maxY="455" name="bookmark-parking-m"/>
+  <symbol minX="594" maxX="682" minY="360" maxY="448" name="route-point-18"/>
+  <symbol minX="682" maxX="770" minY="360" maxY="448" name="route-point-15"/>
+  <symbol minX="770" maxX="894" minY="360" maxY="448" name="norating-bg-l"/>
+  <symbol minX="894" maxX="1018" minY="360" maxY="448" name="norating-default-l"/>
+  <symbol minX="1018" maxX="1106" minY="360" maxY="448" name="route-point-1"/>
+  <symbol minX="1106" maxX="1194" minY="360" maxY="448" name="route-point-10"/>
+  <symbol minX="1194" maxX="1282" minY="360" maxY="448" name="route-point-16"/>
+  <symbol minX="1282" maxX="1406" minY="360" maxY="448" name="coloredmark-default-l"/>
+  <symbol minX="1406" maxX="1530" minY="360" maxY="448" name="coloredmark-bg-l"/>
+  <symbol minX="1530" maxX="1618" minY="360" maxY="448" name="route-point-14"/>
+  <symbol minX="1618" maxX="1706" minY="360" maxY="448" name="route-point-13"/>
+  <symbol minX="1706" maxX="1794" minY="360" maxY="448" name="route-point-12"/>
+  <symbol minX="1794" maxX="1882" minY="360" maxY="448" name="route-point-11"/>
+  <symbol minX="1882" maxX="1970" minY="360" maxY="448" name="route-point-8"/>
+  <symbol minX="0" maxX="88" minY="455" maxY="543" name="route-point-6"/>
+  <symbol minX="88" maxX="176" minY="455" maxY="543" name="route-point-5"/>
+  <symbol minX="176" maxX="264" minY="455" maxY="543" name="route-point-4"/>
+  <symbol minX="264" maxX="352" minY="455" maxY="543" name="route-point-3"/>
+  <symbol minX="352" maxX="440" minY="455" maxY="543" name="route-point-9"/>
+  <symbol minX="440" maxX="528" minY="455" maxY="543" name="route-point-20"/>
+  <symbol minX="528" maxX="616" minY="455" maxY="543" name="route-point-7"/>
+  <symbol minX="616" maxX="704" minY="455" maxY="543" name="route-point-2"/>
+  <symbol minX="704" maxX="792" minY="455" maxY="543" name="route-point-17"/>
+  <symbol minX="792" maxX="880" minY="455" maxY="543" name="route-point-start"/>
+  <symbol minX="880" maxX="968" minY="455" maxY="543" name="route-point-19"/>
+  <symbol minX="968" maxX="1050" minY="455" maxY="531" name="shield-us-i-wide"/>
+  <symbol minX="1050" maxX="1114" minY="455" maxY="531" name="shield-us-i-thin"/>
+  <symbol minX="1114" maxX="1196" minY="455" maxY="525" name="shield-us-hw-wide"/>
+  <symbol minX="1196" maxX="1266" minY="455" maxY="525" name="shield-us-hw-thin"/>
+  <symbol minX="1266" maxX="1313" minY="455" maxY="521" name="bookmark-bg-s"/>
+  <symbol minX="1313" maxX="1360" minY="455" maxY="521" name="bookmark-default-s"/>
+  <symbol minX="1360" maxX="1424" minY="455" maxY="519" name="current-position"/>
+  <symbol minX="1424" maxX="1488" minY="455" maxY="519" name="track_marker_deselected"/>
+  <symbol minX="1488" maxX="1546" minY="455" maxY="513" name="skiing-m"/>
+  <symbol minX="1546" maxX="1604" minY="455" maxY="513" name="shop-m"/>
+  <symbol minX="1604" maxX="1662" minY="455" maxY="513" name="soccer-m"/>
+  <symbol minX="1662" maxX="1720" minY="455" maxY="513" name="skateboard-m"/>
+  <symbol minX="1720" maxX="1778" minY="455" maxY="513" name="subway-chengdu-m"/>
+  <symbol minX="1778" maxX="1836" minY="455" maxY="513" name="shop-bicycle-m"/>
+  <symbol minX="1836" maxX="1894" minY="455" maxY="513" name="shower-m"/>
+  <symbol minX="1894" maxX="1952" minY="455" maxY="513" name="subway-bursaray-m"/>
+  <symbol minX="1952" maxX="2010" minY="455" maxY="513" name="subway-chicago-m"/>
+  <symbol minX="0" maxX="58" minY="543" maxY="601" name="shoes-m"/>
+  <symbol minX="58" maxX="116" minY="543" maxY="601" name="ship-m"/>
+  <symbol minX="116" maxX="174" minY="543" maxY="601" name="shinto-m"/>
+  <symbol minX="174" maxX="230" minY="543" maxY="601" name="subway-delhi-m"/>
+  <symbol minX="230" maxX="288" minY="543" maxY="601" name="shelter-m"/>
+  <symbol minX="288" maxX="346" minY="543" maxY="601" name="second_hand_shop-m"/>
+  <symbol minX="346" maxX="404" minY="543" maxY="601" name="seafood-shop-m"/>
+  <symbol minX="404" maxX="462" minY="543" maxY="601" name="subway-dubai-m"/>
+  <symbol minX="462" maxX="520" minY="543" maxY="601" name="school-m"/>
+  <symbol minX="520" maxX="578" minY="543" maxY="601" name="sawmill-m"/>
+  <symbol minX="578" maxX="636" minY="543" maxY="601" name="travel_agency_shop-m"/>
+  <symbol minX="636" maxX="689" minY="543" maxY="601" name="subway-brescia-m"/>
+  <symbol minX="689" maxX="747" minY="543" maxY="601" name="subway-beijing-m"/>
+  <symbol minX="747" maxX="805" minY="543" maxY="601" name="subway-bangkok-m"/>
+  <symbol minX="805" maxX="863" minY="543" maxY="601" name="sauna-m"/>
+  <symbol minX="863" maxX="919" minY="543" maxY="601" name="subway-athens-m"/>
+  <symbol minX="919" maxX="977" minY="543" maxY="601" name="subway-ankara-s"/>
+  <symbol minX="977" maxX="1035" minY="543" maxY="601" name="subway-ankara-m"/>
+  <symbol minX="1035" maxX="1093" minY="543" maxY="601" name="subway-brasilia-m"/>
+  <symbol minX="1093" maxX="1144" minY="543" maxY="601" name="subway-amsterdam-m"/>
+  <symbol minX="1144" maxX="1202" minY="543" maxY="601" name="subway-algeria-m"/>
+  <symbol minX="1202" maxX="1260" minY="543" maxY="601" name="subway-adana-s"/>
+  <symbol minX="1260" maxX="1318" minY="543" maxY="601" name="subway-adana-m"/>
+  <symbol minX="1318" maxX="1376" minY="543" maxY="601" name="speech_therapist-m"/>
+  <symbol minX="1376" maxX="1434" minY="543" maxY="601" name="stationery_shop-m"/>
+  <symbol minX="1434" maxX="1492" minY="543" maxY="601" name="subway-budapest-m"/>
+  <symbol minX="1492" maxX="1550" minY="543" maxY="601" name="stadium-m"/>
+  <symbol minX="1550" maxX="1608" minY="543" maxY="601" name="sports-m"/>
+  <symbol minX="1608" maxX="1666" minY="543" maxY="601" name="subway-buenosaires-m"/>
+  <symbol minX="1666" maxX="1724" minY="543" maxY="601" name="subway-bengaluru-m"/>
+  <symbol minX="1724" maxX="1782" minY="543" maxY="601" name="subway-cairo-m"/>
+  <symbol minX="1782" maxX="1840" minY="543" maxY="601" name="speedcam-alert-l"/>
+  <symbol minX="1840" maxX="1898" minY="543" maxY="601" name="subway-caracas-m"/>
+  <symbol minX="1898" maxX="1956" minY="543" maxY="601" name="subway-catania-m"/>
+  <symbol minX="1956" maxX="2014" minY="543" maxY="601" name="subway-changchun-m"/>
+  <symbol minX="0" maxX="58" minY="601" maxY="659" name="subway-warszawa-m"/>
+  <symbol minX="58" maxX="116" minY="601" maxY="659" name="tennis-m"/>
+  <symbol minX="116" maxX="174" minY="601" maxY="659" name="taxi-m"/>
+  <symbol minX="174" maxX="232" minY="601" maxY="659" name="taoist-m"/>
+  <symbol minX="232" maxX="290" minY="601" maxY="659" name="table-tennis-m"/>
+  <symbol minX="290" maxX="348" minY="601" maxY="659" name="swimming-m"/>
+  <symbol minX="348" maxX="406" minY="601" maxY="659" name="sweets-m"/>
+  <symbol minX="406" maxX="464" minY="601" maxY="659" name="survey_point-m"/>
+  <symbol minX="464" maxX="522" minY="601" maxY="659" name="subway-yokohama-m"/>
+  <symbol minX="522" maxX="580" minY="601" maxY="659" name="subway-wuhan-m"/>
+  <symbol minX="580" maxX="638" minY="601" maxY="659" name="subway-washington-m"/>
+  <symbol minX="638" maxX="696" minY="601" maxY="659" name="theatre-m"/>
+  <symbol minX="696" maxX="754" minY="601" maxY="659" name="subway-volgograd-m"/>
+  <symbol minX="754" maxX="812" minY="601" maxY="659" name="subway-vienna-m"/>
+  <symbol minX="812" maxX="870" minY="601" maxY="659" name="subway-valencia-m"/>
+  <symbol minX="870" maxX="928" minY="601" maxY="659" name="subway-tyneandwear-m"/>
+  <symbol minX="928" maxX="986" minY="601" maxY="659" name="subway-tokyo-m"/>
+  <symbol minX="986" maxX="1044" minY="601" maxY="659" name="subway-tianjin-m"/>
+  <symbol minX="1044" maxX="1102" minY="601" maxY="659" name="subway-tashkent-m"/>
+  <symbol minX="1102" maxX="1160" minY="601" maxY="659" name="subway-stockholm-m"/>
+  <symbol minX="1160" maxX="1218" minY="601" maxY="659" name="subway-stlouis-m"/>
+  <symbol minX="1218" maxX="1276" minY="601" maxY="659" name="subway-southkorea-m"/>
+  <symbol minX="1276" maxX="1334" minY="601" maxY="659" name="toys-m"/>
+  <symbol minX="1334" maxX="1392" minY="601" maxY="659" name="vending-m"/>
+  <symbol minX="1392" maxX="1450" minY="601" maxY="659" name="veterinary-m"/>
+  <symbol minX="1450" maxX="1508" minY="601" maxY="659" name="video-games-m"/>
+  <symbol minX="1508" maxX="1566" minY="601" maxY="659" name="viewpoint-m"/>
+  <symbol minX="1566" maxX="1624" minY="601" maxY="659" name="volleyball-m"/>
+  <symbol minX="1624" maxX="1682" minY="601" maxY="659" name="waste-basket-m"/>
+  <symbol minX="1682" maxX="1740" minY="601" maxY="659" name="waterfall-m"/>
+  <symbol minX="1740" maxX="1798" minY="601" maxY="659" name="tram-m"/>
+  <symbol minX="1798" maxX="1856" minY="601" maxY="659" name="wayside_shrine-m"/>
+  <symbol minX="1856" maxX="1914" minY="601" maxY="659" name="train-m"/>
+  <symbol minX="1914" maxX="1972" minY="601" maxY="659" name="subway-sofia-m"/>
+  <symbol minX="1972" maxX="2030" minY="601" maxY="659" name="windmill-m"/>
+  <symbol minX="0" maxX="58" minY="659" maxY="717" name="tourism-m"/>
+  <symbol minX="58" maxX="116" minY="659" maxY="717" name="tomb-m"/>
+  <symbol minX="116" maxX="174" minY="659" maxY="717" name="yoga-m"/>
+  <symbol minX="174" maxX="232" minY="659" maxY="717" name="toll_booth-m"/>
+  <symbol minX="232" maxX="290" minY="659" maxY="717" name="toilets-m"/>
+  <symbol minX="290" maxX="348" minY="659" maxY="717" name="tire-repair-m"/>
+  <symbol minX="348" maxX="406" minY="659" maxY="717" name="ticket-shop-m"/>
+  <symbol minX="406" maxX="464" minY="659" maxY="717" name="zoo-m"/>
+  <symbol minX="464" maxX="522" minY="659" maxY="717" name="theme_park-m"/>
+  <symbol minX="522" maxX="580" minY="659" maxY="717" name="subway-kunming-m"/>
+  <symbol minX="580" maxX="636" minY="659" maxY="717" name="subway-mashhad-m"/>
+  <symbol minX="636" maxX="694" minY="659" maxY="717" name="subway-marseille-s"/>
+  <symbol minX="694" maxX="752" minY="659" maxY="717" name="subway-m"/>
+  <symbol minX="752" maxX="810" minY="659" maxY="717" name="subway-lyon-m"/>
+  <symbol minX="810" maxX="868" minY="659" maxY="717" name="subway-losangeles-m"/>
+  <symbol minX="868" maxX="926" minY="659" maxY="717" name="subway-lisboa-m"/>
+  <symbol minX="926" maxX="984" minY="659" maxY="717" name="subway-lima-m"/>
+  <symbol minX="984" maxX="1042" minY="659" maxY="717" name="subway-lille-m"/>
+  <symbol minX="1042" maxX="1100" minY="659" maxY="717" name="subway-lausanne-m"/>
+  <symbol minX="1100" maxX="1158" minY="659" maxY="717" name="subway-kyoto-m"/>
+  <symbol minX="1158" maxX="1216" minY="659" maxY="717" name="subway-massachusetts-m"/>
+  <symbol minX="1216" maxX="1274" minY="659" maxY="717" name="subway-kobe-m"/>
+  <symbol minX="1274" maxX="1332" minY="659" maxY="717" name="subway-kazan-m"/>
+  <symbol minX="1332" maxX="1379" minY="659" maxY="717" name="subway-istanbul-m"/>
+  <symbol minX="1379" maxX="1437" minY="659" maxY="717" name="subway-isfahan-m"/>
+  <symbol minX="1437" maxX="1495" minY="659" maxY="717" name="subway-hirosima-m"/>
+  <symbol minX="1495" maxX="1553" minY="659" maxY="717" name="subway-helsinki-m"/>
+  <symbol minX="1553" maxX="1611" minY="659" maxY="717" name="subway-guangzhou-m"/>
+  <symbol minX="1611" maxX="1669" minY="659" maxY="717" name="subway-guadalajara-m"/>
+  <symbol minX="1669" maxX="1727" minY="659" maxY="717" name="subway-glasgow-m"/>
+  <symbol minX="1727" maxX="1785" minY="659" maxY="717" name="subway-foshan-m"/>
+  <symbol minX="1785" maxX="1843" minY="659" maxY="717" name="subway-perugia-m"/>
+  <symbol minX="1843" maxX="1901" minY="659" maxY="717" name="subway-shiraz-m"/>
+  <symbol minX="1901" maxX="1959" minY="659" maxY="717" name="subway-saopaulo-m"/>
+  <symbol minX="1959" maxX="2017" minY="659" maxY="717" name="subway-santodomingo-m"/>
+  <symbol minX="0" maxX="58" minY="717" maxY="775" name="subway-samara-m"/>
+  <symbol minX="58" maxX="116" minY="717" maxY="775" name="subway-riodejaneiro-m"/>
+  <symbol minX="116" maxX="174" minY="717" maxY="775" name="subway-reseau-paris-m"/>
+  <symbol minX="174" maxX="232" minY="717" maxY="775" name="subway-rennes-m"/>
+  <symbol minX="232" maxX="290" minY="717" maxY="775" name="subway-pyongyang-m"/>
+  <symbol minX="290" maxX="346" minY="717" maxY="775" name="subway-porto-m"/>
+  <symbol minX="346" maxX="404" minY="717" maxY="775" name="subway-pittsburgh-m"/>
+  <symbol minX="404" maxX="462" minY="717" maxY="775" name="subway-ekb-m"/>
+  <symbol minX="462" maxX="520" minY="717" maxY="775" name="subway-panama-m"/>
+  <symbol minX="520" maxX="578" minY="717" maxY="775" name="subway-oslo-m"/>
+  <symbol minX="578" maxX="634" minY="717" maxY="775" name="subway-nnov-m"/>
+  <symbol minX="634" maxX="692" minY="717" maxY="775" name="subway-newyork-m"/>
+  <symbol minX="692" maxX="750" minY="717" maxY="775" name="subway-nagoya-m"/>
+  <symbol minX="750" maxX="808" minY="717" maxY="775" name="subway-minatomirai-m"/>
+  <symbol minX="808" maxX="866" minY="717" maxY="775" name="subway-milan-m"/>
+  <symbol minX="866" maxX="922" minY="717" maxY="775" name="subway-mexico-m"/>
+  <symbol minX="922" maxX="980" minY="717" maxY="775" name="subway-medellin-m"/>
+  <symbol minX="980" maxX="1038" minY="717" maxY="775" name="subway-mecca-m"/>
+  <symbol minX="1038" maxX="1096" minY="717" maxY="775" name="doityourself-m"/>
+  <symbol minX="1096" maxX="1154" minY="717" maxY="775" name="fountain-m"/>
+  <symbol minX="1154" maxX="1212" minY="717" maxY="775" name="florist-m"/>
+  <symbol minX="1212" maxX="1270" minY="717" maxY="775" name="firehydrant-m"/>
+  <symbol minX="1270" maxX="1328" minY="717" maxY="775" name="fire_station-m"/>
+  <symbol minX="1328" maxX="1386" minY="717" maxY="775" name="fastfood-m"/>
+  <symbol minX="1386" maxX="1444" minY="717" maxY="775" name="erotic-m"/>
+  <symbol minX="1444" maxX="1502" minY="717" maxY="775" name="equestrian-m"/>
+  <symbol minX="1502" maxX="1560" minY="717" maxY="775" name="emergency-phone-m"/>
+  <symbol minX="1560" maxX="1618" minY="717" maxY="775" name="embassy-m"/>
+  <symbol minX="1618" maxX="1676" minY="717" maxY="775" name="electronics-m"/>
+  <symbol minX="1676" maxX="1734" minY="717" maxY="775" name="electrician-m"/>
+  <symbol minX="1734" maxX="1792" minY="717" maxY="775" name="dump-station-m"/>
+  <symbol minX="1792" maxX="1850" minY="717" maxY="775" name="driving_school-m"/>
+  <symbol minX="1850" maxX="1908" minY="717" maxY="775" name="drinking-water-m"/>
+  <symbol minX="1908" maxX="1966" minY="717" maxY="775" name="fountain-s"/>
+  <symbol minX="1966" maxX="2024" minY="717" maxY="775" name="dog_park-m"/>
+  <symbol minX="0" maxX="58" minY="775" maxY="833" name="diving-m"/>
+  <symbol minX="58" maxX="116" minY="775" maxY="833" name="department_store-m"/>
+  <symbol minX="116" maxX="174" minY="775" maxY="833" name="dentist-m"/>
+  <symbol minX="174" maxX="232" minY="775" maxY="833" name="defibrillator-m"/>
+  <symbol minX="232" maxX="290" minY="775" maxY="833" name="curling-m"/>
+  <symbol minX="290" maxX="348" minY="775" maxY="833" name="cross-m"/>
+  <symbol minX="348" maxX="406" minY="775" maxY="833" name="cricket-m"/>
+  <symbol minX="406" maxX="464" minY="775" maxY="833" name="copyshop-m"/>
+  <symbol minX="464" maxX="522" minY="775" maxY="833" name="computer-m"/>
+  <symbol minX="522" maxX="580" minY="775" maxY="833" name="college-m"/>
+  <symbol minX="580" maxX="638" minY="775" maxY="833" name="clothes-m"/>
+  <symbol minX="638" maxX="696" minY="775" maxY="833" name="climbing-m"/>
+  <symbol minX="696" maxX="754" minY="775" maxY="833" name="golf-m"/>
+  <symbol minX="754" maxX="812" minY="775" maxY="833" name="home-m"/>
+  <symbol minX="812" maxX="870" minY="775" maxY="833" name="hockey-m"/>
+  <symbol minX="870" maxX="928" minY="775" maxY="833" name="historic-ship-m"/>
+  <symbol minX="928" maxX="986" minY="775" maxY="833" name="hindu-m"/>
+  <symbol minX="986" maxX="1044" minY="775" maxY="833" name="heliport-m"/>
+  <symbol minX="1044" maxX="1102" minY="775" maxY="833" name="helipad-m"/>
+  <symbol minX="1102" maxX="1160" minY="775" maxY="833" name="handball-m"/>
+  <symbol minX="1160" maxX="1218" minY="775" maxY="833" name="hand-m"/>
+  <symbol minX="1218" maxX="1276" minY="775" maxY="833" name="hairdresser-m"/>
+  <symbol minX="1276" maxX="1334" minY="775" maxY="833" name="gym-m"/>
+  <symbol minX="1334" maxX="1392" minY="775" maxY="833" name="guidepost"/>
+  <symbol minX="1392" maxX="1450" minY="775" maxY="833" name="grocery-m"/>
+  <symbol minX="1450" maxX="1508" minY="775" maxY="833" name="greengrocer-m"/>
+  <symbol minX="1508" maxX="1566" minY="775" maxY="833" name="cinema-m"/>
+  <symbol minX="1566" maxX="1624" minY="775" maxY="833" name="gift-m"/>
+  <symbol minX="1624" maxX="1682" minY="775" maxY="833" name="geyser-m"/>
+  <symbol minX="1682" maxX="1740" minY="775" maxY="833" name="geyser-l"/>
+  <symbol minX="1740" maxX="1798" minY="775" maxY="833" name="gate-m"/>
+  <symbol minX="1798" maxX="1856" minY="775" maxY="833" name="garden_center-m"/>
+  <symbol minX="1856" maxX="1914" minY="775" maxY="833" name="garden-outline-m"/>
+  <symbol minX="1914" maxX="1972" minY="775" maxY="833" name="garden-m"/>
+  <symbol minX="1972" maxX="2030" minY="775" maxY="833" name="gallery-m"/>
+  <symbol minX="0" maxX="58" minY="833" maxY="891" name="furniture-m"/>
+  <symbol minX="58" maxX="116" minY="833" maxY="891" name="funicular-m"/>
+  <symbol minX="116" maxX="174" minY="833" maxY="891" name="funeral_directors-m"/>
+  <symbol minX="174" maxX="232" minY="833" maxY="891" name="fuel-m"/>
+  <symbol minX="232" maxX="290" minY="833" maxY="891" name="fuel-dispenser-m"/>
+  <symbol minX="290" maxX="348" minY="833" maxY="891" name="bank-m"/>
+  <symbol minX="348" maxX="406" minY="833" maxY="891" name="blacksmith-m"/>
+  <symbol minX="406" maxX="464" minY="833" maxY="891" name="bicycle-repair-station"/>
+  <symbol minX="464" maxX="522" minY="833" maxY="891" name="bicycle-m"/>
+  <symbol minX="522" maxX="580" minY="833" maxY="891" name="beer-m"/>
+  <symbol minX="580" maxX="638" minY="833" maxY="891" name="beekeeper-m"/>
+  <symbol minX="638" maxX="696" minY="833" maxY="891" name="beauty-m"/>
+  <symbol minX="696" maxX="754" minY="833" maxY="891" name="beach-m"/>
+  <symbol minX="754" maxX="812" minY="833" maxY="891" name="bcontrol-m"/>
+  <symbol minX="812" maxX="870" minY="833" maxY="891" name="bbq-m"/>
+  <symbol minX="870" maxX="928" minY="833" maxY="891" name="basketball-m"/>
+  <symbol minX="928" maxX="986" minY="833" maxY="891" name="baseball-m"/>
+  <symbol minX="986" maxX="1044" minY="833" maxY="891" name="bar-m"/>
+  <symbol minX="1044" maxX="1102" minY="833" maxY="891" name="banknote-m"/>
+  <symbol minX="1102" maxX="1160" minY="833" maxY="891" name="blood_donation-m"/>
+  <symbol minX="1160" maxX="1218" minY="833" maxY="891" name="bakery-m"/>
+  <symbol minX="1218" maxX="1276" minY="833" maxY="891" name="badminton-m"/>
+  <symbol minX="1276" maxX="1334" minY="833" maxY="891" name="australian-football-m"/>
+  <symbol minX="1334" maxX="1392" minY="833" maxY="891" name="audiologist-m"/>
+  <symbol minX="1392" maxX="1450" minY="833" maxY="891" name="atm-m"/>
+  <symbol minX="1450" maxX="1508" minY="833" maxY="891" name="archery-m"/>
+  <symbol minX="1508" maxX="1566" minY="833" maxY="891" name="archaeological-site-m"/>
+  <symbol minX="1566" maxX="1624" minY="833" maxY="891" name="apartment-m"/>
+  <symbol minX="1624" maxX="1682" minY="833" maxY="891" name="america-football-m"/>
+  <symbol minX="1682" maxX="1740" minY="833" maxY="891" name="alternative-m"/>
+  <symbol minX="1740" maxX="1798" minY="833" maxY="891" name="alpine_hut-m"/>
+  <symbol minX="1798" maxX="1856" minY="833" maxY="891" name="alcohol-m"/>
+  <symbol minX="1856" maxX="1914" minY="833" maxY="891" name="airport-m"/>
   <symbol minX="1914" maxX="1972" minY="833" maxY="891" name="car-wash-m"/>
-  <symbol minX="1972" maxX="2030" minY="833" maxY="891" name="car-repair-m"/>
-  <symbol minX="0" maxX="58" minY="891" maxY="949" name="car-part-m"/>
-  <symbol minX="58" maxX="116" minY="891" maxY="949" name="campsite-m"/>
-  <symbol minX="116" maxX="174" minY="891" maxY="949" name="cafe-m"/>
-  <symbol minX="174" maxX="232" minY="891" maxY="949" name="cable-car-m"/>
-  <symbol minX="232" maxX="290" minY="891" maxY="949" name="recycling-m"/>
-  <symbol minX="290" maxX="348" minY="891" maxY="949" name="bus-m"/>
-  <symbol minX="348" maxX="406" minY="891" maxY="949" name="buddhist-m"/>
-  <symbol minX="406" maxX="464" minY="891" maxY="949" name="brewery-m"/>
-  <symbol minX="464" maxX="522" minY="891" maxY="949" name="bowling_alley-m"/>
-  <symbol minX="522" maxX="580" minY="891" maxY="949" name="bowling-m"/>
-  <symbol minX="580" maxX="638" minY="891" maxY="949" name="bookmaker-m"/>
-  <symbol minX="638" maxX="696" minY="891" maxY="949" name="book-shop-m"/>
-  <symbol minX="696" maxX="754" minY="891" maxY="949" name="blood_donation-m"/>
-  <symbol minX="754" maxX="812" minY="891" maxY="949" name="blacksmith-m"/>
-  <symbol minX="812" maxX="870" minY="891" maxY="949" name="bicycle-repair-station"/>
-  <symbol minX="870" maxX="928" minY="891" maxY="949" name="bicycle-m"/>
-  <symbol minX="928" maxX="986" minY="891" maxY="949" name="music_school-m"/>
-  <symbol minX="986" maxX="1044" minY="891" maxY="949" name="outdoor-shop-m"/>
-  <symbol minX="1044" maxX="1102" minY="891" maxY="949" name="optometrist-m"/>
-  <symbol minX="1102" maxX="1160" minY="891" maxY="949" name="optician-m"/>
-  <symbol minX="1160" maxX="1218" minY="891" maxY="949" name="office-m"/>
-  <symbol minX="1218" maxX="1276" minY="891" maxY="949" name="nparkf-outline-m"/>
-  <symbol minX="1276" maxX="1334" minY="891" maxY="949" name="nparkf-m"/>
-  <symbol minX="1334" maxX="1392" minY="891" maxY="949" name="npark-m"/>
-  <symbol minX="1392" maxX="1450" minY="891" maxY="949" name="nightclub-m"/>
-  <symbol minX="1450" maxX="1508" minY="891" maxY="949" name="newsagent_shop-m"/>
-  <symbol minX="1508" maxX="1566" minY="891" maxY="949" name="needle_and_thread-m"/>
-  <symbol minX="1566" maxX="1624" minY="891" maxY="949" name="muslim-m"/>
-  <symbol minX="1624" maxX="1682" minY="891" maxY="949" name="musical-instrument-m"/>
-  <symbol minX="1682" maxX="1740" minY="891" maxY="949" name="padel-m"/>
-  <symbol minX="1740" maxX="1798" minY="891" maxY="949" name="music-m"/>
-  <symbol minX="1798" maxX="1856" minY="891" maxY="949" name="museum-m"/>
-  <symbol minX="1856" maxX="1914" minY="891" maxY="949" name="motorcycle_shop-m"/>
-  <symbol minX="1914" maxX="1972" minY="891" maxY="949" name="motel-m"/>
-  <symbol minX="1972" maxX="2030" minY="891" maxY="949" name="monument-m"/>
-  <symbol minX="0" maxX="58" minY="949" maxY="1007" name="mobile_phone-m"/>
-  <symbol minX="58" maxX="116" minY="949" maxY="1007" name="military-m"/>
-  <symbol minX="116" maxX="174" minY="949" maxY="1007" name="metal_construction-m"/>
-  <symbol minX="174" maxX="232" minY="949" maxY="1007" name="media_shop-m"/>
-  <symbol minX="232" maxX="290" minY="949" maxY="1007" name="media-m"/>
-  <symbol minX="290" maxX="348" minY="949" maxY="1007" name="marketplace-m"/>
-  <symbol minX="348" maxX="406" minY="949" maxY="1007" name="picnic_table-m"/>
-  <symbol minX="406" maxX="464" minY="949" maxY="1007" name="remains-m"/>
-  <symbol minX="464" maxX="522" minY="949" maxY="1007" name="public-building-m"/>
-  <symbol minX="522" maxX="580" minY="949" maxY="1007" name="psychotherapist-m"/>
-  <symbol minX="580" maxX="638" minY="949" maxY="1007" name="prison-m"/>
-  <symbol minX="638" maxX="696" minY="949" maxY="1007" name="power-m"/>
-  <symbol minX="696" maxX="754" minY="949" maxY="1007" name="postbox-m"/>
-  <symbol minX="754" maxX="812" minY="949" maxY="1007" name="police-m"/>
-  <symbol minX="812" maxX="870" minY="949" maxY="1007" name="podiatrist-m"/>
-  <symbol minX="870" maxX="928" minY="949" maxY="1007" name="plumber-m"/>
-  <symbol minX="928" maxX="986" minY="949" maxY="1007" name="playground-m"/>
-  <symbol minX="986" maxX="1044" minY="949" maxY="1007" name="place-of-worship-m"/>
-  <symbol minX="1044" maxX="1102" minY="949" maxY="1007" name="pitch-m"/>
-  <symbol minX="1102" maxX="1160" minY="949" maxY="1007" name="grocery-m"/>
-  <symbol minX="1160" maxX="1218" minY="949" maxY="1007" name="picnic-m"/>
-  <symbol minX="1218" maxX="1276" minY="949" maxY="1007" name="physiotherapist-m"/>
-  <symbol minX="1276" maxX="1334" minY="949" maxY="1007" name="photo-shop-m"/>
-  <symbol minX="1334" maxX="1392" minY="949" maxY="1007" name="phone-m"/>
-  <symbol minX="1392" maxX="1450" minY="949" maxY="1007" name="pharmacy-m"/>
-  <symbol minX="1450" maxX="1508" minY="949" maxY="1007" name="petshop-m"/>
-  <symbol minX="1508" maxX="1566" minY="949" maxY="1007" name="pelota-m"/>
-  <symbol minX="1566" maxX="1624" minY="949" maxY="1007" name="parking-meter-m"/>
-  <symbol minX="1624" maxX="1682" minY="949" maxY="1007" name="park-outline-m"/>
-  <symbol minX="1682" maxX="1740" minY="949" maxY="1007" name="park-m"/>
-  <symbol minX="1740" maxX="1798" minY="949" maxY="1007" name="painter-m"/>
-  <symbol minX="1798" maxX="1856" minY="949" maxY="1007" name="guidepost"/>
-  <symbol minX="1856" maxX="1914" minY="949" maxY="1007" name="jewelry-m"/>
-  <symbol minX="1914" maxX="1972" minY="949" maxY="1007" name="internet_cafe-m"/>
-  <symbol minX="1972" maxX="2030" minY="949" maxY="1007" name="greengrocer-m"/>
-  <symbol minX="0" maxX="58" minY="1007" maxY="1065" name="interior_decoration-m"/>
-  <symbol minX="58" maxX="116" minY="1007" maxY="1065" name="information-m"/>
-  <symbol minX="116" maxX="174" minY="1007" maxY="1065" name="ice_cream-m"/>
-  <symbol minX="174" maxX="232" minY="1007" maxY="1065" name="hunting-tower-m"/>
-  <symbol minX="232" maxX="290" minY="1007" maxY="1065" name="hotel-m"/>
-  <symbol minX="290" maxX="348" minY="1007" maxY="1065" name="hostel-m"/>
-  <symbol minX="348" maxX="406" minY="1007" maxY="1065" name="hospital-m"/>
-  <symbol minX="406" maxX="464" minY="1007" maxY="1065" name="marina-m"/>
-  <symbol minX="464" maxX="522" minY="1007" maxY="1065" name="gym-m"/>
-  <symbol minX="522" maxX="580" minY="1007" maxY="1065" name="home-m"/>
-  <symbol minX="580" maxX="638" minY="1007" maxY="1065" name="hairdresser-m"/>
-  <symbol minX="638" maxX="696" minY="1007" maxY="1065" name="hockey-m"/>
-  <symbol minX="696" maxX="754" minY="1007" maxY="1065" name="hand-m"/>
-  <symbol minX="754" maxX="812" minY="1007" maxY="1065" name="handball-m"/>
-  <symbol minX="812" maxX="870" minY="1007" maxY="1065" name="helipad-m"/>
-  <symbol minX="870" maxX="928" minY="1007" maxY="1065" name="historic-ship-m"/>
-  <symbol minX="928" maxX="986" minY="1007" maxY="1065" name="hindu-m"/>
-  <symbol minX="986" maxX="1044" minY="1007" maxY="1065" name="heliport-m"/>
-  <symbol minX="1044" maxX="1102" minY="1007" maxY="1065" name="jewish-m"/>
-  <symbol minX="1102" maxX="1160" minY="1007" maxY="1065" name="library-m"/>
-  <symbol minX="1160" maxX="1218" minY="1007" maxY="1065" name="mail-m"/>
-  <symbol minX="1218" maxX="1276" minY="1007" maxY="1065" name="kindergarten-m"/>
-  <symbol minX="1276" maxX="1334" minY="1007" maxY="1065" name="kiosk-m"/>
-  <symbol minX="1334" maxX="1392" minY="1007" maxY="1065" name="lift_gate-m"/>
-  <symbol minX="1392" maxX="1450" minY="1007" maxY="1065" name="language_school-m"/>
-  <symbol minX="1450" maxX="1508" minY="1007" maxY="1065" name="lighthouse-m"/>
-  <symbol minX="1508" maxX="1566" minY="1007" maxY="1065" name="laundry-m"/>
-  <symbol minX="1566" maxX="1624" minY="1007" maxY="1065" name="lawyer-m"/>
-  <symbol minX="1624" maxX="1682" minY="1007" maxY="1063" name="subway-dalian-m"/>
-  <symbol minX="1682" maxX="1740" minY="1007" maxY="1063" name="subway-shanghai-m"/>
-  <symbol minX="1740" maxX="1798" minY="1007" maxY="1063" name="subway-maracaibo-m"/>
-  <symbol minX="1798" maxX="1856" minY="1007" maxY="1063" name="subway-sapporo-m"/>
-  <symbol minX="1856" maxX="1912" minY="1007" maxY="1063" name="subway-ekb-s"/>
-  <symbol minX="1912" maxX="1968" minY="1007" maxY="1063" name="subway-southkorea-s"/>
-  <symbol minX="1968" maxX="2024" minY="1007" maxY="1063" name="subway-montreal-m"/>
-  <symbol minX="0" maxX="56" minY="1065" maxY="1121" name="subway-spb-m"/>
-  <symbol minX="56" maxX="114" minY="1065" maxY="1120" name="subway-marseille-m"/>
-  <symbol minX="114" maxX="168" minY="1065" maxY="1119" name="subway-algeria-s"/>
-  <symbol minX="168" maxX="219" minY="1065" maxY="1119" name="subway-warsaw-m"/>
-  <symbol minX="219" maxX="273" minY="1065" maxY="1119" name="subway-entrance-m"/>
-  <symbol minX="273" maxX="327" minY="1065" maxY="1119" name="subway-stlouis-s"/>
-  <symbol minX="327" maxX="385" minY="1065" maxY="1118" name="subway-izmir-m"/>
-  <symbol minX="385" maxX="437" minY="1065" maxY="1117" name="search-result"/>
-  <symbol minX="437" maxX="488" minY="1065" maxY="1116" name="lightrail-berlin-m"/>
-  <symbol minX="488" maxX="533" minY="1065" maxY="1116" name="subway-istanbul-s"/>
-  <symbol minX="533" maxX="584" minY="1065" maxY="1116" name="subway-pittsburgh-s"/>
-  <symbol minX="584" maxX="642" minY="1065" maxY="1115" name="subway-taoyuan-m"/>
-  <symbol minX="642" maxX="691" minY="1065" maxY="1114" name="subway-isfahan-s"/>
-  <symbol minX="691" maxX="736" minY="1065" maxY="1114" name="subway-brescia-s"/>
-  <symbol minX="736" maxX="785" minY="1065" maxY="1114" name="subway-cairo-s"/>
-  <symbol minX="785" maxX="843" minY="1065" maxY="1114" name="subway-rotterdam-m"/>
-  <symbol minX="843" maxX="892" minY="1065" maxY="1114" name="subway-sapporo-s"/>
-  <symbol minX="892" maxX="943" minY="1065" maxY="1114" name="subway-izmir-s"/>
-  <symbol minX="943" maxX="992" minY="1065" maxY="1114" name="non-found-search-result"/>
-  <symbol minX="992" maxX="1041" minY="1065" maxY="1114" name="parking_pay-m"/>
-  <symbol minX="1041" maxX="1090" minY="1065" maxY="1114" name="subway-medellin-s"/>
-  <symbol minX="1090" maxX="1187" minY="1065" maxY="1114" name="coloredmark-bg-s"/>
-  <symbol minX="1187" maxX="1284" minY="1065" maxY="1114" name="coloredmark-default-s"/>
-  <symbol minX="1284" maxX="1331" minY="1065" maxY="1114" name="subway-mashhad-s"/>
-  <symbol minX="1331" maxX="1380" minY="1065" maxY="1114" name="bike-parking-m"/>
-  <symbol minX="1380" maxX="1429" minY="1065" maxY="1114" name="bicycle-rental"/>
-  <symbol minX="1429" maxX="1478" minY="1065" maxY="1114" name="motorcycle-parking-m"/>
-  <symbol minX="1478" maxX="1527" minY="1065" maxY="1114" name="parking-disabled-m"/>
-  <symbol minX="1527" maxX="1576" minY="1065" maxY="1114" name="parking-m"/>
-  <symbol minX="1576" maxX="1625" minY="1065" maxY="1114" name="speedcam-m"/>
-  <symbol minX="1625" maxX="1674" minY="1065" maxY="1114" name="subway-panama-s"/>
-  <symbol minX="1674" maxX="1732" minY="1065" maxY="1114" name="subway-tbilisi-m"/>
-  <symbol minX="1732" maxX="1781" minY="1065" maxY="1114" name="parking_entrance-m"/>
-  <symbol minX="1781" maxX="1839" minY="1065" maxY="1113" name="subway-almaty-m"/>
-  <symbol minX="1839" maxX="1884" minY="1065" maxY="1112" name="subway-tianjin-s"/>
-  <symbol minX="1884" maxX="1942" minY="1065" maxY="1112" name="subway-santiago-m"/>
-  <symbol minX="1942" maxX="1993" minY="1065" maxY="1112" name="subway-seattle-m"/>
-  <symbol minX="0" maxX="58" minY="1121" maxY="1168" name="subway-lyon-m"/>
-  <symbol minX="58" maxX="103" minY="1121" maxY="1168" name="subway-pyongyang-s"/>
-  <symbol minX="103" maxX="161" minY="1121" maxY="1168" name="subway-yerevan-m"/>
-  <symbol minX="161" maxX="208" minY="1121" maxY="1168" name="subway-warszawa-s"/>
-  <symbol minX="208" maxX="255" minY="1121" maxY="1168" name="subway-ubahn-m"/>
-  <symbol minX="255" maxX="302" minY="1121" maxY="1168" name="subway-paris-m"/>
-  <symbol minX="302" maxX="335" minY="1121" maxY="1168" name="bookmark-default-xs"/>
-  <symbol minX="335" maxX="389" minY="1121" maxY="1168" name="subway-moscow-m"/>
-  <symbol minX="389" maxX="434" minY="1121" maxY="1168" name="subway-porto-s"/>
-  <symbol minX="434" maxX="481" minY="1121" maxY="1168" name="subway-rennes-s"/>
-  <symbol minX="481" maxX="528" minY="1121" maxY="1168" name="subway-hirosima-s"/>
-  <symbol minX="528" maxX="575" minY="1121" maxY="1168" name="subway-rome-m"/>
-  <symbol minX="575" maxX="608" minY="1121" maxY="1168" name="bookmark-bg-xs"/>
-  <symbol minX="608" maxX="653" minY="1121" maxY="1168" name="subway-athens-s"/>
-  <symbol minX="653" maxX="698" minY="1121" maxY="1168" name="subway-delhi-s"/>
-  <symbol minX="698" maxX="743" minY="1121" maxY="1166" name="subway-tashkent-s"/>
-  <symbol minX="743" maxX="801" minY="1121" maxY="1166" name="subway-tabriz-m"/>
-  <symbol minX="801" maxX="846" minY="1121" maxY="1166" name="subway-yokohama-s"/>
-  <symbol minX="846" maxX="902" minY="1121" maxY="1166" name="subway-yerevan-s"/>
-  <symbol minX="902" maxX="947" minY="1121" maxY="1166" name="subway-guangzhou-s"/>
-  <symbol minX="947" maxX="998" minY="1121" maxY="1166" name="subway-taoyuan-s"/>
-  <symbol minX="998" maxX="1043" minY="1121" maxY="1166" name="subway-wuhan-s"/>
-  <symbol minX="1043" maxX="1088" minY="1121" maxY="1166" name="subway-washington-s"/>
-  <symbol minX="1088" maxX="1128" minY="1121" maxY="1166" name="subway-warsaw-s"/>
-  <symbol minX="1128" maxX="1173" minY="1121" maxY="1166" name="subway-volgograd-s"/>
-  <symbol minX="1173" maxX="1218" minY="1121" maxY="1166" name="subway-vienna-s"/>
-  <symbol minX="1218" maxX="1263" minY="1121" maxY="1166" name="subway-tokyo-s"/>
-  <symbol minX="1263" maxX="1308" minY="1121" maxY="1166" name="subway-valencia-s"/>
-  <symbol minX="1308" maxX="1353" minY="1121" maxY="1166" name="subway-tyneandwear-s"/>
-  <symbol minX="1353" maxX="1398" minY="1121" maxY="1166" name="subway-caracas-s"/>
-  <symbol minX="1398" maxX="1443" minY="1121" maxY="1166" name="subway-dubai-s"/>
-  <symbol minX="1443" maxX="1488" minY="1121" maxY="1166" name="subway-oslo-s"/>
-  <symbol minX="1488" maxX="1546" minY="1121" maxY="1166" name="subway-dnepro-m"/>
-  <symbol minX="1546" maxX="1591" minY="1121" maxY="1166" name="subway-dalian-s"/>
-  <symbol minX="1591" maxX="1649" minY="1121" maxY="1166" name="subway-omsk-s"/>
-  <symbol minX="1649" maxX="1707" minY="1121" maxY="1166" name="subway-omsk-m"/>
-  <symbol minX="1707" maxX="1752" minY="1121" maxY="1166" name="subway-chicago-s"/>
-  <symbol minX="1752" maxX="1797" minY="1121" maxY="1166" name="subway-nnov-s"/>
-  <symbol minX="1797" maxX="1842" minY="1121" maxY="1166" name="subway-chengdu-s"/>
-  <symbol minX="1842" maxX="1887" minY="1121" maxY="1166" name="subway-nagoya-s"/>
-  <symbol minX="1887" maxX="1932" minY="1121" maxY="1166" name="subway-changchun-s"/>
-  <symbol minX="1932" maxX="1977" minY="1121" maxY="1166" name="subway-catania-s"/>
-  <symbol minX="1977" maxX="2022" minY="1121" maxY="1166" name="subway-montreal-s"/>
-  <symbol minX="0" maxX="45" minY="1168" maxY="1213" name="subway-losangeles-s"/>
-  <symbol minX="45" maxX="90" minY="1168" maxY="1213" name="subway-bursaray-s"/>
-  <symbol minX="90" maxX="135" minY="1168" maxY="1213" name="subway-buenosaires-s"/>
-  <symbol minX="135" maxX="180" minY="1168" maxY="1213" name="subway-minatomirai-s"/>
-  <symbol minX="180" maxX="225" minY="1168" maxY="1213" name="subway-budapest-s"/>
-  <symbol minX="225" maxX="270" minY="1168" maxY="1213" name="subway-milan-s"/>
-  <symbol minX="270" maxX="315" minY="1168" maxY="1213" name="subway-brasilia-s"/>
-  <symbol minX="315" maxX="360" minY="1168" maxY="1213" name="subway-mecca-s"/>
-  <symbol minX="360" maxX="405" minY="1168" maxY="1213" name="subway-massachusetts-s"/>
-  <symbol minX="405" maxX="450" minY="1168" maxY="1213" name="subway-bengaluru-s"/>
-  <symbol minX="450" maxX="495" minY="1168" maxY="1213" name="subway-beijing-s"/>
-  <symbol minX="495" maxX="553" minY="1168" maxY="1213" name="subway-alicante-m"/>
-  <symbol minX="553" maxX="598" minY="1168" maxY="1213" name="subway-bangkok-s"/>
-  <symbol minX="598" maxX="645" minY="1168" maxY="1213" name="subway-glasgow-s"/>
-  <symbol minX="645" maxX="690" minY="1168" maxY="1213" name="subway-kobe-s"/>
-  <symbol minX="690" maxX="735" minY="1168" maxY="1213" name="subway-kazan-s"/>
-  <symbol minX="735" maxX="780" minY="1168" maxY="1213" name="subway-stockholm-s"/>
-  <symbol minX="780" maxX="825" minY="1168" maxY="1213" name="subway-helsinki-s"/>
-  <symbol minX="825" maxX="870" minY="1168" maxY="1213" name="subway-sofia-s"/>
-  <symbol minX="870" maxX="915" minY="1168" maxY="1213" name="subway-shiraz-s"/>
-  <symbol minX="915" maxX="960" minY="1168" maxY="1213" name="subway-shanghai-s"/>
-  <symbol minX="960" maxX="1018" minY="1168" maxY="1213" name="subway-kryvyirih-m"/>
-  <symbol minX="1018" maxX="1063" minY="1168" maxY="1213" name="subway-guadalajara-s"/>
-  <symbol minX="1063" maxX="1108" minY="1168" maxY="1213" name="subway-kunming-s"/>
-  <symbol minX="1108" maxX="1153" minY="1168" maxY="1213" name="subway-kyoto-s"/>
-  <symbol minX="1153" maxX="1198" minY="1168" maxY="1213" name="subway-saopaulo-s"/>
-  <symbol minX="1198" maxX="1243" minY="1168" maxY="1213" name="subway-santodomingo-s"/>
-  <symbol minX="1243" maxX="1299" minY="1168" maxY="1213" name="subway-santiago-s"/>
-  <symbol minX="1299" maxX="1344" minY="1168" maxY="1213" name="subway-lisboa-s"/>
-  <symbol minX="1344" maxX="1389" minY="1168" maxY="1213" name="subway-perugia-s"/>
-  <symbol minX="1389" maxX="1434" minY="1168" maxY="1213" name="subway-foshan-s"/>
-  <symbol minX="1434" maxX="1479" minY="1168" maxY="1213" name="subway-reseau-paris-s"/>
-  <symbol minX="1479" maxX="1524" minY="1168" maxY="1213" name="subway-riodejaneiro-s"/>
-  <symbol minX="1524" maxX="1569" minY="1168" maxY="1213" name="subway-lima-s"/>
-  <symbol minX="1569" maxX="1614" minY="1168" maxY="1213" name="subway-lille-s"/>
-  <symbol minX="1614" maxX="1670" minY="1168" maxY="1213" name="subway-fukuoka-s"/>
-  <symbol minX="1670" maxX="1715" minY="1168" maxY="1213" name="subway-samara-s"/>
-  <symbol minX="1715" maxX="1773" minY="1168" maxY="1212" name="subway-philadelphia-m"/>
-  <symbol minX="1773" maxX="1831" minY="1168" maxY="1211" name="subway-osaka-m"/>
-  <symbol minX="1831" maxX="1889" minY="1168" maxY="1210" name="subway-lucknow-s"/>
-  <symbol minX="1889" maxX="1931" minY="1168" maxY="1210" name="subway-lausanne-s"/>
-  <symbol minX="1931" maxX="1989" minY="1168" maxY="1210" name="subway-madrid-m"/>
-  <symbol minX="1989" maxX="2047" minY="1168" maxY="1210" name="subway-barcelona-m"/>
-  <symbol minX="0" maxX="42" minY="1213" maxY="1255" name="subway-spb-s"/>
-  <symbol minX="42" maxX="98" minY="1213" maxY="1255" name="subway-london-m"/>
-  <symbol minX="98" maxX="152" minY="1213" maxY="1255" name="subway-almaty-s"/>
-  <symbol minX="152" maxX="192" minY="1213" maxY="1255" name="subway-amsterdam-s"/>
-  <symbol minX="192" maxX="237" minY="1213" maxY="1255" name="subway-maracaibo-s"/>
-  <symbol minX="237" maxX="293" minY="1213" maxY="1255" name="subway-tabriz-s"/>
-  <symbol minX="293" maxX="333" minY="1213" maxY="1255" name="subway-mexico-s"/>
-  <symbol minX="333" maxX="375" minY="1213" maxY="1255" name="cave-m"/>
-  <symbol minX="375" maxX="433" minY="1213" maxY="1254" name="subway-lucknow-m"/>
-  <symbol minX="433" maxX="473" minY="1213" maxY="1253" name="hotel-s"/>
-  <symbol minX="473" maxX="513" minY="1213" maxY="1253" name="airport-s"/>
-  <symbol minX="513" maxX="553" minY="1213" maxY="1253" name="subway-entrance-s"/>
-  <symbol minX="553" maxX="593" minY="1213" maxY="1253" name="hospital-s"/>
-  <symbol minX="593" maxX="633" minY="1213" maxY="1253" name="hindu-s"/>
-  <symbol minX="633" maxX="673" minY="1213" maxY="1253" name="geyser-s"/>
-  <symbol minX="673" maxX="713" minY="1213" maxY="1253" name="fuel-s"/>
-  <symbol minX="713" maxX="753" minY="1213" maxY="1253" name="drinking-water-s"/>
-  <symbol minX="753" maxX="793" minY="1213" maxY="1253" name="college-s"/>
-  <symbol minX="793" maxX="833" minY="1213" maxY="1253" name="christian-s"/>
-  <symbol minX="833" maxX="873" minY="1213" maxY="1253" name="charging-station-s"/>
-  <symbol minX="873" maxX="913" minY="1213" maxY="1253" name="car-repair-s"/>
-  <symbol minX="913" maxX="953" minY="1213" maxY="1253" name="cable-car-s"/>
-  <symbol minX="953" maxX="993" minY="1213" maxY="1253" name="bus-s"/>
-  <symbol minX="993" maxX="1033" minY="1213" maxY="1253" name="buddhist-s"/>
-  <symbol minX="1033" maxX="1073" minY="1213" maxY="1253" name="park-outline-s"/>
-  <symbol minX="1073" maxX="1113" minY="1213" maxY="1253" name="stadium-s"/>
-  <symbol minX="1113" maxX="1153" minY="1213" maxY="1253" name="shop-s"/>
-  <symbol minX="1153" maxX="1211" minY="1213" maxY="1253" name="subway-bilbao-m"/>
-  <symbol minX="1211" maxX="1251" minY="1213" maxY="1253" name="ship-s"/>
-  <symbol minX="1251" maxX="1291" minY="1213" maxY="1253" name="shinto-s"/>
-  <symbol minX="1291" maxX="1331" minY="1213" maxY="1253" name="remains-s"/>
-  <symbol minX="1331" maxX="1371" minY="1213" maxY="1253" name="place-of-worship-s"/>
-  <symbol minX="1371" maxX="1411" minY="1213" maxY="1253" name="park-s"/>
-  <symbol minX="1411" maxX="1451" minY="1213" maxY="1253" name="jewish-s"/>
-  <symbol minX="1451" maxX="1491" minY="1213" maxY="1253" name="nparkf-s"/>
-  <symbol minX="1491" maxX="1531" minY="1213" maxY="1253" name="nparkf-outline-s"/>
-  <symbol minX="1531" maxX="1571" minY="1213" maxY="1253" name="muslim-s"/>
-  <symbol minX="1571" maxX="1611" minY="1213" maxY="1253" name="museum-s"/>
-  <symbol minX="1611" maxX="1651" minY="1213" maxY="1253" name="monument-s"/>
-  <symbol minX="1651" maxX="1691" minY="1213" maxY="1253" name="lighthouse-s"/>
-  <symbol minX="1691" maxX="1745" minY="1213" maxY="1253" name="subway-dnepro-s"/>
-  <symbol minX="1745" maxX="1785" minY="1213" maxY="1253" name="waterfall-s"/>
-  <symbol minX="1785" maxX="1825" minY="1213" maxY="1253" name="subway-s"/>
-  <symbol minX="1825" maxX="1856" minY="1213" maxY="1253" name="transit_train-m"/>
-  <symbol minX="1856" maxX="1896" minY="1213" maxY="1253" name="tourism-s"/>
-  <symbol minX="1896" maxX="1941" minY="1213" maxY="1253" name="subway-rotterdam-s"/>
-  <symbol minX="1941" maxX="1986" minY="1213" maxY="1253" name="subway-tbilisi-s"/>
-  <symbol minX="1986" maxX="2026" minY="1213" maxY="1253" name="viewpoint-s"/>
-  <symbol minX="0" maxX="51" minY="1255" maxY="1295" name="subway-philadelphia-s"/>
-  <symbol minX="51" maxX="91" minY="1255" maxY="1295" name="toll_booth-s"/>
-  <symbol minX="91" maxX="131" minY="1255" maxY="1295" name="theme_park-s"/>
-  <symbol minX="131" maxX="171" minY="1255" maxY="1295" name="theatre-s"/>
-  <symbol minX="171" maxX="211" minY="1255" maxY="1295" name="train-s"/>
-  <symbol minX="211" maxX="251" minY="1255" maxY="1295" name="waste-basket-s"/>
-  <symbol minX="251" maxX="291" minY="1255" maxY="1295" name="tram-s"/>
-  <symbol minX="291" maxX="347" minY="1255" maxY="1295" name="subway-palma-s"/>
-  <symbol minX="347" maxX="387" minY="1255" maxY="1295" name="zoo-s"/>
-  <symbol minX="387" maxX="445" minY="1255" maxY="1295" name="subway-palma-m"/>
-  <symbol minX="445" maxX="494" minY="1255" maxY="1295" name="subway-osaka-s"/>
-  <symbol minX="494" maxX="539" minY="1255" maxY="1295" name="transfer_arrow"/>
-  <symbol minX="539" maxX="579" minY="1255" maxY="1295" name="taoist-s"/>
-  <symbol minX="579" maxX="637" minY="1255" maxY="1295" name="subway-kolkata-m"/>
-  <symbol minX="637" maxX="677" minY="1255" maxY="1295" name="subway-newyork-s"/>
-  <symbol minX="677" maxX="708" minY="1255" maxY="1295" name="transit_light_rail-m"/>
-  <symbol minX="708" maxX="766" minY="1255" maxY="1294" name="subway-sanfrancisco-m"/>
-  <symbol minX="766" maxX="824" minY="1255" maxY="1294" name="subway-bucharest-m"/>
-  <symbol minX="824" maxX="882" minY="1255" maxY="1294" name="subway-fukuoka-m"/>
-  <symbol minX="882" maxX="940" minY="1255" maxY="1294" name="subway-novosibirsk-m"/>
-  <symbol minX="940" maxX="978" minY="1255" maxY="1293" name="elevator"/>
-  <symbol minX="978" maxX="1016" minY="1255" maxY="1293" name="subway-paris-s"/>
-  <symbol minX="1016" maxX="1067" minY="1255" maxY="1293" name="subway-barcelona-s"/>
-  <symbol minX="1067" maxX="1105" minY="1255" maxY="1293" name="lightrail-berlin-s"/>
-  <symbol minX="1105" maxX="1161" minY="1255" maxY="1293" name="subway-novosibirsk-s"/>
-  <symbol minX="1161" maxX="1217" minY="1255" maxY="1293" name="subway-kiev-m"/>
-  <symbol minX="1217" maxX="1268" minY="1255" maxY="1293" name="subway-madrid-s"/>
-  <symbol minX="1268" maxX="1326" minY="1255" maxY="1293" name="subway-sendai-m"/>
-  <symbol minX="1326" maxX="1375" minY="1255" maxY="1293" name="subway-kryvyirih-s"/>
-  <symbol minX="1375" maxX="1420" minY="1255" maxY="1293" name="subway-lyon-s"/>
-  <symbol minX="1420" maxX="1478" minY="1255" maxY="1293" name="subway-sanfrancisco-s"/>
-  <symbol minX="1478" maxX="1509" minY="1255" maxY="1293" name="transit_monorail-m"/>
-  <symbol minX="1509" maxX="1567" minY="1255" maxY="1293" name="subway-kharkiv-s"/>
-  <symbol minX="1567" maxX="1625" minY="1255" maxY="1293" name="subway-brussel-s"/>
-  <symbol minX="1625" maxX="1661" minY="1255" maxY="1291" name="transit_subway-m"/>
-  <symbol minX="1661" maxX="1719" minY="1255" maxY="1291" name="subway-kharkiv-m"/>
-  <symbol minX="1719" maxX="1757" minY="1255" maxY="1291" name="subway-moscow-s"/>
-  <symbol minX="1757" maxX="1784" minY="1255" maxY="1291" name="transit_train-s"/>
-  <symbol minX="1784" maxX="1820" minY="1255" maxY="1291" name="map"/>
-  <symbol minX="1820" maxX="1856" minY="1255" maxY="1291" name="board"/>
-  <symbol minX="1856" maxX="1903" minY="1255" maxY="1291" name="subway-alicante-s"/>
-  <symbol minX="1903" maxX="1959" minY="1255" maxY="1291" name="subway-bucharest-s"/>
-  <symbol minX="1959" maxX="1995" minY="1255" maxY="1291" name="storage-tank"/>
-  <symbol minX="0" maxX="58" minY="1295" maxY="1331" name="subway-haagse-s"/>
-  <symbol minX="58" maxX="116" minY="1295" maxY="1331" name="subway-sendai-s"/>
-  <symbol minX="116" maxX="174" minY="1295" maxY="1331" name="subway-brussel-m"/>
-  <symbol minX="174" maxX="232" minY="1295" maxY="1330" name="subway-manila-m"/>
-  <symbol minX="232" maxX="290" minY="1295" maxY="1328" name="subway-haagse-m"/>
-  <symbol minX="290" maxX="323" minY="1295" maxY="1328" name="subway-rome-s"/>
-  <symbol minX="323" maxX="381" minY="1295" maxY="1328" name="subway-edmonton-s"/>
-  <symbol minX="381" maxX="439" minY="1295" maxY="1328" name="subway-taipei-s"/>
-  <symbol minX="439" maxX="481" minY="1295" maxY="1328" name="subway-london-s"/>
-  <symbol minX="481" maxX="537" minY="1295" maxY="1328" name="subway-manila-s"/>
-  <symbol minX="537" maxX="573" minY="1295" maxY="1328" name="subway-seattle-s"/>
-  <symbol minX="573" maxX="606" minY="1295" maxY="1328" name="cave-s"/>
-  <symbol minX="606" maxX="639" minY="1295" maxY="1328" name="subway-ubahn-s"/>
-  <symbol minX="639" maxX="688" minY="1295" maxY="1328" name="subway-bilbao-s"/>
-  <symbol minX="688" maxX="719" minY="1295" maxY="1326" name="gate-s"/>
-  <symbol minX="719" maxX="752" minY="1295" maxY="1326" name="main_entrance-s"/>
-  <symbol minX="752" maxX="772" minY="1295" maxY="1326" name="entrance-s"/>
-  <symbol minX="772" maxX="803" minY="1295" maxY="1326" name="subway-xs"/>
-  <symbol minX="803" maxX="841" minY="1295" maxY="1326" name="bench"/>
-  <symbol minX="841" maxX="872" minY="1295" maxY="1326" name="star-l"/>
-  <symbol minX="872" maxX="903" minY="1295" maxY="1326" name="parking-s"/>
-  <symbol minX="903" maxX="934" minY="1295" maxY="1326" name="transit_subway-s"/>
-  <symbol minX="934" maxX="983" minY="1295" maxY="1326" name="railway-crossing-l"/>
-  <symbol minX="983" maxX="1010" minY="1295" maxY="1326" name="transit_monorail-s"/>
-  <symbol minX="1010" maxX="1037" minY="1295" maxY="1326" name="transit_light_rail-s"/>
-  <symbol minX="1037" maxX="1068" minY="1295" maxY="1326" name="speedcam-s"/>
-  <symbol minX="1068" maxX="1099" minY="1295" maxY="1326" name="subway-newyork-xs"/>
-  <symbol minX="1099" maxX="1157" minY="1295" maxY="1325" name="subway-edmonton-m"/>
-  <symbol minX="1157" maxX="1199" minY="1295" maxY="1324" name="subway-kolkata-s"/>
-  <symbol minX="1199" maxX="1232" minY="1295" maxY="1324" name="volcano-m"/>
-  <symbol minX="1232" maxX="1279" minY="1295" maxY="1324" name="subway-kiev-s"/>
-  <symbol minX="1279" maxX="1308" minY="1295" maxY="1324" name="star-m"/>
-  <symbol minX="1308" maxX="1364" minY="1295" maxY="1324" name="subway-malaga-s"/>
-  <symbol minX="1364" maxX="1422" minY="1295" maxY="1323" name="subway-taipei-m"/>
-  <symbol minX="1422" maxX="1480" minY="1295" maxY="1323" name="subway-malaga-m"/>
-  <symbol minX="1480" maxX="1536" minY="1295" maxY="1322" name="subway-baku-s"/>
-  <symbol minX="1536" maxX="1583" minY="1295" maxY="1322" name="subway-minsk-m"/>
-  <symbol minX="1583" maxX="1625" minY="1295" maxY="1322" name="railway-crossing-m"/>
-  <symbol minX="1625" maxX="1656" minY="1295" maxY="1322" name="plaque"/>
-  <symbol minX="1656" maxX="1714" minY="1295" maxY="1321" name="subway-baku-m"/>
-  <symbol minX="1714" maxX="1772" minY="1295" maxY="1320" name="subway-chongqing-s"/>
-  <symbol minX="1772" maxX="1796" minY="1295" maxY="1319" name="star-s"/>
-  <symbol minX="1796" maxX="1838" minY="1295" maxY="1319" name="subway-minsk-s"/>
-  <symbol minX="1838" maxX="1896" minY="1295" maxY="1318" name="subway-chongqing-m"/>
-  <symbol minX="1896" maxX="1936" minY="1295" maxY="1317" name="mountain-pass"/>
-  <symbol minX="1936" maxX="1987" minY="1295" maxY="1317" name="arrow-m"/>
-  <symbol minX="1987" maxX="2011" minY="1295" maxY="1317" name="peakt-m"/>
-  <symbol minX="2011" maxX="2035" minY="1295" maxY="1317" name="volcano-s"/>
-  <symbol minX="0" maxX="20" minY="1331" maxY="1351" name="zero-icon"/>
-  <symbol minX="20" maxX="40" minY="1331" maxY="1349" name="peakt-s"/>
-  <symbol minX="40" maxX="78" minY="1331" maxY="1346" name="arrow-s"/>
-  <symbol minX="78" maxX="93" minY="1331" maxY="1346" name="dot-m"/>
-  <symbol minX="93" maxX="117" minY="1331" maxY="1342" name="arrow-xs"/>
+  <symbol minX="1972" maxX="2030" minY="833" maxY="891" name="christian-m"/>
+  <symbol minX="0" maxX="58" minY="891" maxY="949" name="chimney-m"/>
+  <symbol minX="58" maxX="116" minY="891" maxY="949" name="chess-m"/>
+  <symbol minX="116" maxX="174" minY="891" maxY="949" name="chemist-m"/>
+  <symbol minX="174" maxX="232" minY="891" maxY="949" name="charity_shop-m"/>
+  <symbol minX="232" maxX="290" minY="891" maxY="949" name="charging-station-m"/>
+  <symbol minX="290" maxX="348" minY="891" maxY="949" name="cemetery-m"/>
+  <symbol minX="348" maxX="406" minY="891" maxY="949" name="casino-m"/>
+  <symbol minX="406" maxX="464" minY="891" maxY="949" name="carpenter-m"/>
+  <symbol minX="464" maxX="522" minY="891" maxY="949" name="caravan_site-m"/>
+  <symbol minX="522" maxX="580" minY="891" maxY="949" name="caravan-shop-m"/>
+  <symbol minX="580" maxX="638" minY="891" maxY="949" name="car_shop-m"/>
+  <symbol minX="638" maxX="696" minY="891" maxY="949" name="car_sharing-m"/>
+  <symbol minX="696" maxX="754" minY="891" maxY="949" name="restaurant-m"/>
+  <symbol minX="754" maxX="812" minY="891" maxY="949" name="car-repair-m"/>
+  <symbol minX="812" maxX="870" minY="891" maxY="949" name="car-part-m"/>
+  <symbol minX="870" maxX="928" minY="891" maxY="949" name="campsite-m"/>
+  <symbol minX="928" maxX="986" minY="891" maxY="949" name="cafe-m"/>
+  <symbol minX="986" maxX="1044" minY="891" maxY="949" name="cable-car-m"/>
+  <symbol minX="1044" maxX="1102" minY="891" maxY="949" name="butcher-m"/>
+  <symbol minX="1102" maxX="1160" minY="891" maxY="949" name="bus-m"/>
+  <symbol minX="1160" maxX="1218" minY="891" maxY="949" name="buddhist-m"/>
+  <symbol minX="1218" maxX="1276" minY="891" maxY="949" name="brewery-m"/>
+  <symbol minX="1276" maxX="1334" minY="891" maxY="949" name="bowling_alley-m"/>
+  <symbol minX="1334" maxX="1392" minY="891" maxY="949" name="bowling-m"/>
+  <symbol minX="1392" maxX="1450" minY="891" maxY="949" name="bookmaker-m"/>
+  <symbol minX="1450" maxX="1508" minY="891" maxY="949" name="book-shop-m"/>
+  <symbol minX="1508" maxX="1566" minY="891" maxY="949" name="lighthouse-m"/>
+  <symbol minX="1566" maxX="1624" minY="891" maxY="949" name="optometrist-m"/>
+  <symbol minX="1624" maxX="1682" minY="891" maxY="949" name="media-m"/>
+  <symbol minX="1682" maxX="1740" minY="891" maxY="949" name="outdoor-shop-m"/>
+  <symbol minX="1740" maxX="1798" minY="891" maxY="949" name="marketplace-m"/>
+  <symbol minX="1798" maxX="1856" minY="891" maxY="949" name="marina-m"/>
+  <symbol minX="1856" maxX="1914" minY="891" maxY="949" name="mail-m"/>
+  <symbol minX="1914" maxX="1972" minY="891" maxY="949" name="padel-m"/>
+  <symbol minX="1972" maxX="2030" minY="891" maxY="949" name="painter-m"/>
+  <symbol minX="0" maxX="58" minY="949" maxY="1007" name="park-m"/>
+  <symbol minX="58" maxX="116" minY="949" maxY="1007" name="park-outline-m"/>
+  <symbol minX="116" maxX="174" minY="949" maxY="1007" name="media_shop-m"/>
+  <symbol minX="174" maxX="232" minY="949" maxY="1007" name="lift_gate-m"/>
+  <symbol minX="232" maxX="290" minY="949" maxY="1007" name="parking-meter-m"/>
+  <symbol minX="290" maxX="348" minY="949" maxY="1007" name="library-m"/>
+  <symbol minX="348" maxX="406" minY="949" maxY="1007" name="pelota-m"/>
+  <symbol minX="406" maxX="464" minY="949" maxY="1007" name="lawyer-m"/>
+  <symbol minX="464" maxX="522" minY="949" maxY="1007" name="laundry-m"/>
+  <symbol minX="522" maxX="580" minY="949" maxY="1007" name="petshop-m"/>
+  <symbol minX="580" maxX="638" minY="949" maxY="1007" name="language_school-m"/>
+  <symbol minX="638" maxX="696" minY="949" maxY="1007" name="kiosk-m"/>
+  <symbol minX="696" maxX="754" minY="949" maxY="1007" name="motorcycle_shop-m"/>
+  <symbol minX="754" maxX="812" minY="949" maxY="1007" name="muslim-m"/>
+  <symbol minX="812" maxX="870" minY="949" maxY="1007" name="needle_and_thread-m"/>
+  <symbol minX="870" maxX="928" minY="949" maxY="1007" name="newsagent_shop-m"/>
+  <symbol minX="928" maxX="986" minY="949" maxY="1007" name="musical-instrument-m"/>
+  <symbol minX="986" maxX="1044" minY="949" maxY="1007" name="music_school-m"/>
+  <symbol minX="1044" maxX="1102" minY="949" maxY="1007" name="music-m"/>
+  <symbol minX="1102" maxX="1160" minY="949" maxY="1007" name="nightclub-m"/>
+  <symbol minX="1160" maxX="1218" minY="949" maxY="1007" name="museum-m"/>
+  <symbol minX="1218" maxX="1276" minY="949" maxY="1007" name="npark-m"/>
+  <symbol minX="1276" maxX="1334" minY="949" maxY="1007" name="hospital-m"/>
+  <symbol minX="1334" maxX="1392" minY="949" maxY="1007" name="nparkf-m"/>
+  <symbol minX="1392" maxX="1450" minY="949" maxY="1007" name="motel-m"/>
+  <symbol minX="1450" maxX="1508" minY="949" maxY="1007" name="monument-m"/>
+  <symbol minX="1508" maxX="1566" minY="949" maxY="1007" name="mobile_phone-m"/>
+  <symbol minX="1566" maxX="1624" minY="949" maxY="1007" name="nparkf-outline-m"/>
+  <symbol minX="1624" maxX="1682" minY="949" maxY="1007" name="military-m"/>
+  <symbol minX="1682" maxX="1740" minY="949" maxY="1007" name="metal_construction-m"/>
+  <symbol minX="1740" maxX="1798" minY="949" maxY="1007" name="office-m"/>
+  <symbol minX="1798" maxX="1856" minY="949" maxY="1007" name="optician-m"/>
+  <symbol minX="1856" maxX="1914" minY="949" maxY="1007" name="information-m"/>
+  <symbol minX="1914" maxX="1972" minY="949" maxY="1007" name="jewelry-m"/>
+  <symbol minX="1972" maxX="2030" minY="949" maxY="1007" name="pitch-m"/>
+  <symbol minX="0" maxX="58" minY="1007" maxY="1065" name="place-of-worship-m"/>
+  <symbol minX="58" maxX="116" minY="1007" maxY="1065" name="playground-m"/>
+  <symbol minX="116" maxX="174" minY="1007" maxY="1065" name="plumber-m"/>
+  <symbol minX="174" maxX="232" minY="1007" maxY="1065" name="podiatrist-m"/>
+  <symbol minX="232" maxX="290" minY="1007" maxY="1065" name="police-m"/>
+  <symbol minX="290" maxX="348" minY="1007" maxY="1065" name="internet_cafe-m"/>
+  <symbol minX="348" maxX="406" minY="1007" maxY="1065" name="postbox-m"/>
+  <symbol minX="406" maxX="464" minY="1007" maxY="1065" name="power-m"/>
+  <symbol minX="464" maxX="522" minY="1007" maxY="1065" name="kindergarten-m"/>
+  <symbol minX="522" maxX="580" minY="1007" maxY="1065" name="prison-m"/>
+  <symbol minX="580" maxX="638" minY="1007" maxY="1065" name="psychotherapist-m"/>
+  <symbol minX="638" maxX="696" minY="1007" maxY="1065" name="public-building-m"/>
+  <symbol minX="696" maxX="754" minY="1007" maxY="1065" name="ice_cream-m"/>
+  <symbol minX="754" maxX="812" minY="1007" maxY="1065" name="recycling-m"/>
+  <symbol minX="812" maxX="870" minY="1007" maxY="1065" name="hunting-tower-m"/>
+  <symbol minX="870" maxX="928" minY="1007" maxY="1065" name="hotel-m"/>
+  <symbol minX="928" maxX="986" minY="1007" maxY="1065" name="remains-m"/>
+  <symbol minX="986" maxX="1044" minY="1007" maxY="1065" name="hostel-m"/>
+  <symbol minX="1044" maxX="1102" minY="1007" maxY="1065" name="sample_collection-m"/>
+  <symbol minX="1102" maxX="1160" minY="1007" maxY="1065" name="picnic_table-m"/>
+  <symbol minX="1160" maxX="1218" minY="1007" maxY="1065" name="physiotherapist-m"/>
+  <symbol minX="1218" maxX="1276" minY="1007" maxY="1065" name="picnic-m"/>
+  <symbol minX="1276" maxX="1334" minY="1007" maxY="1065" name="photo-shop-m"/>
+  <symbol minX="1334" maxX="1392" minY="1007" maxY="1065" name="pharmacy-m"/>
+  <symbol minX="1392" maxX="1450" minY="1007" maxY="1065" name="phone-m"/>
+  <symbol minX="1450" maxX="1508" minY="1007" maxY="1065" name="jewish-m"/>
+  <symbol minX="1508" maxX="1566" minY="1007" maxY="1063" name="subway-maracaibo-m"/>
+  <symbol minX="1566" maxX="1622" minY="1007" maxY="1063" name="subway-spb-m"/>
+  <symbol minX="1622" maxX="1678" minY="1007" maxY="1063" name="subway-southkorea-s"/>
+  <symbol minX="1678" maxX="1734" minY="1007" maxY="1063" name="subway-ekb-s"/>
+  <symbol minX="1734" maxX="1792" minY="1007" maxY="1063" name="subway-shanghai-m"/>
+  <symbol minX="1792" maxX="1850" minY="1007" maxY="1063" name="subway-dalian-m"/>
+  <symbol minX="1850" maxX="1908" minY="1007" maxY="1063" name="subway-sapporo-m"/>
+  <symbol minX="1908" maxX="1964" minY="1007" maxY="1063" name="subway-montreal-m"/>
+  <symbol minX="1964" maxX="2022" minY="1007" maxY="1062" name="subway-marseille-m"/>
+  <symbol minX="0" maxX="54" minY="1065" maxY="1119" name="subway-stlouis-s"/>
+  <symbol minX="54" maxX="105" minY="1065" maxY="1119" name="subway-warsaw-m"/>
+  <symbol minX="105" maxX="159" minY="1065" maxY="1119" name="subway-algeria-s"/>
+  <symbol minX="159" maxX="213" minY="1065" maxY="1119" name="subway-entrance-m"/>
+  <symbol minX="213" maxX="271" minY="1065" maxY="1118" name="subway-izmir-m"/>
+  <symbol minX="271" maxX="323" minY="1065" maxY="1117" name="search-result"/>
+  <symbol minX="323" maxX="374" minY="1065" maxY="1116" name="lightrail-berlin-m"/>
+  <symbol minX="374" maxX="425" minY="1065" maxY="1116" name="subway-pittsburgh-s"/>
+  <symbol minX="425" maxX="470" minY="1065" maxY="1116" name="subway-istanbul-s"/>
+  <symbol minX="470" maxX="528" minY="1065" maxY="1115" name="subway-taoyuan-m"/>
+  <symbol minX="528" maxX="577" minY="1065" maxY="1114" name="speedcam-m"/>
+  <symbol minX="577" maxX="628" minY="1065" maxY="1114" name="subway-izmir-s"/>
+  <symbol minX="628" maxX="673" minY="1065" maxY="1114" name="subway-brescia-s"/>
+  <symbol minX="673" maxX="731" minY="1065" maxY="1114" name="subway-rotterdam-m"/>
+  <symbol minX="731" maxX="780" minY="1065" maxY="1114" name="subway-isfahan-s"/>
+  <symbol minX="780" maxX="829" minY="1065" maxY="1114" name="subway-sapporo-s"/>
+  <symbol minX="829" maxX="878" minY="1065" maxY="1114" name="motorcycle-parking-m"/>
+  <symbol minX="878" maxX="927" minY="1065" maxY="1114" name="parking_pay-m"/>
+  <symbol minX="927" maxX="974" minY="1065" maxY="1114" name="subway-mashhad-s"/>
+  <symbol minX="974" maxX="1023" minY="1065" maxY="1114" name="non-found-search-result"/>
+  <symbol minX="1023" maxX="1072" minY="1065" maxY="1114" name="subway-medellin-s"/>
+  <symbol minX="1072" maxX="1121" minY="1065" maxY="1114" name="subway-cairo-s"/>
+  <symbol minX="1121" maxX="1170" minY="1065" maxY="1114" name="bike-parking-m"/>
+  <symbol minX="1170" maxX="1219" minY="1065" maxY="1114" name="bicycle-rental"/>
+  <symbol minX="1219" maxX="1277" minY="1065" maxY="1114" name="subway-tbilisi-m"/>
+  <symbol minX="1277" maxX="1374" minY="1065" maxY="1114" name="coloredmark-bg-s"/>
+  <symbol minX="1374" maxX="1423" minY="1065" maxY="1114" name="subway-panama-s"/>
+  <symbol minX="1423" maxX="1472" minY="1065" maxY="1114" name="parking_entrance-m"/>
+  <symbol minX="1472" maxX="1521" minY="1065" maxY="1114" name="parking-m"/>
+  <symbol minX="1521" maxX="1570" minY="1065" maxY="1114" name="parking-disabled-m"/>
+  <symbol minX="1570" maxX="1667" minY="1065" maxY="1114" name="coloredmark-default-s"/>
+  <symbol minX="1667" maxX="1725" minY="1065" maxY="1113" name="subway-almaty-m"/>
+  <symbol minX="1725" maxX="1772" minY="1065" maxY="1112" name="subway-rome-m"/>
+  <symbol minX="1772" maxX="1823" minY="1065" maxY="1112" name="subway-seattle-m"/>
+  <symbol minX="1823" maxX="1870" minY="1065" maxY="1112" name="subway-warszawa-s"/>
+  <symbol minX="1870" maxX="1917" minY="1065" maxY="1112" name="subway-ubahn-m"/>
+  <symbol minX="1917" maxX="1962" minY="1065" maxY="1112" name="subway-tianjin-s"/>
+  <symbol minX="1962" maxX="2020" minY="1065" maxY="1112" name="subway-yerevan-m"/>
+  <symbol minX="0" maxX="33" minY="1119" maxY="1166" name="bookmark-bg-xs"/>
+  <symbol minX="33" maxX="78" minY="1119" maxY="1166" name="subway-athens-s"/>
+  <symbol minX="78" maxX="123" minY="1119" maxY="1166" name="subway-delhi-s"/>
+  <symbol minX="123" maxX="181" minY="1119" maxY="1166" name="subway-santiago-m"/>
+  <symbol minX="181" maxX="228" minY="1119" maxY="1166" name="subway-paris-m"/>
+  <symbol minX="228" maxX="261" minY="1119" maxY="1166" name="bookmark-default-xs"/>
+  <symbol minX="261" maxX="306" minY="1119" maxY="1166" name="subway-porto-s"/>
+  <symbol minX="306" maxX="360" minY="1119" maxY="1166" name="subway-moscow-m"/>
+  <symbol minX="360" maxX="407" minY="1119" maxY="1166" name="subway-hirosima-s"/>
+  <symbol minX="407" maxX="452" minY="1119" maxY="1166" name="subway-pyongyang-s"/>
+  <symbol minX="452" maxX="499" minY="1119" maxY="1166" name="subway-rennes-s"/>
+  <symbol minX="499" maxX="544" minY="1119" maxY="1164" name="subway-chengdu-s"/>
+  <symbol minX="544" maxX="589" minY="1119" maxY="1164" name="subway-dalian-s"/>
+  <symbol minX="589" maxX="634" minY="1119" maxY="1164" name="subway-mecca-s"/>
+  <symbol minX="634" maxX="679" minY="1119" maxY="1164" name="subway-milan-s"/>
+  <symbol minX="679" maxX="724" minY="1119" maxY="1164" name="subway-yokohama-s"/>
+  <symbol minX="724" maxX="769" minY="1119" maxY="1164" name="subway-chicago-s"/>
+  <symbol minX="769" maxX="825" minY="1119" maxY="1164" name="subway-yerevan-s"/>
+  <symbol minX="825" maxX="870" minY="1119" maxY="1164" name="subway-minatomirai-s"/>
+  <symbol minX="870" maxX="915" minY="1119" maxY="1164" name="subway-lyon-s"/>
+  <symbol minX="915" maxX="960" minY="1119" maxY="1164" name="subway-wuhan-s"/>
+  <symbol minX="960" maxX="1005" minY="1119" maxY="1164" name="subway-montreal-s"/>
+  <symbol minX="1005" maxX="1050" minY="1119" maxY="1164" name="subway-washington-s"/>
+  <symbol minX="1050" maxX="1095" minY="1119" maxY="1164" name="subway-changchun-s"/>
+  <symbol minX="1095" maxX="1140" minY="1119" maxY="1164" name="subway-nagoya-s"/>
+  <symbol minX="1140" maxX="1180" minY="1119" maxY="1164" name="subway-warsaw-s"/>
+  <symbol minX="1180" maxX="1225" minY="1119" maxY="1164" name="subway-catania-s"/>
+  <symbol minX="1225" maxX="1270" minY="1119" maxY="1164" name="subway-volgograd-s"/>
+  <symbol minX="1270" maxX="1326" minY="1119" maxY="1164" name="subway-fukuoka-s"/>
+  <symbol minX="1326" maxX="1371" minY="1119" maxY="1164" name="subway-helsinki-s"/>
+  <symbol minX="1371" maxX="1416" minY="1119" maxY="1164" name="subway-kazan-s"/>
+  <symbol minX="1416" maxX="1461" minY="1119" maxY="1164" name="subway-guangzhou-s"/>
+  <symbol minX="1461" maxX="1506" minY="1119" maxY="1164" name="subway-kobe-s"/>
+  <symbol minX="1506" maxX="1551" minY="1119" maxY="1164" name="subway-guadalajara-s"/>
+  <symbol minX="1551" maxX="1609" minY="1119" maxY="1164" name="subway-kryvyirih-m"/>
+  <symbol minX="1609" maxX="1656" minY="1119" maxY="1164" name="subway-glasgow-s"/>
+  <symbol minX="1656" maxX="1701" minY="1119" maxY="1164" name="subway-kunming-s"/>
+  <symbol minX="1701" maxX="1746" minY="1119" maxY="1164" name="subway-kyoto-s"/>
+  <symbol minX="1746" maxX="1791" minY="1119" maxY="1164" name="subway-massachusetts-s"/>
+  <symbol minX="1791" maxX="1836" minY="1119" maxY="1164" name="subway-lille-s"/>
+  <symbol minX="1836" maxX="1881" minY="1119" maxY="1164" name="subway-foshan-s"/>
+  <symbol minX="1881" maxX="1926" minY="1119" maxY="1164" name="subway-lima-s"/>
+  <symbol minX="1926" maxX="1971" minY="1119" maxY="1164" name="subway-lisboa-s"/>
+  <symbol minX="1971" maxX="2016" minY="1119" maxY="1164" name="subway-losangeles-s"/>
+  <symbol minX="0" maxX="45" minY="1166" maxY="1211" name="subway-beijing-s"/>
+  <symbol minX="45" maxX="90" minY="1166" maxY="1211" name="subway-dubai-s"/>
+  <symbol minX="90" maxX="148" minY="1166" maxY="1211" name="subway-dnepro-m"/>
+  <symbol minX="148" maxX="199" minY="1166" maxY="1211" name="subway-taoyuan-s"/>
+  <symbol minX="199" maxX="244" minY="1166" maxY="1211" name="subway-sofia-s"/>
+  <symbol minX="244" maxX="289" minY="1166" maxY="1211" name="subway-riodejaneiro-s"/>
+  <symbol minX="289" maxX="334" minY="1166" maxY="1211" name="subway-brasilia-s"/>
+  <symbol minX="334" maxX="379" minY="1166" maxY="1211" name="subway-reseau-paris-s"/>
+  <symbol minX="379" maxX="424" minY="1166" maxY="1211" name="subway-bangkok-s"/>
+  <symbol minX="424" maxX="469" minY="1166" maxY="1211" name="subway-shiraz-s"/>
+  <symbol minX="469" maxX="514" minY="1166" maxY="1211" name="subway-shanghai-s"/>
+  <symbol minX="514" maxX="559" minY="1166" maxY="1211" name="subway-stockholm-s"/>
+  <symbol minX="559" maxX="617" minY="1166" maxY="1211" name="subway-alicante-m"/>
+  <symbol minX="617" maxX="675" minY="1166" maxY="1211" name="subway-tabriz-m"/>
+  <symbol minX="675" maxX="720" minY="1166" maxY="1211" name="subway-samara-s"/>
+  <symbol minX="720" maxX="765" minY="1166" maxY="1211" name="subway-bengaluru-s"/>
+  <symbol minX="765" maxX="810" minY="1166" maxY="1211" name="subway-perugia-s"/>
+  <symbol minX="810" maxX="855" minY="1166" maxY="1211" name="subway-budapest-s"/>
+  <symbol minX="855" maxX="911" minY="1166" maxY="1211" name="subway-santiago-s"/>
+  <symbol minX="911" maxX="956" minY="1166" maxY="1211" name="subway-tokyo-s"/>
+  <symbol minX="956" maxX="1001" minY="1166" maxY="1211" name="subway-vienna-s"/>
+  <symbol minX="1001" maxX="1046" minY="1166" maxY="1211" name="subway-caracas-s"/>
+  <symbol minX="1046" maxX="1091" minY="1166" maxY="1211" name="subway-valencia-s"/>
+  <symbol minX="1091" maxX="1136" minY="1166" maxY="1211" name="subway-nnov-s"/>
+  <symbol minX="1136" maxX="1181" minY="1166" maxY="1211" name="subway-santodomingo-s"/>
+  <symbol minX="1181" maxX="1239" minY="1166" maxY="1211" name="subway-omsk-m"/>
+  <symbol minX="1239" maxX="1284" minY="1166" maxY="1211" name="subway-tyneandwear-s"/>
+  <symbol minX="1284" maxX="1342" minY="1166" maxY="1211" name="subway-omsk-s"/>
+  <symbol minX="1342" maxX="1387" minY="1166" maxY="1211" name="subway-tashkent-s"/>
+  <symbol minX="1387" maxX="1432" minY="1166" maxY="1211" name="subway-saopaulo-s"/>
+  <symbol minX="1432" maxX="1477" minY="1166" maxY="1211" name="subway-bursaray-s"/>
+  <symbol minX="1477" maxX="1522" minY="1166" maxY="1211" name="subway-oslo-s"/>
+  <symbol minX="1522" maxX="1567" minY="1166" maxY="1211" name="subway-buenosaires-s"/>
+  <symbol minX="1567" maxX="1625" minY="1166" maxY="1210" name="subway-philadelphia-m"/>
+  <symbol minX="1625" maxX="1683" minY="1166" maxY="1209" name="subway-osaka-m"/>
+  <symbol minX="1683" maxX="1725" minY="1166" maxY="1208" name="cave-m"/>
+  <symbol minX="1725" maxX="1783" minY="1166" maxY="1208" name="subway-barcelona-m"/>
+  <symbol minX="1783" maxX="1841" minY="1166" maxY="1208" name="subway-madrid-m"/>
+  <symbol minX="1841" maxX="1883" minY="1166" maxY="1208" name="subway-lausanne-s"/>
+  <symbol minX="1883" maxX="1939" minY="1166" maxY="1208" name="subway-london-m"/>
+  <symbol minX="1939" maxX="1981" minY="1166" maxY="1208" name="subway-spb-s"/>
+  <symbol minX="1981" maxX="2039" minY="1166" maxY="1208" name="subway-lucknow-s"/>
+  <symbol minX="0" maxX="45" minY="1211" maxY="1253" name="subway-maracaibo-s"/>
+  <symbol minX="45" maxX="101" minY="1211" maxY="1253" name="subway-tabriz-s"/>
+  <symbol minX="101" maxX="141" minY="1211" maxY="1253" name="subway-mexico-s"/>
+  <symbol minX="141" maxX="181" minY="1211" maxY="1253" name="subway-amsterdam-s"/>
+  <symbol minX="181" maxX="235" minY="1211" maxY="1253" name="subway-almaty-s"/>
+  <symbol minX="235" maxX="293" minY="1211" maxY="1252" name="subway-lucknow-m"/>
+  <symbol minX="293" maxX="333" minY="1211" maxY="1251" name="waterfall-s"/>
+  <symbol minX="333" maxX="373" minY="1211" maxY="1251" name="waste-basket-s"/>
+  <symbol minX="373" maxX="413" minY="1211" maxY="1251" name="zoo-s"/>
+  <symbol minX="413" maxX="453" minY="1211" maxY="1251" name="viewpoint-s"/>
+  <symbol minX="453" maxX="493" minY="1211" maxY="1251" name="airport-s"/>
+  <symbol minX="493" maxX="533" minY="1211" maxY="1251" name="cable-car-s"/>
+  <symbol minX="533" maxX="573" minY="1211" maxY="1251" name="park-s"/>
+  <symbol minX="573" maxX="613" minY="1211" maxY="1251" name="car-repair-s"/>
+  <symbol minX="613" maxX="653" minY="1211" maxY="1251" name="place-of-worship-s"/>
+  <symbol minX="653" maxX="693" minY="1211" maxY="1251" name="remains-s"/>
+  <symbol minX="693" maxX="733" minY="1211" maxY="1251" name="shinto-s"/>
+  <symbol minX="733" maxX="773" minY="1211" maxY="1251" name="ship-s"/>
+  <symbol minX="773" maxX="813" minY="1211" maxY="1251" name="shop-s"/>
+  <symbol minX="813" maxX="853" minY="1211" maxY="1251" name="stadium-s"/>
+  <symbol minX="853" maxX="893" minY="1211" maxY="1251" name="park-outline-s"/>
+  <symbol minX="893" maxX="951" minY="1211" maxY="1251" name="subway-bilbao-m"/>
+  <symbol minX="951" maxX="991" minY="1211" maxY="1251" name="bus-s"/>
+  <symbol minX="991" maxX="1045" minY="1211" maxY="1251" name="subway-dnepro-s"/>
+  <symbol minX="1045" maxX="1085" minY="1211" maxY="1251" name="subway-entrance-s"/>
+  <symbol minX="1085" maxX="1143" minY="1211" maxY="1251" name="subway-kolkata-m"/>
+  <symbol minX="1143" maxX="1183" minY="1211" maxY="1251" name="buddhist-s"/>
+  <symbol minX="1183" maxX="1223" minY="1211" maxY="1251" name="subway-newyork-s"/>
+  <symbol minX="1223" maxX="1272" minY="1211" maxY="1251" name="subway-osaka-s"/>
+  <symbol minX="1272" maxX="1312" minY="1211" maxY="1251" name="jewish-s"/>
+  <symbol minX="1312" maxX="1352" minY="1211" maxY="1251" name="college-s"/>
+  <symbol minX="1352" maxX="1392" minY="1211" maxY="1251" name="christian-s"/>
+  <symbol minX="1392" maxX="1432" minY="1211" maxY="1251" name="drinking-water-s"/>
+  <symbol minX="1432" maxX="1472" minY="1211" maxY="1251" name="fuel-s"/>
+  <symbol minX="1472" maxX="1512" minY="1211" maxY="1251" name="geyser-s"/>
+  <symbol minX="1512" maxX="1552" minY="1211" maxY="1251" name="hindu-s"/>
+  <symbol minX="1552" maxX="1592" minY="1211" maxY="1251" name="hospital-s"/>
+  <symbol minX="1592" maxX="1632" minY="1211" maxY="1251" name="hotel-s"/>
+  <symbol minX="1632" maxX="1663" minY="1211" maxY="1251" name="transit_train-m"/>
+  <symbol minX="1663" maxX="1703" minY="1211" maxY="1251" name="lighthouse-s"/>
+  <symbol minX="1703" maxX="1743" minY="1211" maxY="1251" name="monument-s"/>
+  <symbol minX="1743" maxX="1783" minY="1211" maxY="1251" name="charging-station-s"/>
+  <symbol minX="1783" maxX="1823" minY="1211" maxY="1251" name="museum-s"/>
+  <symbol minX="1823" maxX="1863" minY="1211" maxY="1251" name="muslim-s"/>
+  <symbol minX="1863" maxX="1903" minY="1211" maxY="1251" name="nparkf-outline-s"/>
+  <symbol minX="1903" maxX="1943" minY="1211" maxY="1251" name="nparkf-s"/>
+  <symbol minX="1943" maxX="1999" minY="1211" maxY="1251" name="subway-palma-s"/>
+  <symbol minX="1999" maxX="2039" minY="1211" maxY="1251" name="theme_park-s"/>
+  <symbol minX="0" maxX="40" minY="1253" maxY="1293" name="theatre-s"/>
+  <symbol minX="40" maxX="85" minY="1253" maxY="1293" name="subway-rotterdam-s"/>
+  <symbol minX="85" maxX="125" minY="1253" maxY="1293" name="toll_booth-s"/>
+  <symbol minX="125" maxX="165" minY="1253" maxY="1293" name="tourism-s"/>
+  <symbol minX="165" maxX="205" minY="1253" maxY="1293" name="train-s"/>
+  <symbol minX="205" maxX="245" minY="1253" maxY="1293" name="taoist-s"/>
+  <symbol minX="245" maxX="285" minY="1253" maxY="1293" name="tram-s"/>
+  <symbol minX="285" maxX="330" minY="1253" maxY="1293" name="subway-tbilisi-s"/>
+  <symbol minX="330" maxX="370" minY="1253" maxY="1293" name="subway-s"/>
+  <symbol minX="370" maxX="415" minY="1253" maxY="1293" name="transfer_arrow"/>
+  <symbol minX="415" maxX="446" minY="1253" maxY="1293" name="transit_light_rail-m"/>
+  <symbol minX="446" maxX="497" minY="1253" maxY="1293" name="subway-philadelphia-s"/>
+  <symbol minX="497" maxX="555" minY="1253" maxY="1293" name="subway-palma-m"/>
+  <symbol minX="555" maxX="613" minY="1253" maxY="1292" name="subway-sanfrancisco-m"/>
+  <symbol minX="613" maxX="671" minY="1253" maxY="1292" name="subway-bucharest-m"/>
+  <symbol minX="671" maxX="729" minY="1253" maxY="1292" name="subway-novosibirsk-m"/>
+  <symbol minX="729" maxX="787" minY="1253" maxY="1292" name="subway-fukuoka-m"/>
+  <symbol minX="787" maxX="845" minY="1253" maxY="1291" name="subway-sendai-m"/>
+  <symbol minX="845" maxX="903" minY="1253" maxY="1291" name="subway-brussel-s"/>
+  <symbol minX="903" maxX="961" minY="1253" maxY="1291" name="subway-sanfrancisco-s"/>
+  <symbol minX="961" maxX="1012" minY="1253" maxY="1291" name="subway-barcelona-s"/>
+  <symbol minX="1012" maxX="1070" minY="1253" maxY="1291" name="subway-kharkiv-s"/>
+  <symbol minX="1070" maxX="1126" minY="1253" maxY="1291" name="subway-kiev-m"/>
+  <symbol minX="1126" maxX="1175" minY="1253" maxY="1291" name="subway-kryvyirih-s"/>
+  <symbol minX="1175" maxX="1226" minY="1253" maxY="1291" name="subway-madrid-s"/>
+  <symbol minX="1226" maxX="1264" minY="1253" maxY="1291" name="lightrail-berlin-s"/>
+  <symbol minX="1264" maxX="1295" minY="1253" maxY="1291" name="transit_monorail-m"/>
+  <symbol minX="1295" maxX="1333" minY="1253" maxY="1291" name="elevator"/>
+  <symbol minX="1333" maxX="1371" minY="1253" maxY="1291" name="subway-paris-s"/>
+  <symbol minX="1371" maxX="1427" minY="1253" maxY="1291" name="subway-novosibirsk-s"/>
+  <symbol minX="1427" maxX="1463" minY="1253" maxY="1289" name="board"/>
+  <symbol minX="1463" maxX="1499" minY="1253" maxY="1289" name="map"/>
+  <symbol minX="1499" maxX="1557" minY="1253" maxY="1289" name="subway-sendai-s"/>
+  <symbol minX="1557" maxX="1593" minY="1253" maxY="1289" name="storage-tank"/>
+  <symbol minX="1593" maxX="1629" minY="1253" maxY="1289" name="transit_subway-m"/>
+  <symbol minX="1629" maxX="1676" minY="1253" maxY="1289" name="subway-alicante-s"/>
+  <symbol minX="1676" maxX="1734" minY="1253" maxY="1289" name="subway-kharkiv-m"/>
+  <symbol minX="1734" maxX="1761" minY="1253" maxY="1289" name="transit_train-s"/>
+  <symbol minX="1761" maxX="1817" minY="1253" maxY="1289" name="subway-bucharest-s"/>
+  <symbol minX="1817" maxX="1875" minY="1253" maxY="1289" name="subway-haagse-s"/>
+  <symbol minX="1875" maxX="1913" minY="1253" maxY="1289" name="subway-moscow-s"/>
+  <symbol minX="1913" maxX="1971" minY="1253" maxY="1289" name="subway-brussel-m"/>
+  <symbol minX="1971" maxX="2029" minY="1253" maxY="1288" name="subway-manila-m"/>
+  <symbol minX="0" maxX="36" minY="1293" maxY="1326" name="subway-seattle-s"/>
+  <symbol minX="36" maxX="85" minY="1293" maxY="1326" name="subway-bilbao-s"/>
+  <symbol minX="85" maxX="143" minY="1293" maxY="1326" name="subway-haagse-m"/>
+  <symbol minX="143" maxX="201" minY="1293" maxY="1326" name="subway-edmonton-s"/>
+  <symbol minX="201" maxX="259" minY="1293" maxY="1326" name="subway-taipei-s"/>
+  <symbol minX="259" maxX="292" minY="1293" maxY="1326" name="subway-rome-s"/>
+  <symbol minX="292" maxX="348" minY="1293" maxY="1326" name="subway-manila-s"/>
+  <symbol minX="348" maxX="381" minY="1293" maxY="1326" name="cave-s"/>
+  <symbol minX="381" maxX="414" minY="1293" maxY="1326" name="subway-ubahn-s"/>
+  <symbol minX="414" maxX="456" minY="1293" maxY="1326" name="subway-london-s"/>
+  <symbol minX="456" maxX="483" minY="1293" maxY="1324" name="transit_light_rail-s"/>
+  <symbol minX="483" maxX="516" minY="1293" maxY="1324" name="main_entrance-s"/>
+  <symbol minX="516" maxX="547" minY="1293" maxY="1324" name="transit_subway-s"/>
+  <symbol minX="547" maxX="585" minY="1293" maxY="1324" name="bench"/>
+  <symbol minX="585" maxX="612" minY="1293" maxY="1324" name="transit_monorail-s"/>
+  <symbol minX="612" maxX="632" minY="1293" maxY="1324" name="entrance-s"/>
+  <symbol minX="632" maxX="663" minY="1293" maxY="1324" name="subway-newyork-xs"/>
+  <symbol minX="663" maxX="694" minY="1293" maxY="1324" name="parking-s"/>
+  <symbol minX="694" maxX="725" minY="1293" maxY="1324" name="star-l"/>
+  <symbol minX="725" maxX="756" minY="1293" maxY="1324" name="subway-xs"/>
+  <symbol minX="756" maxX="787" minY="1293" maxY="1324" name="speedcam-s"/>
+  <symbol minX="787" maxX="836" minY="1293" maxY="1324" name="railway-crossing-l"/>
+  <symbol minX="836" maxX="894" minY="1293" maxY="1323" name="subway-edmonton-m"/>
+  <symbol minX="894" maxX="950" minY="1293" maxY="1322" name="subway-malaga-s"/>
+  <symbol minX="950" maxX="997" minY="1293" maxY="1322" name="subway-kiev-s"/>
+  <symbol minX="997" maxX="1030" minY="1293" maxY="1322" name="volcano-m"/>
+  <symbol minX="1030" maxX="1072" minY="1293" maxY="1322" name="subway-kolkata-s"/>
+  <symbol minX="1072" maxX="1101" minY="1293" maxY="1322" name="star-m"/>
+  <symbol minX="1101" maxX="1159" minY="1293" maxY="1321" name="subway-taipei-m"/>
+  <symbol minX="1159" maxX="1217" minY="1293" maxY="1321" name="subway-malaga-m"/>
+  <symbol minX="1217" maxX="1248" minY="1293" maxY="1320" name="plaque"/>
+  <symbol minX="1248" maxX="1290" minY="1293" maxY="1320" name="railway-crossing-m"/>
+  <symbol minX="1290" maxX="1337" minY="1293" maxY="1320" name="subway-minsk-m"/>
+  <symbol minX="1337" maxX="1393" minY="1293" maxY="1320" name="subway-baku-s"/>
+  <symbol minX="1393" maxX="1451" minY="1293" maxY="1319" name="subway-baku-m"/>
+  <symbol minX="1451" maxX="1509" minY="1293" maxY="1318" name="subway-chongqing-s"/>
+  <symbol minX="1509" maxX="1533" minY="1293" maxY="1317" name="star-s"/>
+  <symbol minX="1533" maxX="1575" minY="1293" maxY="1317" name="subway-minsk-s"/>
+  <symbol minX="1575" maxX="1633" minY="1293" maxY="1316" name="subway-chongqing-m"/>
+  <symbol minX="1633" maxX="1673" minY="1293" maxY="1315" name="mountain-pass"/>
+  <symbol minX="1673" maxX="1697" minY="1293" maxY="1315" name="peakt-m"/>
+  <symbol minX="1697" maxX="1721" minY="1293" maxY="1315" name="volcano-s"/>
+  <symbol minX="1721" maxX="1772" minY="1293" maxY="1315" name="arrow-m"/>
+  <symbol minX="1772" maxX="1792" minY="1293" maxY="1313" name="zero-icon"/>
+  <symbol minX="1792" maxX="1812" minY="1293" maxY="1311" name="peakt-s"/>
+  <symbol minX="1812" maxX="1827" minY="1293" maxY="1308" name="dot-m"/>
+  <symbol minX="1827" maxX="1865" minY="1293" maxY="1308" name="arrow-s"/>
+  <symbol minX="1865" maxX="1889" minY="1293" maxY="1304" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png
index 6252d79bf8..e622ba3971 100644
Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf
index 81bf08fdd8..fdf03c04da 100644
--- a/data/resources-xxxhdpi_clear/symbols.sdf
+++ b/data/resources-xxxhdpi_clear/symbols.sdf
@@ -2,701 +2,696 @@
 <root>
  <file width="2048" height="2048">
   <symbol minX="0" maxX="144" minY="0" maxY="144" name="compass-image"/>
-  <symbol minX="144" maxX="281" minY="0" maxY="137" name="cross_geoposition"/>
-  <symbol minX="281" maxX="425" minY="0" maxY="137" name="route-point-finish"/>
-  <symbol minX="425" maxX="562" minY="0" maxY="137" name="shield-us-i-wide-scaled"/>
-  <symbol minX="562" maxX="678" minY="0" maxY="137" name="shield-us-i-thin-scaled"/>
+  <symbol minX="144" maxX="260" minY="0" maxY="137" name="shield-us-i-thin-scaled"/>
+  <symbol minX="260" maxX="397" minY="0" maxY="137" name="cross_geoposition"/>
+  <symbol minX="397" maxX="534" minY="0" maxY="137" name="shield-us-i-wide-scaled"/>
+  <symbol minX="534" maxX="678" minY="0" maxY="137" name="route-point-finish"/>
   <symbol minX="678" maxX="904" minY="0" maxY="136" name="route-arrow"/>
-  <symbol minX="904" maxX="1034" minY="0" maxY="130" name="search-result-shop-department_store"/>
-  <symbol minX="1034" maxX="1164" minY="0" maxY="130" name="search-result-marketplace"/>
-  <symbol minX="1164" maxX="1294" minY="0" maxY="130" name="search-result-shop-cosmetics"/>
+  <symbol minX="904" maxX="1034" minY="0" maxY="130" name="search-result-marketplace"/>
+  <symbol minX="1034" maxX="1164" minY="0" maxY="130" name="search-result-shop-shoes"/>
+  <symbol minX="1164" maxX="1294" minY="0" maxY="130" name="search-result-theme-park"/>
   <symbol minX="1294" maxX="1424" minY="0" maxY="130" name="search-result-shop-convenience"/>
-  <symbol minX="1424" maxX="1554" minY="0" maxY="130" name="search-result-shop-confectionery"/>
-  <symbol minX="1554" maxX="1684" minY="0" maxY="130" name="search-result-shop-clothes"/>
-  <symbol minX="1684" maxX="1814" minY="0" maxY="130" name="search-result-shop-butcher"/>
-  <symbol minX="1814" maxX="1944" minY="0" maxY="130" name="search-result-shop-alcohol"/>
-  <symbol minX="0" maxX="130" minY="144" maxY="274" name="search-result-restaurant"/>
-  <symbol minX="130" maxX="260" minY="144" maxY="274" name="search-result-pub"/>
-  <symbol minX="260" maxX="390" minY="144" maxY="274" name="search-result-playground"/>
+  <symbol minX="1424" maxX="1554" minY="0" maxY="130" name="search-result-restaurant"/>
+  <symbol minX="1554" maxX="1684" minY="0" maxY="130" name="search-result-pub"/>
+  <symbol minX="1684" maxX="1814" minY="0" maxY="130" name="search-result-cinema"/>
+  <symbol minX="1814" maxX="1944" minY="0" maxY="130" name="search-result-fastfood"/>
+  <symbol minX="0" maxX="130" minY="144" maxY="274" name="search-result-shop-sports"/>
+  <symbol minX="130" maxX="260" minY="144" maxY="274" name="search-result-shop-cosmetics"/>
+  <symbol minX="260" maxX="390" minY="144" maxY="274" name="search-result-zoo"/>
   <symbol minX="390" maxX="520" minY="144" maxY="274" name="search-result-nightclub"/>
-  <symbol minX="520" maxX="650" minY="144" maxY="274" name="search-result-fastfood"/>
-  <symbol minX="650" maxX="780" minY="144" maxY="274" name="search-result-cinema"/>
-  <symbol minX="780" maxX="910" minY="144" maxY="274" name="search-result-casino"/>
-  <symbol minX="910" maxX="1040" minY="144" maxY="274" name="search-result-cafe"/>
-  <symbol minX="1040" maxX="1170" minY="144" maxY="274" name="search-result-bar"/>
-  <symbol minX="1170" maxX="1300" minY="144" maxY="274" name="search-result-bakery"/>
-  <symbol minX="1300" maxX="1430" minY="144" maxY="274" name="search-result-shop-greengrocer"/>
-  <symbol minX="1430" maxX="1567" minY="144" maxY="274" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="1567" maxX="1697" minY="144" maxY="274" name="search-result-zoo"/>
-  <symbol minX="1697" maxX="1827" minY="144" maxY="274" name="search-result-shop-gift"/>
-  <symbol minX="1827" maxX="1957" minY="144" maxY="274" name="search-result-water-park"/>
-  <symbol minX="0" maxX="130" minY="274" maxY="404" name="search-result-theme-park"/>
-  <symbol minX="130" maxX="260" minY="274" maxY="404" name="search-result-shop-toys"/>
-  <symbol minX="260" maxX="390" minY="274" maxY="404" name="search-result-shop-supermarket"/>
-  <symbol minX="390" maxX="520" minY="274" maxY="404" name="search-result-shop-sports"/>
-  <symbol minX="520" maxX="650" minY="274" maxY="404" name="search-result-shop-shoes"/>
-  <symbol minX="650" maxX="780" minY="274" maxY="404" name="search-result-shop-seafood"/>
-  <symbol minX="780" maxX="910" minY="274" maxY="404" name="search-result-shop-mall"/>
-  <symbol minX="910" maxX="1040" minY="274" maxY="404" name="search-result-shop-jewelry"/>
+  <symbol minX="520" maxX="650" minY="144" maxY="274" name="search-result-shop-butcher"/>
+  <symbol minX="650" maxX="780" minY="144" maxY="274" name="search-result-playground"/>
+  <symbol minX="780" maxX="910" minY="144" maxY="274" name="search-result-shop-toys"/>
+  <symbol minX="910" maxX="1040" minY="144" maxY="274" name="search-result-shop-confectionery"/>
+  <symbol minX="1040" maxX="1170" minY="144" maxY="274" name="search-result-shop-clothes"/>
+  <symbol minX="1170" maxX="1300" minY="144" maxY="274" name="search-result-shop-supermarket"/>
+  <symbol minX="1300" maxX="1437" minY="144" maxY="274" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="1437" maxX="1567" minY="144" maxY="274" name="search-result-shop-gift"/>
+  <symbol minX="1567" maxX="1697" minY="144" maxY="274" name="search-result-water-park"/>
+  <symbol minX="1697" maxX="1827" minY="144" maxY="274" name="search-result-shop-greengrocer"/>
+  <symbol minX="1827" maxX="1957" minY="144" maxY="274" name="search-result-bakery"/>
+  <symbol minX="0" maxX="130" minY="274" maxY="404" name="search-result-bar"/>
+  <symbol minX="130" maxX="260" minY="274" maxY="404" name="search-result-shop-jewelry"/>
+  <symbol minX="260" maxX="390" minY="274" maxY="404" name="search-result-shop-mall"/>
+  <symbol minX="390" maxX="520" minY="274" maxY="404" name="search-result-shop-seafood"/>
+  <symbol minX="520" maxX="650" minY="274" maxY="404" name="search-result-cafe"/>
+  <symbol minX="650" maxX="780" minY="274" maxY="404" name="search-result-shop-department_store"/>
+  <symbol minX="780" maxX="910" minY="274" maxY="404" name="search-result-shop-alcohol"/>
+  <symbol minX="910" maxX="1040" minY="274" maxY="404" name="search-result-casino"/>
   <symbol minX="1040" maxX="1156" minY="274" maxY="397" name="shield-us-hw-thin-scaled"/>
   <symbol minX="1156" maxX="1251" minY="274" maxY="394" name="ferry"/>
-  <symbol minX="1251" maxX="1346" minY="274" maxY="394" name="unpaved_road"/>
-  <symbol minX="1346" maxX="1441" minY="274" maxY="394" name="paid_road"/>
-  <symbol minX="1441" maxX="1557" minY="274" maxY="390" name="infosign"/>
-  <symbol minX="1557" maxX="1673" minY="274" maxY="390" name="track_marker_selected"/>
-  <symbol minX="1673" maxX="1750" minY="274" maxY="384" name="bookmark-parking-m"/>
-  <symbol minX="1750" maxX="1827" minY="274" maxY="384" name="bookmark-museum-m"/>
-  <symbol minX="1827" maxX="1904" minY="274" maxY="384" name="bookmark-building-m"/>
-  <symbol minX="1904" maxX="1981" minY="274" maxY="384" name="bookmark-water-m"/>
-  <symbol minX="0" maxX="77" minY="404" maxY="514" name="bookmark-buddhism-m"/>
-  <symbol minX="77" maxX="154" minY="404" maxY="514" name="bookmark-animals-m"/>
-  <symbol minX="154" maxX="231" minY="404" maxY="514" name="bookmark-viewpoint-m"/>
-  <symbol minX="231" maxX="308" minY="404" maxY="514" name="bookmark-transport-m"/>
-  <symbol minX="308" maxX="385" minY="404" maxY="514" name="bookmark-swim-m"/>
-  <symbol minX="385" maxX="462" minY="404" maxY="514" name="bookmark-start-m"/>
-  <symbol minX="462" maxX="539" minY="404" maxY="514" name="bookmark-sport-m"/>
-  <symbol minX="539" maxX="616" minY="404" maxY="514" name="bookmark-sights-m"/>
-  <symbol minX="616" maxX="693" minY="404" maxY="514" name="bookmark-shop-m"/>
-  <symbol minX="693" maxX="770" minY="404" maxY="514" name="bookmark-bg-m"/>
-  <symbol minX="770" maxX="847" minY="404" maxY="514" name="bookmark-park-m"/>
-  <symbol minX="847" maxX="924" minY="404" maxY="514" name="bookmark-mountain-m"/>
-  <symbol minX="924" maxX="1001" minY="404" maxY="514" name="bookmark-medicine-m"/>
-  <symbol minX="1001" maxX="1078" minY="404" maxY="514" name="bookmark-judaism-m"/>
-  <symbol minX="1078" maxX="1155" minY="404" maxY="514" name="bookmark-islam-m"/>
-  <symbol minX="1155" maxX="1232" minY="404" maxY="514" name="bookmark-hotel-m"/>
-  <symbol minX="1232" maxX="1309" minY="404" maxY="514" name="bookmark-gas-m"/>
-  <symbol minX="1309" maxX="1386" minY="404" maxY="514" name="bookmark-food-m"/>
-  <symbol minX="1386" maxX="1463" minY="404" maxY="514" name="bookmark-finish-m"/>
-  <symbol minX="1463" maxX="1540" minY="404" maxY="514" name="bookmark-exchange-m"/>
-  <symbol minX="1540" maxX="1617" minY="404" maxY="514" name="bookmark-entertainment-m"/>
-  <symbol minX="1617" maxX="1694" minY="404" maxY="514" name="bookmark-default-m"/>
-  <symbol minX="1694" maxX="1771" minY="404" maxY="514" name="bookmark-bar-m"/>
-  <symbol minX="1771" maxX="1848" minY="404" maxY="514" name="bookmark-christianity-m"/>
-  <symbol minX="1848" maxX="1992" minY="404" maxY="506" name="norating-bg-l"/>
-  <symbol minX="0" maxX="102" minY="514" maxY="616" name="route-point-start"/>
-  <symbol minX="102" maxX="204" minY="514" maxY="616" name="route-point-9"/>
-  <symbol minX="204" maxX="306" minY="514" maxY="616" name="route-point-8"/>
-  <symbol minX="306" maxX="408" minY="514" maxY="616" name="route-point-7"/>
-  <symbol minX="408" maxX="510" minY="514" maxY="616" name="route-point-6"/>
-  <symbol minX="510" maxX="612" minY="514" maxY="616" name="route-point-5"/>
-  <symbol minX="612" maxX="714" minY="514" maxY="616" name="route-point-4"/>
-  <symbol minX="714" maxX="816" minY="514" maxY="616" name="route-point-3"/>
-  <symbol minX="816" maxX="918" minY="514" maxY="616" name="route-point-20"/>
-  <symbol minX="918" maxX="1020" minY="514" maxY="616" name="route-point-2"/>
-  <symbol minX="1020" maxX="1122" minY="514" maxY="616" name="route-point-19"/>
-  <symbol minX="1122" maxX="1224" minY="514" maxY="616" name="route-point-18"/>
-  <symbol minX="1224" maxX="1326" minY="514" maxY="616" name="route-point-17"/>
-  <symbol minX="1326" maxX="1428" minY="514" maxY="616" name="route-point-16"/>
-  <symbol minX="1428" maxX="1530" minY="514" maxY="616" name="route-point-15"/>
-  <symbol minX="1530" maxX="1632" minY="514" maxY="616" name="route-point-14"/>
-  <symbol minX="1632" maxX="1734" minY="514" maxY="616" name="route-point-13"/>
-  <symbol minX="1734" maxX="1836" minY="514" maxY="616" name="route-point-12"/>
-  <symbol minX="1836" maxX="1938" minY="514" maxY="616" name="route-point-11"/>
-  <symbol minX="1938" maxX="2040" minY="514" maxY="616" name="route-point-10"/>
-  <symbol minX="0" maxX="102" minY="616" maxY="718" name="route-point-1"/>
-  <symbol minX="102" maxX="246" minY="616" maxY="718" name="norating-default-l"/>
-  <symbol minX="246" maxX="390" minY="616" maxY="718" name="coloredmark-bg-l"/>
-  <symbol minX="390" maxX="534" minY="616" maxY="718" name="coloredmark-default-l"/>
-  <symbol minX="534" maxX="608" minY="616" maxY="704" name="shield-us-i-thin"/>
-  <symbol minX="608" maxX="703" minY="616" maxY="704" name="shield-us-i-wide"/>
-  <symbol minX="703" maxX="784" minY="616" maxY="697" name="shield-us-hw-thin"/>
-  <symbol minX="784" maxX="879" minY="616" maxY="697" name="shield-us-hw-wide"/>
-  <symbol minX="879" maxX="933" minY="616" maxY="693" name="bookmark-default-s"/>
-  <symbol minX="933" maxX="987" minY="616" maxY="693" name="bookmark-bg-s"/>
-  <symbol minX="987" maxX="1061" minY="616" maxY="690" name="track_marker_deselected"/>
-  <symbol minX="1061" maxX="1135" minY="616" maxY="690" name="current-position"/>
-  <symbol minX="1135" maxX="1203" minY="616" maxY="684" name="subway-chengdu-m"/>
-  <symbol minX="1203" maxX="1271" minY="616" maxY="684" name="subway-guadalajara-m"/>
-  <symbol minX="1271" maxX="1339" minY="616" maxY="684" name="subway-glasgow-m"/>
-  <symbol minX="1339" maxX="1407" minY="616" maxY="684" name="subway-foshan-m"/>
-  <symbol minX="1407" maxX="1475" minY="616" maxY="684" name="subway-ekb-m"/>
-  <symbol minX="1475" maxX="1543" minY="616" maxY="684" name="subway-dubai-m"/>
-  <symbol minX="1543" maxX="1608" minY="616" maxY="684" name="subway-delhi-m"/>
-  <symbol minX="1608" maxX="1676" minY="616" maxY="684" name="subway-chicago-m"/>
-  <symbol minX="1676" maxX="1744" minY="616" maxY="684" name="airport-m"/>
-  <symbol minX="1744" maxX="1812" minY="616" maxY="684" name="subway-changchun-m"/>
-  <symbol minX="1812" maxX="1880" minY="616" maxY="684" name="subway-catania-m"/>
-  <symbol minX="1880" maxX="1948" minY="616" maxY="684" name="subway-caracas-m"/>
-  <symbol minX="1948" maxX="2016" minY="616" maxY="684" name="subway-cairo-m"/>
-  <symbol minX="0" maxX="68" minY="718" maxY="786" name="subway-bursaray-m"/>
-  <symbol minX="68" maxX="136" minY="718" maxY="786" name="subway-buenosaires-m"/>
-  <symbol minX="136" maxX="204" minY="718" maxY="786" name="subway-budapest-m"/>
-  <symbol minX="204" maxX="267" minY="718" maxY="786" name="subway-brescia-m"/>
-  <symbol minX="267" maxX="335" minY="718" maxY="786" name="subway-helsinki-m"/>
-  <symbol minX="335" maxX="403" minY="718" maxY="786" name="subway-hirosima-m"/>
-  <symbol minX="403" maxX="471" minY="718" maxY="786" name="subway-isfahan-m"/>
-  <symbol minX="471" maxX="526" minY="718" maxY="786" name="subway-istanbul-m"/>
-  <symbol minX="526" maxX="594" minY="718" maxY="786" name="subway-kazan-m"/>
-  <symbol minX="594" maxX="662" minY="718" maxY="786" name="subway-kobe-m"/>
-  <symbol minX="662" maxX="730" minY="718" maxY="786" name="subway-kunming-m"/>
-  <symbol minX="730" maxX="798" minY="718" maxY="786" name="subway-kyoto-m"/>
-  <symbol minX="798" maxX="866" minY="718" maxY="786" name="subway-lausanne-m"/>
-  <symbol minX="866" maxX="934" minY="718" maxY="786" name="subway-lille-m"/>
-  <symbol minX="934" maxX="1002" minY="718" maxY="786" name="subway-lima-m"/>
-  <symbol minX="1002" maxX="1070" minY="718" maxY="786" name="subway-lisboa-m"/>
-  <symbol minX="1070" maxX="1138" minY="718" maxY="786" name="subway-losangeles-m"/>
-  <symbol minX="1138" maxX="1206" minY="718" maxY="786" name="subway-m"/>
-  <symbol minX="1206" maxX="1274" minY="718" maxY="786" name="subway-marseille-s"/>
-  <symbol minX="1274" maxX="1341" minY="718" maxY="786" name="subway-mashhad-m"/>
-  <symbol minX="1341" maxX="1409" minY="718" maxY="786" name="second_hand_shop-m"/>
-  <symbol minX="1409" maxX="1477" minY="718" maxY="786" name="skateboard-m"/>
-  <symbol minX="1477" maxX="1545" minY="718" maxY="786" name="shower-m"/>
-  <symbol minX="1545" maxX="1613" minY="718" maxY="786" name="shop-m"/>
-  <symbol minX="1613" maxX="1681" minY="718" maxY="786" name="shop-bicycle-m"/>
-  <symbol minX="1681" maxX="1749" minY="718" maxY="786" name="shoes-m"/>
-  <symbol minX="1749" maxX="1817" minY="718" maxY="786" name="ship-m"/>
-  <symbol minX="1817" maxX="1885" minY="718" maxY="786" name="shinto-m"/>
-  <symbol minX="1885" maxX="1953" minY="718" maxY="786" name="shelter-m"/>
-  <symbol minX="1953" maxX="2021" minY="718" maxY="786" name="skiing-m"/>
-  <symbol minX="0" maxX="68" minY="786" maxY="854" name="seafood-shop-m"/>
-  <symbol minX="68" maxX="136" minY="786" maxY="854" name="school-m"/>
-  <symbol minX="136" maxX="204" minY="786" maxY="854" name="sawmill-m"/>
-  <symbol minX="204" maxX="272" minY="786" maxY="854" name="sauna-m"/>
-  <symbol minX="272" maxX="340" minY="786" maxY="854" name="sample_collection-m"/>
-  <symbol minX="340" maxX="408" minY="786" maxY="854" name="subway-guangzhou-m"/>
-  <symbol minX="408" maxX="476" minY="786" maxY="854" name="restaurant-m"/>
-  <symbol minX="476" maxX="544" minY="786" maxY="854" name="subway-adana-s"/>
-  <symbol minX="544" maxX="612" minY="786" maxY="854" name="subway-bengaluru-m"/>
-  <symbol minX="612" maxX="680" minY="786" maxY="854" name="subway-beijing-m"/>
-  <symbol minX="680" maxX="748" minY="786" maxY="854" name="subway-bangkok-m"/>
-  <symbol minX="748" maxX="813" minY="786" maxY="854" name="subway-athens-m"/>
-  <symbol minX="813" maxX="881" minY="786" maxY="854" name="subway-ankara-s"/>
-  <symbol minX="881" maxX="949" minY="786" maxY="854" name="subway-ankara-m"/>
-  <symbol minX="949" maxX="1009" minY="786" maxY="854" name="subway-amsterdam-m"/>
-  <symbol minX="1009" maxX="1077" minY="786" maxY="854" name="subway-algeria-m"/>
-  <symbol minX="1077" maxX="1145" minY="786" maxY="854" name="subway-brasilia-m"/>
-  <symbol minX="1145" maxX="1213" minY="786" maxY="854" name="subway-adana-m"/>
-  <symbol minX="1213" maxX="1281" minY="786" maxY="854" name="stationery_shop-m"/>
-  <symbol minX="1281" maxX="1349" minY="786" maxY="854" name="stadium-m"/>
-  <symbol minX="1349" maxX="1417" minY="786" maxY="854" name="sports-m"/>
-  <symbol minX="1417" maxX="1485" minY="786" maxY="854" name="speedcam-alert-l"/>
-  <symbol minX="1485" maxX="1553" minY="786" maxY="854" name="speech_therapist-m"/>
-  <symbol minX="1553" maxX="1621" minY="786" maxY="854" name="soccer-m"/>
-  <symbol minX="1621" maxX="1689" minY="786" maxY="854" name="taoist-m"/>
-  <symbol minX="1689" maxX="1757" minY="786" maxY="854" name="toll_booth-m"/>
-  <symbol minX="1757" maxX="1825" minY="786" maxY="854" name="toilets-m"/>
-  <symbol minX="1825" maxX="1893" minY="786" maxY="854" name="tire-repair-m"/>
-  <symbol minX="1893" maxX="1961" minY="786" maxY="854" name="ticket-shop-m"/>
-  <symbol minX="1961" maxX="2029" minY="786" maxY="854" name="theme_park-m"/>
-  <symbol minX="0" maxX="68" minY="854" maxY="922" name="theatre-m"/>
-  <symbol minX="68" maxX="136" minY="854" maxY="922" name="tennis-m"/>
-  <symbol minX="136" maxX="204" minY="854" maxY="922" name="taxi-m"/>
-  <symbol minX="204" maxX="272" minY="854" maxY="922" name="tomb-m"/>
-  <symbol minX="272" maxX="340" minY="854" maxY="922" name="table-tennis-m"/>
-  <symbol minX="340" maxX="408" minY="854" maxY="922" name="swimming-m"/>
-  <symbol minX="408" maxX="476" minY="854" maxY="922" name="sweets-m"/>
-  <symbol minX="476" maxX="544" minY="854" maxY="922" name="survey_point-m"/>
-  <symbol minX="544" maxX="612" minY="854" maxY="922" name="subway-yokohama-m"/>
-  <symbol minX="612" maxX="680" minY="854" maxY="922" name="subway-wuhan-m"/>
-  <symbol minX="680" maxX="748" minY="854" maxY="922" name="subway-washington-m"/>
-  <symbol minX="748" maxX="816" minY="854" maxY="922" name="video-games-m"/>
-  <symbol minX="816" maxX="884" minY="854" maxY="922" name="zoo-m"/>
-  <symbol minX="884" maxX="952" minY="854" maxY="922" name="yoga-m"/>
-  <symbol minX="952" maxX="1020" minY="854" maxY="922" name="windmill-m"/>
-  <symbol minX="1020" maxX="1088" minY="854" maxY="922" name="wayside_shrine-m"/>
-  <symbol minX="1088" maxX="1156" minY="854" maxY="922" name="waterfall-m"/>
-  <symbol minX="1156" maxX="1224" minY="854" maxY="922" name="waste-basket-m"/>
-  <symbol minX="1224" maxX="1292" minY="854" maxY="922" name="volleyball-m"/>
-  <symbol minX="1292" maxX="1360" minY="854" maxY="922" name="viewpoint-m"/>
-  <symbol minX="1360" maxX="1428" minY="854" maxY="922" name="subway-warszawa-m"/>
-  <symbol minX="1428" maxX="1496" minY="854" maxY="922" name="veterinary-m"/>
-  <symbol minX="1496" maxX="1564" minY="854" maxY="922" name="vending-m"/>
-  <symbol minX="1564" maxX="1632" minY="854" maxY="922" name="travel_agency_shop-m"/>
-  <symbol minX="1632" maxX="1700" minY="854" maxY="922" name="tram-m"/>
-  <symbol minX="1700" maxX="1768" minY="854" maxY="922" name="train-m"/>
-  <symbol minX="1768" maxX="1836" minY="854" maxY="922" name="toys-m"/>
-  <symbol minX="1836" maxX="1904" minY="854" maxY="922" name="tourism-m"/>
-  <symbol minX="1904" maxX="1969" minY="854" maxY="922" name="subway-nnov-m"/>
-  <symbol minX="1969" maxX="2037" minY="854" maxY="922" name="subway-reseau-paris-m"/>
-  <symbol minX="0" maxX="68" minY="922" maxY="990" name="subway-rennes-m"/>
-  <symbol minX="68" maxX="136" minY="922" maxY="990" name="subway-pyongyang-m"/>
-  <symbol minX="136" maxX="201" minY="922" maxY="990" name="subway-porto-m"/>
-  <symbol minX="201" maxX="269" minY="922" maxY="990" name="subway-pittsburgh-m"/>
-  <symbol minX="269" maxX="337" minY="922" maxY="990" name="subway-perugia-m"/>
-  <symbol minX="337" maxX="405" minY="922" maxY="990" name="subway-panama-m"/>
-  <symbol minX="405" maxX="473" minY="922" maxY="990" name="subway-oslo-m"/>
-  <symbol minX="473" maxX="541" minY="922" maxY="990" name="subway-riodejaneiro-m"/>
-  <symbol minX="541" maxX="609" minY="922" maxY="990" name="subway-newyork-m"/>
-  <symbol minX="609" maxX="677" minY="922" maxY="990" name="subway-nagoya-m"/>
-  <symbol minX="677" maxX="745" minY="922" maxY="990" name="subway-minatomirai-m"/>
-  <symbol minX="745" maxX="813" minY="922" maxY="990" name="subway-milan-m"/>
-  <symbol minX="813" maxX="878" minY="922" maxY="990" name="subway-mexico-m"/>
-  <symbol minX="878" maxX="946" minY="922" maxY="990" name="subway-medellin-m"/>
-  <symbol minX="946" maxX="1014" minY="922" maxY="990" name="subway-mecca-m"/>
-  <symbol minX="1014" maxX="1082" minY="922" maxY="990" name="subway-massachusetts-m"/>
-  <symbol minX="1082" maxX="1150" minY="922" maxY="990" name="subway-samara-m"/>
-  <symbol minX="1150" maxX="1218" minY="922" maxY="990" name="subway-santodomingo-m"/>
-  <symbol minX="1218" maxX="1286" minY="922" maxY="990" name="subway-saopaulo-m"/>
-  <symbol minX="1286" maxX="1354" minY="922" maxY="990" name="subway-shiraz-m"/>
-  <symbol minX="1354" maxX="1422" minY="922" maxY="990" name="subway-sofia-m"/>
-  <symbol minX="1422" maxX="1490" minY="922" maxY="990" name="subway-southkorea-m"/>
-  <symbol minX="1490" maxX="1558" minY="922" maxY="990" name="subway-stlouis-m"/>
-  <symbol minX="1558" maxX="1626" minY="922" maxY="990" name="subway-stockholm-m"/>
-  <symbol minX="1626" maxX="1694" minY="922" maxY="990" name="subway-tashkent-m"/>
-  <symbol minX="1694" maxX="1762" minY="922" maxY="990" name="subway-tianjin-m"/>
-  <symbol minX="1762" maxX="1830" minY="922" maxY="990" name="subway-tokyo-m"/>
-  <symbol minX="1830" maxX="1898" minY="922" maxY="990" name="subway-tyneandwear-m"/>
-  <symbol minX="1898" maxX="1966" minY="922" maxY="990" name="subway-valencia-m"/>
-  <symbol minX="1966" maxX="2034" minY="922" maxY="990" name="subway-vienna-m"/>
-  <symbol minX="0" maxX="68" minY="990" maxY="1058" name="subway-volgograd-m"/>
-  <symbol minX="68" maxX="136" minY="990" maxY="1058" name="laundry-m"/>
-  <symbol minX="136" maxX="204" minY="990" maxY="1058" name="casino-m"/>
-  <symbol minX="204" maxX="272" minY="990" maxY="1058" name="mail-m"/>
-  <symbol minX="272" maxX="340" minY="990" maxY="1058" name="cemetery-m"/>
-  <symbol minX="340" maxX="408" minY="990" maxY="1058" name="charging-station-m"/>
-  <symbol minX="408" maxX="476" minY="990" maxY="1058" name="charity_shop-m"/>
-  <symbol minX="476" maxX="544" minY="990" maxY="1058" name="cheese-m"/>
-  <symbol minX="544" maxX="612" minY="990" maxY="1058" name="lighthouse-m"/>
-  <symbol minX="612" maxX="680" minY="990" maxY="1058" name="chemist-m"/>
-  <symbol minX="680" maxX="748" minY="990" maxY="1058" name="chess-m"/>
-  <symbol minX="748" maxX="816" minY="990" maxY="1058" name="lift_gate-m"/>
-  <symbol minX="816" maxX="884" minY="990" maxY="1058" name="chimney-m"/>
-  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="library-m"/>
-  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="christian-m"/>
-  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="lawyer-m"/>
-  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="carpenter-m"/>
-  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="language_school-m"/>
-  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="kiosk-m"/>
-  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="kindergarten-m"/>
-  <symbol minX="1360" maxX="1428" minY="990" maxY="1058" name="cinema-m"/>
-  <symbol minX="1428" maxX="1496" minY="990" maxY="1058" name="jewish-m"/>
-  <symbol minX="1496" maxX="1564" minY="990" maxY="1058" name="climbing-m"/>
-  <symbol minX="1564" maxX="1632" minY="990" maxY="1058" name="clothes-m"/>
+  <symbol minX="1251" maxX="1346" minY="274" maxY="394" name="paid_road"/>
+  <symbol minX="1346" maxX="1441" minY="274" maxY="394" name="unpaved_road"/>
+  <symbol minX="1441" maxX="1557" minY="274" maxY="390" name="track_marker_selected"/>
+  <symbol minX="1557" maxX="1673" minY="274" maxY="390" name="infosign"/>
+  <symbol minX="1673" maxX="1750" minY="274" maxY="384" name="bookmark-building-m"/>
+  <symbol minX="1750" maxX="1827" minY="274" maxY="384" name="bookmark-default-m"/>
+  <symbol minX="1827" maxX="1904" minY="274" maxY="384" name="bookmark-christianity-m"/>
+  <symbol minX="1904" maxX="1981" minY="274" maxY="384" name="bookmark-parking-m"/>
+  <symbol minX="0" maxX="77" minY="404" maxY="514" name="bookmark-museum-m"/>
+  <symbol minX="77" maxX="154" minY="404" maxY="514" name="bookmark-park-m"/>
+  <symbol minX="154" maxX="231" minY="404" maxY="514" name="bookmark-bar-m"/>
+  <symbol minX="231" maxX="308" minY="404" maxY="514" name="bookmark-shop-m"/>
+  <symbol minX="308" maxX="385" minY="404" maxY="514" name="bookmark-exchange-m"/>
+  <symbol minX="385" maxX="462" minY="404" maxY="514" name="bookmark-finish-m"/>
+  <symbol minX="462" maxX="539" minY="404" maxY="514" name="bookmark-sights-m"/>
+  <symbol minX="539" maxX="616" minY="404" maxY="514" name="bookmark-entertainment-m"/>
+  <symbol minX="616" maxX="693" minY="404" maxY="514" name="bookmark-transport-m"/>
+  <symbol minX="693" maxX="770" minY="404" maxY="514" name="bookmark-hotel-m"/>
+  <symbol minX="770" maxX="847" minY="404" maxY="514" name="bookmark-islam-m"/>
+  <symbol minX="847" maxX="924" minY="404" maxY="514" name="bookmark-gas-m"/>
+  <symbol minX="924" maxX="1001" minY="404" maxY="514" name="bookmark-food-m"/>
+  <symbol minX="1001" maxX="1078" minY="404" maxY="514" name="bookmark-animals-m"/>
+  <symbol minX="1078" maxX="1155" minY="404" maxY="514" name="bookmark-water-m"/>
+  <symbol minX="1155" maxX="1232" minY="404" maxY="514" name="bookmark-viewpoint-m"/>
+  <symbol minX="1232" maxX="1309" minY="404" maxY="514" name="bookmark-buddhism-m"/>
+  <symbol minX="1309" maxX="1386" minY="404" maxY="514" name="bookmark-swim-m"/>
+  <symbol minX="1386" maxX="1463" minY="404" maxY="514" name="bookmark-start-m"/>
+  <symbol minX="1463" maxX="1540" minY="404" maxY="514" name="bookmark-sport-m"/>
+  <symbol minX="1540" maxX="1617" minY="404" maxY="514" name="bookmark-judaism-m"/>
+  <symbol minX="1617" maxX="1694" minY="404" maxY="514" name="bookmark-bg-m"/>
+  <symbol minX="1694" maxX="1771" minY="404" maxY="514" name="bookmark-medicine-m"/>
+  <symbol minX="1771" maxX="1848" minY="404" maxY="514" name="bookmark-mountain-m"/>
+  <symbol minX="1848" maxX="1950" minY="404" maxY="506" name="route-point-11"/>
+  <symbol minX="0" maxX="102" minY="514" maxY="616" name="route-point-16"/>
+  <symbol minX="102" maxX="204" minY="514" maxY="616" name="route-point-15"/>
+  <symbol minX="204" maxX="306" minY="514" maxY="616" name="route-point-14"/>
+  <symbol minX="306" maxX="408" minY="514" maxY="616" name="route-point-13"/>
+  <symbol minX="408" maxX="510" minY="514" maxY="616" name="route-point-12"/>
+  <symbol minX="510" maxX="612" minY="514" maxY="616" name="route-point-18"/>
+  <symbol minX="612" maxX="756" minY="514" maxY="616" name="coloredmark-bg-l"/>
+  <symbol minX="756" maxX="900" minY="514" maxY="616" name="coloredmark-default-l"/>
+  <symbol minX="900" maxX="1002" minY="514" maxY="616" name="route-point-10"/>
+  <symbol minX="1002" maxX="1104" minY="514" maxY="616" name="route-point-1"/>
+  <symbol minX="1104" maxX="1248" minY="514" maxY="616" name="norating-bg-l"/>
+  <symbol minX="1248" maxX="1392" minY="514" maxY="616" name="norating-default-l"/>
+  <symbol minX="1392" maxX="1494" minY="514" maxY="616" name="route-point-6"/>
+  <symbol minX="1494" maxX="1596" minY="514" maxY="616" name="route-point-9"/>
+  <symbol minX="1596" maxX="1698" minY="514" maxY="616" name="route-point-20"/>
+  <symbol minX="1698" maxX="1800" minY="514" maxY="616" name="route-point-7"/>
+  <symbol minX="1800" maxX="1902" minY="514" maxY="616" name="route-point-3"/>
+  <symbol minX="1902" maxX="2004" minY="514" maxY="616" name="route-point-2"/>
+  <symbol minX="0" maxX="102" minY="616" maxY="718" name="route-point-8"/>
+  <symbol minX="102" maxX="204" minY="616" maxY="718" name="route-point-4"/>
+  <symbol minX="204" maxX="306" minY="616" maxY="718" name="route-point-19"/>
+  <symbol minX="306" maxX="408" minY="616" maxY="718" name="route-point-5"/>
+  <symbol minX="408" maxX="510" minY="616" maxY="718" name="route-point-start"/>
+  <symbol minX="510" maxX="612" minY="616" maxY="718" name="route-point-17"/>
+  <symbol minX="612" maxX="707" minY="616" maxY="704" name="shield-us-i-wide"/>
+  <symbol minX="707" maxX="781" minY="616" maxY="704" name="shield-us-i-thin"/>
+  <symbol minX="781" maxX="862" minY="616" maxY="697" name="shield-us-hw-thin"/>
+  <symbol minX="862" maxX="957" minY="616" maxY="697" name="shield-us-hw-wide"/>
+  <symbol minX="957" maxX="1011" minY="616" maxY="693" name="bookmark-default-s"/>
+  <symbol minX="1011" maxX="1065" minY="616" maxY="693" name="bookmark-bg-s"/>
+  <symbol minX="1065" maxX="1139" minY="616" maxY="690" name="track_marker_deselected"/>
+  <symbol minX="1139" maxX="1213" minY="616" maxY="690" name="current-position"/>
+  <symbol minX="1213" maxX="1281" minY="616" maxY="684" name="subway-chengdu-m"/>
+  <symbol minX="1281" maxX="1349" minY="616" maxY="684" name="shop-m"/>
+  <symbol minX="1349" maxX="1417" minY="616" maxY="684" name="shop-bicycle-m"/>
+  <symbol minX="1417" maxX="1485" minY="616" maxY="684" name="subway-catania-m"/>
+  <symbol minX="1485" maxX="1553" minY="616" maxY="684" name="subway-changchun-m"/>
+  <symbol minX="1553" maxX="1621" minY="616" maxY="684" name="shower-m"/>
+  <symbol minX="1621" maxX="1689" minY="616" maxY="684" name="skateboard-m"/>
+  <symbol minX="1689" maxX="1757" minY="616" maxY="684" name="subway-bursaray-m"/>
+  <symbol minX="1757" maxX="1825" minY="616" maxY="684" name="subway-chicago-m"/>
+  <symbol minX="1825" maxX="1893" minY="616" maxY="684" name="shoes-m"/>
+  <symbol minX="1893" maxX="1961" minY="616" maxY="684" name="ship-m"/>
+  <symbol minX="1961" maxX="2026" minY="616" maxY="684" name="subway-delhi-m"/>
+  <symbol minX="0" maxX="68" minY="718" maxY="786" name="shinto-m"/>
+  <symbol minX="68" maxX="136" minY="718" maxY="786" name="shelter-m"/>
+  <symbol minX="136" maxX="204" minY="718" maxY="786" name="second_hand_shop-m"/>
+  <symbol minX="204" maxX="272" minY="718" maxY="786" name="subway-dubai-m"/>
+  <symbol minX="272" maxX="340" minY="718" maxY="786" name="seafood-shop-m"/>
+  <symbol minX="340" maxX="408" minY="718" maxY="786" name="school-m"/>
+  <symbol minX="408" maxX="476" minY="718" maxY="786" name="sawmill-m"/>
+  <symbol minX="476" maxX="544" minY="718" maxY="786" name="travel_agency_shop-m"/>
+  <symbol minX="544" maxX="607" minY="718" maxY="786" name="subway-brescia-m"/>
+  <symbol minX="607" maxX="675" minY="718" maxY="786" name="subway-beijing-m"/>
+  <symbol minX="675" maxX="743" minY="718" maxY="786" name="subway-bangkok-m"/>
+  <symbol minX="743" maxX="811" minY="718" maxY="786" name="sauna-m"/>
+  <symbol minX="811" maxX="876" minY="718" maxY="786" name="subway-athens-m"/>
+  <symbol minX="876" maxX="944" minY="718" maxY="786" name="subway-ankara-s"/>
+  <symbol minX="944" maxX="1012" minY="718" maxY="786" name="subway-ankara-m"/>
+  <symbol minX="1012" maxX="1080" minY="718" maxY="786" name="subway-brasilia-m"/>
+  <symbol minX="1080" maxX="1140" minY="718" maxY="786" name="subway-amsterdam-m"/>
+  <symbol minX="1140" maxX="1208" minY="718" maxY="786" name="subway-algeria-m"/>
+  <symbol minX="1208" maxX="1276" minY="718" maxY="786" name="subway-adana-s"/>
+  <symbol minX="1276" maxX="1344" minY="718" maxY="786" name="subway-adana-m"/>
+  <symbol minX="1344" maxX="1412" minY="718" maxY="786" name="skiing-m"/>
+  <symbol minX="1412" maxX="1480" minY="718" maxY="786" name="stationery_shop-m"/>
+  <symbol minX="1480" maxX="1548" minY="718" maxY="786" name="subway-budapest-m"/>
+  <symbol minX="1548" maxX="1616" minY="718" maxY="786" name="stadium-m"/>
+  <symbol minX="1616" maxX="1684" minY="718" maxY="786" name="sports-m"/>
+  <symbol minX="1684" maxX="1752" minY="718" maxY="786" name="subway-buenosaires-m"/>
+  <symbol minX="1752" maxX="1820" minY="718" maxY="786" name="subway-bengaluru-m"/>
+  <symbol minX="1820" maxX="1888" minY="718" maxY="786" name="subway-cairo-m"/>
+  <symbol minX="1888" maxX="1956" minY="718" maxY="786" name="speedcam-alert-l"/>
+  <symbol minX="1956" maxX="2024" minY="718" maxY="786" name="speech_therapist-m"/>
+  <symbol minX="0" maxX="68" minY="786" maxY="854" name="subway-caracas-m"/>
+  <symbol minX="68" maxX="136" minY="786" maxY="854" name="soccer-m"/>
+  <symbol minX="136" maxX="204" minY="786" maxY="854" name="subway-warszawa-m"/>
+  <symbol minX="204" maxX="272" minY="786" maxY="854" name="tennis-m"/>
+  <symbol minX="272" maxX="340" minY="786" maxY="854" name="taxi-m"/>
+  <symbol minX="340" maxX="408" minY="786" maxY="854" name="taoist-m"/>
+  <symbol minX="408" maxX="476" minY="786" maxY="854" name="table-tennis-m"/>
+  <symbol minX="476" maxX="544" minY="786" maxY="854" name="swimming-m"/>
+  <symbol minX="544" maxX="612" minY="786" maxY="854" name="sweets-m"/>
+  <symbol minX="612" maxX="680" minY="786" maxY="854" name="survey_point-m"/>
+  <symbol minX="680" maxX="748" minY="786" maxY="854" name="subway-yokohama-m"/>
+  <symbol minX="748" maxX="816" minY="786" maxY="854" name="subway-wuhan-m"/>
+  <symbol minX="816" maxX="884" minY="786" maxY="854" name="subway-washington-m"/>
+  <symbol minX="884" maxX="952" minY="786" maxY="854" name="theatre-m"/>
+  <symbol minX="952" maxX="1020" minY="786" maxY="854" name="subway-volgograd-m"/>
+  <symbol minX="1020" maxX="1088" minY="786" maxY="854" name="subway-vienna-m"/>
+  <symbol minX="1088" maxX="1156" minY="786" maxY="854" name="subway-valencia-m"/>
+  <symbol minX="1156" maxX="1224" minY="786" maxY="854" name="subway-tyneandwear-m"/>
+  <symbol minX="1224" maxX="1292" minY="786" maxY="854" name="subway-tokyo-m"/>
+  <symbol minX="1292" maxX="1360" minY="786" maxY="854" name="subway-tianjin-m"/>
+  <symbol minX="1360" maxX="1428" minY="786" maxY="854" name="subway-tashkent-m"/>
+  <symbol minX="1428" maxX="1496" minY="786" maxY="854" name="subway-stockholm-m"/>
+  <symbol minX="1496" maxX="1564" minY="786" maxY="854" name="subway-stlouis-m"/>
+  <symbol minX="1564" maxX="1632" minY="786" maxY="854" name="subway-southkorea-m"/>
+  <symbol minX="1632" maxX="1700" minY="786" maxY="854" name="toys-m"/>
+  <symbol minX="1700" maxX="1768" minY="786" maxY="854" name="vending-m"/>
+  <symbol minX="1768" maxX="1836" minY="786" maxY="854" name="veterinary-m"/>
+  <symbol minX="1836" maxX="1904" minY="786" maxY="854" name="video-games-m"/>
+  <symbol minX="1904" maxX="1972" minY="786" maxY="854" name="viewpoint-m"/>
+  <symbol minX="1972" maxX="2040" minY="786" maxY="854" name="volleyball-m"/>
+  <symbol minX="0" maxX="68" minY="854" maxY="922" name="waste-basket-m"/>
+  <symbol minX="68" maxX="136" minY="854" maxY="922" name="waterfall-m"/>
+  <symbol minX="136" maxX="204" minY="854" maxY="922" name="tram-m"/>
+  <symbol minX="204" maxX="272" minY="854" maxY="922" name="wayside_shrine-m"/>
+  <symbol minX="272" maxX="340" minY="854" maxY="922" name="train-m"/>
+  <symbol minX="340" maxX="408" minY="854" maxY="922" name="subway-sofia-m"/>
+  <symbol minX="408" maxX="476" minY="854" maxY="922" name="windmill-m"/>
+  <symbol minX="476" maxX="544" minY="854" maxY="922" name="tourism-m"/>
+  <symbol minX="544" maxX="612" minY="854" maxY="922" name="tomb-m"/>
+  <symbol minX="612" maxX="680" minY="854" maxY="922" name="yoga-m"/>
+  <symbol minX="680" maxX="748" minY="854" maxY="922" name="toll_booth-m"/>
+  <symbol minX="748" maxX="816" minY="854" maxY="922" name="toilets-m"/>
+  <symbol minX="816" maxX="884" minY="854" maxY="922" name="tire-repair-m"/>
+  <symbol minX="884" maxX="952" minY="854" maxY="922" name="ticket-shop-m"/>
+  <symbol minX="952" maxX="1020" minY="854" maxY="922" name="zoo-m"/>
+  <symbol minX="1020" maxX="1088" minY="854" maxY="922" name="theme_park-m"/>
+  <symbol minX="1088" maxX="1156" minY="854" maxY="922" name="subway-kunming-m"/>
+  <symbol minX="1156" maxX="1223" minY="854" maxY="922" name="subway-mashhad-m"/>
+  <symbol minX="1223" maxX="1291" minY="854" maxY="922" name="subway-marseille-s"/>
+  <symbol minX="1291" maxX="1359" minY="854" maxY="922" name="subway-m"/>
+  <symbol minX="1359" maxX="1427" minY="854" maxY="922" name="subway-lyon-m"/>
+  <symbol minX="1427" maxX="1495" minY="854" maxY="922" name="subway-losangeles-m"/>
+  <symbol minX="1495" maxX="1563" minY="854" maxY="922" name="subway-lisboa-m"/>
+  <symbol minX="1563" maxX="1631" minY="854" maxY="922" name="subway-lima-m"/>
+  <symbol minX="1631" maxX="1699" minY="854" maxY="922" name="subway-lille-m"/>
+  <symbol minX="1699" maxX="1767" minY="854" maxY="922" name="subway-lausanne-m"/>
+  <symbol minX="1767" maxX="1835" minY="854" maxY="922" name="subway-kyoto-m"/>
+  <symbol minX="1835" maxX="1903" minY="854" maxY="922" name="subway-massachusetts-m"/>
+  <symbol minX="1903" maxX="1971" minY="854" maxY="922" name="subway-kobe-m"/>
+  <symbol minX="1971" maxX="2039" minY="854" maxY="922" name="subway-kazan-m"/>
+  <symbol minX="0" maxX="55" minY="922" maxY="990" name="subway-istanbul-m"/>
+  <symbol minX="55" maxX="123" minY="922" maxY="990" name="subway-isfahan-m"/>
+  <symbol minX="123" maxX="191" minY="922" maxY="990" name="subway-hirosima-m"/>
+  <symbol minX="191" maxX="259" minY="922" maxY="990" name="subway-helsinki-m"/>
+  <symbol minX="259" maxX="327" minY="922" maxY="990" name="subway-guangzhou-m"/>
+  <symbol minX="327" maxX="395" minY="922" maxY="990" name="subway-guadalajara-m"/>
+  <symbol minX="395" maxX="463" minY="922" maxY="990" name="subway-glasgow-m"/>
+  <symbol minX="463" maxX="531" minY="922" maxY="990" name="subway-foshan-m"/>
+  <symbol minX="531" maxX="599" minY="922" maxY="990" name="subway-perugia-m"/>
+  <symbol minX="599" maxX="667" minY="922" maxY="990" name="subway-shiraz-m"/>
+  <symbol minX="667" maxX="735" minY="922" maxY="990" name="subway-saopaulo-m"/>
+  <symbol minX="735" maxX="803" minY="922" maxY="990" name="subway-santodomingo-m"/>
+  <symbol minX="803" maxX="871" minY="922" maxY="990" name="subway-samara-m"/>
+  <symbol minX="871" maxX="939" minY="922" maxY="990" name="subway-riodejaneiro-m"/>
+  <symbol minX="939" maxX="1007" minY="922" maxY="990" name="subway-reseau-paris-m"/>
+  <symbol minX="1007" maxX="1075" minY="922" maxY="990" name="subway-rennes-m"/>
+  <symbol minX="1075" maxX="1143" minY="922" maxY="990" name="subway-pyongyang-m"/>
+  <symbol minX="1143" maxX="1208" minY="922" maxY="990" name="subway-porto-m"/>
+  <symbol minX="1208" maxX="1276" minY="922" maxY="990" name="subway-pittsburgh-m"/>
+  <symbol minX="1276" maxX="1344" minY="922" maxY="990" name="subway-ekb-m"/>
+  <symbol minX="1344" maxX="1412" minY="922" maxY="990" name="subway-panama-m"/>
+  <symbol minX="1412" maxX="1480" minY="922" maxY="990" name="subway-oslo-m"/>
+  <symbol minX="1480" maxX="1545" minY="922" maxY="990" name="subway-nnov-m"/>
+  <symbol minX="1545" maxX="1613" minY="922" maxY="990" name="subway-newyork-m"/>
+  <symbol minX="1613" maxX="1681" minY="922" maxY="990" name="subway-nagoya-m"/>
+  <symbol minX="1681" maxX="1749" minY="922" maxY="990" name="subway-minatomirai-m"/>
+  <symbol minX="1749" maxX="1817" minY="922" maxY="990" name="subway-milan-m"/>
+  <symbol minX="1817" maxX="1882" minY="922" maxY="990" name="subway-mexico-m"/>
+  <symbol minX="1882" maxX="1950" minY="922" maxY="990" name="subway-medellin-m"/>
+  <symbol minX="1950" maxX="2018" minY="922" maxY="990" name="subway-mecca-m"/>
+  <symbol minX="0" maxX="68" minY="990" maxY="1058" name="department_store-m"/>
+  <symbol minX="68" maxX="136" minY="990" maxY="1058" name="fire_station-m"/>
+  <symbol minX="136" maxX="204" minY="990" maxY="1058" name="fastfood-m"/>
+  <symbol minX="204" maxX="272" minY="990" maxY="1058" name="erotic-m"/>
+  <symbol minX="272" maxX="340" minY="990" maxY="1058" name="equestrian-m"/>
+  <symbol minX="340" maxX="408" minY="990" maxY="1058" name="emergency-phone-m"/>
+  <symbol minX="408" maxX="476" minY="990" maxY="1058" name="embassy-m"/>
+  <symbol minX="476" maxX="544" minY="990" maxY="1058" name="electronics-m"/>
+  <symbol minX="544" maxX="612" minY="990" maxY="1058" name="electrician-m"/>
+  <symbol minX="612" maxX="680" minY="990" maxY="1058" name="dump-station-m"/>
+  <symbol minX="680" maxX="748" minY="990" maxY="1058" name="driving_school-m"/>
+  <symbol minX="748" maxX="816" minY="990" maxY="1058" name="drinking-water-m"/>
+  <symbol minX="816" maxX="884" minY="990" maxY="1058" name="doityourself-m"/>
+  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="dog_park-m"/>
+  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="diving-m"/>
+  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="firehydrant-m"/>
+  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="dentist-m"/>
+  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="defibrillator-m"/>
+  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="curling-m"/>
+  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="cross-m"/>
+  <symbol minX="1360" maxX="1428" minY="990" maxY="1058" name="cricket-m"/>
+  <symbol minX="1428" maxX="1496" minY="990" maxY="1058" name="copyshop-m"/>
+  <symbol minX="1496" maxX="1564" minY="990" maxY="1058" name="convenience-m"/>
+  <symbol minX="1564" maxX="1632" minY="990" maxY="1058" name="computer-m"/>
   <symbol minX="1632" maxX="1700" minY="990" maxY="1058" name="college-m"/>
-  <symbol minX="1700" maxX="1768" minY="990" maxY="1058" name="jewelry-m"/>
-  <symbol minX="1768" maxX="1836" minY="990" maxY="1058" name="computer-m"/>
-  <symbol minX="1836" maxX="1904" minY="990" maxY="1058" name="internet_cafe-m"/>
-  <symbol minX="1904" maxX="1972" minY="990" maxY="1058" name="interior_decoration-m"/>
-  <symbol minX="1972" maxX="2040" minY="990" maxY="1058" name="convenience-m"/>
-  <symbol minX="0" maxX="68" minY="1058" maxY="1126" name="car-part-m"/>
-  <symbol minX="68" maxX="136" minY="1058" maxY="1126" name="brewery-m"/>
-  <symbol minX="136" maxX="204" minY="1058" maxY="1126" name="muslim-m"/>
-  <symbol minX="204" maxX="272" minY="1058" maxY="1126" name="musical-instrument-m"/>
-  <symbol minX="272" maxX="340" minY="1058" maxY="1126" name="music_school-m"/>
-  <symbol minX="340" maxX="408" minY="1058" maxY="1126" name="music-m"/>
-  <symbol minX="408" maxX="476" minY="1058" maxY="1126" name="buddhist-m"/>
-  <symbol minX="476" maxX="544" minY="1058" maxY="1126" name="bus-m"/>
-  <symbol minX="544" maxX="612" minY="1058" maxY="1126" name="butcher-m"/>
-  <symbol minX="612" maxX="680" minY="1058" maxY="1126" name="cable-car-m"/>
-  <symbol minX="680" maxX="748" minY="1058" maxY="1126" name="cafe-m"/>
-  <symbol minX="748" maxX="816" minY="1058" maxY="1126" name="museum-m"/>
-  <symbol minX="816" maxX="884" minY="1058" maxY="1126" name="campsite-m"/>
-  <symbol minX="884" maxX="952" minY="1058" maxY="1126" name="motorcycle_shop-m"/>
-  <symbol minX="952" maxX="1020" minY="1058" maxY="1126" name="copyshop-m"/>
-  <symbol minX="1020" maxX="1088" minY="1058" maxY="1126" name="monument-m"/>
-  <symbol minX="1088" maxX="1156" minY="1058" maxY="1126" name="car-repair-m"/>
-  <symbol minX="1156" maxX="1224" minY="1058" maxY="1126" name="mobile_phone-m"/>
-  <symbol minX="1224" maxX="1292" minY="1058" maxY="1126" name="military-m"/>
-  <symbol minX="1292" maxX="1360" minY="1058" maxY="1126" name="car-wash-m"/>
-  <symbol minX="1360" maxX="1428" minY="1058" maxY="1126" name="car_sharing-m"/>
-  <symbol minX="1428" maxX="1496" minY="1058" maxY="1126" name="car_shop-m"/>
-  <symbol minX="1496" maxX="1564" minY="1058" maxY="1126" name="caravan-shop-m"/>
-  <symbol minX="1564" maxX="1632" minY="1058" maxY="1126" name="caravan_site-m"/>
-  <symbol minX="1632" maxX="1700" minY="1058" maxY="1126" name="metal_construction-m"/>
-  <symbol minX="1700" maxX="1768" minY="1058" maxY="1126" name="media-m"/>
-  <symbol minX="1768" maxX="1836" minY="1058" maxY="1126" name="marketplace-m"/>
-  <symbol minX="1836" maxX="1904" minY="1058" maxY="1126" name="marina-m"/>
-  <symbol minX="1904" maxX="1972" minY="1058" maxY="1126" name="funicular-m"/>
-  <symbol minX="1972" maxX="2040" minY="1058" maxY="1126" name="greengrocer-m"/>
-  <symbol minX="0" maxX="68" minY="1126" maxY="1194" name="golf-m"/>
-  <symbol minX="68" maxX="136" minY="1126" maxY="1194" name="gift-m"/>
-  <symbol minX="136" maxX="204" minY="1126" maxY="1194" name="driving_school-m"/>
-  <symbol minX="204" maxX="272" minY="1126" maxY="1194" name="geyser-m"/>
-  <symbol minX="272" maxX="340" minY="1126" maxY="1194" name="geyser-l"/>
-  <symbol minX="340" maxX="408" minY="1126" maxY="1194" name="dump-station-m"/>
-  <symbol minX="408" maxX="476" minY="1126" maxY="1194" name="garden_center-m"/>
-  <symbol minX="476" maxX="544" minY="1126" maxY="1194" name="electrician-m"/>
-  <symbol minX="544" maxX="612" minY="1126" maxY="1194" name="garden-outline-m"/>
-  <symbol minX="612" maxX="680" minY="1126" maxY="1194" name="garden-m"/>
-  <symbol minX="680" maxX="748" minY="1126" maxY="1194" name="electronics-m"/>
-  <symbol minX="748" maxX="816" minY="1126" maxY="1194" name="gallery-m"/>
-  <symbol minX="816" maxX="884" minY="1126" maxY="1194" name="furniture-m"/>
-  <symbol minX="884" maxX="952" minY="1126" maxY="1194" name="drinking-water-m"/>
-  <symbol minX="952" maxX="1020" minY="1126" maxY="1194" name="embassy-m"/>
-  <symbol minX="1020" maxX="1088" minY="1126" maxY="1194" name="emergency-phone-m"/>
-  <symbol minX="1088" maxX="1156" minY="1126" maxY="1194" name="equestrian-m"/>
-  <symbol minX="1156" maxX="1224" minY="1126" maxY="1194" name="erotic-m"/>
-  <symbol minX="1224" maxX="1292" minY="1126" maxY="1194" name="fastfood-m"/>
-  <symbol minX="1292" maxX="1360" minY="1126" maxY="1194" name="fire_station-m"/>
-  <symbol minX="1360" maxX="1428" minY="1126" maxY="1194" name="firehydrant-m"/>
-  <symbol minX="1428" maxX="1496" minY="1126" maxY="1194" name="funeral_directors-m"/>
-  <symbol minX="1496" maxX="1564" minY="1126" maxY="1194" name="florist-m"/>
-  <symbol minX="1564" maxX="1632" minY="1126" maxY="1194" name="fuel-m"/>
-  <symbol minX="1632" maxX="1700" minY="1126" maxY="1194" name="fuel-dispenser-m"/>
-  <symbol minX="1700" maxX="1768" minY="1126" maxY="1194" name="fountain-s"/>
-  <symbol minX="1768" maxX="1836" minY="1126" maxY="1194" name="fountain-m"/>
-  <symbol minX="1836" maxX="1904" minY="1126" maxY="1194" name="diving-m"/>
-  <symbol minX="1904" maxX="1972" minY="1126" maxY="1194" name="cricket-m"/>
-  <symbol minX="1972" maxX="2040" minY="1126" maxY="1194" name="information-m"/>
-  <symbol minX="0" maxX="68" minY="1194" maxY="1262" name="ice_cream-m"/>
-  <symbol minX="68" maxX="136" minY="1194" maxY="1262" name="hunting-tower-m"/>
-  <symbol minX="136" maxX="204" minY="1194" maxY="1262" name="cross-m"/>
-  <symbol minX="204" maxX="272" minY="1194" maxY="1262" name="hotel-m"/>
-  <symbol minX="272" maxX="340" minY="1194" maxY="1262" name="curling-m"/>
-  <symbol minX="340" maxX="408" minY="1194" maxY="1262" name="defibrillator-m"/>
-  <symbol minX="408" maxX="476" minY="1194" maxY="1262" name="hostel-m"/>
-  <symbol minX="476" maxX="544" minY="1194" maxY="1262" name="dentist-m"/>
-  <symbol minX="544" maxX="612" minY="1194" maxY="1262" name="department_store-m"/>
-  <symbol minX="612" maxX="680" minY="1194" maxY="1262" name="hospital-m"/>
-  <symbol minX="680" maxX="748" minY="1194" maxY="1262" name="home-m"/>
-  <symbol minX="748" maxX="816" minY="1194" maxY="1262" name="remains-m"/>
-  <symbol minX="816" maxX="884" minY="1194" maxY="1262" name="hockey-m"/>
-  <symbol minX="884" maxX="952" minY="1194" maxY="1262" name="historic-ship-m"/>
-  <symbol minX="952" maxX="1020" minY="1194" maxY="1262" name="dog_park-m"/>
-  <symbol minX="1020" maxX="1088" minY="1194" maxY="1262" name="hindu-m"/>
-  <symbol minX="1088" maxX="1156" minY="1194" maxY="1262" name="heliport-m"/>
-  <symbol minX="1156" maxX="1224" minY="1194" maxY="1262" name="helipad-m"/>
-  <symbol minX="1224" maxX="1292" minY="1194" maxY="1262" name="doityourself-m"/>
-  <symbol minX="1292" maxX="1360" minY="1194" maxY="1262" name="handball-m"/>
-  <symbol minX="1360" maxX="1428" minY="1194" maxY="1262" name="hand-m"/>
-  <symbol minX="1428" maxX="1496" minY="1194" maxY="1262" name="hairdresser-m"/>
-  <symbol minX="1496" maxX="1564" minY="1194" maxY="1262" name="gym-m"/>
-  <symbol minX="1564" maxX="1632" minY="1194" maxY="1262" name="guidepost"/>
-  <symbol minX="1632" maxX="1700" minY="1194" maxY="1262" name="grocery-m"/>
-  <symbol minX="1700" maxX="1768" minY="1194" maxY="1262" name="archery-m"/>
-  <symbol minX="1768" maxX="1836" minY="1194" maxY="1262" name="australian-football-m"/>
-  <symbol minX="1836" maxX="1904" minY="1194" maxY="1262" name="optician-m"/>
-  <symbol minX="1904" maxX="1972" minY="1194" maxY="1262" name="pelota-m"/>
-  <symbol minX="1972" maxX="2040" minY="1194" maxY="1262" name="office-m"/>
-  <symbol minX="0" maxX="68" minY="1262" maxY="1330" name="petshop-m"/>
-  <symbol minX="68" maxX="136" minY="1262" maxY="1330" name="audiologist-m"/>
-  <symbol minX="136" maxX="204" minY="1262" maxY="1330" name="pharmacy-m"/>
-  <symbol minX="204" maxX="272" minY="1262" maxY="1330" name="atm-m"/>
-  <symbol minX="272" maxX="340" minY="1262" maxY="1330" name="art-m"/>
-  <symbol minX="340" maxX="408" minY="1262" maxY="1330" name="beer-m"/>
-  <symbol minX="408" maxX="476" minY="1262" maxY="1330" name="optometrist-m"/>
-  <symbol minX="476" maxX="544" minY="1262" maxY="1330" name="phone-m"/>
-  <symbol minX="544" maxX="612" minY="1262" maxY="1330" name="bicycle-m"/>
-  <symbol minX="612" maxX="680" minY="1262" maxY="1330" name="photo-shop-m"/>
-  <symbol minX="680" maxX="748" minY="1262" maxY="1330" name="archaeological-site-m"/>
-  <symbol minX="748" maxX="816" minY="1262" maxY="1330" name="bicycle-repair-station"/>
-  <symbol minX="816" maxX="884" minY="1262" maxY="1330" name="nparkf-outline-m"/>
-  <symbol minX="884" maxX="952" minY="1262" maxY="1330" name="physiotherapist-m"/>
-  <symbol minX="952" maxX="1020" minY="1262" maxY="1330" name="picnic-m"/>
-  <symbol minX="1020" maxX="1088" minY="1262" maxY="1330" name="blacksmith-m"/>
-  <symbol minX="1088" maxX="1156" minY="1262" maxY="1330" name="bcontrol-m"/>
-  <symbol minX="1156" maxX="1224" minY="1262" maxY="1330" name="parking-meter-m"/>
-  <symbol minX="1224" maxX="1292" minY="1262" maxY="1330" name="banknote-l"/>
-  <symbol minX="1292" maxX="1360" minY="1262" maxY="1330" name="bank-m"/>
-  <symbol minX="1360" maxX="1428" minY="1262" maxY="1330" name="banknote-m"/>
-  <symbol minX="1428" maxX="1496" minY="1262" maxY="1330" name="bank-l"/>
-  <symbol minX="1496" maxX="1564" minY="1262" maxY="1330" name="bar-m"/>
-  <symbol minX="1564" maxX="1632" minY="1262" maxY="1330" name="baseball-m"/>
-  <symbol minX="1632" maxX="1700" minY="1262" maxY="1330" name="basketball-m"/>
-  <symbol minX="1700" maxX="1768" minY="1262" maxY="1330" name="bakery-m"/>
-  <symbol minX="1768" maxX="1836" minY="1262" maxY="1330" name="bbq-m"/>
-  <symbol minX="1836" maxX="1904" minY="1262" maxY="1330" name="bowling_alley-m"/>
-  <symbol minX="1904" maxX="1972" minY="1262" maxY="1330" name="beach-m"/>
-  <symbol minX="1972" maxX="2040" minY="1262" maxY="1330" name="beauty-m"/>
-  <symbol minX="0" maxX="68" minY="1330" maxY="1398" name="beekeeper-m"/>
-  <symbol minX="68" maxX="136" minY="1330" maxY="1398" name="park-outline-m"/>
-  <symbol minX="136" maxX="204" minY="1330" maxY="1398" name="park-m"/>
-  <symbol minX="204" maxX="272" minY="1330" maxY="1398" name="badminton-m"/>
-  <symbol minX="272" maxX="340" minY="1330" maxY="1398" name="painter-m"/>
-  <symbol minX="340" maxX="408" minY="1330" maxY="1398" name="padel-m"/>
-  <symbol minX="408" maxX="476" minY="1330" maxY="1398" name="outdoor-shop-m"/>
-  <symbol minX="476" maxX="544" minY="1330" maxY="1398" name="nparkf-m"/>
-  <symbol minX="544" maxX="612" minY="1330" maxY="1398" name="alcohol-m"/>
-  <symbol minX="612" maxX="680" minY="1330" maxY="1398" name="alternative-m"/>
-  <symbol minX="680" maxX="748" minY="1330" maxY="1398" name="npark-m"/>
-  <symbol minX="748" maxX="816" minY="1330" maxY="1398" name="book-shop-m"/>
-  <symbol minX="816" maxX="884" minY="1330" maxY="1398" name="plumber-m"/>
-  <symbol minX="884" maxX="952" minY="1330" maxY="1398" name="airport_gate-m"/>
-  <symbol minX="952" maxX="1020" minY="1330" maxY="1398" name="podiatrist-m"/>
-  <symbol minX="1020" maxX="1088" minY="1330" maxY="1398" name="alpine_hut-m"/>
-  <symbol minX="1088" maxX="1156" minY="1330" maxY="1398" name="playground-m"/>
-  <symbol minX="1156" maxX="1224" minY="1330" maxY="1398" name="bookmaker-m"/>
-  <symbol minX="1224" maxX="1292" minY="1330" maxY="1398" name="america-football-m"/>
-  <symbol minX="1292" maxX="1360" minY="1330" maxY="1398" name="recycling-m"/>
-  <symbol minX="1360" maxX="1428" minY="1330" maxY="1398" name="antiques-m"/>
-  <symbol minX="1428" maxX="1496" minY="1330" maxY="1398" name="newsagent_shop-m"/>
-  <symbol minX="1496" maxX="1564" minY="1330" maxY="1398" name="picnic_table-m"/>
+  <symbol minX="1700" maxX="1768" minY="990" maxY="1058" name="clothes-m"/>
+  <symbol minX="1768" maxX="1836" minY="990" maxY="1058" name="climbing-m"/>
+  <symbol minX="1836" maxX="1904" minY="990" maxY="1058" name="cinema-m"/>
+  <symbol minX="1904" maxX="1972" minY="990" maxY="1058" name="christian-m"/>
+  <symbol minX="1972" maxX="2040" minY="990" maxY="1058" name="geyser-l"/>
+  <symbol minX="0" maxX="68" minY="1058" maxY="1126" name="hindu-m"/>
+  <symbol minX="68" maxX="136" minY="1058" maxY="1126" name="heliport-m"/>
+  <symbol minX="136" maxX="204" minY="1058" maxY="1126" name="helipad-m"/>
+  <symbol minX="204" maxX="272" minY="1058" maxY="1126" name="handball-m"/>
+  <symbol minX="272" maxX="340" minY="1058" maxY="1126" name="hand-m"/>
+  <symbol minX="340" maxX="408" minY="1058" maxY="1126" name="hairdresser-m"/>
+  <symbol minX="408" maxX="476" minY="1058" maxY="1126" name="gym-m"/>
+  <symbol minX="476" maxX="544" minY="1058" maxY="1126" name="guidepost"/>
+  <symbol minX="544" maxX="612" minY="1058" maxY="1126" name="grocery-m"/>
+  <symbol minX="612" maxX="680" minY="1058" maxY="1126" name="greengrocer-m"/>
+  <symbol minX="680" maxX="748" minY="1058" maxY="1126" name="golf-m"/>
+  <symbol minX="748" maxX="816" minY="1058" maxY="1126" name="gift-m"/>
+  <symbol minX="816" maxX="884" minY="1058" maxY="1126" name="geyser-m"/>
+  <symbol minX="884" maxX="952" minY="1058" maxY="1126" name="chimney-m"/>
+  <symbol minX="952" maxX="1020" minY="1058" maxY="1126" name="gate-m"/>
+  <symbol minX="1020" maxX="1088" minY="1058" maxY="1126" name="garden_center-m"/>
+  <symbol minX="1088" maxX="1156" minY="1058" maxY="1126" name="garden-outline-m"/>
+  <symbol minX="1156" maxX="1224" minY="1058" maxY="1126" name="garden-m"/>
+  <symbol minX="1224" maxX="1292" minY="1058" maxY="1126" name="gallery-m"/>
+  <symbol minX="1292" maxX="1360" minY="1058" maxY="1126" name="furniture-m"/>
+  <symbol minX="1360" maxX="1428" minY="1058" maxY="1126" name="funicular-m"/>
+  <symbol minX="1428" maxX="1496" minY="1058" maxY="1126" name="funeral_directors-m"/>
+  <symbol minX="1496" maxX="1564" minY="1058" maxY="1126" name="fuel-m"/>
+  <symbol minX="1564" maxX="1632" minY="1058" maxY="1126" name="fuel-dispenser-m"/>
+  <symbol minX="1632" maxX="1700" minY="1058" maxY="1126" name="fountain-s"/>
+  <symbol minX="1700" maxX="1768" minY="1058" maxY="1126" name="fountain-m"/>
+  <symbol minX="1768" maxX="1836" minY="1058" maxY="1126" name="florist-m"/>
+  <symbol minX="1836" maxX="1904" minY="1058" maxY="1126" name="bank-l"/>
+  <symbol minX="1904" maxX="1972" minY="1058" maxY="1126" name="bicycle-m"/>
+  <symbol minX="1972" maxX="2040" minY="1058" maxY="1126" name="beer-m"/>
+  <symbol minX="0" maxX="68" minY="1126" maxY="1194" name="beekeeper-m"/>
+  <symbol minX="68" maxX="136" minY="1126" maxY="1194" name="beauty-m"/>
+  <symbol minX="136" maxX="204" minY="1126" maxY="1194" name="beach-m"/>
+  <symbol minX="204" maxX="272" minY="1126" maxY="1194" name="bcontrol-m"/>
+  <symbol minX="272" maxX="340" minY="1126" maxY="1194" name="bbq-m"/>
+  <symbol minX="340" maxX="408" minY="1126" maxY="1194" name="basketball-m"/>
+  <symbol minX="408" maxX="476" minY="1126" maxY="1194" name="baseball-m"/>
+  <symbol minX="476" maxX="544" minY="1126" maxY="1194" name="bar-m"/>
+  <symbol minX="544" maxX="612" minY="1126" maxY="1194" name="banknote-m"/>
+  <symbol minX="612" maxX="680" minY="1126" maxY="1194" name="banknote-l"/>
+  <symbol minX="680" maxX="748" minY="1126" maxY="1194" name="bank-m"/>
+  <symbol minX="748" maxX="816" minY="1126" maxY="1194" name="bicycle-repair-station"/>
+  <symbol minX="816" maxX="884" minY="1126" maxY="1194" name="bakery-m"/>
+  <symbol minX="884" maxX="952" minY="1126" maxY="1194" name="badminton-m"/>
+  <symbol minX="952" maxX="1020" minY="1126" maxY="1194" name="australian-football-m"/>
+  <symbol minX="1020" maxX="1088" minY="1126" maxY="1194" name="audiologist-m"/>
+  <symbol minX="1088" maxX="1156" minY="1126" maxY="1194" name="atm-m"/>
+  <symbol minX="1156" maxX="1224" minY="1126" maxY="1194" name="archery-m"/>
+  <symbol minX="1224" maxX="1292" minY="1126" maxY="1194" name="archaeological-site-m"/>
+  <symbol minX="1292" maxX="1360" minY="1126" maxY="1194" name="apartment-m"/>
+  <symbol minX="1360" maxX="1428" minY="1126" maxY="1194" name="america-football-m"/>
+  <symbol minX="1428" maxX="1496" minY="1126" maxY="1194" name="alternative-m"/>
+  <symbol minX="1496" maxX="1564" minY="1126" maxY="1194" name="alpine_hut-m"/>
+  <symbol minX="1564" maxX="1632" minY="1126" maxY="1194" name="alcohol-m"/>
+  <symbol minX="1632" maxX="1700" minY="1126" maxY="1194" name="airport-m"/>
+  <symbol minX="1700" maxX="1768" minY="1126" maxY="1194" name="car-part-m"/>
+  <symbol minX="1768" maxX="1836" minY="1126" maxY="1194" name="chess-m"/>
+  <symbol minX="1836" maxX="1904" minY="1126" maxY="1194" name="chemist-m"/>
+  <symbol minX="1904" maxX="1972" minY="1126" maxY="1194" name="charity_shop-m"/>
+  <symbol minX="1972" maxX="2040" minY="1126" maxY="1194" name="charging-station-m"/>
+  <symbol minX="0" maxX="68" minY="1194" maxY="1262" name="cemetery-m"/>
+  <symbol minX="68" maxX="136" minY="1194" maxY="1262" name="casino-m"/>
+  <symbol minX="136" maxX="204" minY="1194" maxY="1262" name="carpenter-m"/>
+  <symbol minX="204" maxX="272" minY="1194" maxY="1262" name="caravan_site-m"/>
+  <symbol minX="272" maxX="340" minY="1194" maxY="1262" name="caravan-shop-m"/>
+  <symbol minX="340" maxX="408" minY="1194" maxY="1262" name="car_shop-m"/>
+  <symbol minX="408" maxX="476" minY="1194" maxY="1262" name="car_sharing-m"/>
+  <symbol minX="476" maxX="544" minY="1194" maxY="1262" name="car-wash-m"/>
+  <symbol minX="544" maxX="612" minY="1194" maxY="1262" name="car-repair-m"/>
+  <symbol minX="612" maxX="680" minY="1194" maxY="1262" name="restaurant-m"/>
+  <symbol minX="680" maxX="748" minY="1194" maxY="1262" name="campsite-m"/>
+  <symbol minX="748" maxX="816" minY="1194" maxY="1262" name="cafe-m"/>
+  <symbol minX="816" maxX="884" minY="1194" maxY="1262" name="cable-car-m"/>
+  <symbol minX="884" maxX="952" minY="1194" maxY="1262" name="butcher-m"/>
+  <symbol minX="952" maxX="1020" minY="1194" maxY="1262" name="bus-m"/>
+  <symbol minX="1020" maxX="1088" minY="1194" maxY="1262" name="buddhist-m"/>
+  <symbol minX="1088" maxX="1156" minY="1194" maxY="1262" name="brewery-m"/>
+  <symbol minX="1156" maxX="1224" minY="1194" maxY="1262" name="bowling_alley-m"/>
+  <symbol minX="1224" maxX="1292" minY="1194" maxY="1262" name="bowling-m"/>
+  <symbol minX="1292" maxX="1360" minY="1194" maxY="1262" name="bookmaker-m"/>
+  <symbol minX="1360" maxX="1428" minY="1194" maxY="1262" name="book-shop-m"/>
+  <symbol minX="1428" maxX="1496" minY="1194" maxY="1262" name="blood_donation-m"/>
+  <symbol minX="1496" maxX="1564" minY="1194" maxY="1262" name="blacksmith-m"/>
+  <symbol minX="1564" maxX="1632" minY="1194" maxY="1262" name="library-m"/>
+  <symbol minX="1632" maxX="1700" minY="1194" maxY="1262" name="media-m"/>
+  <symbol minX="1700" maxX="1768" minY="1194" maxY="1262" name="outdoor-shop-m"/>
+  <symbol minX="1768" maxX="1836" minY="1194" maxY="1262" name="marketplace-m"/>
+  <symbol minX="1836" maxX="1904" minY="1194" maxY="1262" name="padel-m"/>
+  <symbol minX="1904" maxX="1972" minY="1194" maxY="1262" name="marina-m"/>
+  <symbol minX="1972" maxX="2040" minY="1194" maxY="1262" name="painter-m"/>
+  <symbol minX="0" maxX="68" minY="1262" maxY="1330" name="mail-m"/>
+  <symbol minX="68" maxX="136" minY="1262" maxY="1330" name="lighthouse-m"/>
+  <symbol minX="136" maxX="204" minY="1262" maxY="1330" name="park-outline-m"/>
+  <symbol minX="204" maxX="272" minY="1262" maxY="1330" name="lift_gate-m"/>
+  <symbol minX="272" maxX="340" minY="1262" maxY="1330" name="metal_construction-m"/>
+  <symbol minX="340" maxX="408" minY="1262" maxY="1330" name="lawyer-m"/>
+  <symbol minX="408" maxX="476" minY="1262" maxY="1330" name="laundry-m"/>
+  <symbol minX="476" maxX="544" minY="1262" maxY="1330" name="parking-meter-m"/>
+  <symbol minX="544" maxX="612" minY="1262" maxY="1330" name="language_school-m"/>
+  <symbol minX="612" maxX="680" minY="1262" maxY="1330" name="pelota-m"/>
+  <symbol minX="680" maxX="748" minY="1262" maxY="1330" name="kiosk-m"/>
+  <symbol minX="748" maxX="816" minY="1262" maxY="1330" name="kindergarten-m"/>
+  <symbol minX="816" maxX="884" minY="1262" maxY="1330" name="petshop-m"/>
+  <symbol minX="884" maxX="952" minY="1262" maxY="1330" name="jewish-m"/>
+  <symbol minX="952" maxX="1020" minY="1262" maxY="1330" name="musical-instrument-m"/>
+  <symbol minX="1020" maxX="1088" minY="1262" maxY="1330" name="nparkf-m"/>
+  <symbol minX="1088" maxX="1156" minY="1262" maxY="1330" name="npark-m"/>
+  <symbol minX="1156" maxX="1224" minY="1262" maxY="1330" name="nightclub-m"/>
+  <symbol minX="1224" maxX="1292" minY="1262" maxY="1330" name="nparkf-outline-m"/>
+  <symbol minX="1292" maxX="1360" minY="1262" maxY="1330" name="newsagent_shop-m"/>
+  <symbol minX="1360" maxX="1428" minY="1262" maxY="1330" name="office-m"/>
+  <symbol minX="1428" maxX="1496" minY="1262" maxY="1330" name="needle_and_thread-m"/>
+  <symbol minX="1496" maxX="1564" minY="1262" maxY="1330" name="optician-m"/>
+  <symbol minX="1564" maxX="1632" minY="1262" maxY="1330" name="muslim-m"/>
+  <symbol minX="1632" maxX="1700" minY="1262" maxY="1330" name="park-m"/>
+  <symbol minX="1700" maxX="1768" minY="1262" maxY="1330" name="optometrist-m"/>
+  <symbol minX="1768" maxX="1836" minY="1262" maxY="1330" name="music_school-m"/>
+  <symbol minX="1836" maxX="1904" minY="1262" maxY="1330" name="music-m"/>
+  <symbol minX="1904" maxX="1972" minY="1262" maxY="1330" name="museum-m"/>
+  <symbol minX="1972" maxX="2040" minY="1262" maxY="1330" name="historic-ship-m"/>
+  <symbol minX="0" maxX="68" minY="1330" maxY="1398" name="motorcycle_shop-m"/>
+  <symbol minX="68" maxX="136" minY="1330" maxY="1398" name="monument-m"/>
+  <symbol minX="136" maxX="204" minY="1330" maxY="1398" name="mobile_phone-m"/>
+  <symbol minX="204" maxX="272" minY="1330" maxY="1398" name="military-m"/>
+  <symbol minX="272" maxX="340" minY="1330" maxY="1398" name="power-m"/>
+  <symbol minX="340" maxX="408" minY="1330" maxY="1398" name="information-m"/>
+  <symbol minX="408" maxX="476" minY="1330" maxY="1398" name="pitch-m"/>
+  <symbol minX="476" maxX="544" minY="1330" maxY="1398" name="sample_collection-m"/>
+  <symbol minX="544" maxX="612" minY="1330" maxY="1398" name="ice_cream-m"/>
+  <symbol minX="612" maxX="680" minY="1330" maxY="1398" name="place-of-worship-m"/>
+  <symbol minX="680" maxX="748" minY="1330" maxY="1398" name="playground-m"/>
+  <symbol minX="748" maxX="816" minY="1330" maxY="1398" name="plumber-m"/>
+  <symbol minX="816" maxX="884" minY="1330" maxY="1398" name="hockey-m"/>
+  <symbol minX="884" maxX="952" minY="1330" maxY="1398" name="podiatrist-m"/>
+  <symbol minX="952" maxX="1020" minY="1330" maxY="1398" name="police-m"/>
+  <symbol minX="1020" maxX="1088" minY="1330" maxY="1398" name="postbox-m"/>
+  <symbol minX="1088" maxX="1156" minY="1330" maxY="1398" name="jewelry-m"/>
+  <symbol minX="1156" maxX="1224" minY="1330" maxY="1398" name="hunting-tower-m"/>
+  <symbol minX="1224" maxX="1292" minY="1330" maxY="1398" name="prison-m"/>
+  <symbol minX="1292" maxX="1360" minY="1330" maxY="1398" name="home-m"/>
+  <symbol minX="1360" maxX="1428" minY="1330" maxY="1398" name="hotel-m"/>
+  <symbol minX="1428" maxX="1496" minY="1330" maxY="1398" name="remains-m"/>
+  <symbol minX="1496" maxX="1564" minY="1330" maxY="1398" name="psychotherapist-m"/>
   <symbol minX="1564" maxX="1632" minY="1330" maxY="1398" name="public-building-m"/>
-  <symbol minX="1632" maxX="1700" minY="1330" maxY="1398" name="psychotherapist-m"/>
-  <symbol minX="1700" maxX="1768" minY="1330" maxY="1398" name="blood_donation-m"/>
-  <symbol minX="1768" maxX="1836" minY="1330" maxY="1398" name="apartment-m"/>
-  <symbol minX="1836" maxX="1904" minY="1330" maxY="1398" name="prison-m"/>
-  <symbol minX="1904" maxX="1972" minY="1330" maxY="1398" name="nightclub-m"/>
-  <symbol minX="1972" maxX="2040" minY="1330" maxY="1398" name="needle_and_thread-m"/>
-  <symbol minX="0" maxX="68" minY="1398" maxY="1466" name="police-m"/>
-  <symbol minX="68" maxX="136" minY="1398" maxY="1466" name="postbox-m"/>
-  <symbol minX="136" maxX="204" minY="1398" maxY="1466" name="bowling-m"/>
-  <symbol minX="204" maxX="272" minY="1398" maxY="1466" name="pitch-m"/>
-  <symbol minX="272" maxX="340" minY="1398" maxY="1466" name="power-m"/>
-  <symbol minX="340" maxX="408" minY="1398" maxY="1466" name="place-of-worship-m"/>
-  <symbol minX="408" maxX="473" minY="1398" maxY="1463" name="subway-southkorea-s"/>
-  <symbol minX="473" maxX="538" minY="1398" maxY="1463" name="subway-spb-m"/>
-  <symbol minX="538" maxX="606" minY="1398" maxY="1463" name="subway-shanghai-m"/>
-  <symbol minX="606" maxX="674" minY="1398" maxY="1463" name="subway-maracaibo-m"/>
-  <symbol minX="674" maxX="739" minY="1398" maxY="1463" name="subway-montreal-m"/>
-  <symbol minX="739" maxX="804" minY="1398" maxY="1463" name="subway-ekb-s"/>
-  <symbol minX="804" maxX="872" minY="1398" maxY="1463" name="subway-marseille-m"/>
-  <symbol minX="872" maxX="940" minY="1398" maxY="1463" name="subway-sapporo-m"/>
-  <symbol minX="940" maxX="1008" minY="1398" maxY="1463" name="subway-dalian-m"/>
-  <symbol minX="1008" maxX="1071" minY="1398" maxY="1461" name="subway-stlouis-s"/>
-  <symbol minX="1071" maxX="1134" minY="1398" maxY="1461" name="subway-entrance-m"/>
-  <symbol minX="1134" maxX="1202" minY="1398" maxY="1461" name="subway-izmir-m"/>
-  <symbol minX="1202" maxX="1262" minY="1398" maxY="1461" name="subway-warsaw-m"/>
-  <symbol minX="1262" maxX="1325" minY="1398" maxY="1461" name="subway-algeria-s"/>
-  <symbol minX="1325" maxX="1385" minY="1398" maxY="1458" name="subway-pittsburgh-s"/>
-  <symbol minX="1385" maxX="1437" minY="1398" maxY="1458" name="subway-istanbul-s"/>
-  <symbol minX="1437" maxX="1497" minY="1398" maxY="1458" name="search-result"/>
-  <symbol minX="1497" maxX="1557" minY="1398" maxY="1458" name="lightrail-berlin-m"/>
-  <symbol minX="1557" maxX="1625" minY="1398" maxY="1456" name="subway-taoyuan-m"/>
-  <symbol minX="1625" maxX="1682" minY="1398" maxY="1455" name="parking-disabled-m"/>
-  <symbol minX="1682" maxX="1739" minY="1398" maxY="1455" name="parking_entrance-m"/>
-  <symbol minX="1739" maxX="1796" minY="1398" maxY="1455" name="parking_pay-m"/>
-  <symbol minX="1796" maxX="1853" minY="1398" maxY="1455" name="subway-sapporo-s"/>
-  <symbol minX="1853" maxX="1913" minY="1398" maxY="1455" name="subway-izmir-s"/>
-  <symbol minX="1913" maxX="1981" minY="1398" maxY="1455" name="subway-rotterdam-m"/>
-  <symbol minX="1981" maxX="2033" minY="1398" maxY="1455" name="subway-brescia-s"/>
-  <symbol minX="0" maxX="57" minY="1466" maxY="1523" name="subway-isfahan-s"/>
-  <symbol minX="57" maxX="114" minY="1466" maxY="1523" name="motorcycle-parking-m"/>
-  <symbol minX="114" maxX="171" minY="1466" maxY="1523" name="subway-medellin-s"/>
-  <symbol minX="171" maxX="284" minY="1466" maxY="1523" name="coloredmark-default-s"/>
-  <symbol minX="284" maxX="341" minY="1466" maxY="1523" name="parking-m"/>
-  <symbol minX="341" maxX="409" minY="1466" maxY="1523" name="subway-tbilisi-m"/>
-  <symbol minX="409" maxX="466" minY="1466" maxY="1523" name="bicycle-rental"/>
-  <symbol minX="466" maxX="521" minY="1466" maxY="1523" name="subway-mashhad-s"/>
-  <symbol minX="521" maxX="634" minY="1466" maxY="1523" name="coloredmark-bg-s"/>
-  <symbol minX="634" maxX="691" minY="1466" maxY="1523" name="speedcam-m"/>
-  <symbol minX="691" maxX="748" minY="1466" maxY="1523" name="subway-cairo-s"/>
-  <symbol minX="748" maxX="805" minY="1466" maxY="1523" name="subway-panama-s"/>
-  <symbol minX="805" maxX="862" minY="1466" maxY="1523" name="bike-parking-m"/>
-  <symbol minX="862" maxX="930" minY="1466" maxY="1522" name="subway-almaty-m"/>
-  <symbol minX="930" maxX="985" minY="1466" maxY="1521" name="subway-paris-m"/>
-  <symbol minX="985" maxX="1045" minY="1466" maxY="1521" name="subway-seattle-m"/>
-  <symbol minX="1045" maxX="1100" minY="1466" maxY="1521" name="subway-ubahn-m"/>
-  <symbol minX="1100" maxX="1152" minY="1466" maxY="1521" name="subway-delhi-s"/>
-  <symbol minX="1152" maxX="1215" minY="1466" maxY="1521" name="subway-moscow-m"/>
-  <symbol minX="1215" maxX="1270" minY="1466" maxY="1521" name="subway-hirosima-s"/>
-  <symbol minX="1270" maxX="1325" minY="1466" maxY="1521" name="subway-rome-m"/>
-  <symbol minX="1325" maxX="1377" minY="1466" maxY="1521" name="subway-athens-s"/>
-  <symbol minX="1377" maxX="1429" minY="1466" maxY="1521" name="subway-tianjin-s"/>
-  <symbol minX="1429" maxX="1484" minY="1466" maxY="1521" name="subway-rennes-s"/>
-  <symbol minX="1484" maxX="1536" minY="1466" maxY="1521" name="subway-pyongyang-s"/>
-  <symbol minX="1536" maxX="1588" minY="1466" maxY="1521" name="subway-porto-s"/>
-  <symbol minX="1588" maxX="1643" minY="1466" maxY="1521" name="subway-warszawa-s"/>
-  <symbol minX="1643" maxX="1711" minY="1466" maxY="1520" name="subway-lyon-m"/>
-  <symbol minX="1711" maxX="1779" minY="1466" maxY="1520" name="subway-santiago-m"/>
-  <symbol minX="1779" maxX="1817" minY="1466" maxY="1520" name="bookmark-default-xs"/>
-  <symbol minX="1817" maxX="1855" minY="1466" maxY="1520" name="bookmark-bg-xs"/>
-  <symbol minX="1855" maxX="1923" minY="1466" maxY="1520" name="subway-yerevan-m"/>
-  <symbol minX="1923" maxX="1991" minY="1466" maxY="1519" name="subway-tabriz-m"/>
-  <symbol minX="0" maxX="68" minY="1523" maxY="1576" name="subway-dnepro-m"/>
-  <symbol minX="68" maxX="136" minY="1523" maxY="1576" name="subway-kryvyirih-m"/>
-  <symbol minX="136" maxX="204" minY="1523" maxY="1576" name="subway-omsk-m"/>
-  <symbol minX="204" maxX="256" minY="1523" maxY="1575" name="subway-helsinki-s"/>
-  <symbol minX="256" maxX="308" minY="1523" maxY="1575" name="subway-tokyo-s"/>
-  <symbol minX="308" maxX="368" minY="1523" maxY="1575" name="subway-taoyuan-s"/>
-  <symbol minX="368" maxX="420" minY="1523" maxY="1575" name="subway-yokohama-s"/>
-  <symbol minX="420" maxX="485" minY="1523" maxY="1575" name="subway-yerevan-s"/>
-  <symbol minX="485" maxX="537" minY="1523" maxY="1575" name="subway-tashkent-s"/>
-  <symbol minX="537" maxX="589" minY="1523" maxY="1575" name="subway-wuhan-s"/>
-  <symbol minX="589" maxX="641" minY="1523" maxY="1575" name="subway-washington-s"/>
-  <symbol minX="641" maxX="709" minY="1523" maxY="1575" name="subway-alicante-m"/>
-  <symbol minX="709" maxX="756" minY="1523" maxY="1575" name="subway-warsaw-s"/>
-  <symbol minX="756" maxX="808" minY="1523" maxY="1575" name="subway-volgograd-s"/>
-  <symbol minX="808" maxX="860" minY="1523" maxY="1575" name="subway-vienna-s"/>
-  <symbol minX="860" maxX="912" minY="1523" maxY="1575" name="subway-valencia-s"/>
-  <symbol minX="912" maxX="964" minY="1523" maxY="1575" name="subway-tyneandwear-s"/>
-  <symbol minX="964" maxX="1016" minY="1523" maxY="1575" name="subway-dubai-s"/>
-  <symbol minX="1016" maxX="1084" minY="1523" maxY="1575" name="subway-omsk-s"/>
-  <symbol minX="1084" maxX="1136" minY="1523" maxY="1575" name="subway-nnov-s"/>
-  <symbol minX="1136" maxX="1188" minY="1523" maxY="1575" name="subway-catania-s"/>
-  <symbol minX="1188" maxX="1240" minY="1523" maxY="1575" name="subway-changchun-s"/>
-  <symbol minX="1240" maxX="1292" minY="1523" maxY="1575" name="subway-nagoya-s"/>
-  <symbol minX="1292" maxX="1344" minY="1523" maxY="1575" name="subway-montreal-s"/>
-  <symbol minX="1344" maxX="1396" minY="1523" maxY="1575" name="subway-chengdu-s"/>
-  <symbol minX="1396" maxX="1448" minY="1523" maxY="1575" name="subway-minatomirai-s"/>
-  <symbol minX="1448" maxX="1500" minY="1523" maxY="1575" name="subway-milan-s"/>
-  <symbol minX="1500" maxX="1552" minY="1523" maxY="1575" name="subway-chicago-s"/>
-  <symbol minX="1552" maxX="1604" minY="1523" maxY="1575" name="subway-mecca-s"/>
-  <symbol minX="1604" maxX="1656" minY="1523" maxY="1575" name="subway-massachusetts-s"/>
-  <symbol minX="1656" maxX="1708" minY="1523" maxY="1575" name="subway-dalian-s"/>
-  <symbol minX="1708" maxX="1760" minY="1523" maxY="1575" name="subway-stockholm-s"/>
-  <symbol minX="1760" maxX="1812" minY="1523" maxY="1575" name="subway-losangeles-s"/>
-  <symbol minX="1812" maxX="1864" minY="1523" maxY="1575" name="subway-lisboa-s"/>
-  <symbol minX="1864" maxX="1916" minY="1523" maxY="1575" name="subway-lima-s"/>
-  <symbol minX="1916" maxX="1968" minY="1523" maxY="1575" name="subway-lille-s"/>
-  <symbol minX="1968" maxX="2020" minY="1523" maxY="1575" name="subway-kyoto-s"/>
-  <symbol minX="0" maxX="52" minY="1576" maxY="1628" name="subway-kunming-s"/>
-  <symbol minX="52" maxX="104" minY="1576" maxY="1628" name="subway-foshan-s"/>
-  <symbol minX="104" maxX="169" minY="1576" maxY="1628" name="subway-fukuoka-s"/>
-  <symbol minX="169" maxX="221" minY="1576" maxY="1628" name="subway-kobe-s"/>
-  <symbol minX="221" maxX="276" minY="1576" maxY="1628" name="subway-glasgow-s"/>
-  <symbol minX="276" maxX="328" minY="1576" maxY="1628" name="subway-kazan-s"/>
-  <symbol minX="328" maxX="380" minY="1576" maxY="1628" name="subway-guadalajara-s"/>
-  <symbol minX="380" maxX="432" minY="1576" maxY="1628" name="subway-guangzhou-s"/>
-  <symbol minX="432" maxX="484" minY="1576" maxY="1628" name="subway-sofia-s"/>
-  <symbol minX="484" maxX="536" minY="1576" maxY="1628" name="subway-brasilia-s"/>
-  <symbol minX="536" maxX="601" minY="1576" maxY="1628" name="subway-santiago-s"/>
-  <symbol minX="601" maxX="653" minY="1576" maxY="1628" name="subway-santodomingo-s"/>
-  <symbol minX="653" maxX="705" minY="1576" maxY="1628" name="subway-saopaulo-s"/>
-  <symbol minX="705" maxX="757" minY="1576" maxY="1628" name="subway-bengaluru-s"/>
-  <symbol minX="757" maxX="809" minY="1576" maxY="1628" name="subway-shanghai-s"/>
-  <symbol minX="809" maxX="861" minY="1576" maxY="1628" name="subway-beijing-s"/>
-  <symbol minX="861" maxX="913" minY="1576" maxY="1628" name="subway-samara-s"/>
-  <symbol minX="913" maxX="965" minY="1576" maxY="1628" name="subway-riodejaneiro-s"/>
-  <symbol minX="965" maxX="1017" minY="1576" maxY="1628" name="subway-shiraz-s"/>
-  <symbol minX="1017" maxX="1069" minY="1576" maxY="1628" name="subway-reseau-paris-s"/>
-  <symbol minX="1069" maxX="1121" minY="1576" maxY="1628" name="subway-budapest-s"/>
-  <symbol minX="1121" maxX="1173" minY="1576" maxY="1628" name="subway-buenosaires-s"/>
-  <symbol minX="1173" maxX="1225" minY="1576" maxY="1628" name="subway-bangkok-s"/>
-  <symbol minX="1225" maxX="1277" minY="1576" maxY="1628" name="subway-perugia-s"/>
-  <symbol minX="1277" maxX="1329" minY="1576" maxY="1628" name="subway-bursaray-s"/>
-  <symbol minX="1329" maxX="1381" minY="1576" maxY="1628" name="subway-oslo-s"/>
-  <symbol minX="1381" maxX="1433" minY="1576" maxY="1628" name="subway-caracas-s"/>
-  <symbol minX="1433" maxX="1501" minY="1576" maxY="1627" name="subway-philadelphia-m"/>
-  <symbol minX="1501" maxX="1569" minY="1576" maxY="1627" name="subway-osaka-m"/>
-  <symbol minX="1569" maxX="1618" minY="1576" maxY="1625" name="subway-spb-s"/>
-  <symbol minX="1618" maxX="1686" minY="1576" maxY="1625" name="subway-lucknow-s"/>
-  <symbol minX="1686" maxX="1754" minY="1576" maxY="1625" name="subway-barcelona-m"/>
-  <symbol minX="1754" maxX="1819" minY="1576" maxY="1625" name="subway-tabriz-s"/>
-  <symbol minX="1819" maxX="1868" minY="1576" maxY="1625" name="subway-lausanne-s"/>
-  <symbol minX="1868" maxX="1933" minY="1576" maxY="1625" name="subway-london-m"/>
-  <symbol minX="1933" maxX="1982" minY="1576" maxY="1625" name="non-found-search-result"/>
-  <symbol minX="0" maxX="68" minY="1628" maxY="1677" name="subway-madrid-m"/>
-  <symbol minX="68" maxX="117" minY="1628" maxY="1677" name="cave-m"/>
-  <symbol minX="117" maxX="169" minY="1628" maxY="1677" name="subway-maracaibo-s"/>
-  <symbol minX="169" maxX="216" minY="1628" maxY="1677" name="subway-amsterdam-s"/>
-  <symbol minX="216" maxX="263" minY="1628" maxY="1677" name="subway-mexico-s"/>
-  <symbol minX="263" maxX="326" minY="1628" maxY="1677" name="subway-almaty-s"/>
-  <symbol minX="326" maxX="394" minY="1628" maxY="1676" name="subway-lucknow-m"/>
-  <symbol minX="394" maxX="441" minY="1628" maxY="1675" name="cable-car-s"/>
-  <symbol minX="441" maxX="488" minY="1628" maxY="1675" name="drinking-water-s"/>
-  <symbol minX="488" maxX="535" minY="1628" maxY="1675" name="zoo-s"/>
-  <symbol minX="535" maxX="582" minY="1628" maxY="1675" name="waterfall-s"/>
-  <symbol minX="582" maxX="629" minY="1628" maxY="1675" name="bus-s"/>
-  <symbol minX="629" maxX="676" minY="1628" maxY="1675" name="waste-basket-s"/>
-  <symbol minX="676" maxX="723" minY="1628" maxY="1675" name="college-s"/>
-  <symbol minX="723" maxX="770" minY="1628" maxY="1675" name="buddhist-s"/>
-  <symbol minX="770" maxX="817" minY="1628" maxY="1675" name="car-repair-s"/>
-  <symbol minX="817" maxX="864" minY="1628" maxY="1675" name="christian-s"/>
-  <symbol minX="864" maxX="911" minY="1628" maxY="1675" name="charging-station-s"/>
-  <symbol minX="911" maxX="958" minY="1628" maxY="1675" name="airport-s"/>
-  <symbol minX="958" maxX="1005" minY="1628" maxY="1675" name="subway-entrance-s"/>
-  <symbol minX="1005" maxX="1052" minY="1628" maxY="1675" name="taoist-s"/>
-  <symbol minX="1052" maxX="1099" minY="1628" maxY="1675" name="park-outline-s"/>
-  <symbol minX="1099" maxX="1146" minY="1628" maxY="1675" name="hindu-s"/>
-  <symbol minX="1146" maxX="1193" minY="1628" maxY="1675" name="hospital-s"/>
-  <symbol minX="1193" maxX="1245" minY="1628" maxY="1675" name="subway-tbilisi-s"/>
-  <symbol minX="1245" maxX="1292" minY="1628" maxY="1675" name="nparkf-s"/>
-  <symbol minX="1292" maxX="1339" minY="1628" maxY="1675" name="hotel-s"/>
-  <symbol minX="1339" maxX="1386" minY="1628" maxY="1675" name="nparkf-outline-s"/>
-  <symbol minX="1386" maxX="1449" minY="1628" maxY="1675" name="subway-dnepro-s"/>
-  <symbol minX="1449" maxX="1496" minY="1628" maxY="1675" name="subway-s"/>
-  <symbol minX="1496" maxX="1548" minY="1628" maxY="1675" name="subway-rotterdam-s"/>
-  <symbol minX="1548" maxX="1595" minY="1628" maxY="1675" name="remains-s"/>
-  <symbol minX="1595" maxX="1642" minY="1628" maxY="1675" name="jewish-s"/>
-  <symbol minX="1642" maxX="1702" minY="1628" maxY="1675" name="subway-philadelphia-s"/>
-  <symbol minX="1702" maxX="1767" minY="1628" maxY="1675" name="subway-palma-s"/>
-  <symbol minX="1767" maxX="1835" minY="1628" maxY="1675" name="subway-palma-m"/>
-  <symbol minX="1835" maxX="1892" minY="1628" maxY="1675" name="subway-osaka-s"/>
-  <symbol minX="1892" maxX="1939" minY="1628" maxY="1675" name="subway-newyork-s"/>
-  <symbol minX="1939" maxX="1986" minY="1628" maxY="1675" name="lighthouse-s"/>
-  <symbol minX="1986" maxX="2033" minY="1628" maxY="1675" name="muslim-s"/>
-  <symbol minX="0" maxX="47" minY="1677" maxY="1724" name="museum-s"/>
-  <symbol minX="47" maxX="94" minY="1677" maxY="1724" name="monument-s"/>
-  <symbol minX="94" maxX="141" minY="1677" maxY="1724" name="geyser-s"/>
-  <symbol minX="141" maxX="177" minY="1677" maxY="1724" name="transit_train-m"/>
-  <symbol minX="177" maxX="224" minY="1677" maxY="1724" name="shinto-s"/>
-  <symbol minX="224" maxX="271" minY="1677" maxY="1724" name="ship-s"/>
-  <symbol minX="271" maxX="318" minY="1677" maxY="1724" name="shop-s"/>
-  <symbol minX="318" maxX="365" minY="1677" maxY="1724" name="place-of-worship-s"/>
-  <symbol minX="365" maxX="412" minY="1677" maxY="1724" name="fuel-s"/>
-  <symbol minX="412" maxX="459" minY="1677" maxY="1724" name="stadium-s"/>
-  <symbol minX="459" maxX="495" minY="1677" maxY="1724" name="transit_light_rail-m"/>
-  <symbol minX="495" maxX="563" minY="1677" maxY="1724" name="subway-bilbao-m"/>
-  <symbol minX="563" maxX="615" minY="1677" maxY="1724" name="transfer_arrow"/>
-  <symbol minX="615" maxX="662" minY="1677" maxY="1724" name="viewpoint-s"/>
-  <symbol minX="662" maxX="709" minY="1677" maxY="1724" name="tram-s"/>
-  <symbol minX="709" maxX="756" minY="1677" maxY="1724" name="train-s"/>
-  <symbol minX="756" maxX="803" minY="1677" maxY="1724" name="tourism-s"/>
-  <symbol minX="803" maxX="850" minY="1677" maxY="1724" name="theme_park-s"/>
-  <symbol minX="850" maxX="897" minY="1677" maxY="1724" name="toll_booth-s"/>
-  <symbol minX="897" maxX="944" minY="1677" maxY="1724" name="theatre-s"/>
-  <symbol minX="944" maxX="991" minY="1677" maxY="1724" name="park-s"/>
-  <symbol minX="991" maxX="1059" minY="1677" maxY="1723" name="subway-kolkata-m"/>
-  <symbol minX="1059" maxX="1127" minY="1677" maxY="1723" name="subway-sanfrancisco-m"/>
-  <symbol minX="1127" maxX="1195" minY="1677" maxY="1723" name="subway-fukuoka-m"/>
-  <symbol minX="1195" maxX="1263" minY="1677" maxY="1723" name="subway-novosibirsk-m"/>
-  <symbol minX="1263" maxX="1323" minY="1677" maxY="1721" name="subway-madrid-s"/>
-  <symbol minX="1323" maxX="1375" minY="1677" maxY="1721" name="subway-lyon-s"/>
-  <symbol minX="1375" maxX="1443" minY="1677" maxY="1721" name="subway-kharkiv-s"/>
-  <symbol minX="1443" maxX="1487" minY="1677" maxY="1721" name="lightrail-berlin-s"/>
-  <symbol minX="1487" maxX="1544" minY="1677" maxY="1721" name="subway-kryvyirih-s"/>
-  <symbol minX="1544" maxX="1609" minY="1677" maxY="1721" name="subway-kiev-m"/>
-  <symbol minX="1609" maxX="1674" minY="1677" maxY="1721" name="subway-novosibirsk-s"/>
-  <symbol minX="1674" maxX="1718" minY="1677" maxY="1721" name="subway-paris-s"/>
-  <symbol minX="1718" maxX="1754" minY="1677" maxY="1721" name="transit_monorail-m"/>
-  <symbol minX="1754" maxX="1814" minY="1677" maxY="1721" name="subway-barcelona-s"/>
-  <symbol minX="1814" maxX="1882" minY="1677" maxY="1721" name="subway-sanfrancisco-s"/>
-  <symbol minX="1882" maxX="1926" minY="1677" maxY="1721" name="elevator"/>
-  <symbol minX="1926" maxX="1994" minY="1677" maxY="1721" name="subway-bucharest-m"/>
-  <symbol minX="0" maxX="68" minY="1724" maxY="1768" name="subway-brussel-s"/>
-  <symbol minX="68" maxX="136" minY="1724" maxY="1767" name="subway-sendai-m"/>
-  <symbol minX="136" maxX="204" minY="1724" maxY="1766" name="subway-haagse-s"/>
-  <symbol minX="204" maxX="272" minY="1724" maxY="1766" name="subway-kharkiv-m"/>
-  <symbol minX="272" maxX="340" minY="1724" maxY="1766" name="subway-manila-m"/>
-  <symbol minX="340" maxX="408" minY="1724" maxY="1766" name="subway-brussel-m"/>
-  <symbol minX="408" maxX="476" minY="1724" maxY="1766" name="subway-sendai-s"/>
-  <symbol minX="476" maxX="507" minY="1724" maxY="1765" name="transit_train-s"/>
-  <symbol minX="507" maxX="572" minY="1724" maxY="1765" name="subway-bucharest-s"/>
-  <symbol minX="572" maxX="613" minY="1724" maxY="1765" name="transit_subway-m"/>
-  <symbol minX="613" maxX="654" minY="1724" maxY="1765" name="map"/>
-  <symbol minX="654" maxX="695" minY="1724" maxY="1765" name="board"/>
-  <symbol minX="695" maxX="736" minY="1724" maxY="1765" name="storage-tank"/>
-  <symbol minX="736" maxX="780" minY="1724" maxY="1765" name="subway-moscow-s"/>
-  <symbol minX="780" maxX="835" minY="1724" maxY="1765" name="subway-alicante-s"/>
-  <symbol minX="835" maxX="884" minY="1724" maxY="1763" name="subway-london-s"/>
-  <symbol minX="884" maxX="923" minY="1724" maxY="1763" name="subway-ubahn-s"/>
-  <symbol minX="923" maxX="991" minY="1724" maxY="1763" name="subway-taipei-s"/>
-  <symbol minX="991" maxX="1048" minY="1724" maxY="1763" name="subway-bilbao-s"/>
-  <symbol minX="1048" maxX="1089" minY="1724" maxY="1763" name="subway-seattle-s"/>
-  <symbol minX="1089" maxX="1157" minY="1724" maxY="1763" name="subway-edmonton-s"/>
-  <symbol minX="1157" maxX="1196" minY="1724" maxY="1763" name="subway-rome-s"/>
-  <symbol minX="1196" maxX="1235" minY="1724" maxY="1763" name="cave-s"/>
-  <symbol minX="1235" maxX="1300" minY="1724" maxY="1763" name="subway-manila-s"/>
-  <symbol minX="1300" maxX="1368" minY="1724" maxY="1762" name="subway-haagse-m"/>
-  <symbol minX="1368" maxX="1404" minY="1724" maxY="1760" name="star-l"/>
-  <symbol minX="1404" maxX="1440" minY="1724" maxY="1760" name="parking-s"/>
-  <symbol minX="1440" maxX="1476" minY="1724" maxY="1760" name="speedcam-s"/>
-  <symbol minX="1476" maxX="1507" minY="1724" maxY="1760" name="transit_monorail-s"/>
-  <symbol minX="1507" maxX="1538" minY="1724" maxY="1760" name="transit_light_rail-s"/>
-  <symbol minX="1538" maxX="1561" minY="1724" maxY="1760" name="entrance-s"/>
-  <symbol minX="1561" maxX="1597" minY="1724" maxY="1760" name="gate-s"/>
-  <symbol minX="1597" maxX="1633" minY="1724" maxY="1760" name="transit_subway-s"/>
-  <symbol minX="1633" maxX="1690" minY="1724" maxY="1760" name="railway-crossing-l"/>
-  <symbol minX="1690" maxX="1726" minY="1724" maxY="1760" name="subway-xs"/>
-  <symbol minX="1726" maxX="1765" minY="1724" maxY="1760" name="main_entrance-s"/>
-  <symbol minX="1765" maxX="1809" minY="1724" maxY="1760" name="bench"/>
-  <symbol minX="1809" maxX="1845" minY="1724" maxY="1760" name="subway-newyork-xs"/>
-  <symbol minX="1845" maxX="1913" minY="1724" maxY="1758" name="subway-edmonton-m"/>
-  <symbol minX="1913" maxX="1978" minY="1724" maxY="1757" name="subway-malaga-s"/>
-  <symbol minX="1978" maxX="2033" minY="1724" maxY="1757" name="subway-kiev-s"/>
-  <symbol minX="0" maxX="49" minY="1768" maxY="1801" name="subway-kolkata-s"/>
-  <symbol minX="49" maxX="88" minY="1768" maxY="1801" name="volcano-m"/>
-  <symbol minX="88" maxX="121" minY="1768" maxY="1801" name="star-m"/>
-  <symbol minX="121" maxX="189" minY="1768" maxY="1801" name="subway-taipei-m"/>
-  <symbol minX="189" maxX="257" minY="1768" maxY="1801" name="subway-malaga-m"/>
-  <symbol minX="257" maxX="306" minY="1768" maxY="1799" name="railway-crossing-m"/>
-  <symbol minX="306" maxX="371" minY="1768" maxY="1799" name="subway-baku-s"/>
-  <symbol minX="371" maxX="426" minY="1768" maxY="1799" name="subway-minsk-m"/>
-  <symbol minX="426" maxX="462" minY="1768" maxY="1799" name="plaque"/>
-  <symbol minX="462" maxX="530" minY="1768" maxY="1798" name="subway-baku-m"/>
-  <symbol minX="530" maxX="598" minY="1768" maxY="1797" name="subway-chongqing-s"/>
-  <symbol minX="598" maxX="647" minY="1768" maxY="1796" name="subway-minsk-s"/>
-  <symbol minX="647" maxX="675" minY="1768" maxY="1796" name="star-s"/>
-  <symbol minX="675" maxX="743" minY="1768" maxY="1794" name="subway-chongqing-m"/>
-  <symbol minX="743" maxX="771" minY="1768" maxY="1793" name="volcano-s"/>
-  <symbol minX="771" maxX="818" minY="1768" maxY="1793" name="mountain-pass"/>
-  <symbol minX="818" maxX="878" minY="1768" maxY="1793" name="arrow-m"/>
-  <symbol minX="878" maxX="906" minY="1768" maxY="1793" name="peakt-m"/>
-  <symbol minX="906" maxX="929" minY="1768" maxY="1791" name="zero-icon"/>
-  <symbol minX="929" maxX="952" minY="1768" maxY="1788" name="peakt-s"/>
-  <symbol minX="952" maxX="996" minY="1768" maxY="1785" name="arrow-s"/>
-  <symbol minX="996" maxX="1013" minY="1768" maxY="1785" name="dot-m"/>
-  <symbol minX="1013" maxX="1041" minY="1768" maxY="1780" name="arrow-xs"/>
+  <symbol minX="1632" maxX="1700" minY="1330" maxY="1398" name="hostel-m"/>
+  <symbol minX="1700" maxX="1768" minY="1330" maxY="1398" name="recycling-m"/>
+  <symbol minX="1768" maxX="1836" minY="1330" maxY="1398" name="hospital-m"/>
+  <symbol minX="1836" maxX="1904" minY="1330" maxY="1398" name="photo-shop-m"/>
+  <symbol minX="1904" maxX="1972" minY="1330" maxY="1398" name="picnic_table-m"/>
+  <symbol minX="1972" maxX="2040" minY="1330" maxY="1398" name="phone-m"/>
+  <symbol minX="0" maxX="68" minY="1398" maxY="1466" name="internet_cafe-m"/>
+  <symbol minX="68" maxX="136" minY="1398" maxY="1466" name="pharmacy-m"/>
+  <symbol minX="136" maxX="204" minY="1398" maxY="1466" name="picnic-m"/>
+  <symbol minX="204" maxX="272" minY="1398" maxY="1466" name="physiotherapist-m"/>
+  <symbol minX="272" maxX="337" minY="1398" maxY="1463" name="subway-ekb-s"/>
+  <symbol minX="337" maxX="405" minY="1398" maxY="1463" name="subway-dalian-m"/>
+  <symbol minX="405" maxX="473" minY="1398" maxY="1463" name="subway-sapporo-m"/>
+  <symbol minX="473" maxX="541" minY="1398" maxY="1463" name="subway-maracaibo-m"/>
+  <symbol minX="541" maxX="609" minY="1398" maxY="1463" name="subway-shanghai-m"/>
+  <symbol minX="609" maxX="674" minY="1398" maxY="1463" name="subway-southkorea-s"/>
+  <symbol minX="674" maxX="739" minY="1398" maxY="1463" name="subway-spb-m"/>
+  <symbol minX="739" maxX="807" minY="1398" maxY="1463" name="subway-marseille-m"/>
+  <symbol minX="807" maxX="872" minY="1398" maxY="1463" name="subway-montreal-m"/>
+  <symbol minX="872" maxX="940" minY="1398" maxY="1461" name="subway-izmir-m"/>
+  <symbol minX="940" maxX="1000" minY="1398" maxY="1461" name="subway-warsaw-m"/>
+  <symbol minX="1000" maxX="1063" minY="1398" maxY="1461" name="subway-entrance-m"/>
+  <symbol minX="1063" maxX="1126" minY="1398" maxY="1461" name="subway-stlouis-s"/>
+  <symbol minX="1126" maxX="1189" minY="1398" maxY="1461" name="subway-algeria-s"/>
+  <symbol minX="1189" maxX="1249" minY="1398" maxY="1458" name="subway-pittsburgh-s"/>
+  <symbol minX="1249" maxX="1301" minY="1398" maxY="1458" name="subway-istanbul-s"/>
+  <symbol minX="1301" maxX="1361" minY="1398" maxY="1458" name="search-result"/>
+  <symbol minX="1361" maxX="1421" minY="1398" maxY="1458" name="lightrail-berlin-m"/>
+  <symbol minX="1421" maxX="1489" minY="1398" maxY="1456" name="subway-taoyuan-m"/>
+  <symbol minX="1489" maxX="1541" minY="1398" maxY="1455" name="subway-brescia-s"/>
+  <symbol minX="1541" maxX="1598" minY="1398" maxY="1455" name="subway-sapporo-s"/>
+  <symbol minX="1598" maxX="1655" minY="1398" maxY="1455" name="motorcycle-parking-m"/>
+  <symbol minX="1655" maxX="1712" minY="1398" maxY="1455" name="speedcam-m"/>
+  <symbol minX="1712" maxX="1780" minY="1398" maxY="1455" name="subway-rotterdam-m"/>
+  <symbol minX="1780" maxX="1893" minY="1398" maxY="1455" name="coloredmark-default-s"/>
+  <symbol minX="1893" maxX="2006" minY="1398" maxY="1455" name="coloredmark-bg-s"/>
+  <symbol minX="0" maxX="60" minY="1466" maxY="1523" name="subway-izmir-s"/>
+  <symbol minX="60" maxX="117" minY="1466" maxY="1523" name="subway-panama-s"/>
+  <symbol minX="117" maxX="172" minY="1466" maxY="1523" name="subway-mashhad-s"/>
+  <symbol minX="172" maxX="229" minY="1466" maxY="1523" name="parking_pay-m"/>
+  <symbol minX="229" maxX="286" minY="1466" maxY="1523" name="parking_entrance-m"/>
+  <symbol minX="286" maxX="354" minY="1466" maxY="1523" name="subway-tbilisi-m"/>
+  <symbol minX="354" maxX="411" minY="1466" maxY="1523" name="subway-cairo-s"/>
+  <symbol minX="411" maxX="468" minY="1466" maxY="1523" name="subway-medellin-s"/>
+  <symbol minX="468" maxX="525" minY="1466" maxY="1523" name="subway-isfahan-s"/>
+  <symbol minX="525" maxX="582" minY="1466" maxY="1523" name="parking-m"/>
+  <symbol minX="582" maxX="639" minY="1466" maxY="1523" name="bicycle-rental"/>
+  <symbol minX="639" maxX="696" minY="1466" maxY="1523" name="parking-disabled-m"/>
+  <symbol minX="696" maxX="753" minY="1466" maxY="1523" name="bike-parking-m"/>
+  <symbol minX="753" maxX="821" minY="1466" maxY="1522" name="subway-almaty-m"/>
+  <symbol minX="821" maxX="876" minY="1466" maxY="1521" name="subway-hirosima-s"/>
+  <symbol minX="876" maxX="931" minY="1466" maxY="1521" name="subway-ubahn-m"/>
+  <symbol minX="931" maxX="991" minY="1466" maxY="1521" name="subway-seattle-m"/>
+  <symbol minX="991" maxX="1043" minY="1466" maxY="1521" name="subway-tianjin-s"/>
+  <symbol minX="1043" maxX="1095" minY="1466" maxY="1521" name="subway-athens-s"/>
+  <symbol minX="1095" maxX="1147" minY="1466" maxY="1521" name="subway-delhi-s"/>
+  <symbol minX="1147" maxX="1202" minY="1466" maxY="1521" name="subway-rome-m"/>
+  <symbol minX="1202" maxX="1265" minY="1466" maxY="1521" name="subway-moscow-m"/>
+  <symbol minX="1265" maxX="1320" minY="1466" maxY="1521" name="subway-warszawa-s"/>
+  <symbol minX="1320" maxX="1375" minY="1466" maxY="1521" name="subway-paris-m"/>
+  <symbol minX="1375" maxX="1430" minY="1466" maxY="1521" name="subway-rennes-s"/>
+  <symbol minX="1430" maxX="1482" minY="1466" maxY="1521" name="subway-pyongyang-s"/>
+  <symbol minX="1482" maxX="1534" minY="1466" maxY="1521" name="subway-porto-s"/>
+  <symbol minX="1534" maxX="1602" minY="1466" maxY="1520" name="subway-santiago-m"/>
+  <symbol minX="1602" maxX="1640" minY="1466" maxY="1520" name="bookmark-bg-xs"/>
+  <symbol minX="1640" maxX="1708" minY="1466" maxY="1520" name="subway-yerevan-m"/>
+  <symbol minX="1708" maxX="1746" minY="1466" maxY="1520" name="bookmark-default-xs"/>
+  <symbol minX="1746" maxX="1814" minY="1466" maxY="1519" name="subway-dnepro-m"/>
+  <symbol minX="1814" maxX="1882" minY="1466" maxY="1519" name="subway-tabriz-m"/>
+  <symbol minX="1882" maxX="1950" minY="1466" maxY="1519" name="subway-omsk-m"/>
+  <symbol minX="1950" maxX="2018" minY="1466" maxY="1519" name="subway-kryvyirih-m"/>
+  <symbol minX="0" maxX="52" minY="1523" maxY="1575" name="subway-riodejaneiro-s"/>
+  <symbol minX="52" maxX="104" minY="1523" maxY="1575" name="subway-valencia-s"/>
+  <symbol minX="104" maxX="156" minY="1523" maxY="1575" name="subway-yokohama-s"/>
+  <symbol minX="156" maxX="208" minY="1523" maxY="1575" name="subway-tyneandwear-s"/>
+  <symbol minX="208" maxX="273" minY="1523" maxY="1575" name="subway-yerevan-s"/>
+  <symbol minX="273" maxX="333" minY="1523" maxY="1575" name="subway-taoyuan-s"/>
+  <symbol minX="333" maxX="401" minY="1523" maxY="1575" name="subway-alicante-m"/>
+  <symbol minX="401" maxX="453" minY="1523" maxY="1575" name="subway-wuhan-s"/>
+  <symbol minX="453" maxX="505" minY="1523" maxY="1575" name="subway-washington-s"/>
+  <symbol minX="505" maxX="557" minY="1523" maxY="1575" name="subway-tashkent-s"/>
+  <symbol minX="557" maxX="609" minY="1523" maxY="1575" name="subway-tokyo-s"/>
+  <symbol minX="609" maxX="656" minY="1523" maxY="1575" name="subway-warsaw-s"/>
+  <symbol minX="656" maxX="708" minY="1523" maxY="1575" name="subway-vienna-s"/>
+  <symbol minX="708" maxX="760" minY="1523" maxY="1575" name="subway-volgograd-s"/>
+  <symbol minX="760" maxX="812" minY="1523" maxY="1575" name="subway-losangeles-s"/>
+  <symbol minX="812" maxX="864" minY="1523" maxY="1575" name="subway-catania-s"/>
+  <symbol minX="864" maxX="916" minY="1523" maxY="1575" name="subway-nagoya-s"/>
+  <symbol minX="916" maxX="968" minY="1523" maxY="1575" name="subway-changchun-s"/>
+  <symbol minX="968" maxX="1020" minY="1523" maxY="1575" name="subway-montreal-s"/>
+  <symbol minX="1020" maxX="1072" minY="1523" maxY="1575" name="subway-chengdu-s"/>
+  <symbol minX="1072" maxX="1124" minY="1523" maxY="1575" name="subway-minatomirai-s"/>
+  <symbol minX="1124" maxX="1176" minY="1523" maxY="1575" name="subway-milan-s"/>
+  <symbol minX="1176" maxX="1228" minY="1523" maxY="1575" name="subway-chicago-s"/>
+  <symbol minX="1228" maxX="1280" minY="1523" maxY="1575" name="subway-mecca-s"/>
+  <symbol minX="1280" maxX="1332" minY="1523" maxY="1575" name="subway-massachusetts-s"/>
+  <symbol minX="1332" maxX="1384" minY="1523" maxY="1575" name="subway-dalian-s"/>
+  <symbol minX="1384" maxX="1436" minY="1523" maxY="1575" name="subway-dubai-s"/>
+  <symbol minX="1436" maxX="1488" minY="1523" maxY="1575" name="subway-lyon-s"/>
+  <symbol minX="1488" maxX="1540" minY="1523" maxY="1575" name="subway-stockholm-s"/>
+  <symbol minX="1540" maxX="1592" minY="1523" maxY="1575" name="subway-lisboa-s"/>
+  <symbol minX="1592" maxX="1644" minY="1523" maxY="1575" name="subway-lima-s"/>
+  <symbol minX="1644" maxX="1696" minY="1523" maxY="1575" name="subway-lille-s"/>
+  <symbol minX="1696" maxX="1748" minY="1523" maxY="1575" name="subway-foshan-s"/>
+  <symbol minX="1748" maxX="1800" minY="1523" maxY="1575" name="subway-kyoto-s"/>
+  <symbol minX="1800" maxX="1865" minY="1523" maxY="1575" name="subway-fukuoka-s"/>
+  <symbol minX="1865" maxX="1917" minY="1523" maxY="1575" name="subway-kunming-s"/>
+  <symbol minX="1917" maxX="1972" minY="1523" maxY="1575" name="subway-glasgow-s"/>
+  <symbol minX="1972" maxX="2024" minY="1523" maxY="1575" name="subway-kobe-s"/>
+  <symbol minX="0" maxX="52" minY="1575" maxY="1627" name="subway-guadalajara-s"/>
+  <symbol minX="52" maxX="104" minY="1575" maxY="1627" name="subway-guangzhou-s"/>
+  <symbol minX="104" maxX="156" minY="1575" maxY="1627" name="subway-kazan-s"/>
+  <symbol minX="156" maxX="208" minY="1575" maxY="1627" name="subway-helsinki-s"/>
+  <symbol minX="208" maxX="260" minY="1575" maxY="1627" name="subway-nnov-s"/>
+  <symbol minX="260" maxX="312" minY="1575" maxY="1627" name="subway-sofia-s"/>
+  <symbol minX="312" maxX="364" minY="1575" maxY="1627" name="subway-shiraz-s"/>
+  <symbol minX="364" maxX="416" minY="1575" maxY="1627" name="subway-bangkok-s"/>
+  <symbol minX="416" maxX="468" minY="1575" maxY="1627" name="subway-shanghai-s"/>
+  <symbol minX="468" maxX="520" minY="1575" maxY="1627" name="subway-saopaulo-s"/>
+  <symbol minX="520" maxX="572" minY="1575" maxY="1627" name="subway-santodomingo-s"/>
+  <symbol minX="572" maxX="624" minY="1575" maxY="1627" name="subway-beijing-s"/>
+  <symbol minX="624" maxX="689" minY="1575" maxY="1627" name="subway-santiago-s"/>
+  <symbol minX="689" maxX="741" minY="1575" maxY="1627" name="subway-samara-s"/>
+  <symbol minX="741" maxX="793" minY="1575" maxY="1627" name="subway-bengaluru-s"/>
+  <symbol minX="793" maxX="845" minY="1575" maxY="1627" name="subway-reseau-paris-s"/>
+  <symbol minX="845" maxX="897" minY="1575" maxY="1627" name="subway-brasilia-s"/>
+  <symbol minX="897" maxX="949" minY="1575" maxY="1627" name="subway-caracas-s"/>
+  <symbol minX="949" maxX="1017" minY="1575" maxY="1627" name="subway-omsk-s"/>
+  <symbol minX="1017" maxX="1069" minY="1575" maxY="1627" name="subway-perugia-s"/>
+  <symbol minX="1069" maxX="1121" minY="1575" maxY="1627" name="subway-bursaray-s"/>
+  <symbol minX="1121" maxX="1173" minY="1575" maxY="1627" name="subway-budapest-s"/>
+  <symbol minX="1173" maxX="1225" minY="1575" maxY="1627" name="subway-buenosaires-s"/>
+  <symbol minX="1225" maxX="1277" minY="1575" maxY="1627" name="subway-oslo-s"/>
+  <symbol minX="1277" maxX="1345" minY="1575" maxY="1626" name="subway-philadelphia-m"/>
+  <symbol minX="1345" maxX="1413" minY="1575" maxY="1626" name="subway-osaka-m"/>
+  <symbol minX="1413" maxX="1465" minY="1575" maxY="1624" name="subway-maracaibo-s"/>
+  <symbol minX="1465" maxX="1530" minY="1575" maxY="1624" name="subway-tabriz-s"/>
+  <symbol minX="1530" maxX="1579" minY="1575" maxY="1624" name="subway-spb-s"/>
+  <symbol minX="1579" maxX="1626" minY="1575" maxY="1624" name="subway-amsterdam-s"/>
+  <symbol minX="1626" maxX="1694" minY="1575" maxY="1624" name="subway-barcelona-m"/>
+  <symbol minX="1694" maxX="1743" minY="1575" maxY="1624" name="cave-m"/>
+  <symbol minX="1743" maxX="1792" minY="1575" maxY="1624" name="non-found-search-result"/>
+  <symbol minX="1792" maxX="1841" minY="1575" maxY="1624" name="subway-lausanne-s"/>
+  <symbol minX="1841" maxX="1904" minY="1575" maxY="1624" name="subway-almaty-s"/>
+  <symbol minX="1904" maxX="1969" minY="1575" maxY="1624" name="subway-london-m"/>
+  <symbol minX="1969" maxX="2037" minY="1575" maxY="1624" name="subway-lucknow-s"/>
+  <symbol minX="0" maxX="47" minY="1627" maxY="1676" name="subway-mexico-s"/>
+  <symbol minX="47" maxX="115" minY="1627" maxY="1676" name="subway-madrid-m"/>
+  <symbol minX="115" maxX="183" minY="1627" maxY="1675" name="subway-lucknow-m"/>
+  <symbol minX="183" maxX="230" minY="1627" maxY="1674" name="waterfall-s"/>
+  <symbol minX="230" maxX="277" minY="1627" maxY="1674" name="waste-basket-s"/>
+  <symbol minX="277" maxX="324" minY="1627" maxY="1674" name="viewpoint-s"/>
+  <symbol minX="324" maxX="371" minY="1627" maxY="1674" name="zoo-s"/>
+  <symbol minX="371" maxX="418" minY="1627" maxY="1674" name="airport-s"/>
+  <symbol minX="418" maxX="465" minY="1627" maxY="1674" name="cable-car-s"/>
+  <symbol minX="465" maxX="512" minY="1627" maxY="1674" name="park-s"/>
+  <symbol minX="512" maxX="559" minY="1627" maxY="1674" name="car-repair-s"/>
+  <symbol minX="559" maxX="606" minY="1627" maxY="1674" name="place-of-worship-s"/>
+  <symbol minX="606" maxX="653" minY="1627" maxY="1674" name="remains-s"/>
+  <symbol minX="653" maxX="700" minY="1627" maxY="1674" name="shinto-s"/>
+  <symbol minX="700" maxX="747" minY="1627" maxY="1674" name="ship-s"/>
+  <symbol minX="747" maxX="794" minY="1627" maxY="1674" name="shop-s"/>
+  <symbol minX="794" maxX="841" minY="1627" maxY="1674" name="stadium-s"/>
+  <symbol minX="841" maxX="888" minY="1627" maxY="1674" name="park-outline-s"/>
+  <symbol minX="888" maxX="956" minY="1627" maxY="1674" name="subway-bilbao-m"/>
+  <symbol minX="956" maxX="1003" minY="1627" maxY="1674" name="bus-s"/>
+  <symbol minX="1003" maxX="1066" minY="1627" maxY="1674" name="subway-dnepro-s"/>
+  <symbol minX="1066" maxX="1113" minY="1627" maxY="1674" name="subway-entrance-s"/>
+  <symbol minX="1113" maxX="1160" minY="1627" maxY="1674" name="buddhist-s"/>
+  <symbol minX="1160" maxX="1207" minY="1627" maxY="1674" name="subway-newyork-s"/>
+  <symbol minX="1207" maxX="1264" minY="1627" maxY="1674" name="subway-osaka-s"/>
+  <symbol minX="1264" maxX="1332" minY="1627" maxY="1674" name="subway-palma-m"/>
+  <symbol minX="1332" maxX="1379" minY="1627" maxY="1674" name="jewish-s"/>
+  <symbol minX="1379" maxX="1426" minY="1627" maxY="1674" name="college-s"/>
+  <symbol minX="1426" maxX="1473" minY="1627" maxY="1674" name="christian-s"/>
+  <symbol minX="1473" maxX="1520" minY="1627" maxY="1674" name="drinking-water-s"/>
+  <symbol minX="1520" maxX="1567" minY="1627" maxY="1674" name="fuel-s"/>
+  <symbol minX="1567" maxX="1614" minY="1627" maxY="1674" name="geyser-s"/>
+  <symbol minX="1614" maxX="1661" minY="1627" maxY="1674" name="hindu-s"/>
+  <symbol minX="1661" maxX="1708" minY="1627" maxY="1674" name="hospital-s"/>
+  <symbol minX="1708" maxX="1755" minY="1627" maxY="1674" name="hotel-s"/>
+  <symbol minX="1755" maxX="1791" minY="1627" maxY="1674" name="transit_train-m"/>
+  <symbol minX="1791" maxX="1838" minY="1627" maxY="1674" name="lighthouse-s"/>
+  <symbol minX="1838" maxX="1885" minY="1627" maxY="1674" name="monument-s"/>
+  <symbol minX="1885" maxX="1932" minY="1627" maxY="1674" name="charging-station-s"/>
+  <symbol minX="1932" maxX="1979" minY="1627" maxY="1674" name="museum-s"/>
+  <symbol minX="1979" maxX="2026" minY="1627" maxY="1674" name="muslim-s"/>
+  <symbol minX="0" maxX="47" minY="1676" maxY="1723" name="nparkf-outline-s"/>
+  <symbol minX="47" maxX="94" minY="1676" maxY="1723" name="nparkf-s"/>
+  <symbol minX="94" maxX="141" minY="1676" maxY="1723" name="taoist-s"/>
+  <symbol minX="141" maxX="188" minY="1676" maxY="1723" name="toll_booth-s"/>
+  <symbol minX="188" maxX="240" minY="1676" maxY="1723" name="subway-rotterdam-s"/>
+  <symbol minX="240" maxX="287" minY="1676" maxY="1723" name="theme_park-s"/>
+  <symbol minX="287" maxX="334" minY="1676" maxY="1723" name="tourism-s"/>
+  <symbol minX="334" maxX="381" minY="1676" maxY="1723" name="train-s"/>
+  <symbol minX="381" maxX="428" minY="1676" maxY="1723" name="subway-s"/>
+  <symbol minX="428" maxX="475" minY="1676" maxY="1723" name="tram-s"/>
+  <symbol minX="475" maxX="522" minY="1676" maxY="1723" name="theatre-s"/>
+  <symbol minX="522" maxX="574" minY="1676" maxY="1723" name="transfer_arrow"/>
+  <symbol minX="574" maxX="610" minY="1676" maxY="1723" name="transit_light_rail-m"/>
+  <symbol minX="610" maxX="662" minY="1676" maxY="1723" name="subway-tbilisi-s"/>
+  <symbol minX="662" maxX="722" minY="1676" maxY="1723" name="subway-philadelphia-s"/>
+  <symbol minX="722" maxX="787" minY="1676" maxY="1723" name="subway-palma-s"/>
+  <symbol minX="787" maxX="855" minY="1676" maxY="1722" name="subway-sanfrancisco-m"/>
+  <symbol minX="855" maxX="923" minY="1676" maxY="1722" name="subway-kolkata-m"/>
+  <symbol minX="923" maxX="991" minY="1676" maxY="1722" name="subway-novosibirsk-m"/>
+  <symbol minX="991" maxX="1059" minY="1676" maxY="1722" name="subway-fukuoka-m"/>
+  <symbol minX="1059" maxX="1127" minY="1676" maxY="1720" name="subway-bucharest-m"/>
+  <symbol minX="1127" maxX="1195" minY="1676" maxY="1720" name="subway-kharkiv-s"/>
+  <symbol minX="1195" maxX="1263" minY="1676" maxY="1720" name="subway-brussel-s"/>
+  <symbol minX="1263" maxX="1331" minY="1676" maxY="1720" name="subway-sanfrancisco-s"/>
+  <symbol minX="1331" maxX="1391" minY="1676" maxY="1720" name="subway-barcelona-s"/>
+  <symbol minX="1391" maxX="1435" minY="1676" maxY="1720" name="subway-paris-s"/>
+  <symbol minX="1435" maxX="1500" minY="1676" maxY="1720" name="subway-kiev-m"/>
+  <symbol minX="1500" maxX="1557" minY="1676" maxY="1720" name="subway-kryvyirih-s"/>
+  <symbol minX="1557" maxX="1617" minY="1676" maxY="1720" name="subway-madrid-s"/>
+  <symbol minX="1617" maxX="1682" minY="1676" maxY="1720" name="subway-novosibirsk-s"/>
+  <symbol minX="1682" maxX="1726" minY="1676" maxY="1720" name="lightrail-berlin-s"/>
+  <symbol minX="1726" maxX="1770" minY="1676" maxY="1720" name="elevator"/>
+  <symbol minX="1770" maxX="1806" minY="1676" maxY="1720" name="transit_monorail-m"/>
+  <symbol minX="1806" maxX="1874" minY="1676" maxY="1719" name="subway-sendai-m"/>
+  <symbol minX="1874" maxX="1942" minY="1676" maxY="1718" name="subway-manila-m"/>
+  <symbol minX="1942" maxX="2010" minY="1676" maxY="1718" name="subway-sendai-s"/>
+  <symbol minX="0" maxX="68" minY="1723" maxY="1765" name="subway-brussel-m"/>
+  <symbol minX="68" maxX="136" minY="1723" maxY="1765" name="subway-haagse-s"/>
+  <symbol minX="136" maxX="204" minY="1723" maxY="1765" name="subway-kharkiv-m"/>
+  <symbol minX="204" maxX="245" minY="1723" maxY="1764" name="transit_subway-m"/>
+  <symbol minX="245" maxX="286" minY="1723" maxY="1764" name="map"/>
+  <symbol minX="286" maxX="327" minY="1723" maxY="1764" name="board"/>
+  <symbol minX="327" maxX="382" minY="1723" maxY="1764" name="subway-alicante-s"/>
+  <symbol minX="382" maxX="423" minY="1723" maxY="1764" name="storage-tank"/>
+  <symbol minX="423" maxX="467" minY="1723" maxY="1764" name="subway-moscow-s"/>
+  <symbol minX="467" maxX="498" minY="1723" maxY="1764" name="transit_train-s"/>
+  <symbol minX="498" maxX="563" minY="1723" maxY="1764" name="subway-bucharest-s"/>
+  <symbol minX="563" maxX="604" minY="1723" maxY="1762" name="subway-seattle-s"/>
+  <symbol minX="604" maxX="643" minY="1723" maxY="1762" name="subway-rome-s"/>
+  <symbol minX="643" maxX="708" minY="1723" maxY="1762" name="subway-manila-s"/>
+  <symbol minX="708" maxX="757" minY="1723" maxY="1762" name="subway-london-s"/>
+  <symbol minX="757" maxX="825" minY="1723" maxY="1762" name="subway-edmonton-s"/>
+  <symbol minX="825" maxX="864" minY="1723" maxY="1762" name="cave-s"/>
+  <symbol minX="864" maxX="903" minY="1723" maxY="1762" name="subway-ubahn-s"/>
+  <symbol minX="903" maxX="960" minY="1723" maxY="1762" name="subway-bilbao-s"/>
+  <symbol minX="960" maxX="1028" minY="1723" maxY="1762" name="subway-taipei-s"/>
+  <symbol minX="1028" maxX="1096" minY="1723" maxY="1761" name="subway-haagse-m"/>
+  <symbol minX="1096" maxX="1153" minY="1723" maxY="1759" name="railway-crossing-l"/>
+  <symbol minX="1153" maxX="1184" minY="1723" maxY="1759" name="transit_monorail-s"/>
+  <symbol minX="1184" maxX="1228" minY="1723" maxY="1759" name="bench"/>
+  <symbol minX="1228" maxX="1264" minY="1723" maxY="1759" name="star-l"/>
+  <symbol minX="1264" maxX="1295" minY="1723" maxY="1759" name="transit_light_rail-s"/>
+  <symbol minX="1295" maxX="1318" minY="1723" maxY="1759" name="entrance-s"/>
+  <symbol minX="1318" maxX="1357" minY="1723" maxY="1759" name="main_entrance-s"/>
+  <symbol minX="1357" maxX="1393" minY="1723" maxY="1759" name="speedcam-s"/>
+  <symbol minX="1393" maxX="1429" minY="1723" maxY="1759" name="subway-newyork-xs"/>
+  <symbol minX="1429" maxX="1465" minY="1723" maxY="1759" name="parking-s"/>
+  <symbol minX="1465" maxX="1501" minY="1723" maxY="1759" name="subway-xs"/>
+  <symbol minX="1501" maxX="1537" minY="1723" maxY="1759" name="transit_subway-s"/>
+  <symbol minX="1537" maxX="1605" minY="1723" maxY="1757" name="subway-edmonton-m"/>
+  <symbol minX="1605" maxX="1660" minY="1723" maxY="1756" name="subway-kiev-s"/>
+  <symbol minX="1660" maxX="1709" minY="1723" maxY="1756" name="subway-kolkata-s"/>
+  <symbol minX="1709" maxX="1777" minY="1723" maxY="1756" name="subway-malaga-m"/>
+  <symbol minX="1777" maxX="1842" minY="1723" maxY="1756" name="subway-malaga-s"/>
+  <symbol minX="1842" maxX="1875" minY="1723" maxY="1756" name="star-m"/>
+  <symbol minX="1875" maxX="1943" minY="1723" maxY="1756" name="subway-taipei-m"/>
+  <symbol minX="1943" maxX="1982" minY="1723" maxY="1756" name="volcano-m"/>
+  <symbol minX="1982" maxX="2018" minY="1723" maxY="1754" name="plaque"/>
+  <symbol minX="0" maxX="55" minY="1765" maxY="1796" name="subway-minsk-m"/>
+  <symbol minX="55" maxX="120" minY="1765" maxY="1796" name="subway-baku-s"/>
+  <symbol minX="120" maxX="169" minY="1765" maxY="1796" name="railway-crossing-m"/>
+  <symbol minX="169" maxX="237" minY="1765" maxY="1795" name="subway-baku-m"/>
+  <symbol minX="237" maxX="305" minY="1765" maxY="1794" name="subway-chongqing-s"/>
+  <symbol minX="305" maxX="333" minY="1765" maxY="1793" name="star-s"/>
+  <symbol minX="333" maxX="382" minY="1765" maxY="1793" name="subway-minsk-s"/>
+  <symbol minX="382" maxX="450" minY="1765" maxY="1791" name="subway-chongqing-m"/>
+  <symbol minX="450" maxX="497" minY="1765" maxY="1790" name="mountain-pass"/>
+  <symbol minX="497" maxX="525" minY="1765" maxY="1790" name="peakt-m"/>
+  <symbol minX="525" maxX="553" minY="1765" maxY="1790" name="volcano-s"/>
+  <symbol minX="553" maxX="613" minY="1765" maxY="1790" name="arrow-m"/>
+  <symbol minX="613" maxX="636" minY="1765" maxY="1788" name="zero-icon"/>
+  <symbol minX="636" maxX="659" minY="1765" maxY="1785" name="peakt-s"/>
+  <symbol minX="659" maxX="676" minY="1765" maxY="1782" name="dot-m"/>
+  <symbol minX="676" maxX="720" minY="1765" maxY="1782" name="arrow-s"/>
+  <symbol minX="720" maxX="748" minY="1765" maxY="1777" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index e379cf1640..c60273a11f 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index 89374788c6..8e8cc9094b 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -2,700 +2,695 @@
 <root>
  <file width="2048" height="2048">
   <symbol minX="0" maxX="144" minY="0" maxY="144" name="compass-image"/>
-  <symbol minX="144" maxX="260" minY="0" maxY="137" name="shield-us-i-thin-scaled"/>
-  <symbol minX="260" maxX="397" minY="0" maxY="137" name="cross_geoposition"/>
-  <symbol minX="397" maxX="541" minY="0" maxY="137" name="route-point-finish"/>
-  <symbol minX="541" maxX="678" minY="0" maxY="137" name="shield-us-i-wide-scaled"/>
+  <symbol minX="144" maxX="281" minY="0" maxY="137" name="cross_geoposition"/>
+  <symbol minX="281" maxX="397" minY="0" maxY="137" name="shield-us-i-thin-scaled"/>
+  <symbol minX="397" maxX="534" minY="0" maxY="137" name="shield-us-i-wide-scaled"/>
+  <symbol minX="534" maxX="678" minY="0" maxY="137" name="route-point-finish"/>
   <symbol minX="678" maxX="904" minY="0" maxY="136" name="route-arrow"/>
-  <symbol minX="904" maxX="1034" minY="0" maxY="130" name="search-result-playground"/>
-  <symbol minX="1034" maxX="1164" minY="0" maxY="130" name="search-result-shop-sports"/>
-  <symbol minX="1164" maxX="1294" minY="0" maxY="130" name="search-result-nightclub"/>
-  <symbol minX="1294" maxX="1424" minY="0" maxY="130" name="search-result-water-park"/>
-  <symbol minX="1424" maxX="1554" minY="0" maxY="130" name="search-result-marketplace"/>
-  <symbol minX="1554" maxX="1684" minY="0" maxY="130" name="search-result-fastfood"/>
-  <symbol minX="1684" maxX="1814" minY="0" maxY="130" name="search-result-cinema"/>
-  <symbol minX="1814" maxX="1944" minY="0" maxY="130" name="search-result-casino"/>
-  <symbol minX="0" maxX="130" minY="144" maxY="274" name="search-result-cafe"/>
-  <symbol minX="130" maxX="260" minY="144" maxY="274" name="search-result-bar"/>
-  <symbol minX="260" maxX="390" minY="144" maxY="274" name="search-result-zoo"/>
-  <symbol minX="390" maxX="520" minY="144" maxY="274" name="search-result-bakery"/>
-  <symbol minX="520" maxX="657" minY="144" maxY="274" name="shield-us-hw-wide-scaled"/>
-  <symbol minX="657" maxX="787" minY="144" maxY="274" name="search-result-restaurant"/>
-  <symbol minX="787" maxX="917" minY="144" maxY="274" name="search-result-shop-shoes"/>
-  <symbol minX="917" maxX="1047" minY="144" maxY="274" name="search-result-shop-supermarket"/>
-  <symbol minX="1047" maxX="1177" minY="144" maxY="274" name="search-result-shop-seafood"/>
-  <symbol minX="1177" maxX="1307" minY="144" maxY="274" name="search-result-shop-toys"/>
-  <symbol minX="1307" maxX="1437" minY="144" maxY="274" name="search-result-shop-mall"/>
-  <symbol minX="1437" maxX="1567" minY="144" maxY="274" name="search-result-shop-jewelry"/>
-  <symbol minX="1567" maxX="1697" minY="144" maxY="274" name="search-result-shop-greengrocer"/>
-  <symbol minX="1697" maxX="1827" minY="144" maxY="274" name="search-result-shop-gift"/>
-  <symbol minX="1827" maxX="1957" minY="144" maxY="274" name="search-result-shop-department_store"/>
-  <symbol minX="0" maxX="130" minY="274" maxY="404" name="search-result-shop-cosmetics"/>
-  <symbol minX="130" maxX="260" minY="274" maxY="404" name="search-result-shop-convenience"/>
-  <symbol minX="260" maxX="390" minY="274" maxY="404" name="search-result-shop-confectionery"/>
-  <symbol minX="390" maxX="520" minY="274" maxY="404" name="search-result-shop-clothes"/>
-  <symbol minX="520" maxX="650" minY="274" maxY="404" name="search-result-shop-butcher"/>
-  <symbol minX="650" maxX="780" minY="274" maxY="404" name="search-result-shop-alcohol"/>
-  <symbol minX="780" maxX="910" minY="274" maxY="404" name="search-result-theme-park"/>
-  <symbol minX="910" maxX="1040" minY="274" maxY="404" name="search-result-pub"/>
+  <symbol minX="904" maxX="1034" minY="0" maxY="130" name="search-result-shop-sports"/>
+  <symbol minX="1034" maxX="1164" minY="0" maxY="130" name="search-result-shop-cosmetics"/>
+  <symbol minX="1164" maxX="1294" minY="0" maxY="130" name="search-result-shop-convenience"/>
+  <symbol minX="1294" maxX="1424" minY="0" maxY="130" name="search-result-shop-shoes"/>
+  <symbol minX="1424" maxX="1554" minY="0" maxY="130" name="search-result-theme-park"/>
+  <symbol minX="1554" maxX="1684" minY="0" maxY="130" name="search-result-cinema"/>
+  <symbol minX="1684" maxX="1814" minY="0" maxY="130" name="search-result-fastfood"/>
+  <symbol minX="1814" maxX="1944" minY="0" maxY="130" name="search-result-restaurant"/>
+  <symbol minX="0" maxX="130" minY="144" maxY="274" name="search-result-marketplace"/>
+  <symbol minX="130" maxX="260" minY="144" maxY="274" name="search-result-zoo"/>
+  <symbol minX="260" maxX="390" minY="144" maxY="274" name="search-result-pub"/>
+  <symbol minX="390" maxX="520" minY="144" maxY="274" name="search-result-shop-confectionery"/>
+  <symbol minX="520" maxX="650" minY="144" maxY="274" name="search-result-nightclub"/>
+  <symbol minX="650" maxX="780" minY="144" maxY="274" name="search-result-playground"/>
+  <symbol minX="780" maxX="910" minY="144" maxY="274" name="search-result-shop-clothes"/>
+  <symbol minX="910" maxX="1047" minY="144" maxY="274" name="shield-us-hw-wide-scaled"/>
+  <symbol minX="1047" maxX="1177" minY="144" maxY="274" name="search-result-shop-toys"/>
+  <symbol minX="1177" maxX="1307" minY="144" maxY="274" name="search-result-shop-butcher"/>
+  <symbol minX="1307" maxX="1437" minY="144" maxY="274" name="search-result-shop-supermarket"/>
+  <symbol minX="1437" maxX="1567" minY="144" maxY="274" name="search-result-shop-greengrocer"/>
+  <symbol minX="1567" maxX="1697" minY="144" maxY="274" name="search-result-shop-department_store"/>
+  <symbol minX="1697" maxX="1827" minY="144" maxY="274" name="search-result-casino"/>
+  <symbol minX="1827" maxX="1957" minY="144" maxY="274" name="search-result-bakery"/>
+  <symbol minX="0" maxX="130" minY="274" maxY="404" name="search-result-cafe"/>
+  <symbol minX="130" maxX="260" minY="274" maxY="404" name="search-result-bar"/>
+  <symbol minX="260" maxX="390" minY="274" maxY="404" name="search-result-shop-seafood"/>
+  <symbol minX="390" maxX="520" minY="274" maxY="404" name="search-result-shop-gift"/>
+  <symbol minX="520" maxX="650" minY="274" maxY="404" name="search-result-shop-jewelry"/>
+  <symbol minX="650" maxX="780" minY="274" maxY="404" name="search-result-water-park"/>
+  <symbol minX="780" maxX="910" minY="274" maxY="404" name="search-result-shop-alcohol"/>
+  <symbol minX="910" maxX="1040" minY="274" maxY="404" name="search-result-shop-mall"/>
   <symbol minX="1040" maxX="1156" minY="274" maxY="397" name="shield-us-hw-thin-scaled"/>
-  <symbol minX="1156" maxX="1251" minY="274" maxY="394" name="unpaved_road"/>
+  <symbol minX="1156" maxX="1251" minY="274" maxY="394" name="ferry"/>
   <symbol minX="1251" maxX="1346" minY="274" maxY="394" name="paid_road"/>
-  <symbol minX="1346" maxX="1441" minY="274" maxY="394" name="ferry"/>
-  <symbol minX="1441" maxX="1557" minY="274" maxY="390" name="infosign"/>
-  <symbol minX="1557" maxX="1673" minY="274" maxY="390" name="track_marker_selected"/>
-  <symbol minX="1673" maxX="1750" minY="274" maxY="384" name="bookmark-shop-m"/>
+  <symbol minX="1346" maxX="1441" minY="274" maxY="394" name="unpaved_road"/>
+  <symbol minX="1441" maxX="1557" minY="274" maxY="390" name="track_marker_selected"/>
+  <symbol minX="1557" maxX="1673" minY="274" maxY="390" name="infosign"/>
+  <symbol minX="1673" maxX="1750" minY="274" maxY="384" name="bookmark-mountain-m"/>
   <symbol minX="1750" maxX="1827" minY="274" maxY="384" name="bookmark-judaism-m"/>
-  <symbol minX="1827" maxX="1904" minY="274" maxY="384" name="bookmark-medicine-m"/>
-  <symbol minX="1904" maxX="1981" minY="274" maxY="384" name="bookmark-mountain-m"/>
-  <symbol minX="0" maxX="77" minY="404" maxY="514" name="bookmark-museum-m"/>
+  <symbol minX="1827" maxX="1904" minY="274" maxY="384" name="bookmark-islam-m"/>
+  <symbol minX="1904" maxX="1981" minY="274" maxY="384" name="bookmark-gas-m"/>
+  <symbol minX="0" maxX="77" minY="404" maxY="514" name="bookmark-building-m"/>
   <symbol minX="77" maxX="154" minY="404" maxY="514" name="bookmark-park-m"/>
-  <symbol minX="154" maxX="231" minY="404" maxY="514" name="bookmark-parking-m"/>
-  <symbol minX="231" maxX="308" minY="404" maxY="514" name="bookmark-gas-m"/>
-  <symbol minX="308" maxX="385" minY="404" maxY="514" name="bookmark-water-m"/>
-  <symbol minX="385" maxX="462" minY="404" maxY="514" name="bookmark-viewpoint-m"/>
-  <symbol minX="462" maxX="539" minY="404" maxY="514" name="bookmark-transport-m"/>
-  <symbol minX="539" maxX="616" minY="404" maxY="514" name="bookmark-swim-m"/>
-  <symbol minX="616" maxX="693" minY="404" maxY="514" name="bookmark-start-m"/>
-  <symbol minX="693" maxX="770" minY="404" maxY="514" name="bookmark-sport-m"/>
-  <symbol minX="770" maxX="847" minY="404" maxY="514" name="bookmark-sights-m"/>
-  <symbol minX="847" maxX="924" minY="404" maxY="514" name="bookmark-islam-m"/>
-  <symbol minX="924" maxX="1001" minY="404" maxY="514" name="bookmark-hotel-m"/>
-  <symbol minX="1001" maxX="1078" minY="404" maxY="514" name="bookmark-food-m"/>
-  <symbol minX="1078" maxX="1155" minY="404" maxY="514" name="bookmark-finish-m"/>
-  <symbol minX="1155" maxX="1232" minY="404" maxY="514" name="bookmark-exchange-m"/>
-  <symbol minX="1232" maxX="1309" minY="404" maxY="514" name="bookmark-entertainment-m"/>
-  <symbol minX="1309" maxX="1386" minY="404" maxY="514" name="bookmark-default-m"/>
-  <symbol minX="1386" maxX="1463" minY="404" maxY="514" name="bookmark-christianity-m"/>
-  <symbol minX="1463" maxX="1540" minY="404" maxY="514" name="bookmark-building-m"/>
-  <symbol minX="1540" maxX="1617" minY="404" maxY="514" name="bookmark-buddhism-m"/>
-  <symbol minX="1617" maxX="1694" minY="404" maxY="514" name="bookmark-bg-m"/>
-  <symbol minX="1694" maxX="1771" minY="404" maxY="514" name="bookmark-bar-m"/>
-  <symbol minX="1771" maxX="1848" minY="404" maxY="514" name="bookmark-animals-m"/>
-  <symbol minX="1848" maxX="1950" minY="404" maxY="506" name="route-point-7"/>
-  <symbol minX="0" maxX="144" minY="514" maxY="616" name="norating-default-l"/>
-  <symbol minX="144" maxX="246" minY="514" maxY="616" name="route-point-19"/>
-  <symbol minX="246" maxX="390" minY="514" maxY="616" name="norating-bg-l"/>
+  <symbol minX="154" maxX="231" minY="404" maxY="514" name="bookmark-hotel-m"/>
+  <symbol minX="231" maxX="308" minY="404" maxY="514" name="bookmark-medicine-m"/>
+  <symbol minX="308" maxX="385" minY="404" maxY="514" name="bookmark-christianity-m"/>
+  <symbol minX="385" maxX="462" minY="404" maxY="514" name="bookmark-entertainment-m"/>
+  <symbol minX="462" maxX="539" minY="404" maxY="514" name="bookmark-default-m"/>
+  <symbol minX="539" maxX="616" minY="404" maxY="514" name="bookmark-finish-m"/>
+  <symbol minX="616" maxX="693" minY="404" maxY="514" name="bookmark-museum-m"/>
+  <symbol minX="693" maxX="770" minY="404" maxY="514" name="bookmark-food-m"/>
+  <symbol minX="770" maxX="847" minY="404" maxY="514" name="bookmark-exchange-m"/>
+  <symbol minX="847" maxX="924" minY="404" maxY="514" name="bookmark-shop-m"/>
+  <symbol minX="924" maxX="1001" minY="404" maxY="514" name="bookmark-animals-m"/>
+  <symbol minX="1001" maxX="1078" minY="404" maxY="514" name="bookmark-water-m"/>
+  <symbol minX="1078" maxX="1155" minY="404" maxY="514" name="bookmark-viewpoint-m"/>
+  <symbol minX="1155" maxX="1232" minY="404" maxY="514" name="bookmark-transport-m"/>
+  <symbol minX="1232" maxX="1309" minY="404" maxY="514" name="bookmark-swim-m"/>
+  <symbol minX="1309" maxX="1386" minY="404" maxY="514" name="bookmark-bar-m"/>
+  <symbol minX="1386" maxX="1463" minY="404" maxY="514" name="bookmark-start-m"/>
+  <symbol minX="1463" maxX="1540" minY="404" maxY="514" name="bookmark-sport-m"/>
+  <symbol minX="1540" maxX="1617" minY="404" maxY="514" name="bookmark-bg-m"/>
+  <symbol minX="1617" maxX="1694" minY="404" maxY="514" name="bookmark-sights-m"/>
+  <symbol minX="1694" maxX="1771" minY="404" maxY="514" name="bookmark-buddhism-m"/>
+  <symbol minX="1771" maxX="1848" minY="404" maxY="514" name="bookmark-parking-m"/>
+  <symbol minX="1848" maxX="1950" minY="404" maxY="506" name="route-point-18"/>
+  <symbol minX="0" maxX="102" minY="514" maxY="616" name="route-point-15"/>
+  <symbol minX="102" maxX="246" minY="514" maxY="616" name="norating-bg-l"/>
+  <symbol minX="246" maxX="390" minY="514" maxY="616" name="norating-default-l"/>
   <symbol minX="390" maxX="492" minY="514" maxY="616" name="route-point-1"/>
   <symbol minX="492" maxX="594" minY="514" maxY="616" name="route-point-10"/>
-  <symbol minX="594" maxX="696" minY="514" maxY="616" name="route-point-11"/>
-  <symbol minX="696" maxX="798" minY="514" maxY="616" name="route-point-12"/>
-  <symbol minX="798" maxX="900" minY="514" maxY="616" name="route-point-13"/>
-  <symbol minX="900" maxX="1002" minY="514" maxY="616" name="route-point-14"/>
-  <symbol minX="1002" maxX="1104" minY="514" maxY="616" name="route-point-15"/>
-  <symbol minX="1104" maxX="1206" minY="514" maxY="616" name="route-point-16"/>
-  <symbol minX="1206" maxX="1308" minY="514" maxY="616" name="route-point-17"/>
-  <symbol minX="1308" maxX="1410" minY="514" maxY="616" name="route-point-18"/>
-  <symbol minX="1410" maxX="1512" minY="514" maxY="616" name="route-point-start"/>
-  <symbol minX="1512" maxX="1614" minY="514" maxY="616" name="route-point-2"/>
-  <symbol minX="1614" maxX="1716" minY="514" maxY="616" name="route-point-20"/>
-  <symbol minX="1716" maxX="1818" minY="514" maxY="616" name="route-point-3"/>
-  <symbol minX="1818" maxX="1920" minY="514" maxY="616" name="route-point-4"/>
-  <symbol minX="1920" maxX="2022" minY="514" maxY="616" name="route-point-5"/>
-  <symbol minX="0" maxX="102" minY="616" maxY="718" name="route-point-6"/>
-  <symbol minX="102" maxX="204" minY="616" maxY="718" name="route-point-8"/>
-  <symbol minX="204" maxX="306" minY="616" maxY="718" name="route-point-9"/>
-  <symbol minX="306" maxX="450" minY="616" maxY="718" name="coloredmark-default-l"/>
-  <symbol minX="450" maxX="594" minY="616" maxY="718" name="coloredmark-bg-l"/>
-  <symbol minX="594" maxX="668" minY="616" maxY="704" name="shield-us-i-thin"/>
-  <symbol minX="668" maxX="763" minY="616" maxY="704" name="shield-us-i-wide"/>
-  <symbol minX="763" maxX="844" minY="616" maxY="697" name="shield-us-hw-thin"/>
-  <symbol minX="844" maxX="939" minY="616" maxY="697" name="shield-us-hw-wide"/>
-  <symbol minX="939" maxX="993" minY="616" maxY="693" name="bookmark-default-s"/>
-  <symbol minX="993" maxX="1047" minY="616" maxY="693" name="bookmark-bg-s"/>
-  <symbol minX="1047" maxX="1121" minY="616" maxY="690" name="track_marker_deselected"/>
-  <symbol minX="1121" maxX="1195" minY="616" maxY="690" name="current-position"/>
-  <symbol minX="1195" maxX="1263" minY="616" maxY="684" name="bakery-m"/>
-  <symbol minX="1263" maxX="1331" minY="616" maxY="684" name="audiologist-m"/>
-  <symbol minX="1331" maxX="1399" minY="616" maxY="684" name="subway-ekb-m"/>
-  <symbol minX="1399" maxX="1467" minY="616" maxY="684" name="bank-m"/>
-  <symbol minX="1467" maxX="1535" minY="616" maxY="684" name="banknote-m"/>
-  <symbol minX="1535" maxX="1603" minY="616" maxY="684" name="bar-m"/>
-  <symbol minX="1603" maxX="1671" minY="616" maxY="684" name="subway-dubai-m"/>
-  <symbol minX="1671" maxX="1739" minY="616" maxY="684" name="baseball-m"/>
-  <symbol minX="1739" maxX="1804" minY="616" maxY="684" name="subway-delhi-m"/>
-  <symbol minX="1804" maxX="1872" minY="616" maxY="684" name="basketball-m"/>
-  <symbol minX="1872" maxX="1940" minY="616" maxY="684" name="bbq-m"/>
-  <symbol minX="1940" maxX="2008" minY="616" maxY="684" name="bcontrol-m"/>
-  <symbol minX="0" maxX="68" minY="718" maxY="786" name="beach-m"/>
-  <symbol minX="68" maxX="136" minY="718" maxY="786" name="subway-chicago-m"/>
-  <symbol minX="136" maxX="204" minY="718" maxY="786" name="beauty-m"/>
-  <symbol minX="204" maxX="272" minY="718" maxY="786" name="subway-chengdu-m"/>
-  <symbol minX="272" maxX="340" minY="718" maxY="786" name="beekeeper-m"/>
-  <symbol minX="340" maxX="408" minY="718" maxY="786" name="subway-changchun-m"/>
-  <symbol minX="408" maxX="476" minY="718" maxY="786" name="airport-m"/>
-  <symbol minX="476" maxX="544" minY="718" maxY="786" name="antiques-m"/>
-  <symbol minX="544" maxX="612" minY="718" maxY="786" name="apartment-m"/>
-  <symbol minX="612" maxX="680" minY="718" maxY="786" name="archaeological-site-m"/>
-  <symbol minX="680" maxX="748" minY="718" maxY="786" name="subway-kazan-m"/>
-  <symbol minX="748" maxX="803" minY="718" maxY="786" name="subway-istanbul-m"/>
-  <symbol minX="803" maxX="871" minY="718" maxY="786" name="subway-isfahan-m"/>
-  <symbol minX="871" maxX="939" minY="718" maxY="786" name="subway-hirosima-m"/>
-  <symbol minX="939" maxX="1007" minY="718" maxY="786" name="archery-m"/>
-  <symbol minX="1007" maxX="1075" minY="718" maxY="786" name="subway-helsinki-m"/>
-  <symbol minX="1075" maxX="1143" minY="718" maxY="786" name="subway-foshan-m"/>
-  <symbol minX="1143" maxX="1211" minY="718" maxY="786" name="subway-guangzhou-m"/>
-  <symbol minX="1211" maxX="1279" minY="718" maxY="786" name="art-m"/>
-  <symbol minX="1279" maxX="1347" minY="718" maxY="786" name="subway-guadalajara-m"/>
-  <symbol minX="1347" maxX="1415" minY="718" maxY="786" name="atm-m"/>
-  <symbol minX="1415" maxX="1483" minY="718" maxY="786" name="subway-glasgow-m"/>
-  <symbol minX="1483" maxX="1551" minY="718" maxY="786" name="bicycle-m"/>
-  <symbol minX="1551" maxX="1619" minY="718" maxY="786" name="australian-football-m"/>
-  <symbol minX="1619" maxX="1687" minY="718" maxY="786" name="badminton-m"/>
-  <symbol minX="1687" maxX="1755" minY="718" maxY="786" name="campsite-m"/>
-  <symbol minX="1755" maxX="1823" minY="718" maxY="786" name="subway-bangkok-m"/>
-  <symbol minX="1823" maxX="1891" minY="718" maxY="786" name="bus-m"/>
-  <symbol minX="1891" maxX="1956" minY="718" maxY="786" name="subway-athens-m"/>
-  <symbol minX="1956" maxX="2024" minY="718" maxY="786" name="subway-ankara-s"/>
-  <symbol minX="0" maxX="68" minY="786" maxY="854" name="subway-ankara-m"/>
-  <symbol minX="68" maxX="136" minY="786" maxY="854" name="butcher-m"/>
-  <symbol minX="136" maxX="196" minY="786" maxY="854" name="subway-amsterdam-m"/>
-  <symbol minX="196" maxX="264" minY="786" maxY="854" name="cable-car-m"/>
-  <symbol minX="264" maxX="332" minY="786" maxY="854" name="cafe-m"/>
-  <symbol minX="332" maxX="400" minY="786" maxY="854" name="buddhist-m"/>
-  <symbol minX="400" maxX="468" minY="786" maxY="854" name="subway-algeria-m"/>
-  <symbol minX="468" maxX="536" minY="786" maxY="854" name="subway-adana-s"/>
-  <symbol minX="536" maxX="604" minY="786" maxY="854" name="subway-adana-m"/>
-  <symbol minX="604" maxX="672" minY="786" maxY="854" name="car-part-m"/>
-  <symbol minX="672" maxX="740" minY="786" maxY="854" name="stationery_shop-m"/>
-  <symbol minX="740" maxX="808" minY="786" maxY="854" name="car-repair-m"/>
-  <symbol minX="808" maxX="876" minY="786" maxY="854" name="car-wash-m"/>
-  <symbol minX="876" maxX="944" minY="786" maxY="854" name="car_sharing-m"/>
-  <symbol minX="944" maxX="1012" minY="786" maxY="854" name="stadium-m"/>
-  <symbol minX="1012" maxX="1075" minY="786" maxY="854" name="subway-brescia-m"/>
-  <symbol minX="1075" maxX="1143" minY="786" maxY="854" name="subway-catania-m"/>
-  <symbol minX="1143" maxX="1211" minY="786" maxY="854" name="subway-kobe-m"/>
-  <symbol minX="1211" maxX="1279" minY="786" maxY="854" name="subway-caracas-m"/>
-  <symbol minX="1279" maxX="1347" minY="786" maxY="854" name="subway-cairo-m"/>
-  <symbol minX="1347" maxX="1415" minY="786" maxY="854" name="subway-bursaray-m"/>
-  <symbol minX="1415" maxX="1483" minY="786" maxY="854" name="subway-buenosaires-m"/>
-  <symbol minX="1483" maxX="1551" minY="786" maxY="854" name="subway-budapest-m"/>
-  <symbol minX="1551" maxX="1619" minY="786" maxY="854" name="bicycle-repair-station"/>
-  <symbol minX="1619" maxX="1687" minY="786" maxY="854" name="blacksmith-m"/>
-  <symbol minX="1687" maxX="1755" minY="786" maxY="854" name="beer-m"/>
-  <symbol minX="1755" maxX="1823" minY="786" maxY="854" name="blood_donation-m"/>
-  <symbol minX="1823" maxX="1891" minY="786" maxY="854" name="subway-brasilia-m"/>
-  <symbol minX="1891" maxX="1959" minY="786" maxY="854" name="book-shop-m"/>
-  <symbol minX="1959" maxX="2027" minY="786" maxY="854" name="bookmaker-m"/>
-  <symbol minX="0" maxX="68" minY="854" maxY="922" name="subway-bengaluru-m"/>
-  <symbol minX="68" maxX="136" minY="854" maxY="922" name="bowling-m"/>
-  <symbol minX="136" maxX="204" minY="854" maxY="922" name="subway-beijing-m"/>
-  <symbol minX="204" maxX="272" minY="854" maxY="922" name="bowling_alley-m"/>
-  <symbol minX="272" maxX="340" minY="854" maxY="922" name="brewery-m"/>
-  <symbol minX="340" maxX="408" minY="854" maxY="922" name="swimming-m"/>
-  <symbol minX="408" maxX="476" minY="854" maxY="922" name="subway-warszawa-m"/>
-  <symbol minX="476" maxX="544" minY="854" maxY="922" name="subway-perugia-m"/>
-  <symbol minX="544" maxX="612" minY="854" maxY="922" name="subway-washington-m"/>
-  <symbol minX="612" maxX="680" minY="854" maxY="922" name="subway-panama-m"/>
-  <symbol minX="680" maxX="748" minY="854" maxY="922" name="subway-wuhan-m"/>
-  <symbol minX="748" maxX="816" minY="854" maxY="922" name="subway-oslo-m"/>
-  <symbol minX="816" maxX="884" minY="854" maxY="922" name="subway-yokohama-m"/>
-  <symbol minX="884" maxX="952" minY="854" maxY="922" name="survey_point-m"/>
-  <symbol minX="952" maxX="1020" minY="854" maxY="922" name="sweets-m"/>
-  <symbol minX="1020" maxX="1085" minY="854" maxY="922" name="subway-nnov-m"/>
-  <symbol minX="1085" maxX="1153" minY="854" maxY="922" name="subway-pittsburgh-m"/>
-  <symbol minX="1153" maxX="1221" minY="854" maxY="922" name="table-tennis-m"/>
-  <symbol minX="1221" maxX="1289" minY="854" maxY="922" name="subway-newyork-m"/>
-  <symbol minX="1289" maxX="1357" minY="854" maxY="922" name="taoist-m"/>
-  <symbol minX="1357" maxX="1425" minY="854" maxY="922" name="subway-nagoya-m"/>
-  <symbol minX="1425" maxX="1493" minY="854" maxY="922" name="taxi-m"/>
-  <symbol minX="1493" maxX="1561" minY="854" maxY="922" name="tennis-m"/>
-  <symbol minX="1561" maxX="1629" minY="854" maxY="922" name="theatre-m"/>
-  <symbol minX="1629" maxX="1697" minY="854" maxY="922" name="theme_park-m"/>
-  <symbol minX="1697" maxX="1765" minY="854" maxY="922" name="ticket-shop-m"/>
-  <symbol minX="1765" maxX="1833" minY="854" maxY="922" name="subway-santodomingo-m"/>
-  <symbol minX="1833" maxX="1901" minY="854" maxY="922" name="subway-stockholm-m"/>
-  <symbol minX="1901" maxX="1969" minY="854" maxY="922" name="subway-stlouis-m"/>
-  <symbol minX="1969" maxX="2037" minY="854" maxY="922" name="subway-southkorea-m"/>
-  <symbol minX="0" maxX="68" minY="922" maxY="990" name="subway-tashkent-m"/>
-  <symbol minX="68" maxX="136" minY="922" maxY="990" name="subway-sofia-m"/>
-  <symbol minX="136" maxX="204" minY="922" maxY="990" name="subway-shiraz-m"/>
-  <symbol minX="204" maxX="272" minY="922" maxY="990" name="subway-tianjin-m"/>
-  <symbol minX="272" maxX="340" minY="922" maxY="990" name="subway-tokyo-m"/>
-  <symbol minX="340" maxX="408" minY="922" maxY="990" name="subway-saopaulo-m"/>
-  <symbol minX="408" maxX="476" minY="922" maxY="990" name="subway-tyneandwear-m"/>
-  <symbol minX="476" maxX="544" minY="922" maxY="990" name="subway-minatomirai-m"/>
-  <symbol minX="544" maxX="612" minY="922" maxY="990" name="subway-valencia-m"/>
-  <symbol minX="612" maxX="680" minY="922" maxY="990" name="subway-samara-m"/>
-  <symbol minX="680" maxX="748" minY="922" maxY="990" name="subway-vienna-m"/>
-  <symbol minX="748" maxX="816" minY="922" maxY="990" name="subway-volgograd-m"/>
-  <symbol minX="816" maxX="884" minY="922" maxY="990" name="subway-riodejaneiro-m"/>
-  <symbol minX="884" maxX="952" minY="922" maxY="990" name="subway-reseau-paris-m"/>
-  <symbol minX="952" maxX="1020" minY="922" maxY="990" name="subway-rennes-m"/>
-  <symbol minX="1020" maxX="1088" minY="922" maxY="990" name="subway-pyongyang-m"/>
-  <symbol minX="1088" maxX="1153" minY="922" maxY="990" name="subway-porto-m"/>
-  <symbol minX="1153" maxX="1221" minY="922" maxY="990" name="zoo-m"/>
-  <symbol minX="1221" maxX="1289" minY="922" maxY="990" name="viewpoint-m"/>
-  <symbol minX="1289" maxX="1357" minY="922" maxY="990" name="volleyball-m"/>
-  <symbol minX="1357" maxX="1425" minY="922" maxY="990" name="waste-basket-m"/>
-  <symbol minX="1425" maxX="1493" minY="922" maxY="990" name="subway-losangeles-m"/>
-  <symbol minX="1493" maxX="1561" minY="922" maxY="990" name="waterfall-m"/>
-  <symbol minX="1561" maxX="1629" minY="922" maxY="990" name="wayside_shrine-m"/>
-  <symbol minX="1629" maxX="1697" minY="922" maxY="990" name="windmill-m"/>
-  <symbol minX="1697" maxX="1765" minY="922" maxY="990" name="subway-lisboa-m"/>
-  <symbol minX="1765" maxX="1833" minY="922" maxY="990" name="yoga-m"/>
-  <symbol minX="1833" maxX="1901" minY="922" maxY="990" name="subway-lima-m"/>
-  <symbol minX="1901" maxX="1969" minY="922" maxY="990" name="video-games-m"/>
-  <symbol minX="1969" maxX="2037" minY="922" maxY="990" name="subway-lille-m"/>
-  <symbol minX="0" maxX="68" minY="990" maxY="1058" name="airport_gate-m"/>
-  <symbol minX="68" maxX="136" minY="990" maxY="1058" name="subway-lausanne-m"/>
-  <symbol minX="136" maxX="204" minY="990" maxY="1058" name="alcohol-m"/>
-  <symbol minX="204" maxX="272" minY="990" maxY="1058" name="subway-kyoto-m"/>
-  <symbol minX="272" maxX="340" minY="990" maxY="1058" name="alpine_hut-m"/>
-  <symbol minX="340" maxX="408" minY="990" maxY="1058" name="subway-kunming-m"/>
-  <symbol minX="408" maxX="476" minY="990" maxY="1058" name="alternative-m"/>
-  <symbol minX="476" maxX="544" minY="990" maxY="1058" name="america-football-m"/>
-  <symbol minX="544" maxX="611" minY="990" maxY="1058" name="subway-mashhad-m"/>
-  <symbol minX="611" maxX="679" minY="990" maxY="1058" name="tire-repair-m"/>
-  <symbol minX="679" maxX="747" minY="990" maxY="1058" name="subway-milan-m"/>
-  <symbol minX="747" maxX="815" minY="990" maxY="1058" name="toilets-m"/>
-  <symbol minX="815" maxX="880" minY="990" maxY="1058" name="subway-mexico-m"/>
-  <symbol minX="880" maxX="948" minY="990" maxY="1058" name="subway-medellin-m"/>
-  <symbol minX="948" maxX="1016" minY="990" maxY="1058" name="toll_booth-m"/>
-  <symbol minX="1016" maxX="1084" minY="990" maxY="1058" name="subway-mecca-m"/>
-  <symbol minX="1084" maxX="1152" minY="990" maxY="1058" name="tomb-m"/>
-  <symbol minX="1152" maxX="1220" minY="990" maxY="1058" name="subway-massachusetts-m"/>
-  <symbol minX="1220" maxX="1288" minY="990" maxY="1058" name="electronics-m"/>
-  <symbol minX="1288" maxX="1356" minY="990" maxY="1058" name="subway-marseille-s"/>
-  <symbol minX="1356" maxX="1424" minY="990" maxY="1058" name="tourism-m"/>
-  <symbol minX="1424" maxX="1492" minY="990" maxY="1058" name="toys-m"/>
-  <symbol minX="1492" maxX="1560" minY="990" maxY="1058" name="train-m"/>
-  <symbol minX="1560" maxX="1628" minY="990" maxY="1058" name="tram-m"/>
-  <symbol minX="1628" maxX="1696" minY="990" maxY="1058" name="travel_agency_shop-m"/>
-  <symbol minX="1696" maxX="1764" minY="990" maxY="1058" name="vending-m"/>
-  <symbol minX="1764" maxX="1832" minY="990" maxY="1058" name="veterinary-m"/>
-  <symbol minX="1832" maxX="1900" minY="990" maxY="1058" name="subway-m"/>
-  <symbol minX="1900" maxX="1968" minY="990" maxY="1058" name="defibrillator-m"/>
-  <symbol minX="1968" maxX="2036" minY="990" maxY="1058" name="mail-m"/>
-  <symbol minX="0" maxX="68" minY="1058" maxY="1126" name="cross-m"/>
-  <symbol minX="68" maxX="136" minY="1058" maxY="1126" name="curling-m"/>
-  <symbol minX="136" maxX="204" minY="1058" maxY="1126" name="lighthouse-m"/>
-  <symbol minX="204" maxX="272" minY="1058" maxY="1126" name="lift_gate-m"/>
-  <symbol minX="272" maxX="340" minY="1058" maxY="1126" name="library-m"/>
-  <symbol minX="340" maxX="408" minY="1058" maxY="1126" name="lawyer-m"/>
-  <symbol minX="408" maxX="476" minY="1058" maxY="1126" name="laundry-m"/>
-  <symbol minX="476" maxX="544" minY="1058" maxY="1126" name="language_school-m"/>
-  <symbol minX="544" maxX="612" minY="1058" maxY="1126" name="kiosk-m"/>
-  <symbol minX="612" maxX="680" minY="1058" maxY="1126" name="kindergarten-m"/>
-  <symbol minX="680" maxX="748" minY="1058" maxY="1126" name="cricket-m"/>
-  <symbol minX="748" maxX="816" minY="1058" maxY="1126" name="jewish-m"/>
-  <symbol minX="816" maxX="884" minY="1058" maxY="1126" name="jewelry-m"/>
-  <symbol minX="884" maxX="952" minY="1058" maxY="1126" name="internet_cafe-m"/>
-  <symbol minX="952" maxX="1020" minY="1058" maxY="1126" name="interior_decoration-m"/>
-  <symbol minX="1020" maxX="1088" minY="1058" maxY="1126" name="information-m"/>
-  <symbol minX="1088" maxX="1156" minY="1058" maxY="1126" name="ice_cream-m"/>
-  <symbol minX="1156" maxX="1224" minY="1058" maxY="1126" name="hunting-tower-m"/>
-  <symbol minX="1224" maxX="1292" minY="1058" maxY="1126" name="dentist-m"/>
-  <symbol minX="1292" maxX="1360" minY="1058" maxY="1126" name="hotel-m"/>
-  <symbol minX="1360" maxX="1428" minY="1058" maxY="1126" name="hostel-m"/>
-  <symbol minX="1428" maxX="1496" minY="1058" maxY="1126" name="motel-m"/>
-  <symbol minX="1496" maxX="1564" minY="1058" maxY="1126" name="needle_and_thread-m"/>
-  <symbol minX="1564" maxX="1632" minY="1058" maxY="1126" name="climbing-m"/>
-  <symbol minX="1632" maxX="1700" minY="1058" maxY="1126" name="muslim-m"/>
-  <symbol minX="1700" maxX="1768" minY="1058" maxY="1126" name="musical-instrument-m"/>
-  <symbol minX="1768" maxX="1836" minY="1058" maxY="1126" name="music_school-m"/>
-  <symbol minX="1836" maxX="1904" minY="1058" maxY="1126" name="music-m"/>
-  <symbol minX="1904" maxX="1972" minY="1058" maxY="1126" name="clothes-m"/>
-  <symbol minX="1972" maxX="2040" minY="1058" maxY="1126" name="museum-m"/>
-  <symbol minX="0" maxX="68" minY="1126" maxY="1194" name="college-m"/>
-  <symbol minX="68" maxX="136" minY="1126" maxY="1194" name="motorcycle_shop-m"/>
-  <symbol minX="136" maxX="204" minY="1126" maxY="1194" name="department_store-m"/>
-  <symbol minX="204" maxX="272" minY="1126" maxY="1194" name="computer-m"/>
-  <symbol minX="272" maxX="340" minY="1126" maxY="1194" name="monument-m"/>
-  <symbol minX="340" maxX="408" minY="1126" maxY="1194" name="mobile_phone-m"/>
-  <symbol minX="408" maxX="476" minY="1126" maxY="1194" name="military-m"/>
-  <symbol minX="476" maxX="544" minY="1126" maxY="1194" name="metal_construction-m"/>
-  <symbol minX="544" maxX="612" minY="1126" maxY="1194" name="media_shop-m"/>
-  <symbol minX="612" maxX="680" minY="1126" maxY="1194" name="media-m"/>
-  <symbol minX="680" maxX="748" minY="1126" maxY="1194" name="marketplace-m"/>
-  <symbol minX="748" maxX="816" minY="1126" maxY="1194" name="marina-m"/>
-  <symbol minX="816" maxX="884" minY="1126" maxY="1194" name="copyshop-m"/>
-  <symbol minX="884" maxX="952" minY="1126" maxY="1194" name="florist-m"/>
-  <symbol minX="952" maxX="1020" minY="1126" maxY="1194" name="garden-outline-m"/>
-  <symbol minX="1020" maxX="1088" minY="1126" maxY="1194" name="garden-m"/>
-  <symbol minX="1088" maxX="1156" minY="1126" maxY="1194" name="gallery-m"/>
-  <symbol minX="1156" maxX="1224" minY="1126" maxY="1194" name="furniture-m"/>
-  <symbol minX="1224" maxX="1292" minY="1126" maxY="1194" name="funicular-m"/>
-  <symbol minX="1292" maxX="1360" minY="1126" maxY="1194" name="funeral_directors-m"/>
-  <symbol minX="1360" maxX="1428" minY="1126" maxY="1194" name="drinking-water-m"/>
-  <symbol minX="1428" maxX="1496" minY="1126" maxY="1194" name="fuel-m"/>
-  <symbol minX="1496" maxX="1564" minY="1126" maxY="1194" name="fuel-dispenser-m"/>
-  <symbol minX="1564" maxX="1632" minY="1126" maxY="1194" name="fountain-s"/>
-  <symbol minX="1632" maxX="1700" minY="1126" maxY="1194" name="fountain-m"/>
-  <symbol minX="1700" maxX="1768" minY="1126" maxY="1194" name="garden_center-m"/>
-  <symbol minX="1768" maxX="1836" minY="1126" maxY="1194" name="firehydrant-m"/>
-  <symbol minX="1836" maxX="1904" minY="1126" maxY="1194" name="fire_station-m"/>
-  <symbol minX="1904" maxX="1972" minY="1126" maxY="1194" name="fastfood-m"/>
-  <symbol minX="1972" maxX="2040" minY="1126" maxY="1194" name="erotic-m"/>
-  <symbol minX="0" maxX="68" minY="1194" maxY="1262" name="equestrian-m"/>
-  <symbol minX="68" maxX="136" minY="1194" maxY="1262" name="driving_school-m"/>
-  <symbol minX="136" maxX="204" minY="1194" maxY="1262" name="emergency-phone-m"/>
-  <symbol minX="204" maxX="272" minY="1194" maxY="1262" name="embassy-m"/>
-  <symbol minX="272" maxX="340" minY="1194" maxY="1262" name="dump-station-m"/>
-  <symbol minX="340" maxX="408" minY="1194" maxY="1262" name="electrician-m"/>
-  <symbol minX="408" maxX="476" minY="1194" maxY="1262" name="hairdresser-m"/>
-  <symbol minX="476" maxX="544" minY="1194" maxY="1262" name="hospital-m"/>
-  <symbol minX="544" maxX="612" minY="1194" maxY="1262" name="home-m"/>
-  <symbol minX="612" maxX="680" minY="1194" maxY="1262" name="hockey-m"/>
-  <symbol minX="680" maxX="748" minY="1194" maxY="1262" name="historic-ship-m"/>
-  <symbol minX="748" maxX="816" minY="1194" maxY="1262" name="diving-m"/>
-  <symbol minX="816" maxX="884" minY="1194" maxY="1262" name="hindu-m"/>
-  <symbol minX="884" maxX="952" minY="1194" maxY="1262" name="heliport-m"/>
-  <symbol minX="952" maxX="1020" minY="1194" maxY="1262" name="helipad-m"/>
-  <symbol minX="1020" maxX="1088" minY="1194" maxY="1262" name="handball-m"/>
-  <symbol minX="1088" maxX="1156" minY="1194" maxY="1262" name="hand-m"/>
-  <symbol minX="1156" maxX="1224" minY="1194" maxY="1262" name="car_shop-m"/>
-  <symbol minX="1224" maxX="1292" minY="1194" maxY="1262" name="gym-m"/>
-  <symbol minX="1292" maxX="1360" minY="1194" maxY="1262" name="guidepost"/>
-  <symbol minX="1360" maxX="1428" minY="1194" maxY="1262" name="grocery-m"/>
-  <symbol minX="1428" maxX="1496" minY="1194" maxY="1262" name="greengrocer-m"/>
-  <symbol minX="1496" maxX="1564" minY="1194" maxY="1262" name="golf-m"/>
-  <symbol minX="1564" maxX="1632" minY="1194" maxY="1262" name="gift-m"/>
-  <symbol minX="1632" maxX="1700" minY="1194" maxY="1262" name="dog_park-m"/>
-  <symbol minX="1700" maxX="1768" minY="1194" maxY="1262" name="geyser-m"/>
-  <symbol minX="1768" maxX="1836" minY="1194" maxY="1262" name="geyser-l"/>
-  <symbol minX="1836" maxX="1904" minY="1194" maxY="1262" name="doityourself-m"/>
-  <symbol minX="1904" maxX="1972" minY="1194" maxY="1262" name="podiatrist-m"/>
-  <symbol minX="1972" maxX="2040" minY="1194" maxY="1262" name="carpenter-m"/>
-  <symbol minX="0" maxX="68" minY="1262" maxY="1330" name="remains-m"/>
-  <symbol minX="68" maxX="136" minY="1262" maxY="1330" name="recycling-m"/>
-  <symbol minX="136" maxX="204" minY="1262" maxY="1330" name="casino-m"/>
-  <symbol minX="204" maxX="272" minY="1262" maxY="1330" name="public-building-m"/>
-  <symbol minX="272" maxX="340" minY="1262" maxY="1330" name="psychotherapist-m"/>
-  <symbol minX="340" maxX="408" minY="1262" maxY="1330" name="prison-m"/>
-  <symbol minX="408" maxX="476" minY="1262" maxY="1330" name="power-m"/>
-  <symbol minX="476" maxX="544" minY="1262" maxY="1330" name="postbox-m"/>
-  <symbol minX="544" maxX="612" minY="1262" maxY="1330" name="police-m"/>
-  <symbol minX="612" maxX="680" minY="1262" maxY="1330" name="restaurant-m"/>
-  <symbol minX="680" maxX="748" minY="1262" maxY="1330" name="plumber-m"/>
-  <symbol minX="748" maxX="816" minY="1262" maxY="1330" name="playground-m"/>
-  <symbol minX="816" maxX="884" minY="1262" maxY="1330" name="cemetery-m"/>
-  <symbol minX="884" maxX="952" minY="1262" maxY="1330" name="charging-station-m"/>
-  <symbol minX="952" maxX="1020" minY="1262" maxY="1330" name="place-of-worship-m"/>
-  <symbol minX="1020" maxX="1088" minY="1262" maxY="1330" name="pitch-m"/>
-  <symbol minX="1088" maxX="1156" minY="1262" maxY="1330" name="picnic_table-m"/>
-  <symbol minX="1156" maxX="1224" minY="1262" maxY="1330" name="picnic-m"/>
-  <symbol minX="1224" maxX="1292" minY="1262" maxY="1330" name="physiotherapist-m"/>
-  <symbol minX="1292" maxX="1360" minY="1262" maxY="1330" name="photo-shop-m"/>
-  <symbol minX="1360" maxX="1428" minY="1262" maxY="1330" name="shoes-m"/>
-  <symbol minX="1428" maxX="1496" minY="1262" maxY="1330" name="sports-m"/>
-  <symbol minX="1496" maxX="1564" minY="1262" maxY="1330" name="speedcam-alert-l"/>
-  <symbol minX="1564" maxX="1632" minY="1262" maxY="1330" name="speech_therapist-m"/>
-  <symbol minX="1632" maxX="1700" minY="1262" maxY="1330" name="soccer-m"/>
-  <symbol minX="1700" maxX="1768" minY="1262" maxY="1330" name="skiing-m"/>
-  <symbol minX="1768" maxX="1836" minY="1262" maxY="1330" name="skateboard-m"/>
-  <symbol minX="1836" maxX="1904" minY="1262" maxY="1330" name="shower-m"/>
-  <symbol minX="1904" maxX="1972" minY="1262" maxY="1330" name="caravan-shop-m"/>
-  <symbol minX="1972" maxX="2040" minY="1262" maxY="1330" name="shop-m"/>
-  <symbol minX="0" maxX="68" minY="1330" maxY="1398" name="shop-bicycle-m"/>
-  <symbol minX="68" maxX="136" minY="1330" maxY="1398" name="newsagent_shop-m"/>
-  <symbol minX="136" maxX="204" minY="1330" maxY="1398" name="caravan_site-m"/>
-  <symbol minX="204" maxX="272" minY="1330" maxY="1398" name="ship-m"/>
-  <symbol minX="272" maxX="340" minY="1330" maxY="1398" name="shinto-m"/>
-  <symbol minX="340" maxX="408" minY="1330" maxY="1398" name="shelter-m"/>
-  <symbol minX="408" maxX="476" minY="1330" maxY="1398" name="second_hand_shop-m"/>
-  <symbol minX="476" maxX="544" minY="1330" maxY="1398" name="seafood-shop-m"/>
-  <symbol minX="544" maxX="612" minY="1330" maxY="1398" name="school-m"/>
-  <symbol minX="612" maxX="680" minY="1330" maxY="1398" name="sawmill-m"/>
-  <symbol minX="680" maxX="748" minY="1330" maxY="1398" name="sauna-m"/>
-  <symbol minX="748" maxX="816" minY="1330" maxY="1398" name="sample_collection-m"/>
-  <symbol minX="816" maxX="884" minY="1330" maxY="1398" name="optometrist-m"/>
-  <symbol minX="884" maxX="952" minY="1330" maxY="1398" name="chemist-m"/>
-  <symbol minX="952" maxX="1020" minY="1330" maxY="1398" name="parking-meter-m"/>
-  <symbol minX="1020" maxX="1088" minY="1330" maxY="1398" name="chess-m"/>
-  <symbol minX="1088" maxX="1156" minY="1330" maxY="1398" name="chimney-m"/>
-  <symbol minX="1156" maxX="1224" minY="1330" maxY="1398" name="park-outline-m"/>
-  <symbol minX="1224" maxX="1292" minY="1330" maxY="1398" name="park-m"/>
-  <symbol minX="1292" maxX="1360" minY="1330" maxY="1398" name="painter-m"/>
-  <symbol minX="1360" maxX="1428" minY="1330" maxY="1398" name="padel-m"/>
-  <symbol minX="1428" maxX="1496" minY="1330" maxY="1398" name="outdoor-shop-m"/>
-  <symbol minX="1496" maxX="1564" minY="1330" maxY="1398" name="pharmacy-m"/>
-  <symbol minX="1564" maxX="1632" minY="1330" maxY="1398" name="optician-m"/>
-  <symbol minX="1632" maxX="1700" minY="1330" maxY="1398" name="nightclub-m"/>
-  <symbol minX="1700" maxX="1768" minY="1330" maxY="1398" name="office-m"/>
-  <symbol minX="1768" maxX="1836" minY="1330" maxY="1398" name="christian-m"/>
-  <symbol minX="1836" maxX="1904" minY="1330" maxY="1398" name="cinema-m"/>
-  <symbol minX="1904" maxX="1972" minY="1330" maxY="1398" name="nparkf-outline-m"/>
-  <symbol minX="1972" maxX="2040" minY="1330" maxY="1398" name="nparkf-m"/>
-  <symbol minX="0" maxX="68" minY="1398" maxY="1466" name="npark-m"/>
-  <symbol minX="68" maxX="136" minY="1398" maxY="1466" name="cheese-m"/>
-  <symbol minX="136" maxX="204" minY="1398" maxY="1466" name="pelota-m"/>
-  <symbol minX="204" maxX="272" minY="1398" maxY="1466" name="phone-m"/>
-  <symbol minX="272" maxX="340" minY="1398" maxY="1466" name="petshop-m"/>
-  <symbol minX="340" maxX="408" minY="1398" maxY="1466" name="charity_shop-m"/>
-  <symbol minX="408" maxX="476" minY="1398" maxY="1463" name="subway-shanghai-m"/>
-  <symbol minX="476" maxX="544" minY="1398" maxY="1463" name="subway-dalian-m"/>
-  <symbol minX="544" maxX="612" minY="1398" maxY="1463" name="subway-sapporo-m"/>
-  <symbol minX="612" maxX="677" minY="1398" maxY="1463" name="subway-ekb-s"/>
-  <symbol minX="677" maxX="742" minY="1398" maxY="1463" name="subway-spb-m"/>
-  <symbol minX="742" maxX="810" minY="1398" maxY="1463" name="subway-marseille-m"/>
-  <symbol minX="810" maxX="875" minY="1398" maxY="1463" name="subway-southkorea-s"/>
-  <symbol minX="875" maxX="940" minY="1398" maxY="1463" name="subway-montreal-m"/>
-  <symbol minX="940" maxX="1008" minY="1398" maxY="1463" name="subway-maracaibo-m"/>
-  <symbol minX="1008" maxX="1076" minY="1398" maxY="1461" name="subway-izmir-m"/>
-  <symbol minX="1076" maxX="1139" minY="1398" maxY="1461" name="subway-stlouis-s"/>
-  <symbol minX="1139" maxX="1202" minY="1398" maxY="1461" name="subway-algeria-s"/>
-  <symbol minX="1202" maxX="1265" minY="1398" maxY="1461" name="subway-entrance-m"/>
-  <symbol minX="1265" maxX="1325" minY="1398" maxY="1461" name="subway-warsaw-m"/>
-  <symbol minX="1325" maxX="1385" minY="1398" maxY="1458" name="search-result"/>
-  <symbol minX="1385" maxX="1445" minY="1398" maxY="1458" name="subway-pittsburgh-s"/>
-  <symbol minX="1445" maxX="1497" minY="1398" maxY="1458" name="subway-istanbul-s"/>
-  <symbol minX="1497" maxX="1557" minY="1398" maxY="1458" name="lightrail-berlin-m"/>
-  <symbol minX="1557" maxX="1625" minY="1398" maxY="1456" name="subway-taoyuan-m"/>
-  <symbol minX="1625" maxX="1693" minY="1398" maxY="1455" name="subway-tbilisi-m"/>
-  <symbol minX="1693" maxX="1748" minY="1398" maxY="1455" name="subway-mashhad-s"/>
-  <symbol minX="1748" maxX="1805" minY="1398" maxY="1455" name="subway-isfahan-s"/>
-  <symbol minX="1805" maxX="1873" minY="1398" maxY="1455" name="subway-rotterdam-m"/>
-  <symbol minX="1873" maxX="1930" minY="1398" maxY="1455" name="subway-cairo-s"/>
-  <symbol minX="1930" maxX="1987" minY="1398" maxY="1455" name="subway-sapporo-s"/>
-  <symbol minX="1987" maxX="2044" minY="1398" maxY="1455" name="parking_entrance-m"/>
-  <symbol minX="0" maxX="57" minY="1466" maxY="1523" name="bike-parking-m"/>
-  <symbol minX="57" maxX="170" minY="1466" maxY="1523" name="coloredmark-default-s"/>
-  <symbol minX="170" maxX="222" minY="1466" maxY="1523" name="subway-brescia-s"/>
-  <symbol minX="222" maxX="279" minY="1466" maxY="1523" name="parking-m"/>
-  <symbol minX="279" maxX="336" minY="1466" maxY="1523" name="parking-disabled-m"/>
-  <symbol minX="336" maxX="393" minY="1466" maxY="1523" name="bicycle-rental"/>
-  <symbol minX="393" maxX="450" minY="1466" maxY="1523" name="motorcycle-parking-m"/>
-  <symbol minX="450" maxX="563" minY="1466" maxY="1523" name="coloredmark-bg-s"/>
-  <symbol minX="563" maxX="620" minY="1466" maxY="1523" name="subway-medellin-s"/>
-  <symbol minX="620" maxX="677" minY="1466" maxY="1523" name="speedcam-m"/>
-  <symbol minX="677" maxX="734" minY="1466" maxY="1523" name="parking_pay-m"/>
-  <symbol minX="734" maxX="791" minY="1466" maxY="1523" name="subway-panama-s"/>
-  <symbol minX="791" maxX="851" minY="1466" maxY="1523" name="subway-izmir-s"/>
-  <symbol minX="851" maxX="919" minY="1466" maxY="1522" name="subway-almaty-m"/>
-  <symbol minX="919" maxX="979" minY="1466" maxY="1521" name="subway-seattle-m"/>
-  <symbol minX="979" maxX="1034" minY="1466" maxY="1521" name="subway-ubahn-m"/>
-  <symbol minX="1034" maxX="1086" minY="1466" maxY="1521" name="subway-tianjin-s"/>
-  <symbol minX="1086" maxX="1141" minY="1466" maxY="1521" name="subway-rome-m"/>
-  <symbol minX="1141" maxX="1196" minY="1466" maxY="1521" name="subway-rennes-s"/>
-  <symbol minX="1196" maxX="1248" minY="1466" maxY="1521" name="subway-pyongyang-s"/>
-  <symbol minX="1248" maxX="1300" minY="1466" maxY="1521" name="subway-porto-s"/>
-  <symbol minX="1300" maxX="1352" minY="1466" maxY="1521" name="subway-athens-s"/>
-  <symbol minX="1352" maxX="1407" minY="1466" maxY="1521" name="subway-warszawa-s"/>
-  <symbol minX="1407" maxX="1462" minY="1466" maxY="1521" name="subway-paris-m"/>
-  <symbol minX="1462" maxX="1517" minY="1466" maxY="1521" name="subway-hirosima-s"/>
-  <symbol minX="1517" maxX="1569" minY="1466" maxY="1521" name="subway-delhi-s"/>
-  <symbol minX="1569" maxX="1632" minY="1466" maxY="1521" name="subway-moscow-m"/>
-  <symbol minX="1632" maxX="1700" minY="1466" maxY="1520" name="subway-santiago-m"/>
-  <symbol minX="1700" maxX="1738" minY="1466" maxY="1520" name="bookmark-bg-xs"/>
-  <symbol minX="1738" maxX="1776" minY="1466" maxY="1520" name="bookmark-default-xs"/>
-  <symbol minX="1776" maxX="1844" minY="1466" maxY="1520" name="subway-lyon-m"/>
-  <symbol minX="1844" maxX="1912" minY="1466" maxY="1520" name="subway-yerevan-m"/>
-  <symbol minX="1912" maxX="1980" minY="1466" maxY="1519" name="subway-tabriz-m"/>
-  <symbol minX="1980" maxX="2048" minY="1466" maxY="1519" name="subway-kryvyirih-m"/>
-  <symbol minX="0" maxX="68" minY="1523" maxY="1576" name="subway-omsk-m"/>
-  <symbol minX="68" maxX="136" minY="1523" maxY="1576" name="subway-dnepro-m"/>
-  <symbol minX="136" maxX="188" minY="1523" maxY="1575" name="subway-tokyo-s"/>
-  <symbol minX="188" maxX="240" minY="1523" maxY="1575" name="subway-tyneandwear-s"/>
-  <symbol minX="240" maxX="292" minY="1523" maxY="1575" name="subway-valencia-s"/>
-  <symbol minX="292" maxX="344" minY="1523" maxY="1575" name="subway-vienna-s"/>
-  <symbol minX="344" maxX="396" minY="1523" maxY="1575" name="subway-tashkent-s"/>
-  <symbol minX="396" maxX="448" minY="1523" maxY="1575" name="subway-volgograd-s"/>
-  <symbol minX="448" maxX="500" minY="1523" maxY="1575" name="subway-guangzhou-s"/>
-  <symbol minX="500" maxX="547" minY="1523" maxY="1575" name="subway-warsaw-s"/>
-  <symbol minX="547" maxX="599" minY="1523" maxY="1575" name="subway-washington-s"/>
-  <symbol minX="599" maxX="659" minY="1523" maxY="1575" name="subway-taoyuan-s"/>
-  <symbol minX="659" maxX="711" minY="1523" maxY="1575" name="subway-wuhan-s"/>
-  <symbol minX="711" maxX="776" minY="1523" maxY="1575" name="subway-yerevan-s"/>
-  <symbol minX="776" maxX="828" minY="1523" maxY="1575" name="subway-yokohama-s"/>
-  <symbol minX="828" maxX="880" minY="1523" maxY="1575" name="subway-mecca-s"/>
-  <symbol minX="880" maxX="932" minY="1523" maxY="1575" name="subway-catania-s"/>
-  <symbol minX="932" maxX="984" minY="1523" maxY="1575" name="subway-oslo-s"/>
-  <symbol minX="984" maxX="1036" minY="1523" maxY="1575" name="subway-changchun-s"/>
-  <symbol minX="1036" maxX="1088" minY="1523" maxY="1575" name="subway-chengdu-s"/>
-  <symbol minX="1088" maxX="1156" minY="1523" maxY="1575" name="subway-omsk-s"/>
-  <symbol minX="1156" maxX="1208" minY="1523" maxY="1575" name="subway-chicago-s"/>
-  <symbol minX="1208" maxX="1260" minY="1523" maxY="1575" name="subway-nnov-s"/>
-  <symbol minX="1260" maxX="1312" minY="1523" maxY="1575" name="subway-dalian-s"/>
-  <symbol minX="1312" maxX="1364" minY="1523" maxY="1575" name="subway-dubai-s"/>
-  <symbol minX="1364" maxX="1416" minY="1523" maxY="1575" name="subway-montreal-s"/>
-  <symbol minX="1416" maxX="1468" minY="1523" maxY="1575" name="subway-foshan-s"/>
-  <symbol minX="1468" maxX="1520" minY="1523" maxY="1575" name="subway-minatomirai-s"/>
-  <symbol minX="1520" maxX="1572" minY="1523" maxY="1575" name="subway-milan-s"/>
-  <symbol minX="1572" maxX="1624" minY="1523" maxY="1575" name="subway-nagoya-s"/>
-  <symbol minX="1624" maxX="1689" minY="1523" maxY="1575" name="subway-fukuoka-s"/>
-  <symbol minX="1689" maxX="1741" minY="1523" maxY="1575" name="subway-massachusetts-s"/>
-  <symbol minX="1741" maxX="1796" minY="1523" maxY="1575" name="subway-glasgow-s"/>
-  <symbol minX="1796" maxX="1848" minY="1523" maxY="1575" name="subway-guadalajara-s"/>
-  <symbol minX="1848" maxX="1900" minY="1523" maxY="1575" name="subway-helsinki-s"/>
-  <symbol minX="1900" maxX="1952" minY="1523" maxY="1575" name="subway-kazan-s"/>
-  <symbol minX="1952" maxX="2004" minY="1523" maxY="1575" name="subway-kobe-s"/>
-  <symbol minX="0" maxX="52" minY="1576" maxY="1628" name="subway-kunming-s"/>
-  <symbol minX="52" maxX="104" minY="1576" maxY="1628" name="subway-kyoto-s"/>
-  <symbol minX="104" maxX="156" minY="1576" maxY="1628" name="subway-lille-s"/>
-  <symbol minX="156" maxX="208" minY="1576" maxY="1628" name="subway-lima-s"/>
-  <symbol minX="208" maxX="260" minY="1576" maxY="1628" name="subway-lisboa-s"/>
-  <symbol minX="260" maxX="312" minY="1576" maxY="1628" name="subway-losangeles-s"/>
-  <symbol minX="312" maxX="364" minY="1576" maxY="1628" name="subway-bursaray-s"/>
-  <symbol minX="364" maxX="416" minY="1576" maxY="1628" name="subway-bangkok-s"/>
-  <symbol minX="416" maxX="468" minY="1576" maxY="1628" name="subway-stockholm-s"/>
-  <symbol minX="468" maxX="520" minY="1576" maxY="1628" name="subway-sofia-s"/>
-  <symbol minX="520" maxX="572" minY="1576" maxY="1628" name="subway-shiraz-s"/>
-  <symbol minX="572" maxX="624" minY="1576" maxY="1628" name="subway-shanghai-s"/>
-  <symbol minX="624" maxX="676" minY="1576" maxY="1628" name="subway-beijing-s"/>
-  <symbol minX="676" maxX="728" minY="1576" maxY="1628" name="subway-bengaluru-s"/>
-  <symbol minX="728" maxX="780" minY="1576" maxY="1628" name="subway-saopaulo-s"/>
-  <symbol minX="780" maxX="832" minY="1576" maxY="1628" name="subway-santodomingo-s"/>
-  <symbol minX="832" maxX="897" minY="1576" maxY="1628" name="subway-santiago-s"/>
-  <symbol minX="897" maxX="949" minY="1576" maxY="1628" name="subway-brasilia-s"/>
-  <symbol minX="949" maxX="1001" minY="1576" maxY="1628" name="subway-samara-s"/>
-  <symbol minX="1001" maxX="1069" minY="1576" maxY="1628" name="subway-alicante-m"/>
-  <symbol minX="1069" maxX="1121" minY="1576" maxY="1628" name="subway-caracas-s"/>
-  <symbol minX="1121" maxX="1173" minY="1576" maxY="1628" name="subway-budapest-s"/>
-  <symbol minX="1173" maxX="1225" minY="1576" maxY="1628" name="subway-perugia-s"/>
-  <symbol minX="1225" maxX="1277" minY="1576" maxY="1628" name="subway-buenosaires-s"/>
-  <symbol minX="1277" maxX="1329" minY="1576" maxY="1628" name="subway-reseau-paris-s"/>
-  <symbol minX="1329" maxX="1381" minY="1576" maxY="1628" name="subway-riodejaneiro-s"/>
-  <symbol minX="1381" maxX="1449" minY="1576" maxY="1627" name="subway-philadelphia-m"/>
-  <symbol minX="1449" maxX="1517" minY="1576" maxY="1627" name="subway-osaka-m"/>
-  <symbol minX="1517" maxX="1582" minY="1576" maxY="1625" name="subway-tabriz-s"/>
-  <symbol minX="1582" maxX="1647" minY="1576" maxY="1625" name="subway-london-m"/>
-  <symbol minX="1647" maxX="1715" minY="1576" maxY="1625" name="subway-lucknow-s"/>
-  <symbol minX="1715" maxX="1783" minY="1576" maxY="1625" name="subway-barcelona-m"/>
-  <symbol minX="1783" maxX="1851" minY="1576" maxY="1625" name="subway-madrid-m"/>
-  <symbol minX="1851" maxX="1900" minY="1576" maxY="1625" name="subway-spb-s"/>
-  <symbol minX="1900" maxX="1949" minY="1576" maxY="1625" name="subway-lausanne-s"/>
-  <symbol minX="1949" maxX="1996" minY="1576" maxY="1625" name="subway-amsterdam-s"/>
-  <symbol minX="1996" maxX="2048" minY="1576" maxY="1625" name="subway-maracaibo-s"/>
-  <symbol minX="0" maxX="49" minY="1628" maxY="1677" name="cave-m"/>
-  <symbol minX="49" maxX="112" minY="1628" maxY="1677" name="subway-almaty-s"/>
-  <symbol minX="112" maxX="159" minY="1628" maxY="1677" name="subway-mexico-s"/>
-  <symbol minX="159" maxX="208" minY="1628" maxY="1677" name="non-found-search-result"/>
-  <symbol minX="208" maxX="276" minY="1628" maxY="1676" name="subway-lucknow-m"/>
-  <symbol minX="276" maxX="323" minY="1628" maxY="1675" name="zoo-s"/>
-  <symbol minX="323" maxX="370" minY="1628" maxY="1675" name="airport-s"/>
-  <symbol minX="370" maxX="417" minY="1628" maxY="1675" name="nparkf-outline-s"/>
-  <symbol minX="417" maxX="464" minY="1628" maxY="1675" name="waterfall-s"/>
-  <symbol minX="464" maxX="511" minY="1628" maxY="1675" name="ship-s"/>
-  <symbol minX="511" maxX="558" minY="1628" maxY="1675" name="shinto-s"/>
-  <symbol minX="558" maxX="605" minY="1628" maxY="1675" name="subway-entrance-s"/>
-  <symbol minX="605" maxX="652" minY="1628" maxY="1675" name="nparkf-s"/>
-  <symbol minX="652" maxX="699" minY="1628" maxY="1675" name="remains-s"/>
-  <symbol minX="699" maxX="746" minY="1628" maxY="1675" name="shop-s"/>
-  <symbol minX="746" maxX="793" minY="1628" maxY="1675" name="stadium-s"/>
-  <symbol minX="793" maxX="840" minY="1628" maxY="1675" name="park-outline-s"/>
-  <symbol minX="840" maxX="887" minY="1628" maxY="1675" name="park-s"/>
-  <symbol minX="887" maxX="950" minY="1628" maxY="1675" name="subway-dnepro-s"/>
-  <symbol minX="950" maxX="1018" minY="1628" maxY="1675" name="subway-bilbao-m"/>
-  <symbol minX="1018" maxX="1065" minY="1628" maxY="1675" name="place-of-worship-s"/>
-  <symbol minX="1065" maxX="1112" minY="1628" maxY="1675" name="taoist-s"/>
-  <symbol minX="1112" maxX="1159" minY="1628" maxY="1675" name="hindu-s"/>
-  <symbol minX="1159" maxX="1206" minY="1628" maxY="1675" name="train-s"/>
-  <symbol minX="1206" maxX="1253" minY="1628" maxY="1675" name="fuel-s"/>
-  <symbol minX="1253" maxX="1300" minY="1628" maxY="1675" name="tourism-s"/>
-  <symbol minX="1300" maxX="1347" minY="1628" maxY="1675" name="toll_booth-s"/>
-  <symbol minX="1347" maxX="1394" minY="1628" maxY="1675" name="theme_park-s"/>
-  <symbol minX="1394" maxX="1441" minY="1628" maxY="1675" name="waste-basket-s"/>
-  <symbol minX="1441" maxX="1488" minY="1628" maxY="1675" name="theatre-s"/>
-  <symbol minX="1488" maxX="1535" minY="1628" maxY="1675" name="drinking-water-s"/>
-  <symbol minX="1535" maxX="1582" minY="1628" maxY="1675" name="college-s"/>
-  <symbol minX="1582" maxX="1629" minY="1628" maxY="1675" name="geyser-s"/>
-  <symbol minX="1629" maxX="1676" minY="1628" maxY="1675" name="subway-newyork-s"/>
-  <symbol minX="1676" maxX="1723" minY="1628" maxY="1675" name="christian-s"/>
-  <symbol minX="1723" maxX="1780" minY="1628" maxY="1675" name="subway-osaka-s"/>
-  <symbol minX="1780" maxX="1827" minY="1628" maxY="1675" name="charging-station-s"/>
-  <symbol minX="1827" maxX="1895" minY="1628" maxY="1675" name="subway-palma-m"/>
-  <symbol minX="1895" maxX="1960" minY="1628" maxY="1675" name="subway-palma-s"/>
-  <symbol minX="1960" maxX="2020" minY="1628" maxY="1675" name="subway-philadelphia-s"/>
-  <symbol minX="0" maxX="52" minY="1677" maxY="1724" name="subway-rotterdam-s"/>
-  <symbol minX="52" maxX="99" minY="1677" maxY="1724" name="subway-s"/>
-  <symbol minX="99" maxX="146" minY="1677" maxY="1724" name="jewish-s"/>
-  <symbol minX="146" maxX="193" minY="1677" maxY="1724" name="muslim-s"/>
-  <symbol minX="193" maxX="240" minY="1677" maxY="1724" name="museum-s"/>
-  <symbol minX="240" maxX="287" minY="1677" maxY="1724" name="viewpoint-s"/>
-  <symbol minX="287" maxX="334" minY="1677" maxY="1724" name="buddhist-s"/>
-  <symbol minX="334" maxX="381" minY="1677" maxY="1724" name="monument-s"/>
-  <symbol minX="381" maxX="433" minY="1677" maxY="1724" name="subway-tbilisi-s"/>
-  <symbol minX="433" maxX="469" minY="1677" maxY="1724" name="transit_train-m"/>
-  <symbol minX="469" maxX="516" minY="1677" maxY="1724" name="lighthouse-s"/>
-  <symbol minX="516" maxX="563" minY="1677" maxY="1724" name="tram-s"/>
-  <symbol minX="563" maxX="610" minY="1677" maxY="1724" name="hotel-s"/>
-  <symbol minX="610" maxX="657" minY="1677" maxY="1724" name="bus-s"/>
-  <symbol minX="657" maxX="704" minY="1677" maxY="1724" name="cable-car-s"/>
-  <symbol minX="704" maxX="751" minY="1677" maxY="1724" name="hospital-s"/>
-  <symbol minX="751" maxX="787" minY="1677" maxY="1724" name="transit_light_rail-m"/>
-  <symbol minX="787" maxX="834" minY="1677" maxY="1724" name="car-repair-s"/>
-  <symbol minX="834" maxX="886" minY="1677" maxY="1724" name="transfer_arrow"/>
-  <symbol minX="886" maxX="954" minY="1677" maxY="1723" name="subway-kolkata-m"/>
-  <symbol minX="954" maxX="1022" minY="1677" maxY="1723" name="subway-novosibirsk-m"/>
-  <symbol minX="1022" maxX="1090" minY="1677" maxY="1723" name="subway-sanfrancisco-m"/>
-  <symbol minX="1090" maxX="1158" minY="1677" maxY="1723" name="subway-fukuoka-m"/>
-  <symbol minX="1158" maxX="1218" minY="1677" maxY="1721" name="subway-barcelona-s"/>
-  <symbol minX="1218" maxX="1286" minY="1677" maxY="1721" name="subway-sanfrancisco-s"/>
-  <symbol minX="1286" maxX="1354" minY="1677" maxY="1721" name="subway-brussel-s"/>
-  <symbol minX="1354" maxX="1398" minY="1677" maxY="1721" name="elevator"/>
-  <symbol minX="1398" maxX="1466" minY="1677" maxY="1721" name="subway-bucharest-m"/>
-  <symbol minX="1466" maxX="1510" minY="1677" maxY="1721" name="subway-paris-s"/>
-  <symbol minX="1510" maxX="1575" minY="1677" maxY="1721" name="subway-novosibirsk-s"/>
-  <symbol minX="1575" maxX="1643" minY="1677" maxY="1721" name="subway-kharkiv-s"/>
-  <symbol minX="1643" maxX="1708" minY="1677" maxY="1721" name="subway-kiev-m"/>
-  <symbol minX="1708" maxX="1744" minY="1677" maxY="1721" name="transit_monorail-m"/>
-  <symbol minX="1744" maxX="1801" minY="1677" maxY="1721" name="subway-kryvyirih-s"/>
-  <symbol minX="1801" maxX="1845" minY="1677" maxY="1721" name="lightrail-berlin-s"/>
-  <symbol minX="1845" maxX="1905" minY="1677" maxY="1721" name="subway-madrid-s"/>
-  <symbol minX="1905" maxX="1957" minY="1677" maxY="1721" name="subway-lyon-s"/>
-  <symbol minX="1957" maxX="2025" minY="1677" maxY="1720" name="subway-sendai-m"/>
-  <symbol minX="0" maxX="68" minY="1724" maxY="1766" name="subway-kharkiv-m"/>
-  <symbol minX="68" maxX="136" minY="1724" maxY="1766" name="subway-manila-m"/>
-  <symbol minX="136" maxX="204" minY="1724" maxY="1766" name="subway-haagse-s"/>
-  <symbol minX="204" maxX="272" minY="1724" maxY="1766" name="subway-brussel-m"/>
-  <symbol minX="272" maxX="340" minY="1724" maxY="1766" name="subway-sendai-s"/>
-  <symbol minX="340" maxX="371" minY="1724" maxY="1765" name="transit_train-s"/>
-  <symbol minX="371" maxX="412" minY="1724" maxY="1765" name="map"/>
-  <symbol minX="412" maxX="456" minY="1724" maxY="1765" name="subway-moscow-s"/>
-  <symbol minX="456" maxX="497" minY="1724" maxY="1765" name="board"/>
-  <symbol minX="497" maxX="538" minY="1724" maxY="1765" name="transit_subway-m"/>
-  <symbol minX="538" maxX="579" minY="1724" maxY="1765" name="storage-tank"/>
-  <symbol minX="579" maxX="644" minY="1724" maxY="1765" name="subway-bucharest-s"/>
-  <symbol minX="644" maxX="699" minY="1724" maxY="1765" name="subway-alicante-s"/>
-  <symbol minX="699" maxX="767" minY="1724" maxY="1763" name="subway-taipei-s"/>
-  <symbol minX="767" maxX="832" minY="1724" maxY="1763" name="subway-manila-s"/>
-  <symbol minX="832" maxX="900" minY="1724" maxY="1763" name="subway-edmonton-s"/>
-  <symbol minX="900" maxX="941" minY="1724" maxY="1763" name="subway-seattle-s"/>
-  <symbol minX="941" maxX="980" minY="1724" maxY="1763" name="subway-ubahn-s"/>
-  <symbol minX="980" maxX="1037" minY="1724" maxY="1763" name="subway-bilbao-s"/>
-  <symbol minX="1037" maxX="1076" minY="1724" maxY="1763" name="subway-rome-s"/>
-  <symbol minX="1076" maxX="1115" minY="1724" maxY="1763" name="cave-s"/>
-  <symbol minX="1115" maxX="1164" minY="1724" maxY="1763" name="subway-london-s"/>
-  <symbol minX="1164" maxX="1232" minY="1724" maxY="1762" name="subway-haagse-m"/>
-  <symbol minX="1232" maxX="1271" minY="1724" maxY="1760" name="main_entrance-s"/>
-  <symbol minX="1271" maxX="1307" minY="1724" maxY="1760" name="gate-s"/>
-  <symbol minX="1307" maxX="1338" minY="1724" maxY="1760" name="transit_light_rail-s"/>
-  <symbol minX="1338" maxX="1374" minY="1724" maxY="1760" name="transit_subway-s"/>
-  <symbol minX="1374" maxX="1405" minY="1724" maxY="1760" name="transit_monorail-s"/>
-  <symbol minX="1405" maxX="1428" minY="1724" maxY="1760" name="entrance-s"/>
-  <symbol minX="1428" maxX="1464" minY="1724" maxY="1760" name="subway-newyork-xs"/>
-  <symbol minX="1464" maxX="1500" minY="1724" maxY="1760" name="subway-xs"/>
-  <symbol minX="1500" maxX="1536" minY="1724" maxY="1760" name="parking-s"/>
-  <symbol minX="1536" maxX="1593" minY="1724" maxY="1760" name="railway-crossing-l"/>
-  <symbol minX="1593" maxX="1629" minY="1724" maxY="1760" name="speedcam-s"/>
-  <symbol minX="1629" maxX="1665" minY="1724" maxY="1760" name="star-l"/>
-  <symbol minX="1665" maxX="1709" minY="1724" maxY="1760" name="bench"/>
-  <symbol minX="1709" maxX="1777" minY="1724" maxY="1758" name="subway-edmonton-m"/>
-  <symbol minX="1777" maxX="1845" minY="1724" maxY="1757" name="subway-taipei-m"/>
-  <symbol minX="1845" maxX="1913" minY="1724" maxY="1757" name="subway-malaga-m"/>
-  <symbol minX="1913" maxX="1978" minY="1724" maxY="1757" name="subway-malaga-s"/>
-  <symbol minX="1978" maxX="2017" minY="1724" maxY="1757" name="volcano-m"/>
-  <symbol minX="0" maxX="33" minY="1766" maxY="1799" name="star-m"/>
-  <symbol minX="33" maxX="88" minY="1766" maxY="1799" name="subway-kiev-s"/>
-  <symbol minX="88" maxX="137" minY="1766" maxY="1799" name="subway-kolkata-s"/>
-  <symbol minX="137" maxX="202" minY="1766" maxY="1797" name="subway-baku-s"/>
-  <symbol minX="202" maxX="257" minY="1766" maxY="1797" name="subway-minsk-m"/>
-  <symbol minX="257" maxX="306" minY="1766" maxY="1797" name="railway-crossing-m"/>
-  <symbol minX="306" maxX="342" minY="1766" maxY="1797" name="plaque"/>
-  <symbol minX="342" maxX="410" minY="1766" maxY="1796" name="subway-baku-m"/>
-  <symbol minX="410" maxX="478" minY="1766" maxY="1795" name="subway-chongqing-s"/>
-  <symbol minX="478" maxX="527" minY="1766" maxY="1794" name="subway-minsk-s"/>
-  <symbol minX="527" maxX="555" minY="1766" maxY="1794" name="star-s"/>
-  <symbol minX="555" maxX="623" minY="1766" maxY="1792" name="subway-chongqing-m"/>
-  <symbol minX="623" maxX="651" minY="1766" maxY="1791" name="peakt-m"/>
-  <symbol minX="651" maxX="679" minY="1766" maxY="1791" name="volcano-s"/>
-  <symbol minX="679" maxX="739" minY="1766" maxY="1791" name="arrow-m"/>
-  <symbol minX="739" maxX="786" minY="1766" maxY="1791" name="mountain-pass"/>
-  <symbol minX="786" maxX="809" minY="1766" maxY="1789" name="zero-icon"/>
-  <symbol minX="809" maxX="832" minY="1766" maxY="1786" name="peakt-s"/>
-  <symbol minX="832" maxX="849" minY="1766" maxY="1783" name="dot-m"/>
-  <symbol minX="849" maxX="893" minY="1766" maxY="1783" name="arrow-s"/>
-  <symbol minX="893" maxX="921" minY="1766" maxY="1778" name="arrow-xs"/>
+  <symbol minX="594" maxX="696" minY="514" maxY="616" name="route-point-16"/>
+  <symbol minX="696" maxX="840" minY="514" maxY="616" name="coloredmark-default-l"/>
+  <symbol minX="840" maxX="984" minY="514" maxY="616" name="coloredmark-bg-l"/>
+  <symbol minX="984" maxX="1086" minY="514" maxY="616" name="route-point-14"/>
+  <symbol minX="1086" maxX="1188" minY="514" maxY="616" name="route-point-13"/>
+  <symbol minX="1188" maxX="1290" minY="514" maxY="616" name="route-point-12"/>
+  <symbol minX="1290" maxX="1392" minY="514" maxY="616" name="route-point-11"/>
+  <symbol minX="1392" maxX="1494" minY="514" maxY="616" name="route-point-8"/>
+  <symbol minX="1494" maxX="1596" minY="514" maxY="616" name="route-point-6"/>
+  <symbol minX="1596" maxX="1698" minY="514" maxY="616" name="route-point-5"/>
+  <symbol minX="1698" maxX="1800" minY="514" maxY="616" name="route-point-4"/>
+  <symbol minX="1800" maxX="1902" minY="514" maxY="616" name="route-point-3"/>
+  <symbol minX="1902" maxX="2004" minY="514" maxY="616" name="route-point-9"/>
+  <symbol minX="0" maxX="102" minY="616" maxY="718" name="route-point-20"/>
+  <symbol minX="102" maxX="204" minY="616" maxY="718" name="route-point-7"/>
+  <symbol minX="204" maxX="306" minY="616" maxY="718" name="route-point-2"/>
+  <symbol minX="306" maxX="408" minY="616" maxY="718" name="route-point-17"/>
+  <symbol minX="408" maxX="510" minY="616" maxY="718" name="route-point-start"/>
+  <symbol minX="510" maxX="612" minY="616" maxY="718" name="route-point-19"/>
+  <symbol minX="612" maxX="707" minY="616" maxY="704" name="shield-us-i-wide"/>
+  <symbol minX="707" maxX="781" minY="616" maxY="704" name="shield-us-i-thin"/>
+  <symbol minX="781" maxX="876" minY="616" maxY="697" name="shield-us-hw-wide"/>
+  <symbol minX="876" maxX="957" minY="616" maxY="697" name="shield-us-hw-thin"/>
+  <symbol minX="957" maxX="1011" minY="616" maxY="693" name="bookmark-bg-s"/>
+  <symbol minX="1011" maxX="1065" minY="616" maxY="693" name="bookmark-default-s"/>
+  <symbol minX="1065" maxX="1139" minY="616" maxY="690" name="current-position"/>
+  <symbol minX="1139" maxX="1213" minY="616" maxY="690" name="track_marker_deselected"/>
+  <symbol minX="1213" maxX="1281" minY="616" maxY="684" name="skiing-m"/>
+  <symbol minX="1281" maxX="1349" minY="616" maxY="684" name="shop-m"/>
+  <symbol minX="1349" maxX="1417" minY="616" maxY="684" name="soccer-m"/>
+  <symbol minX="1417" maxX="1485" minY="616" maxY="684" name="skateboard-m"/>
+  <symbol minX="1485" maxX="1553" minY="616" maxY="684" name="subway-chengdu-m"/>
+  <symbol minX="1553" maxX="1621" minY="616" maxY="684" name="shop-bicycle-m"/>
+  <symbol minX="1621" maxX="1689" minY="616" maxY="684" name="shower-m"/>
+  <symbol minX="1689" maxX="1757" minY="616" maxY="684" name="subway-bursaray-m"/>
+  <symbol minX="1757" maxX="1825" minY="616" maxY="684" name="subway-chicago-m"/>
+  <symbol minX="1825" maxX="1893" minY="616" maxY="684" name="shoes-m"/>
+  <symbol minX="1893" maxX="1961" minY="616" maxY="684" name="ship-m"/>
+  <symbol minX="1961" maxX="2029" minY="616" maxY="684" name="shinto-m"/>
+  <symbol minX="0" maxX="65" minY="718" maxY="786" name="subway-delhi-m"/>
+  <symbol minX="65" maxX="133" minY="718" maxY="786" name="shelter-m"/>
+  <symbol minX="133" maxX="201" minY="718" maxY="786" name="second_hand_shop-m"/>
+  <symbol minX="201" maxX="269" minY="718" maxY="786" name="seafood-shop-m"/>
+  <symbol minX="269" maxX="337" minY="718" maxY="786" name="subway-dubai-m"/>
+  <symbol minX="337" maxX="405" minY="718" maxY="786" name="school-m"/>
+  <symbol minX="405" maxX="473" minY="718" maxY="786" name="sawmill-m"/>
+  <symbol minX="473" maxX="541" minY="718" maxY="786" name="travel_agency_shop-m"/>
+  <symbol minX="541" maxX="604" minY="718" maxY="786" name="subway-brescia-m"/>
+  <symbol minX="604" maxX="672" minY="718" maxY="786" name="subway-beijing-m"/>
+  <symbol minX="672" maxX="740" minY="718" maxY="786" name="subway-bangkok-m"/>
+  <symbol minX="740" maxX="808" minY="718" maxY="786" name="sauna-m"/>
+  <symbol minX="808" maxX="873" minY="718" maxY="786" name="subway-athens-m"/>
+  <symbol minX="873" maxX="941" minY="718" maxY="786" name="subway-ankara-s"/>
+  <symbol minX="941" maxX="1009" minY="718" maxY="786" name="subway-ankara-m"/>
+  <symbol minX="1009" maxX="1077" minY="718" maxY="786" name="subway-brasilia-m"/>
+  <symbol minX="1077" maxX="1137" minY="718" maxY="786" name="subway-amsterdam-m"/>
+  <symbol minX="1137" maxX="1205" minY="718" maxY="786" name="subway-algeria-m"/>
+  <symbol minX="1205" maxX="1273" minY="718" maxY="786" name="subway-adana-s"/>
+  <symbol minX="1273" maxX="1341" minY="718" maxY="786" name="subway-adana-m"/>
+  <symbol minX="1341" maxX="1409" minY="718" maxY="786" name="speech_therapist-m"/>
+  <symbol minX="1409" maxX="1477" minY="718" maxY="786" name="stationery_shop-m"/>
+  <symbol minX="1477" maxX="1545" minY="718" maxY="786" name="subway-budapest-m"/>
+  <symbol minX="1545" maxX="1613" minY="718" maxY="786" name="stadium-m"/>
+  <symbol minX="1613" maxX="1681" minY="718" maxY="786" name="sports-m"/>
+  <symbol minX="1681" maxX="1749" minY="718" maxY="786" name="subway-buenosaires-m"/>
+  <symbol minX="1749" maxX="1817" minY="718" maxY="786" name="subway-bengaluru-m"/>
+  <symbol minX="1817" maxX="1885" minY="718" maxY="786" name="subway-cairo-m"/>
+  <symbol minX="1885" maxX="1953" minY="718" maxY="786" name="speedcam-alert-l"/>
+  <symbol minX="1953" maxX="2021" minY="718" maxY="786" name="subway-caracas-m"/>
+  <symbol minX="0" maxX="68" minY="786" maxY="854" name="subway-catania-m"/>
+  <symbol minX="68" maxX="136" minY="786" maxY="854" name="subway-changchun-m"/>
+  <symbol minX="136" maxX="204" minY="786" maxY="854" name="subway-warszawa-m"/>
+  <symbol minX="204" maxX="272" minY="786" maxY="854" name="tennis-m"/>
+  <symbol minX="272" maxX="340" minY="786" maxY="854" name="taxi-m"/>
+  <symbol minX="340" maxX="408" minY="786" maxY="854" name="taoist-m"/>
+  <symbol minX="408" maxX="476" minY="786" maxY="854" name="table-tennis-m"/>
+  <symbol minX="476" maxX="544" minY="786" maxY="854" name="swimming-m"/>
+  <symbol minX="544" maxX="612" minY="786" maxY="854" name="sweets-m"/>
+  <symbol minX="612" maxX="680" minY="786" maxY="854" name="survey_point-m"/>
+  <symbol minX="680" maxX="748" minY="786" maxY="854" name="subway-yokohama-m"/>
+  <symbol minX="748" maxX="816" minY="786" maxY="854" name="subway-wuhan-m"/>
+  <symbol minX="816" maxX="884" minY="786" maxY="854" name="subway-washington-m"/>
+  <symbol minX="884" maxX="952" minY="786" maxY="854" name="theatre-m"/>
+  <symbol minX="952" maxX="1020" minY="786" maxY="854" name="subway-volgograd-m"/>
+  <symbol minX="1020" maxX="1088" minY="786" maxY="854" name="subway-vienna-m"/>
+  <symbol minX="1088" maxX="1156" minY="786" maxY="854" name="subway-valencia-m"/>
+  <symbol minX="1156" maxX="1224" minY="786" maxY="854" name="subway-tyneandwear-m"/>
+  <symbol minX="1224" maxX="1292" minY="786" maxY="854" name="subway-tokyo-m"/>
+  <symbol minX="1292" maxX="1360" minY="786" maxY="854" name="subway-tianjin-m"/>
+  <symbol minX="1360" maxX="1428" minY="786" maxY="854" name="subway-tashkent-m"/>
+  <symbol minX="1428" maxX="1496" minY="786" maxY="854" name="subway-stockholm-m"/>
+  <symbol minX="1496" maxX="1564" minY="786" maxY="854" name="subway-stlouis-m"/>
+  <symbol minX="1564" maxX="1632" minY="786" maxY="854" name="subway-southkorea-m"/>
+  <symbol minX="1632" maxX="1700" minY="786" maxY="854" name="toys-m"/>
+  <symbol minX="1700" maxX="1768" minY="786" maxY="854" name="vending-m"/>
+  <symbol minX="1768" maxX="1836" minY="786" maxY="854" name="veterinary-m"/>
+  <symbol minX="1836" maxX="1904" minY="786" maxY="854" name="video-games-m"/>
+  <symbol minX="1904" maxX="1972" minY="786" maxY="854" name="viewpoint-m"/>
+  <symbol minX="1972" maxX="2040" minY="786" maxY="854" name="volleyball-m"/>
+  <symbol minX="0" maxX="68" minY="854" maxY="922" name="waste-basket-m"/>
+  <symbol minX="68" maxX="136" minY="854" maxY="922" name="waterfall-m"/>
+  <symbol minX="136" maxX="204" minY="854" maxY="922" name="tram-m"/>
+  <symbol minX="204" maxX="272" minY="854" maxY="922" name="wayside_shrine-m"/>
+  <symbol minX="272" maxX="340" minY="854" maxY="922" name="train-m"/>
+  <symbol minX="340" maxX="408" minY="854" maxY="922" name="subway-sofia-m"/>
+  <symbol minX="408" maxX="476" minY="854" maxY="922" name="windmill-m"/>
+  <symbol minX="476" maxX="544" minY="854" maxY="922" name="tourism-m"/>
+  <symbol minX="544" maxX="612" minY="854" maxY="922" name="tomb-m"/>
+  <symbol minX="612" maxX="680" minY="854" maxY="922" name="yoga-m"/>
+  <symbol minX="680" maxX="748" minY="854" maxY="922" name="toll_booth-m"/>
+  <symbol minX="748" maxX="816" minY="854" maxY="922" name="toilets-m"/>
+  <symbol minX="816" maxX="884" minY="854" maxY="922" name="tire-repair-m"/>
+  <symbol minX="884" maxX="952" minY="854" maxY="922" name="ticket-shop-m"/>
+  <symbol minX="952" maxX="1020" minY="854" maxY="922" name="zoo-m"/>
+  <symbol minX="1020" maxX="1088" minY="854" maxY="922" name="theme_park-m"/>
+  <symbol minX="1088" maxX="1156" minY="854" maxY="922" name="subway-kunming-m"/>
+  <symbol minX="1156" maxX="1223" minY="854" maxY="922" name="subway-mashhad-m"/>
+  <symbol minX="1223" maxX="1291" minY="854" maxY="922" name="subway-marseille-s"/>
+  <symbol minX="1291" maxX="1359" minY="854" maxY="922" name="subway-m"/>
+  <symbol minX="1359" maxX="1427" minY="854" maxY="922" name="subway-lyon-m"/>
+  <symbol minX="1427" maxX="1495" minY="854" maxY="922" name="subway-losangeles-m"/>
+  <symbol minX="1495" maxX="1563" minY="854" maxY="922" name="subway-lisboa-m"/>
+  <symbol minX="1563" maxX="1631" minY="854" maxY="922" name="subway-lima-m"/>
+  <symbol minX="1631" maxX="1699" minY="854" maxY="922" name="subway-lille-m"/>
+  <symbol minX="1699" maxX="1767" minY="854" maxY="922" name="subway-lausanne-m"/>
+  <symbol minX="1767" maxX="1835" minY="854" maxY="922" name="subway-kyoto-m"/>
+  <symbol minX="1835" maxX="1903" minY="854" maxY="922" name="subway-massachusetts-m"/>
+  <symbol minX="1903" maxX="1971" minY="854" maxY="922" name="subway-kobe-m"/>
+  <symbol minX="1971" maxX="2039" minY="854" maxY="922" name="subway-kazan-m"/>
+  <symbol minX="0" maxX="55" minY="922" maxY="990" name="subway-istanbul-m"/>
+  <symbol minX="55" maxX="123" minY="922" maxY="990" name="subway-isfahan-m"/>
+  <symbol minX="123" maxX="191" minY="922" maxY="990" name="subway-hirosima-m"/>
+  <symbol minX="191" maxX="259" minY="922" maxY="990" name="subway-helsinki-m"/>
+  <symbol minX="259" maxX="327" minY="922" maxY="990" name="subway-guangzhou-m"/>
+  <symbol minX="327" maxX="395" minY="922" maxY="990" name="subway-guadalajara-m"/>
+  <symbol minX="395" maxX="463" minY="922" maxY="990" name="subway-glasgow-m"/>
+  <symbol minX="463" maxX="531" minY="922" maxY="990" name="subway-foshan-m"/>
+  <symbol minX="531" maxX="599" minY="922" maxY="990" name="subway-perugia-m"/>
+  <symbol minX="599" maxX="667" minY="922" maxY="990" name="subway-shiraz-m"/>
+  <symbol minX="667" maxX="735" minY="922" maxY="990" name="subway-saopaulo-m"/>
+  <symbol minX="735" maxX="803" minY="922" maxY="990" name="subway-santodomingo-m"/>
+  <symbol minX="803" maxX="871" minY="922" maxY="990" name="subway-samara-m"/>
+  <symbol minX="871" maxX="939" minY="922" maxY="990" name="subway-riodejaneiro-m"/>
+  <symbol minX="939" maxX="1007" minY="922" maxY="990" name="subway-reseau-paris-m"/>
+  <symbol minX="1007" maxX="1075" minY="922" maxY="990" name="subway-rennes-m"/>
+  <symbol minX="1075" maxX="1143" minY="922" maxY="990" name="subway-pyongyang-m"/>
+  <symbol minX="1143" maxX="1208" minY="922" maxY="990" name="subway-porto-m"/>
+  <symbol minX="1208" maxX="1276" minY="922" maxY="990" name="subway-pittsburgh-m"/>
+  <symbol minX="1276" maxX="1344" minY="922" maxY="990" name="subway-ekb-m"/>
+  <symbol minX="1344" maxX="1412" minY="922" maxY="990" name="subway-panama-m"/>
+  <symbol minX="1412" maxX="1480" minY="922" maxY="990" name="subway-oslo-m"/>
+  <symbol minX="1480" maxX="1545" minY="922" maxY="990" name="subway-nnov-m"/>
+  <symbol minX="1545" maxX="1613" minY="922" maxY="990" name="subway-newyork-m"/>
+  <symbol minX="1613" maxX="1681" minY="922" maxY="990" name="subway-nagoya-m"/>
+  <symbol minX="1681" maxX="1749" minY="922" maxY="990" name="subway-minatomirai-m"/>
+  <symbol minX="1749" maxX="1817" minY="922" maxY="990" name="subway-milan-m"/>
+  <symbol minX="1817" maxX="1882" minY="922" maxY="990" name="subway-mexico-m"/>
+  <symbol minX="1882" maxX="1950" minY="922" maxY="990" name="subway-medellin-m"/>
+  <symbol minX="1950" maxX="2018" minY="922" maxY="990" name="subway-mecca-m"/>
+  <symbol minX="0" maxX="68" minY="990" maxY="1058" name="doityourself-m"/>
+  <symbol minX="68" maxX="136" minY="990" maxY="1058" name="fountain-m"/>
+  <symbol minX="136" maxX="204" minY="990" maxY="1058" name="florist-m"/>
+  <symbol minX="204" maxX="272" minY="990" maxY="1058" name="firehydrant-m"/>
+  <symbol minX="272" maxX="340" minY="990" maxY="1058" name="fire_station-m"/>
+  <symbol minX="340" maxX="408" minY="990" maxY="1058" name="fastfood-m"/>
+  <symbol minX="408" maxX="476" minY="990" maxY="1058" name="erotic-m"/>
+  <symbol minX="476" maxX="544" minY="990" maxY="1058" name="equestrian-m"/>
+  <symbol minX="544" maxX="612" minY="990" maxY="1058" name="emergency-phone-m"/>
+  <symbol minX="612" maxX="680" minY="990" maxY="1058" name="embassy-m"/>
+  <symbol minX="680" maxX="748" minY="990" maxY="1058" name="electronics-m"/>
+  <symbol minX="748" maxX="816" minY="990" maxY="1058" name="electrician-m"/>
+  <symbol minX="816" maxX="884" minY="990" maxY="1058" name="dump-station-m"/>
+  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="driving_school-m"/>
+  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="drinking-water-m"/>
+  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="fountain-s"/>
+  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="dog_park-m"/>
+  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="diving-m"/>
+  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="department_store-m"/>
+  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="dentist-m"/>
+  <symbol minX="1360" maxX="1428" minY="990" maxY="1058" name="defibrillator-m"/>
+  <symbol minX="1428" maxX="1496" minY="990" maxY="1058" name="curling-m"/>
+  <symbol minX="1496" maxX="1564" minY="990" maxY="1058" name="cross-m"/>
+  <symbol minX="1564" maxX="1632" minY="990" maxY="1058" name="cricket-m"/>
+  <symbol minX="1632" maxX="1700" minY="990" maxY="1058" name="copyshop-m"/>
+  <symbol minX="1700" maxX="1768" minY="990" maxY="1058" name="computer-m"/>
+  <symbol minX="1768" maxX="1836" minY="990" maxY="1058" name="college-m"/>
+  <symbol minX="1836" maxX="1904" minY="990" maxY="1058" name="clothes-m"/>
+  <symbol minX="1904" maxX="1972" minY="990" maxY="1058" name="climbing-m"/>
+  <symbol minX="1972" maxX="2040" minY="990" maxY="1058" name="golf-m"/>
+  <symbol minX="0" maxX="68" minY="1058" maxY="1126" name="home-m"/>
+  <symbol minX="68" maxX="136" minY="1058" maxY="1126" name="hockey-m"/>
+  <symbol minX="136" maxX="204" minY="1058" maxY="1126" name="historic-ship-m"/>
+  <symbol minX="204" maxX="272" minY="1058" maxY="1126" name="hindu-m"/>
+  <symbol minX="272" maxX="340" minY="1058" maxY="1126" name="heliport-m"/>
+  <symbol minX="340" maxX="408" minY="1058" maxY="1126" name="helipad-m"/>
+  <symbol minX="408" maxX="476" minY="1058" maxY="1126" name="handball-m"/>
+  <symbol minX="476" maxX="544" minY="1058" maxY="1126" name="hand-m"/>
+  <symbol minX="544" maxX="612" minY="1058" maxY="1126" name="hairdresser-m"/>
+  <symbol minX="612" maxX="680" minY="1058" maxY="1126" name="gym-m"/>
+  <symbol minX="680" maxX="748" minY="1058" maxY="1126" name="guidepost"/>
+  <symbol minX="748" maxX="816" minY="1058" maxY="1126" name="grocery-m"/>
+  <symbol minX="816" maxX="884" minY="1058" maxY="1126" name="greengrocer-m"/>
+  <symbol minX="884" maxX="952" minY="1058" maxY="1126" name="cinema-m"/>
+  <symbol minX="952" maxX="1020" minY="1058" maxY="1126" name="gift-m"/>
+  <symbol minX="1020" maxX="1088" minY="1058" maxY="1126" name="geyser-m"/>
+  <symbol minX="1088" maxX="1156" minY="1058" maxY="1126" name="geyser-l"/>
+  <symbol minX="1156" maxX="1224" minY="1058" maxY="1126" name="gate-m"/>
+  <symbol minX="1224" maxX="1292" minY="1058" maxY="1126" name="garden_center-m"/>
+  <symbol minX="1292" maxX="1360" minY="1058" maxY="1126" name="garden-outline-m"/>
+  <symbol minX="1360" maxX="1428" minY="1058" maxY="1126" name="garden-m"/>
+  <symbol minX="1428" maxX="1496" minY="1058" maxY="1126" name="gallery-m"/>
+  <symbol minX="1496" maxX="1564" minY="1058" maxY="1126" name="furniture-m"/>
+  <symbol minX="1564" maxX="1632" minY="1058" maxY="1126" name="funicular-m"/>
+  <symbol minX="1632" maxX="1700" minY="1058" maxY="1126" name="funeral_directors-m"/>
+  <symbol minX="1700" maxX="1768" minY="1058" maxY="1126" name="fuel-m"/>
+  <symbol minX="1768" maxX="1836" minY="1058" maxY="1126" name="fuel-dispenser-m"/>
+  <symbol minX="1836" maxX="1904" minY="1058" maxY="1126" name="bank-m"/>
+  <symbol minX="1904" maxX="1972" minY="1058" maxY="1126" name="blacksmith-m"/>
+  <symbol minX="1972" maxX="2040" minY="1058" maxY="1126" name="bicycle-repair-station"/>
+  <symbol minX="0" maxX="68" minY="1126" maxY="1194" name="bicycle-m"/>
+  <symbol minX="68" maxX="136" minY="1126" maxY="1194" name="beer-m"/>
+  <symbol minX="136" maxX="204" minY="1126" maxY="1194" name="beekeeper-m"/>
+  <symbol minX="204" maxX="272" minY="1126" maxY="1194" name="beauty-m"/>
+  <symbol minX="272" maxX="340" minY="1126" maxY="1194" name="beach-m"/>
+  <symbol minX="340" maxX="408" minY="1126" maxY="1194" name="bcontrol-m"/>
+  <symbol minX="408" maxX="476" minY="1126" maxY="1194" name="bbq-m"/>
+  <symbol minX="476" maxX="544" minY="1126" maxY="1194" name="basketball-m"/>
+  <symbol minX="544" maxX="612" minY="1126" maxY="1194" name="baseball-m"/>
+  <symbol minX="612" maxX="680" minY="1126" maxY="1194" name="bar-m"/>
+  <symbol minX="680" maxX="748" minY="1126" maxY="1194" name="banknote-m"/>
+  <symbol minX="748" maxX="816" minY="1126" maxY="1194" name="blood_donation-m"/>
+  <symbol minX="816" maxX="884" minY="1126" maxY="1194" name="bakery-m"/>
+  <symbol minX="884" maxX="952" minY="1126" maxY="1194" name="badminton-m"/>
+  <symbol minX="952" maxX="1020" minY="1126" maxY="1194" name="australian-football-m"/>
+  <symbol minX="1020" maxX="1088" minY="1126" maxY="1194" name="audiologist-m"/>
+  <symbol minX="1088" maxX="1156" minY="1126" maxY="1194" name="atm-m"/>
+  <symbol minX="1156" maxX="1224" minY="1126" maxY="1194" name="archery-m"/>
+  <symbol minX="1224" maxX="1292" minY="1126" maxY="1194" name="archaeological-site-m"/>
+  <symbol minX="1292" maxX="1360" minY="1126" maxY="1194" name="apartment-m"/>
+  <symbol minX="1360" maxX="1428" minY="1126" maxY="1194" name="america-football-m"/>
+  <symbol minX="1428" maxX="1496" minY="1126" maxY="1194" name="alternative-m"/>
+  <symbol minX="1496" maxX="1564" minY="1126" maxY="1194" name="alpine_hut-m"/>
+  <symbol minX="1564" maxX="1632" minY="1126" maxY="1194" name="alcohol-m"/>
+  <symbol minX="1632" maxX="1700" minY="1126" maxY="1194" name="airport-m"/>
+  <symbol minX="1700" maxX="1768" minY="1126" maxY="1194" name="car-wash-m"/>
+  <symbol minX="1768" maxX="1836" minY="1126" maxY="1194" name="christian-m"/>
+  <symbol minX="1836" maxX="1904" minY="1126" maxY="1194" name="chimney-m"/>
+  <symbol minX="1904" maxX="1972" minY="1126" maxY="1194" name="chess-m"/>
+  <symbol minX="1972" maxX="2040" minY="1126" maxY="1194" name="chemist-m"/>
+  <symbol minX="0" maxX="68" minY="1194" maxY="1262" name="charity_shop-m"/>
+  <symbol minX="68" maxX="136" minY="1194" maxY="1262" name="charging-station-m"/>
+  <symbol minX="136" maxX="204" minY="1194" maxY="1262" name="cemetery-m"/>
+  <symbol minX="204" maxX="272" minY="1194" maxY="1262" name="casino-m"/>
+  <symbol minX="272" maxX="340" minY="1194" maxY="1262" name="carpenter-m"/>
+  <symbol minX="340" maxX="408" minY="1194" maxY="1262" name="caravan_site-m"/>
+  <symbol minX="408" maxX="476" minY="1194" maxY="1262" name="caravan-shop-m"/>
+  <symbol minX="476" maxX="544" minY="1194" maxY="1262" name="car_shop-m"/>
+  <symbol minX="544" maxX="612" minY="1194" maxY="1262" name="car_sharing-m"/>
+  <symbol minX="612" maxX="680" minY="1194" maxY="1262" name="restaurant-m"/>
+  <symbol minX="680" maxX="748" minY="1194" maxY="1262" name="car-repair-m"/>
+  <symbol minX="748" maxX="816" minY="1194" maxY="1262" name="car-part-m"/>
+  <symbol minX="816" maxX="884" minY="1194" maxY="1262" name="campsite-m"/>
+  <symbol minX="884" maxX="952" minY="1194" maxY="1262" name="cafe-m"/>
+  <symbol minX="952" maxX="1020" minY="1194" maxY="1262" name="cable-car-m"/>
+  <symbol minX="1020" maxX="1088" minY="1194" maxY="1262" name="butcher-m"/>
+  <symbol minX="1088" maxX="1156" minY="1194" maxY="1262" name="bus-m"/>
+  <symbol minX="1156" maxX="1224" minY="1194" maxY="1262" name="buddhist-m"/>
+  <symbol minX="1224" maxX="1292" minY="1194" maxY="1262" name="brewery-m"/>
+  <symbol minX="1292" maxX="1360" minY="1194" maxY="1262" name="bowling_alley-m"/>
+  <symbol minX="1360" maxX="1428" minY="1194" maxY="1262" name="bowling-m"/>
+  <symbol minX="1428" maxX="1496" minY="1194" maxY="1262" name="bookmaker-m"/>
+  <symbol minX="1496" maxX="1564" minY="1194" maxY="1262" name="book-shop-m"/>
+  <symbol minX="1564" maxX="1632" minY="1194" maxY="1262" name="park-outline-m"/>
+  <symbol minX="1632" maxX="1700" minY="1194" maxY="1262" name="media-m"/>
+  <symbol minX="1700" maxX="1768" minY="1194" maxY="1262" name="optometrist-m"/>
+  <symbol minX="1768" maxX="1836" minY="1194" maxY="1262" name="marketplace-m"/>
+  <symbol minX="1836" maxX="1904" minY="1194" maxY="1262" name="marina-m"/>
+  <symbol minX="1904" maxX="1972" minY="1194" maxY="1262" name="outdoor-shop-m"/>
+  <symbol minX="1972" maxX="2040" minY="1194" maxY="1262" name="mail-m"/>
+  <symbol minX="0" maxX="68" minY="1262" maxY="1330" name="padel-m"/>
+  <symbol minX="68" maxX="136" minY="1262" maxY="1330" name="painter-m"/>
+  <symbol minX="136" maxX="204" minY="1262" maxY="1330" name="park-m"/>
+  <symbol minX="204" maxX="272" minY="1262" maxY="1330" name="optician-m"/>
+  <symbol minX="272" maxX="340" minY="1262" maxY="1330" name="lighthouse-m"/>
+  <symbol minX="340" maxX="408" minY="1262" maxY="1330" name="parking-meter-m"/>
+  <symbol minX="408" maxX="476" minY="1262" maxY="1330" name="library-m"/>
+  <symbol minX="476" maxX="544" minY="1262" maxY="1330" name="lawyer-m"/>
+  <symbol minX="544" maxX="612" minY="1262" maxY="1330" name="laundry-m"/>
+  <symbol minX="612" maxX="680" minY="1262" maxY="1330" name="pelota-m"/>
+  <symbol minX="680" maxX="748" minY="1262" maxY="1330" name="language_school-m"/>
+  <symbol minX="748" maxX="816" minY="1262" maxY="1330" name="kiosk-m"/>
+  <symbol minX="816" maxX="884" minY="1262" maxY="1330" name="petshop-m"/>
+  <symbol minX="884" maxX="952" minY="1262" maxY="1330" name="motel-m"/>
+  <symbol minX="952" maxX="1020" minY="1262" maxY="1330" name="muslim-m"/>
+  <symbol minX="1020" maxX="1088" minY="1262" maxY="1330" name="musical-instrument-m"/>
+  <symbol minX="1088" maxX="1156" minY="1262" maxY="1330" name="music_school-m"/>
+  <symbol minX="1156" maxX="1224" minY="1262" maxY="1330" name="music-m"/>
+  <symbol minX="1224" maxX="1292" minY="1262" maxY="1330" name="needle_and_thread-m"/>
+  <symbol minX="1292" maxX="1360" minY="1262" maxY="1330" name="newsagent_shop-m"/>
+  <symbol minX="1360" maxX="1428" minY="1262" maxY="1330" name="museum-m"/>
+  <symbol minX="1428" maxX="1496" minY="1262" maxY="1330" name="nightclub-m"/>
+  <symbol minX="1496" maxX="1564" minY="1262" maxY="1330" name="motorcycle_shop-m"/>
+  <symbol minX="1564" maxX="1632" minY="1262" maxY="1330" name="lift_gate-m"/>
+  <symbol minX="1632" maxX="1700" minY="1262" maxY="1330" name="monument-m"/>
+  <symbol minX="1700" maxX="1768" minY="1262" maxY="1330" name="npark-m"/>
+  <symbol minX="1768" maxX="1836" minY="1262" maxY="1330" name="mobile_phone-m"/>
+  <symbol minX="1836" maxX="1904" minY="1262" maxY="1330" name="nparkf-m"/>
+  <symbol minX="1904" maxX="1972" minY="1262" maxY="1330" name="military-m"/>
+  <symbol minX="1972" maxX="2040" minY="1262" maxY="1330" name="metal_construction-m"/>
+  <symbol minX="0" maxX="68" minY="1330" maxY="1398" name="nparkf-outline-m"/>
+  <symbol minX="68" maxX="136" minY="1330" maxY="1398" name="media_shop-m"/>
+  <symbol minX="136" maxX="204" minY="1330" maxY="1398" name="office-m"/>
+  <symbol minX="204" maxX="272" minY="1330" maxY="1398" name="prison-m"/>
+  <symbol minX="272" maxX="340" minY="1330" maxY="1398" name="picnic_table-m"/>
+  <symbol minX="340" maxX="408" minY="1330" maxY="1398" name="pitch-m"/>
+  <symbol minX="408" maxX="476" minY="1330" maxY="1398" name="place-of-worship-m"/>
+  <symbol minX="476" maxX="544" minY="1330" maxY="1398" name="playground-m"/>
+  <symbol minX="544" maxX="612" minY="1330" maxY="1398" name="plumber-m"/>
+  <symbol minX="612" maxX="680" minY="1330" maxY="1398" name="podiatrist-m"/>
+  <symbol minX="680" maxX="748" minY="1330" maxY="1398" name="police-m"/>
+  <symbol minX="748" maxX="816" minY="1330" maxY="1398" name="internet_cafe-m"/>
+  <symbol minX="816" maxX="884" minY="1330" maxY="1398" name="postbox-m"/>
+  <symbol minX="884" maxX="952" minY="1330" maxY="1398" name="power-m"/>
+  <symbol minX="952" maxX="1020" minY="1330" maxY="1398" name="information-m"/>
+  <symbol minX="1020" maxX="1088" minY="1330" maxY="1398" name="pharmacy-m"/>
+  <symbol minX="1088" maxX="1156" minY="1330" maxY="1398" name="psychotherapist-m"/>
+  <symbol minX="1156" maxX="1224" minY="1330" maxY="1398" name="public-building-m"/>
+  <symbol minX="1224" maxX="1292" minY="1330" maxY="1398" name="ice_cream-m"/>
+  <symbol minX="1292" maxX="1360" minY="1330" maxY="1398" name="recycling-m"/>
+  <symbol minX="1360" maxX="1428" minY="1330" maxY="1398" name="hunting-tower-m"/>
+  <symbol minX="1428" maxX="1496" minY="1330" maxY="1398" name="hotel-m"/>
+  <symbol minX="1496" maxX="1564" minY="1330" maxY="1398" name="remains-m"/>
+  <symbol minX="1564" maxX="1632" minY="1330" maxY="1398" name="hostel-m"/>
+  <symbol minX="1632" maxX="1700" minY="1330" maxY="1398" name="sample_collection-m"/>
+  <symbol minX="1700" maxX="1768" minY="1330" maxY="1398" name="hospital-m"/>
+  <symbol minX="1768" maxX="1836" minY="1330" maxY="1398" name="jewelry-m"/>
+  <symbol minX="1836" maxX="1904" minY="1330" maxY="1398" name="picnic-m"/>
+  <symbol minX="1904" maxX="1972" minY="1330" maxY="1398" name="kindergarten-m"/>
+  <symbol minX="1972" maxX="2040" minY="1330" maxY="1398" name="physiotherapist-m"/>
+  <symbol minX="0" maxX="68" minY="1398" maxY="1466" name="jewish-m"/>
+  <symbol minX="68" maxX="136" minY="1398" maxY="1466" name="photo-shop-m"/>
+  <symbol minX="136" maxX="204" minY="1398" maxY="1466" name="phone-m"/>
+  <symbol minX="204" maxX="272" minY="1398" maxY="1463" name="subway-marseille-m"/>
+  <symbol minX="272" maxX="340" minY="1398" maxY="1463" name="subway-maracaibo-m"/>
+  <symbol minX="340" maxX="405" minY="1398" maxY="1463" name="subway-spb-m"/>
+  <symbol minX="405" maxX="470" minY="1398" maxY="1463" name="subway-southkorea-s"/>
+  <symbol minX="470" maxX="538" minY="1398" maxY="1463" name="subway-shanghai-m"/>
+  <symbol minX="538" maxX="606" minY="1398" maxY="1463" name="subway-dalian-m"/>
+  <symbol minX="606" maxX="671" minY="1398" maxY="1463" name="subway-ekb-s"/>
+  <symbol minX="671" maxX="739" minY="1398" maxY="1463" name="subway-sapporo-m"/>
+  <symbol minX="739" maxX="804" minY="1398" maxY="1463" name="subway-montreal-m"/>
+  <symbol minX="804" maxX="872" minY="1398" maxY="1461" name="subway-izmir-m"/>
+  <symbol minX="872" maxX="932" minY="1398" maxY="1461" name="subway-warsaw-m"/>
+  <symbol minX="932" maxX="995" minY="1398" maxY="1461" name="subway-entrance-m"/>
+  <symbol minX="995" maxX="1058" minY="1398" maxY="1461" name="subway-algeria-s"/>
+  <symbol minX="1058" maxX="1121" minY="1398" maxY="1461" name="subway-stlouis-s"/>
+  <symbol minX="1121" maxX="1173" minY="1398" maxY="1458" name="subway-istanbul-s"/>
+  <symbol minX="1173" maxX="1233" minY="1398" maxY="1458" name="search-result"/>
+  <symbol minX="1233" maxX="1293" minY="1398" maxY="1458" name="subway-pittsburgh-s"/>
+  <symbol minX="1293" maxX="1353" minY="1398" maxY="1458" name="lightrail-berlin-m"/>
+  <symbol minX="1353" maxX="1421" minY="1398" maxY="1456" name="subway-taoyuan-m"/>
+  <symbol minX="1421" maxX="1478" minY="1398" maxY="1455" name="subway-panama-s"/>
+  <symbol minX="1478" maxX="1546" minY="1398" maxY="1455" name="subway-rotterdam-m"/>
+  <symbol minX="1546" maxX="1603" minY="1398" maxY="1455" name="subway-medellin-s"/>
+  <symbol minX="1603" maxX="1660" minY="1398" maxY="1455" name="subway-isfahan-s"/>
+  <symbol minX="1660" maxX="1717" minY="1398" maxY="1455" name="subway-sapporo-s"/>
+  <symbol minX="1717" maxX="1777" minY="1398" maxY="1455" name="subway-izmir-s"/>
+  <symbol minX="1777" maxX="1834" minY="1398" maxY="1455" name="parking-m"/>
+  <symbol minX="1834" maxX="1891" minY="1398" maxY="1455" name="speedcam-m"/>
+  <symbol minX="1891" maxX="1948" minY="1398" maxY="1455" name="subway-cairo-s"/>
+  <symbol minX="1948" maxX="2000" minY="1398" maxY="1455" name="subway-brescia-s"/>
+  <symbol minX="0" maxX="57" minY="1466" maxY="1523" name="parking-disabled-m"/>
+  <symbol minX="57" maxX="114" minY="1466" maxY="1523" name="bike-parking-m"/>
+  <symbol minX="114" maxX="182" minY="1466" maxY="1523" name="subway-tbilisi-m"/>
+  <symbol minX="182" maxX="239" minY="1466" maxY="1523" name="motorcycle-parking-m"/>
+  <symbol minX="239" maxX="294" minY="1466" maxY="1523" name="subway-mashhad-s"/>
+  <symbol minX="294" maxX="407" minY="1466" maxY="1523" name="coloredmark-bg-s"/>
+  <symbol minX="407" maxX="464" minY="1466" maxY="1523" name="parking_pay-m"/>
+  <symbol minX="464" maxX="577" minY="1466" maxY="1523" name="coloredmark-default-s"/>
+  <symbol minX="577" maxX="634" minY="1466" maxY="1523" name="bicycle-rental"/>
+  <symbol minX="634" maxX="691" minY="1466" maxY="1523" name="parking_entrance-m"/>
+  <symbol minX="691" maxX="759" minY="1466" maxY="1522" name="subway-almaty-m"/>
+  <symbol minX="759" maxX="814" minY="1466" maxY="1521" name="subway-warszawa-s"/>
+  <symbol minX="814" maxX="869" minY="1466" maxY="1521" name="subway-rome-m"/>
+  <symbol minX="869" maxX="929" minY="1466" maxY="1521" name="subway-seattle-m"/>
+  <symbol minX="929" maxX="984" minY="1466" maxY="1521" name="subway-ubahn-m"/>
+  <symbol minX="984" maxX="1036" minY="1466" maxY="1521" name="subway-tianjin-s"/>
+  <symbol minX="1036" maxX="1088" minY="1466" maxY="1521" name="subway-athens-s"/>
+  <symbol minX="1088" maxX="1151" minY="1466" maxY="1521" name="subway-moscow-m"/>
+  <symbol minX="1151" maxX="1206" minY="1466" maxY="1521" name="subway-paris-m"/>
+  <symbol minX="1206" maxX="1261" minY="1466" maxY="1521" name="subway-hirosima-s"/>
+  <symbol minX="1261" maxX="1313" minY="1466" maxY="1521" name="subway-delhi-s"/>
+  <symbol minX="1313" maxX="1365" minY="1466" maxY="1521" name="subway-porto-s"/>
+  <symbol minX="1365" maxX="1417" minY="1466" maxY="1521" name="subway-pyongyang-s"/>
+  <symbol minX="1417" maxX="1472" minY="1466" maxY="1521" name="subway-rennes-s"/>
+  <symbol minX="1472" maxX="1540" minY="1466" maxY="1520" name="subway-santiago-m"/>
+  <symbol minX="1540" maxX="1608" minY="1466" maxY="1520" name="subway-yerevan-m"/>
+  <symbol minX="1608" maxX="1646" minY="1466" maxY="1520" name="bookmark-bg-xs"/>
+  <symbol minX="1646" maxX="1684" minY="1466" maxY="1520" name="bookmark-default-xs"/>
+  <symbol minX="1684" maxX="1752" minY="1466" maxY="1519" name="subway-dnepro-m"/>
+  <symbol minX="1752" maxX="1820" minY="1466" maxY="1519" name="subway-omsk-m"/>
+  <symbol minX="1820" maxX="1888" minY="1466" maxY="1519" name="subway-tabriz-m"/>
+  <symbol minX="1888" maxX="1956" minY="1466" maxY="1519" name="subway-kryvyirih-m"/>
+  <symbol minX="1956" maxX="2008" minY="1466" maxY="1518" name="subway-minatomirai-s"/>
+  <symbol minX="0" maxX="52" minY="1523" maxY="1575" name="subway-yokohama-s"/>
+  <symbol minX="52" maxX="104" minY="1523" maxY="1575" name="subway-milan-s"/>
+  <symbol minX="104" maxX="169" minY="1523" maxY="1575" name="subway-yerevan-s"/>
+  <symbol minX="169" maxX="221" minY="1523" maxY="1575" name="subway-guangzhou-s"/>
+  <symbol minX="221" maxX="273" minY="1523" maxY="1575" name="subway-chicago-s"/>
+  <symbol minX="273" maxX="325" minY="1523" maxY="1575" name="subway-kazan-s"/>
+  <symbol minX="325" maxX="377" minY="1523" maxY="1575" name="subway-wuhan-s"/>
+  <symbol minX="377" maxX="429" minY="1523" maxY="1575" name="subway-mecca-s"/>
+  <symbol minX="429" maxX="481" minY="1523" maxY="1575" name="subway-washington-s"/>
+  <symbol minX="481" maxX="533" minY="1523" maxY="1575" name="subway-chengdu-s"/>
+  <symbol minX="533" maxX="585" minY="1523" maxY="1575" name="subway-montreal-s"/>
+  <symbol minX="585" maxX="637" minY="1523" maxY="1575" name="subway-helsinki-s"/>
+  <symbol minX="637" maxX="684" minY="1523" maxY="1575" name="subway-warsaw-s"/>
+  <symbol minX="684" maxX="736" minY="1523" maxY="1575" name="subway-changchun-s"/>
+  <symbol minX="736" maxX="788" minY="1523" maxY="1575" name="subway-volgograd-s"/>
+  <symbol minX="788" maxX="856" minY="1523" maxY="1575" name="subway-alicante-m"/>
+  <symbol minX="856" maxX="908" minY="1523" maxY="1575" name="subway-lille-s"/>
+  <symbol minX="908" maxX="960" minY="1523" maxY="1575" name="subway-dalian-s"/>
+  <symbol minX="960" maxX="1012" minY="1523" maxY="1575" name="subway-kobe-s"/>
+  <symbol minX="1012" maxX="1064" minY="1523" maxY="1575" name="subway-guadalajara-s"/>
+  <symbol minX="1064" maxX="1116" minY="1523" maxY="1575" name="subway-massachusetts-s"/>
+  <symbol minX="1116" maxX="1171" minY="1523" maxY="1575" name="subway-glasgow-s"/>
+  <symbol minX="1171" maxX="1236" minY="1523" maxY="1575" name="subway-santiago-s"/>
+  <symbol minX="1236" maxX="1288" minY="1523" maxY="1575" name="subway-dubai-s"/>
+  <symbol minX="1288" maxX="1340" minY="1523" maxY="1575" name="subway-lyon-s"/>
+  <symbol minX="1340" maxX="1392" minY="1523" maxY="1575" name="subway-losangeles-s"/>
+  <symbol minX="1392" maxX="1444" minY="1523" maxY="1575" name="subway-kunming-s"/>
+  <symbol minX="1444" maxX="1496" minY="1523" maxY="1575" name="subway-kyoto-s"/>
+  <symbol minX="1496" maxX="1561" minY="1523" maxY="1575" name="subway-fukuoka-s"/>
+  <symbol minX="1561" maxX="1613" minY="1523" maxY="1575" name="subway-lisboa-s"/>
+  <symbol minX="1613" maxX="1665" minY="1523" maxY="1575" name="subway-lima-s"/>
+  <symbol minX="1665" maxX="1717" minY="1523" maxY="1575" name="subway-foshan-s"/>
+  <symbol minX="1717" maxX="1769" minY="1523" maxY="1575" name="subway-saopaulo-s"/>
+  <symbol minX="1769" maxX="1821" minY="1523" maxY="1575" name="subway-sofia-s"/>
+  <symbol minX="1821" maxX="1873" minY="1523" maxY="1575" name="subway-bangkok-s"/>
+  <symbol minX="1873" maxX="1925" minY="1523" maxY="1575" name="subway-shiraz-s"/>
+  <symbol minX="1925" maxX="1977" minY="1523" maxY="1575" name="subway-shanghai-s"/>
+  <symbol minX="1977" maxX="2029" minY="1523" maxY="1575" name="subway-vienna-s"/>
+  <symbol minX="0" maxX="52" minY="1575" maxY="1627" name="subway-reseau-paris-s"/>
+  <symbol minX="52" maxX="104" minY="1575" maxY="1627" name="subway-brasilia-s"/>
+  <symbol minX="104" maxX="156" minY="1575" maxY="1627" name="subway-perugia-s"/>
+  <symbol minX="156" maxX="208" minY="1575" maxY="1627" name="subway-riodejaneiro-s"/>
+  <symbol minX="208" maxX="260" minY="1575" maxY="1627" name="subway-budapest-s"/>
+  <symbol minX="260" maxX="312" minY="1575" maxY="1627" name="subway-stockholm-s"/>
+  <symbol minX="312" maxX="364" minY="1575" maxY="1627" name="subway-samara-s"/>
+  <symbol minX="364" maxX="416" minY="1575" maxY="1627" name="subway-buenosaires-s"/>
+  <symbol minX="416" maxX="476" minY="1575" maxY="1627" name="subway-taoyuan-s"/>
+  <symbol minX="476" maxX="528" minY="1575" maxY="1627" name="subway-oslo-s"/>
+  <symbol minX="528" maxX="580" minY="1575" maxY="1627" name="subway-tashkent-s"/>
+  <symbol minX="580" maxX="632" minY="1575" maxY="1627" name="subway-bursaray-s"/>
+  <symbol minX="632" maxX="684" minY="1575" maxY="1627" name="subway-beijing-s"/>
+  <symbol minX="684" maxX="752" minY="1575" maxY="1627" name="subway-omsk-s"/>
+  <symbol minX="752" maxX="804" minY="1575" maxY="1627" name="subway-santodomingo-s"/>
+  <symbol minX="804" maxX="856" minY="1575" maxY="1627" name="subway-tokyo-s"/>
+  <symbol minX="856" maxX="908" minY="1575" maxY="1627" name="subway-nnov-s"/>
+  <symbol minX="908" maxX="960" minY="1575" maxY="1627" name="subway-tyneandwear-s"/>
+  <symbol minX="960" maxX="1012" minY="1575" maxY="1627" name="subway-caracas-s"/>
+  <symbol minX="1012" maxX="1064" minY="1575" maxY="1627" name="subway-bengaluru-s"/>
+  <symbol minX="1064" maxX="1116" minY="1575" maxY="1627" name="subway-catania-s"/>
+  <symbol minX="1116" maxX="1168" minY="1575" maxY="1627" name="subway-valencia-s"/>
+  <symbol minX="1168" maxX="1220" minY="1575" maxY="1627" name="subway-nagoya-s"/>
+  <symbol minX="1220" maxX="1288" minY="1575" maxY="1626" name="subway-philadelphia-m"/>
+  <symbol minX="1288" maxX="1356" minY="1575" maxY="1626" name="subway-osaka-m"/>
+  <symbol minX="1356" maxX="1405" minY="1575" maxY="1624" name="subway-spb-s"/>
+  <symbol minX="1405" maxX="1468" minY="1575" maxY="1624" name="subway-almaty-s"/>
+  <symbol minX="1468" maxX="1515" minY="1575" maxY="1624" name="subway-amsterdam-s"/>
+  <symbol minX="1515" maxX="1562" minY="1575" maxY="1624" name="subway-mexico-s"/>
+  <symbol minX="1562" maxX="1627" minY="1575" maxY="1624" name="subway-tabriz-s"/>
+  <symbol minX="1627" maxX="1679" minY="1575" maxY="1624" name="subway-maracaibo-s"/>
+  <symbol minX="1679" maxX="1747" minY="1575" maxY="1624" name="subway-madrid-m"/>
+  <symbol minX="1747" maxX="1796" minY="1575" maxY="1624" name="cave-m"/>
+  <symbol minX="1796" maxX="1864" minY="1575" maxY="1624" name="subway-lucknow-s"/>
+  <symbol minX="1864" maxX="1913" minY="1575" maxY="1624" name="subway-lausanne-s"/>
+  <symbol minX="1913" maxX="1962" minY="1575" maxY="1624" name="non-found-search-result"/>
+  <symbol minX="1962" maxX="2030" minY="1575" maxY="1624" name="subway-barcelona-m"/>
+  <symbol minX="0" maxX="65" minY="1627" maxY="1676" name="subway-london-m"/>
+  <symbol minX="65" maxX="133" minY="1627" maxY="1675" name="subway-lucknow-m"/>
+  <symbol minX="133" maxX="180" minY="1627" maxY="1674" name="waterfall-s"/>
+  <symbol minX="180" maxX="227" minY="1627" maxY="1674" name="zoo-s"/>
+  <symbol minX="227" maxX="274" minY="1627" maxY="1674" name="waste-basket-s"/>
+  <symbol minX="274" maxX="321" minY="1627" maxY="1674" name="viewpoint-s"/>
+  <symbol minX="321" maxX="368" minY="1627" maxY="1674" name="airport-s"/>
+  <symbol minX="368" maxX="415" minY="1627" maxY="1674" name="cable-car-s"/>
+  <symbol minX="415" maxX="462" minY="1627" maxY="1674" name="park-s"/>
+  <symbol minX="462" maxX="509" minY="1627" maxY="1674" name="car-repair-s"/>
+  <symbol minX="509" maxX="556" minY="1627" maxY="1674" name="place-of-worship-s"/>
+  <symbol minX="556" maxX="603" minY="1627" maxY="1674" name="remains-s"/>
+  <symbol minX="603" maxX="650" minY="1627" maxY="1674" name="shinto-s"/>
+  <symbol minX="650" maxX="697" minY="1627" maxY="1674" name="ship-s"/>
+  <symbol minX="697" maxX="744" minY="1627" maxY="1674" name="shop-s"/>
+  <symbol minX="744" maxX="791" minY="1627" maxY="1674" name="stadium-s"/>
+  <symbol minX="791" maxX="838" minY="1627" maxY="1674" name="park-outline-s"/>
+  <symbol minX="838" maxX="906" minY="1627" maxY="1674" name="subway-bilbao-m"/>
+  <symbol minX="906" maxX="953" minY="1627" maxY="1674" name="bus-s"/>
+  <symbol minX="953" maxX="1016" minY="1627" maxY="1674" name="subway-dnepro-s"/>
+  <symbol minX="1016" maxX="1063" minY="1627" maxY="1674" name="subway-entrance-s"/>
+  <symbol minX="1063" maxX="1110" minY="1627" maxY="1674" name="buddhist-s"/>
+  <symbol minX="1110" maxX="1157" minY="1627" maxY="1674" name="subway-newyork-s"/>
+  <symbol minX="1157" maxX="1214" minY="1627" maxY="1674" name="subway-osaka-s"/>
+  <symbol minX="1214" maxX="1282" minY="1627" maxY="1674" name="subway-palma-m"/>
+  <symbol minX="1282" maxX="1329" minY="1627" maxY="1674" name="jewish-s"/>
+  <symbol minX="1329" maxX="1376" minY="1627" maxY="1674" name="college-s"/>
+  <symbol minX="1376" maxX="1423" minY="1627" maxY="1674" name="christian-s"/>
+  <symbol minX="1423" maxX="1470" minY="1627" maxY="1674" name="drinking-water-s"/>
+  <symbol minX="1470" maxX="1517" minY="1627" maxY="1674" name="fuel-s"/>
+  <symbol minX="1517" maxX="1564" minY="1627" maxY="1674" name="geyser-s"/>
+  <symbol minX="1564" maxX="1611" minY="1627" maxY="1674" name="hindu-s"/>
+  <symbol minX="1611" maxX="1658" minY="1627" maxY="1674" name="hospital-s"/>
+  <symbol minX="1658" maxX="1705" minY="1627" maxY="1674" name="hotel-s"/>
+  <symbol minX="1705" maxX="1741" minY="1627" maxY="1674" name="transit_train-m"/>
+  <symbol minX="1741" maxX="1788" minY="1627" maxY="1674" name="lighthouse-s"/>
+  <symbol minX="1788" maxX="1835" minY="1627" maxY="1674" name="monument-s"/>
+  <symbol minX="1835" maxX="1882" minY="1627" maxY="1674" name="charging-station-s"/>
+  <symbol minX="1882" maxX="1929" minY="1627" maxY="1674" name="museum-s"/>
+  <symbol minX="1929" maxX="1976" minY="1627" maxY="1674" name="muslim-s"/>
+  <symbol minX="1976" maxX="2023" minY="1627" maxY="1674" name="nparkf-outline-s"/>
+  <symbol minX="0" maxX="47" minY="1676" maxY="1723" name="nparkf-s"/>
+  <symbol minX="47" maxX="94" minY="1676" maxY="1723" name="taoist-s"/>
+  <symbol minX="94" maxX="141" minY="1676" maxY="1723" name="toll_booth-s"/>
+  <symbol minX="141" maxX="193" minY="1676" maxY="1723" name="subway-rotterdam-s"/>
+  <symbol minX="193" maxX="240" minY="1676" maxY="1723" name="theme_park-s"/>
+  <symbol minX="240" maxX="287" minY="1676" maxY="1723" name="tourism-s"/>
+  <symbol minX="287" maxX="334" minY="1676" maxY="1723" name="train-s"/>
+  <symbol minX="334" maxX="381" minY="1676" maxY="1723" name="subway-s"/>
+  <symbol minX="381" maxX="428" minY="1676" maxY="1723" name="tram-s"/>
+  <symbol minX="428" maxX="475" minY="1676" maxY="1723" name="theatre-s"/>
+  <symbol minX="475" maxX="527" minY="1676" maxY="1723" name="transfer_arrow"/>
+  <symbol minX="527" maxX="563" minY="1676" maxY="1723" name="transit_light_rail-m"/>
+  <symbol minX="563" maxX="615" minY="1676" maxY="1723" name="subway-tbilisi-s"/>
+  <symbol minX="615" maxX="675" minY="1676" maxY="1723" name="subway-philadelphia-s"/>
+  <symbol minX="675" maxX="740" minY="1676" maxY="1723" name="subway-palma-s"/>
+  <symbol minX="740" maxX="808" minY="1676" maxY="1722" name="subway-sanfrancisco-m"/>
+  <symbol minX="808" maxX="876" minY="1676" maxY="1722" name="subway-kolkata-m"/>
+  <symbol minX="876" maxX="944" minY="1676" maxY="1722" name="subway-novosibirsk-m"/>
+  <symbol minX="944" maxX="1012" minY="1676" maxY="1722" name="subway-fukuoka-m"/>
+  <symbol minX="1012" maxX="1080" minY="1676" maxY="1720" name="subway-bucharest-m"/>
+  <symbol minX="1080" maxX="1148" minY="1676" maxY="1720" name="subway-kharkiv-s"/>
+  <symbol minX="1148" maxX="1216" minY="1676" maxY="1720" name="subway-brussel-s"/>
+  <symbol minX="1216" maxX="1284" minY="1676" maxY="1720" name="subway-sanfrancisco-s"/>
+  <symbol minX="1284" maxX="1344" minY="1676" maxY="1720" name="subway-barcelona-s"/>
+  <symbol minX="1344" maxX="1388" minY="1676" maxY="1720" name="subway-paris-s"/>
+  <symbol minX="1388" maxX="1453" minY="1676" maxY="1720" name="subway-kiev-m"/>
+  <symbol minX="1453" maxX="1510" minY="1676" maxY="1720" name="subway-kryvyirih-s"/>
+  <symbol minX="1510" maxX="1570" minY="1676" maxY="1720" name="subway-madrid-s"/>
+  <symbol minX="1570" maxX="1635" minY="1676" maxY="1720" name="subway-novosibirsk-s"/>
+  <symbol minX="1635" maxX="1679" minY="1676" maxY="1720" name="lightrail-berlin-s"/>
+  <symbol minX="1679" maxX="1723" minY="1676" maxY="1720" name="elevator"/>
+  <symbol minX="1723" maxX="1759" minY="1676" maxY="1720" name="transit_monorail-m"/>
+  <symbol minX="1759" maxX="1827" minY="1676" maxY="1719" name="subway-sendai-m"/>
+  <symbol minX="1827" maxX="1895" minY="1676" maxY="1718" name="subway-manila-m"/>
+  <symbol minX="1895" maxX="1963" minY="1676" maxY="1718" name="subway-sendai-s"/>
+  <symbol minX="1963" maxX="2031" minY="1676" maxY="1718" name="subway-brussel-m"/>
+  <symbol minX="0" maxX="68" minY="1723" maxY="1765" name="subway-haagse-s"/>
+  <symbol minX="68" maxX="136" minY="1723" maxY="1765" name="subway-kharkiv-m"/>
+  <symbol minX="136" maxX="177" minY="1723" maxY="1764" name="transit_subway-m"/>
+  <symbol minX="177" maxX="218" minY="1723" maxY="1764" name="map"/>
+  <symbol minX="218" maxX="259" minY="1723" maxY="1764" name="board"/>
+  <symbol minX="259" maxX="314" minY="1723" maxY="1764" name="subway-alicante-s"/>
+  <symbol minX="314" maxX="355" minY="1723" maxY="1764" name="storage-tank"/>
+  <symbol minX="355" maxX="399" minY="1723" maxY="1764" name="subway-moscow-s"/>
+  <symbol minX="399" maxX="430" minY="1723" maxY="1764" name="transit_train-s"/>
+  <symbol minX="430" maxX="495" minY="1723" maxY="1764" name="subway-bucharest-s"/>
+  <symbol minX="495" maxX="536" minY="1723" maxY="1762" name="subway-seattle-s"/>
+  <symbol minX="536" maxX="575" minY="1723" maxY="1762" name="subway-rome-s"/>
+  <symbol minX="575" maxX="640" minY="1723" maxY="1762" name="subway-manila-s"/>
+  <symbol minX="640" maxX="689" minY="1723" maxY="1762" name="subway-london-s"/>
+  <symbol minX="689" maxX="757" minY="1723" maxY="1762" name="subway-edmonton-s"/>
+  <symbol minX="757" maxX="796" minY="1723" maxY="1762" name="cave-s"/>
+  <symbol minX="796" maxX="835" minY="1723" maxY="1762" name="subway-ubahn-s"/>
+  <symbol minX="835" maxX="892" minY="1723" maxY="1762" name="subway-bilbao-s"/>
+  <symbol minX="892" maxX="960" minY="1723" maxY="1762" name="subway-taipei-s"/>
+  <symbol minX="960" maxX="1028" minY="1723" maxY="1761" name="subway-haagse-m"/>
+  <symbol minX="1028" maxX="1085" minY="1723" maxY="1759" name="railway-crossing-l"/>
+  <symbol minX="1085" maxX="1116" minY="1723" maxY="1759" name="transit_monorail-s"/>
+  <symbol minX="1116" maxX="1160" minY="1723" maxY="1759" name="bench"/>
+  <symbol minX="1160" maxX="1196" minY="1723" maxY="1759" name="star-l"/>
+  <symbol minX="1196" maxX="1227" minY="1723" maxY="1759" name="transit_light_rail-s"/>
+  <symbol minX="1227" maxX="1250" minY="1723" maxY="1759" name="entrance-s"/>
+  <symbol minX="1250" maxX="1289" minY="1723" maxY="1759" name="main_entrance-s"/>
+  <symbol minX="1289" maxX="1325" minY="1723" maxY="1759" name="speedcam-s"/>
+  <symbol minX="1325" maxX="1361" minY="1723" maxY="1759" name="subway-newyork-xs"/>
+  <symbol minX="1361" maxX="1397" minY="1723" maxY="1759" name="parking-s"/>
+  <symbol minX="1397" maxX="1433" minY="1723" maxY="1759" name="subway-xs"/>
+  <symbol minX="1433" maxX="1469" minY="1723" maxY="1759" name="transit_subway-s"/>
+  <symbol minX="1469" maxX="1537" minY="1723" maxY="1757" name="subway-edmonton-m"/>
+  <symbol minX="1537" maxX="1592" minY="1723" maxY="1756" name="subway-kiev-s"/>
+  <symbol minX="1592" maxX="1641" minY="1723" maxY="1756" name="subway-kolkata-s"/>
+  <symbol minX="1641" maxX="1709" minY="1723" maxY="1756" name="subway-malaga-m"/>
+  <symbol minX="1709" maxX="1774" minY="1723" maxY="1756" name="subway-malaga-s"/>
+  <symbol minX="1774" maxX="1807" minY="1723" maxY="1756" name="star-m"/>
+  <symbol minX="1807" maxX="1875" minY="1723" maxY="1756" name="subway-taipei-m"/>
+  <symbol minX="1875" maxX="1914" minY="1723" maxY="1756" name="volcano-m"/>
+  <symbol minX="1914" maxX="1950" minY="1723" maxY="1754" name="plaque"/>
+  <symbol minX="1950" maxX="2005" minY="1723" maxY="1754" name="subway-minsk-m"/>
+  <symbol minX="0" maxX="65" minY="1765" maxY="1796" name="subway-baku-s"/>
+  <symbol minX="65" maxX="114" minY="1765" maxY="1796" name="railway-crossing-m"/>
+  <symbol minX="114" maxX="182" minY="1765" maxY="1795" name="subway-baku-m"/>
+  <symbol minX="182" maxX="250" minY="1765" maxY="1794" name="subway-chongqing-s"/>
+  <symbol minX="250" maxX="278" minY="1765" maxY="1793" name="star-s"/>
+  <symbol minX="278" maxX="327" minY="1765" maxY="1793" name="subway-minsk-s"/>
+  <symbol minX="327" maxX="395" minY="1765" maxY="1791" name="subway-chongqing-m"/>
+  <symbol minX="395" maxX="442" minY="1765" maxY="1790" name="mountain-pass"/>
+  <symbol minX="442" maxX="470" minY="1765" maxY="1790" name="peakt-m"/>
+  <symbol minX="470" maxX="498" minY="1765" maxY="1790" name="volcano-s"/>
+  <symbol minX="498" maxX="558" minY="1765" maxY="1790" name="arrow-m"/>
+  <symbol minX="558" maxX="581" minY="1765" maxY="1788" name="zero-icon"/>
+  <symbol minX="581" maxX="604" minY="1765" maxY="1785" name="peakt-s"/>
+  <symbol minX="604" maxX="621" minY="1765" maxY="1782" name="dot-m"/>
+  <symbol minX="621" maxX="665" minY="1765" maxY="1782" name="arrow-s"/>
+  <symbol minX="665" maxX="693" minY="1765" maxY="1777" name="arrow-xs"/>
  </file>
 </root>
diff --git a/data/sound-strings/en.json/localize.json b/data/sound-strings/en.json/localize.json
index 2f8d982a22..cd6053f70f 100644
--- a/data/sound-strings/en.json/localize.json
+++ b/data/sound-strings/en.json/localize.json
@@ -3,7 +3,7 @@
 "make_a_right_turn":"Turn right.",
 "make_a_sharp_right_turn":"Sharp right.",
 "enter_the_roundabout":"Enter the roundabout.",
-"leave_the_roundabout":"Exit the roundabout.",
+"leave_the_roundabout":"Exit from the roundabout.",
 "make_a_slight_left_turn":"Keep left.",
 "make_a_left_turn":"Turn left.",
 "make_a_sharp_left_turn":"Sharp left.",
diff --git a/data/sound-strings/pt-BR.json/localize.json b/data/sound-strings/pt-BR.json/localize.json
index 95a2e9ad80..3e9dea000b 100644
--- a/data/sound-strings/pt-BR.json/localize.json
+++ b/data/sound-strings/pt-BR.json/localize.json
@@ -9,7 +9,7 @@
 "make_a_sharp_left_turn":"Curva acentuada à esquerda.",
 "make_a_u_turn":"Faça o retorno.",
 "go_straight":"Siga em frente.",
-"exit":"Pegue a saída.",
+"exit":"Saia.",
 "destination":"Você chegará ao seu destino.",
 "you_have_reached_the_destination":"Você chegou ao seu destino.",
 "in_50_meters":"Em cinquenta metros",
@@ -30,17 +30,17 @@
 "in_2_5_kilometers":"Em dois quilômetros e meio",
 "in_3_kilometers":"Em três quilômetros",
 "then":"Depois",
-"take_the_1_exit":"Pegue a primeira saída.",
-"take_the_2_exit":"Pegue a segunda saída.",
-"take_the_3_exit":"Pegue a terceira saída.",
-"take_the_4_exit":"Pegue a quarta saída.",
-"take_the_5_exit":"Pegue a quinta saída.",
-"take_the_6_exit":"Pegue a sexta saída.",
-"take_the_7_exit":"Pegue a sétima saída.",
-"take_the_8_exit":"Pegue a oitava saída.",
-"take_the_9_exit":"Pegue a nona saída.",
-"take_the_10_exit":"Pegue a décima saída.",
-"take_the_11_exit":"Pegue a décima primeira saída.",
+"take_the_1_exit":"Saia na primeira saída.",
+"take_the_2_exit":"Saia na segunda saída.",
+"take_the_3_exit":"Saia na terceira saída.",
+"take_the_4_exit":"Saia na quarta saída.",
+"take_the_5_exit":"Saia na quinta saída.",
+"take_the_6_exit":"Saia na sexta saída.",
+"take_the_7_exit":"Saia na sétima saída.",
+"take_the_8_exit":"Saia na oitava saída.",
+"take_the_9_exit":"Saia na nona saída.",
+"take_the_10_exit":"Saia na décima saída.",
+"take_the_11_exit":"Saia na décima primeira saída.",
 "in_50_feet":"Em cinquenta pés",
 "in_100_feet":"Em cem pés",
 "in_200_feet":"Em duzentos pés",
diff --git a/data/strings/sound.txt b/data/strings/sound.txt
index f2fafa24b9..57b8b5b92b 100644
--- a/data/strings/sound.txt
+++ b/data/strings/sound.txt
@@ -157,7 +157,7 @@
     zh-Hant = 進入環島。
 
   [leave_the_roundabout]
-    en = Exit the roundabout.
+    en = Exit from the roundabout.
     ar = اخرج من الدوار.
     be = Збочце з круга.
     ca = Sortiu de la rotonda.
@@ -416,7 +416,7 @@
     nl = Verlaat.
     pl = Zjazd.
     pt = Saia.
-    pt-BR = Pegue a saída.
+    pt-BR = Saia.
     ro = Ieșire.
     ru = Съезд.
     sk = Výjazd.
@@ -1235,7 +1235,7 @@
     nl = Neem de eerste afslag.
     pl = Zjedź pierwszym zjazdem.
     pt = Saia na primeira saída.
-    pt-BR = Pegue a primeira saída.
+    pt-BR = Saia na primeira saída.
     ro = Folosiți prima ieșire.
     ru = Сверните на первый съезд.
     sk = Opustite kruhový objazd na prvom výjazde.
@@ -1274,7 +1274,7 @@
     nl = Neem de tweede afslag.
     pl = Zjedź drugim zjazdem.
     pt = Saia na segunda saída.
-    pt-BR = Pegue a segunda saída.
+    pt-BR = Saia na segunda saída.
     ro = Folosiți a doua ieșire.
     ru = Сверните на второй съезд.
     sk = Opustite kruhový objazd na druhom výjazde.
@@ -1313,7 +1313,7 @@
     nl = Neem de derde afslag.
     pl = Zjedź trzecim zjazdem.
     pt = Saia na terceira saída.
-    pt-BR = Pegue a terceira saída.
+    pt-BR = Saia na terceira saída.
     ro = Folosiți a treia ieșire.
     ru = Сверните на третий съезд.
     sk = Opustite kruhový objazd na treťom výjazde.
@@ -1352,7 +1352,7 @@
     nl = Neem de vierde afslag.
     pl = Zjedź czwartym zjazdem.
     pt = Saia na quarta saída.
-    pt-BR = Pegue a quarta saída.
+    pt-BR = Saia na quarta saída.
     ro = Folosiți a patra ieșire.
     ru = Сверните на четвертый съезд.
     sk = Opustite kruhový objazd na štvrtom výjazde.
@@ -1391,7 +1391,7 @@
     nl = Neem de vijfde afslag.
     pl = Zjedź piątym zjazdem.
     pt = Saia na quinta saída.
-    pt-BR = Pegue a quinta saída.
+    pt-BR = Saia na quinta saída.
     ro = Folosiți a cincea ieșire.
     ru = Сверните на пятый съезд.
     sk = Opustite kruhový objazd na piatom výjazde.
@@ -1430,7 +1430,7 @@
     nl = Neem de zesde afslag.
     pl = Zjedź szóstym zjazdem.
     pt = Saia na sexta saída.
-    pt-BR = Pegue a sexta saída.
+    pt-BR = Saia na sexta saída.
     ro = Folosiți a șasea ieșire.
     ru = Сверните на шестой съезд.
     sk = Opustite kruhový objazd na šiestom výjazde.
@@ -1469,7 +1469,7 @@
     nl = Neem de zevende afslag.
     pl = Zjedź siódmym zjazdem.
     pt = Saia na sétima saída.
-    pt-BR = Pegue a sétima saída.
+    pt-BR = Saia na sétima saída.
     ro = Folosiți a șaptea ieșire.
     ru = Сверните на седьмой съезд.
     sk = Opustite kruhový objazd na siedmom výjazde.
@@ -1508,7 +1508,7 @@
     nl = Neem de achtste afslag.
     pl = Zjedź ósmym zjazdem.
     pt = Saia na oitava saída.
-    pt-BR = Pegue a oitava saída.
+    pt-BR = Saia na oitava saída.
     ro = Folosiți a opta ieșire.
     ru = Сверните на восьмой съезд.
     sk = Opustite kruhový objazd na ôsmom výjazde.
@@ -1547,7 +1547,7 @@
     nl = Neem de negende afslag.
     pl = Zjedź dziewiątym zjazdem.
     pt = Saia na nona saída.
-    pt-BR = Pegue a nona saída.
+    pt-BR = Saia na nona saída.
     ro = Folosiți a noua ieșire.
     ru = Сверните на девятый съезд.
     sk = Opustite kruhový objazd na deviatom výjazde.
@@ -1586,7 +1586,7 @@
     nl = Neem de tiende afslag.
     pl = Zjedź dziesiątym zjazdem.
     pt = Saia na décima saída.
-    pt-BR = Pegue a décima saída.
+    pt-BR = Saia na décima saída.
     ro = Folosiți a zecea ieșire.
     ru = Сверните на десятый съезд.
     sk = Opustite kruhový objazd na desiatom výjazde.
@@ -1625,7 +1625,7 @@
     nl = Neem de elfde afslag.
     pl = Zjedź jedenastym zjazdem.
     pt = Saia na décima primeira saída.
-    pt-BR = Pegue a décima primeira saída.
+    pt-BR = Saia na décima primeira saída.
     ro = Folosiți a unsprezecea ieșire.
     ru = Сверните на одиннадцатый съезд.
     sk = Opustite kruhový objazd na jedenástom výjazde.
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index 1972187ccb..034ae60d0d 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -96,7 +96,7 @@
     el = Ακύρωση λήψης
     es = Cancelar descarga
     et = Tühista allalaadimine
-    eu = Utzi deskarga
+    eu = Utzi deskargatzea
     fa = لغو دانلود
     fi = Peruuta lataus
     fr = Annuler le téléchargement
@@ -137,7 +137,7 @@
     el = Διαγραφή
     es = Eliminar
     et = Kustuta
-    eu = Ezabatu
+    eu = Kendu
     fa = حذف
     fi = Poista
     fr = Supprimer
@@ -301,7 +301,7 @@
     el = Χιλιόμετρα
     es = Kilómetros
     et = Kilomeetrid
-    eu = Kilometro
+    eu = Kilometroak
     fa = کیلومتر
     fi = Kilometrit
     fr = kilomètres
@@ -452,7 +452,7 @@
     el = Η θέση μου
     es = Mi posición
     et = Minu asukoht
-    eu = Nire kokapena
+    eu = Nire posizioa
     fa = مکان من
     fi = Sijaintini
     fr = Ma position
@@ -480,7 +480,7 @@
     zh-Hant = 我的位置
 
   [later]
-    comment = Update maps later button text
+    comment = Update maps later/Buy pro version later button text
     tags = android,ios
     en = Later
     ar = ًلاحقا
@@ -661,7 +661,7 @@
     fi = Laitteen tai sovelluksen kaikki sijaintipalvelut ovat tällä hetkellä poissa käytöstä. Ota ne käyttöön Asetukset-valikossa.
     fr = Tous les services de localisation de cet appareil sont désactivés, ou ils le sont pour cette application. Veuillez les activer dans les paramètres.
     he = שרותי המיקום של מכשיר או ישום זה זה כבויים. הכנס ל "הגדרות" Settings)) כדי להדליקם.
-    hu = Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Kérjük, engedélyezze őket a Beállításokban.
+    hu = Ezen az eszközön jelenleg minden helyzetmeghatározó szolgáltatás ki van kapcsolva. Kérjük kapcsolja be ezeket a Beállítások között.
     id = Saat ini semua Layanan Lokasi untuk perangkat atau aplikasi ini non-aktif. Mohon aktifkan lewat Setelan.
     it = Attualmente tutti i servizi di localizzazione per questo dispositivo o applicazione sono disattivati. Si prega di abilitarli in Impostazioni.
     ja = 端末の位置情報サービスが無効になっているか、このアプリケーションからの位置情報利用が制限されています。端末の設定を有効化してください。
@@ -697,7 +697,7 @@
     el = Εμφάνιση στο χάρτη
     es = Mostrar en el mapa
     et = Kuva kaardil
-    eu = Erakutsi mapan
+    eu = Mapan erakutsi
     fa = بر روی نقشه نمایش بده
     fi = Näytä kartalla
     fr = Voir sur la carte
@@ -778,7 +778,7 @@
     el = Η λήψη απέτυχε
     es = Error durante la descarga
     et = Allalaadimine ebaõnnestus
-    eu = Deskargak huts egin du
+    eu = Errore bat deskargatzean
     fa = دانلود با شکست مواجه شد
     fi = Lataus epäonnistui
     fr = Échec lors du téléchargement
@@ -859,12 +859,12 @@
     el = Σχετικά με το Organic Maps
     es = Sobre Organic Maps
     et = Organic Maps kohta
-    eu = Organic Maps-i buruz
+    eu = Organic Maps buruz
     fa = Organic Maps درباره‌ی
     fi = Tietoa Organic Maps:stä
     fr = À propos de Organic Maps
     he = Organic Maps אודות
-    hu = Az Organic Mapsről
+    hu = A Organic Maps programról
     id = Tentang Organic Maps
     it = Informazioni su Organic Maps
     ja = Organic Mapsについて
@@ -898,7 +898,6 @@
     de = Kostenlos für alle, mit Liebe gemacht
     el = Δωρεάν για όλους, φτιαγμένα με αγάπη
     es = Gratis para todos, hecho con amor
-    eu = Denontzat doan, maitasunez egina
     fa = رایگان برای همه ، ساخته شده با عشق
     fi = Ilmainen kaikille, tehty rakkaudella
     fr = Gratuit pour tout le monde, fait avec amour
@@ -937,7 +936,6 @@
     de = • Keine Werbung, kein Tracking, keine Datenerfassung
     el = • Δεν υπάρχουν διαφημίσεις, χωρίς παρακολούθηση, χωρίς συλλογή δεδομένων
     es = • Sin anuncios, sin seguimiento, sin recopilación de datos
-    eu = • Ez iragarkirik, ez jarraipenik, ez datu-bilketarik
     fa = • بدون تبلیغات ، ردیابی ، جمع آوری داده ها
     fi = • Ei mainoksia, ei seurantaa, ei tiedonkeruua
     fr = • Pas d'annonces, pas de suivi, pas de collecte de données
@@ -1018,7 +1016,6 @@
     de = • Schnell, minimalistisch, keine Bloatware
     el = • Γρήγορη, μινιμαλιστική, χωρίς σκουπίδια
     es = • Rápido, minimalista, sin basura
-    eu = • Azkarra, minimalista, zaborrik gabe
     fa = • سریع ، مینیمالیستی ، بدون آشغال
     fi = • Nopea, minimalistinen, ei roskaa
     fr = • Rapide, minimaliste, pas de superflu
@@ -1057,7 +1054,6 @@
     de = Open-Source-Anwendung von Enthusiasten und Freiwilligen.
     el = Εφαρμογή ανοιχτού κώδικα που δημιουργήθηκε από ενθουσιώδες και εθελοντές.
     es = Aplicación de código abierto creada por entusiastas y voluntarios.
-    eu = Kode irekiko aplikazioa zaleek eta boluntarioek sortutakoa.
     fa = برنامه منبع باز ایجاد شده توسط علاقه مندان و داوطلبان.
     fi = Harrastajien ja vapaaehtoisten luoma avoimen lähdekoodin sovellus.
     fr = Application open source créée par des amateurs et des bénévoles.
@@ -1101,7 +1097,7 @@
     fi = Yhteysasetukset
     fr = Paramètres de connexion
     he = הגדרות תקשורת
-    hu = Helymeghatározási beállítások
+    hu = Kapcsolat beállítások
     id = Pengaturan Koneksi
     it = Impostazioni di connessione
     ja = 接続設定
@@ -1176,7 +1172,7 @@
     el = Η εφαρμογή απαιτεί OpenGL με επιτάχυνση υλικού. Δυστυχώς, η συσκευή σας δεν το υποστηρίζει.
     es = La aplicación requiere OpenGL acelerado por hardware. Lamentablemente, su dispositivo no es compatible.
     et = Rakendus vajab riistvaralist OpenGL tuge. Kahjuks Sinu seade ei ole toetatud.
-    eu = Aplikazioak hardwarez azeleratutako OpenGL behar du. Zoritxarrez, zure gailua ez da onartzen.
+    eu = Aplikazioak hardware-azeleratutako OpenGL behar du. Zoritxarrez, zure gailua ez da onartzen.
     fa = نیازمند است. متاسفانه دستگاه شما از آن پشتیبانی نمی‌کندOpenGLبرنامه برای اجرا به
     fi = Laitteistokiihdytetty OpenGL vaaditaan. Valitettavasti laitteesi ei ole tuettu.
     fr = L'accélération OpenGL matérielle est exigée. Malheureusement, votre appareil n'est pas pris en charge.
@@ -1326,7 +1322,7 @@
 
   [download_resources]
     tags = android
-    en = Before you start using the app, please download the general world map to your device.\nIt will use %@ of storage.
+    en = Before you start using the app, allow us to download the general world map to your device.\nIt will use %@ of storage.
     ar = قبل أن تبدأ باستخدام التطبيق، سنقوم بتنزيل خريطة العالم العامة على جهازك.\nستحتاج إلى %@ من البيانات.
     be = Перад пачаткам працы дазвольце нам спампаваць агульную мапу свету на вашу прыладу.\nГэта патрабуе %@ дадзеных.
     bg = Преди да започнете да използвате приложението, позволете ни да изтеглим общата карта на света на вашето устройство.\nТова ще използва %@ от паметта.
@@ -1337,7 +1333,7 @@
     el = Πριν ξεκινήσετε τη χρήση της εφαρμογής, επιτρέψτε μας να κατεβάσουμε το γενικό παγκόσμιο χάρτη στη συσκευή σας. \nIt θα χρησιμοποιήσει %@ αποθηκευτικού χώρου.
     es = Antes de comenzar, permita que descarguemos en tu dispositivo un mapamundi general.\nSe requieren %@ de almacenamiento.
     et = Ennem rakenduse kasutamise alustamist luba meil laadida seadmesse alla maailma üldkaart.\nSee kasutab %@ mälumahtu.
-    eu = Hasi baino lehen, utzi mundu-mapa orokor bat zure gailuan deskargatzen.\nDatuen %@ beharrezkoa da.
+    eu = Hasi baino lehen, utzi mundu-mapa orokor bat zure gailura deskargatzeko.\nDatuen %@ beharrezkoa da.
     fa = قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم.\nمقدار %@ از حافظه شما اشغال می شود.
     fi = Ennen aloitusta laitteelle tulee ladata yleinen maailmankartta.\nSe tarvitsee yhteensä %@ dataa.
     fr = Avant de commencer, permettez-nous de télécharger la carte générale du monde dans votre appareil.\n%@ de données sont nécessaires.
@@ -1497,7 +1493,7 @@
     el = Να γίνει ενημέρωση %@;
     es = ¿Actualizar %@?
     et = Värskendada %@?
-    eu = %@ eguneratu?
+    eu = %@ eguneratzeko?
     fa = آپدیت %@?
     fi = Päivitetäänkö %@?
     fr = Mettre %@ à jour ?
@@ -1620,7 +1616,7 @@
     el = η λήψη %@ απέτυχε
     es = %@ la descarga ha fallado
     et = %@ allalaadimine ebaõnnestus
-    eu = %@ deskargak huts egin du
+    eu = %@ deskargatu huts egin du
     fa = %@ دانلود با شکست مواجه شد
     fi = %@ lataus epäonnistui
     fr = %@, échec lors du téléchargement
@@ -1650,7 +1646,7 @@
   [add_new_set]
     comment = "Add new bookmark list" dialog title
     tags = android,ios
-    en = Add a New List
+    en = Add New List
     ar = إضافة قائمة جديدة
     be = Дадаць новы спіс
     bg = Добавяне на нова група
@@ -1661,7 +1657,7 @@
     el = Προσθέστε νέο σύνολο
     es = Agregar un grupo nuevo
     et = Lisa uus loetelu
-    eu = Gehitu zerrenda berri bat
+    eu = Gehitu talde berri bat
     fa = اضافه کردن مجموعه جدید
     fi = Lisää uusi valikoima
     fr = Ajouter un nouveau groupe
@@ -1703,7 +1699,7 @@
     el = Χρώμα αγαπημένου
     es = Color del marcador
     et = Järjehoidja värv
-    eu = Markagailuaren kolorea
+    eu = Markatzailearen kolorea
     fa = رنگ نشانه
     fi = Kirjanmerkin väri
     fr = Couleur du signet
@@ -1744,7 +1740,7 @@
     el = Όνομα συνόλου αγαπημένων
     es = Nombre del grupo de marcadores
     et = Järjehoidjate loetelu nimi
-    eu = Markagailuen zerrendaren izena
+    eu = Markatzaile taldearen izena
     fi = Kirjanmerkkivalikoiman nimi
     fr = Nom du groupe de signets
     he = שם רשימת האתרים
@@ -1783,7 +1779,7 @@
     el = Σύνολα αγαπημένων
     es = Grupos de marcadores
     et = Järjehoidjate loetelud
-    eu = Markagailuen zerrenda
+    eu = Markagailu taldeak
     fi = Kirjanmerkkivalikoimat
     fr = Groupes de signets
     he = רשימות אתרים
@@ -1946,7 +1942,7 @@
     el = Διεύθυνση
     es = Dirección
     et = Aadress
-    eu = Helbidea
+    eu = Norabidea
     fa = آدرس
     fi = Osoite
     fr = Adresse
@@ -2069,11 +2065,11 @@
     el = Αποθήκευση χαρτών στο
     es = Guardar mapas en
     et = Salvesta kaardid asukohta
-    eu = Mapak gordetzeko tokia
+    eu = Mapak gordetzeko
     fa = ذخیره نقشه‌ها در
     fi = Tallenna kartat kohteeseen
     fr = Enregistrer les cartes dans
-    hu = Térképek mentési helye
+    hu = Térképek mentése ide:
     id = Simpan peta di
     it = Salva mappe in
     ja = 地図の保存先
@@ -2099,7 +2095,7 @@
   [maps_storage_summary]
     comment = Detailed description of Maps Storage settings button
     tags = android
-    en = Select the folder to download maps to.
+    en = Select the place where maps should be downloaded to
     ar = اختر المكان الذي ينبغي تنزيل الخرائط إليه.
     be = Выберыце месца, дзе захоўваць запампаваныя мапы
     bg = Изберете мястото, където картите трябва да се изтеглят
@@ -2151,12 +2147,12 @@
     el = Χάρτες
     es = Mapas descargados
     et = Kaardid
-    eu = Deskargatutako mapak
+    eu = Mapak
     fa = نقشه‌ها
     fi = Kartat
     fr = Cartes téléchargées
     he = מפות
-    hu = Letöltött térképek
+    hu = Térképek
     id = Peta
     it = Mappe
     ja = マップ
@@ -2187,9 +2183,7 @@
     de = Interner persönlicher Speicher
     es = Almacenamiento interno privado
     et = Sisemine privaatne salvestusruum
-    eu = Barne biltegiratze pribatua
     fr = Stockage interne privé
-    hu = Belső privát tárhely
     nb = Intern privat lagring
     nl = Intern persoonlijk geheugen
     pl = Wewnętrzna pamięć prywatna
@@ -2208,9 +2202,7 @@
     de = Interner gemeinsamer Speicher
     es = Almacenamiento interno compartido
     et = Sisemine jagatud salvestusruum
-    eu = Barne biltegiratze partekatua
     fr = Stockage interne partagé
-    hu = Belső közös tárhely
     nb = Intern delt lagring
     nl = Intern gedeeld geheugen
     pl = Wewnętrzna pamięć współdzielona
@@ -2229,9 +2221,7 @@
     de = SD-Karte
     es = Tarjeta SD
     et = SD-kaart
-    eu = SD txartela
     fr = Carte SD
-    hu = SD-kártya
     nb = SD-kort
     nl = SD-kaart
     pl = Karta SD
@@ -2250,9 +2240,7 @@
     de = Externer gemeinsamer Speicher
     es = Almacenamiento externo compartido
     et = Väline jagatud salvestusruum
-    eu = Kanpoko biltegiratze partekatua
     fr = Stockage externe partagé
-    hu = Külső közös tárhely
     nb = Ekstern delt lagring
     nl = Extern gedeeld geheugen
     pl = Zewnętrzna pamięć współdzielona
@@ -2271,9 +2259,7 @@
     de = %1$@ frei von %2$@
     es = %1$@ libres de %2$@
     et = %1$@ vaba ruumist %2$@
-    eu = %2$@-tik %1$@ libre
     fr = %1$@ libres sur %2$@
-    hu = %1$@ szabad %2$@-ból
     nb = %1$@ ledig av %2$@
     nl = %1$@ beschikbaar van %2$@
     pl = %1$@ wolne z %2$@
@@ -2301,7 +2287,7 @@
     fi = Siirrä karttoja?
     fr = Déplacer les cartes ?
     he = להעביר המפות?
-    hu = Áthelyezzük a térképfájlokat?
+    hu = Áthelyezzük a térképeket?
     id = Pindahkan peta?
     it = Vuoi spostare le mappe?
     ja = マップを移動させますか？
@@ -2332,9 +2318,7 @@
     de = Fehler beim Verschieben der Karten
     es = Error al mover los archivos de mapas
     et = Kaardipaanide teisaldamine ebaõnnestus
-    eu = Ezin izan dira mapak mugitu
     fr = Erreur lors du déplacement des cartes
-    hu = Hiba történt a térképfájlok áthelyezése közben
     nb = Kunne ikke flytte kart
     nl = Fout bij het verplaatsen van kaartbestanden
     pl = Błąd przenoszenia plików map
@@ -2397,7 +2381,7 @@
     el = Μονάδες μέτρησης
     es = Unidades de medida
     et = Mõõtühikud
-    eu = Neurketa unitateak
+    eu = Neurketa-unitateak
     fa = واحد اندازه‌گیری
     fi = Mittayksiköt
     fr = Unités de mesure
@@ -2523,11 +2507,11 @@
     el = Παντοπωλεία
     es = Alimentación
     et = Toidukaubad
-    eu = Janari-denda
+    eu = Janariak
     fa = عطاری
     fi = Elintarvikkeet
     fr = Epiceries
-    hu = Élelmiszerek
+    hu = Termékek
     id = Toserba
     it = Alimentari
     ja = 食料雑貨
@@ -2569,7 +2553,7 @@
     fi = Liikenne
     fr = Transport
     he = תחבורה
-    hu = Tömegközlekedés
+    hu = Közlekedés
     id = Transportasi
     it = Trasporto
     ja = 交通機関
@@ -2606,7 +2590,7 @@
     el = Βενζίνη
     es = Gasolinera
     et = Tanklad
-    eu = Gasolindegia
+    eu = Erregai-geltokia
     fa = سوخت
     fi = Huoltoasema
     fr = Stations-service
@@ -2775,7 +2759,7 @@
     fi = Nähtävyydet
     fr = Sites touristiques
     he = נקודות עיניין
-    hu = Látnivalók
+    hu = Látnivaló
     id = Pemandangan
     it = Luoghi turistici
     ja = 観光
@@ -2893,7 +2877,7 @@
     el = Νυχτερινή Ζωή
     es = Vida nocturna
     et = Ööelu
-    eu = Gaueko giroa
+    eu = Gaueko bizitza
     fa = تفریحات شبانه
     fi = Yöelämä
     fr = Vie nocturne
@@ -2938,7 +2922,7 @@
     fa = تعطیلات خانوادگی
     fi = Vapaa-aikaa lasten kanssa
     fr = Vacances en famille
-    hu = Családi kiruccanás
+    hu = Pihenés a gyerekekkel
     id = Liburan keluarga
     it = Divertimento in famiglia
     ja = 家族の休日
@@ -3099,7 +3083,7 @@
     el = Τουαλέτα
     es = Baños
     et = Tualett
-    eu = Komuna
+    eu = Komunak
     fa = توالت
     fi = WC
     fr = Toilettes
@@ -3386,7 +3370,7 @@
     el = Σημειώσεις
     es = Notas
     et = Märkmed
-    eu = Oharrak
+    eu = Notak
     fa = یادداشت‌ها
     fi = Muistiinpanot
     fr = Notes
@@ -3427,7 +3411,7 @@
     el = Κοινοποιήθηκαν αγαπημένα Organic Maps με σας
     es = Marcadores de Organic Maps compartidos con usted
     et = Organic Maps järjehoidjaid jagati Sinuga
-    eu = Organic Maps markagailuak zurekin partekatu dira
+    eu = Organic Maps markatzaileak zurekin partekatu dira
     fi = Jaetut Organic Maps-kirjanmerkit
     fr = Signets Organic Maps partagés
     he = משותפתOrganic Maps רשימת אתרי
@@ -3455,14 +3439,14 @@
 
   [share_bookmarks_email_body]
     tags = android,ios
-    en = Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!
+    en = Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!
     ar = مرحباً! ْ\n\n تم إرفاق إشاراتي المرجعية من تطبيق Organic Maps. الرجاء فتحهم إذا لديك تطبيق Organic Maps مثبتاً. أو، إذا لم يكن مثبتاً، قم بتنزيل التطبيق لنظام iOS أو أندرويد من خلال الضغط على هذا الرابط: https://omaps.app/get?kmz \n\nاستمتع بالسفر مع Organic Maps!
     be = Вітаю!\n\nУ далучаным файле мае закладкі з праграмы Organic Maps. Калі ласка, адчыніце іх, калі ў вас усталяваны Organic Maps. Калі не, спампуйце праграму для вашай прылады iOS альбо Andriod па спасылцы: https://omaps.app/get?kmz\n\nПрыемных падарожжаў з Organic Maps!
     ca = Hola!\n\nAdjunto els meus marcadors de l'aplicació Organic Maps. Obriu-los si teniu l'Organic Maps instal·lat. O, si no teniu l'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://omaps.app/get?kmz\n\nGaudiu viatjant amb l'Organic Maps!
     de = Hallo!\n\nIm Anhang sind meine Lesezeichen der Organic Maps App. Sie können sie mit Organic Maps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://omaps.app/get?kmz für iOS oder Android herunterladen.\n\nViel Spaß beim Reisen mit Organic Maps!
     es = Hola!\n\Adjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz\n¡Disfrute viajando con Organic Maps!
     et = Tere!\nManuses on minu järjehoidjad rakendusest Organic Maps. Palun ava need kui Sul on Organic Maps paigaldatud. Või kui ei ole, lae rakendus alla oma iOS või Android seadmesse, järgides seda linki: https:omaps.appget?kmz\n\nNaudi reisimist Organic Maps-iga!
-    eu = Kaixo!\nNire markagailuak Organic Maps aplikazioan erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin!
+    eu = Kaixo!\nNire markatzaileak Mapak organikoak aplikaziotik erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin!
     fr = Bonjour !\n\nVous trouverez ci-joint mes signets de l'appli Organic Maps. Veuillez les ouvrir si vous avez installé Organic Maps. Si vous ne l'avez pas, téléchargez l'application pour votre appareil iOS ou Android en suivant ce lien : https://omaps.app/get?kmz\n\nBon voyage avec Organic Maps!
     it = Ciao!\n\nIn allegato ci sono i miei luoghi preferiti. Aprili se hai installato Organic Maps. Oppure, se non ce l'hai, scarica l'app per iOS o Android seguendo questo link: https://omaps.app/\n\nDivertiti a viaggiare con Organic Maps!
     mr = नमस्कार!\n\nOrganic Maps ऍप मधील माझे खूणपत्रे संलग्न केले आहेत. तुम्ही Organic Maps इन्स्टॉल केले असल्यास हे खूणपत्रे उघडा. इन्स्टॉल केले नसल्यास, पुढील दुव्यावर जाऊन तुमच्या iOS किंवा अँड्रॉइड उपकरणावर हे डाउनलोड करा: https://omaps.app/get?kmz\n\nOrganic Maps सह प्रवासाचा आनंद घ्या!
@@ -3490,7 +3474,7 @@
     el = Φόρτωση αγαπημένων
     es = Cargando marcadores
     et = Järjehoidjate laadimine
-    eu = Markagailuak kargatzen
+    eu = Markatzaileak kargatzen
     fa = در حال بارگیری نشانه‌ها
     fi = Ladataan kirjanmerkkejä
     fr = Chargement des signets
@@ -3531,7 +3515,7 @@
     el = Τα αγαπημένα φορτώθηκαν με επιτυχία! Μπορείτε να τα βρείτε στο χάρτη ή στην οθόνη Διαχείριση αγαπημένων.
     es = ¡Los marcadores se han cargado con éxito! Puede encontrarlos en el mapa o en la pantalla de Gestión de marcadores.
     et = Järjehoidjad edukalt laetud! Leiad need kaardil või järjehoidjate halduri ekraanil.
-    eu = Markagailuak behar bezala kargatu dira! Mapan edo markagailuak kudeatzeko pantailan aurki ditzakezu.
+    eu = Gogokoak behar bezala kargatu dira! Mapan edo kudeatu gogokoak pantailan aurki ditzakezu.
     fa = نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید
     fi = Kirjanmerkkien lataaminen onnistui! Löydät ne joko kartalta tai kirjanmerkkien hallinnasta.
     fr = Les signets ont été chargés avec succès ! Vous pouvez les trouver sur la carte ou sur l'écran du Gestionnaire de signets.
@@ -3572,7 +3556,7 @@
     el = Η μεταφόρτωση των αγαπημένων απέτυχε. Το αρχείο μπορεί να είναι κατεστραμμένο ή ελαττωματικό.
     es = La carga de marcadores ha fallado. El archivo puede estar corrupto o ser defectuoso.
     et = Järjehoidjate laadimine ebaõnnestus. Fail võib olla vigane.
-    eu = Ezin izan dira markagailuak kargatu. Fitxategia hondatuta edo akastuna izan daiteke.
+    eu = Ezin izan da gogokoak kargatu. Fitxategia hondatuta edo akastuna izan daiteke.
     fa = بارگذاری نشانه‌ها با شکست مواجه شد.ممکن است فایل آسیب دیده یا معیوب باشد
     fi = Kirjanmerkkien lähetys epäonnistui. Tiedosto saattaa olla vioittunut.
     fr = Échec lors du chargement des signets. Le fichier peut être corrompu ou défectueux.
@@ -3765,7 +3749,7 @@
   [my_position_share_sms]
     comment = Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140.
     tags = android
-    en = Check out my current location in Organic Maps! %1$@ or %2$@ Don't have offline maps? Download here: https://omaps.app/get
+    en = Hey, check out my current location in Organic Maps! %1$@ or %2$@ Don't have offline maps? Download here: https://omaps.app/get
     ar = مرحباً، تفقد الموقع الخاص بي على Organic Maps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://omaps.app/get
     be = Гэй, глядзі дзе я зараз на мапе! %1$@ альбо %2$@ Няма офлайн-мапаў? Спампуй тут: https://omaps.app/get
     bg = Хей, виж текущото ми местоположение в Organic Maps! %1$@ или %2$@
@@ -3776,7 +3760,7 @@
     el = Έλεγξε την τρέχουσα τοποθεσία μου στο Organic Maps! %1$@ ή %2$@ στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get
     es = ¡Mira mi ubicación actual en Organic Maps!. %1$@ o %2$@ ¿No tienes mapas offline? Descarga aquí: https://omaps.app/get
     et = Hei, vaata minu hetkeasukohta Organic Maps kaardil! %1$@ või %2$@ Võrguühenduseta kaardid puuduvad? Lae siit: https://omaps.app/get
-    eu = Ikusi nire uneko kokapena Organic Maps-en! %1$@ edo %2$@ Ez al duzu lineaz kanpoko maparik? Deskargatu hemendik: https://omaps.app/get
+    eu = Ikusi nire uneko kokapena Organic Maps-en! %1$@ edo %2$@ Ez al duzu lineaz kanpoko maparik? Deskargatu hemen: https://omaps.app/get
     fi = Hei, katso sijaintini Organic Maps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://omaps.app/get
     fr = Hé, regardez ma position actuelle sur Organic Maps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get
     he = . אין ברשותך מפות לא מקוונות? הורד Organic Maps! %1$@ or %2$@ הי, בדוק את מיקומי הנוכחי ב. https://omaps.app/get הורד אותן מ:
@@ -3816,7 +3800,7 @@
     el = Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps!
     es = ¡Mira mi marcador en el mapa de Organic Maps!
     et = Hei, vaata minu asukoha märget Organic Maps kaardil!
-    eu = Begiratu nire markagailua Organic Maps mapan!
+    eu = Begiratu nire markatzailea Map organikoak mapan!
     fi = Hei, katso merkintäni Organic Maps-kartalla
     fr = Hé, regardez mon signet sur la carte Organic Maps !
     he = הי, בדוק את הסיכה שלי במפה של Organic Maps!
@@ -3856,7 +3840,7 @@
     el = Έλεγξε την τρέχουσα τοποθεσία μου στο χάρτη Organic Maps!
     es = ¡Mira mi ubicación actual en el mapa en Organic Maps!
     et = Hei, vaata minu hetkeasukohta Organic Maps kaardil!
-    eu = Ikusi nire uneko kokapena Organic Maps mapan!
+    eu = Ikusi nire uneko kokapena mapan Organic Maps-en!
     fi = Hei, kurkkaa tämänhetkinen sijaintini Organic Maps:n kartalla!
     fr = Hé, regardez ma position actuelle sur la carte Organic Maps !
     he = היי, בדקו את המיקום הנוכחי שלי במפה של Organic Maps!
@@ -3977,7 +3961,7 @@
     el = Email
     es = Email
     et = E-post
-    eu = Posta elektronikoa
+    eu = Email
     fa = ایمیل
     fi = Sähköposti
     fr = Email
@@ -4265,7 +4249,7 @@
     el = Διαδρομές
     es = Rutas
     et = Rajad
-    eu = Arrastoak
+    eu = Ibilbideak
     fa = مسیر
     fi = Reitit
     fr = Parcours
@@ -4385,7 +4369,7 @@
     de = Allgemeine Einstellungen
     es = Ajustes generales
     et = Üldseaded
-    eu = Ezarpen orokorrak
+    eu = Doikuntza orokorrak
     fa = تنظیمات عمومی
     fi = Yleiset asetukset
     fr = Paramètres généraux
@@ -4418,7 +4402,6 @@
     fa = اطلاعات
     fi = Tietoja
     fr = Information
-    hu = Információk
     it = Informazioni
     mr = माहिती
     nb = Informasjon
@@ -4524,7 +4507,7 @@
     el = Εμφάνιση στο χάρτη
     es = Visualización en la pantalla
     et = Kuva kaardil
-    eu = Erakutsi mapan
+    eu = Pantailan bistaratzea
     fa = نمایش بر روی نقشه
     fi = Näytä ruudulla
     fr = Afficher à l'écran
@@ -4794,7 +4777,7 @@
   [pref_map_3d_buildings_disabled_summary]
     comment = A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled
     tags = android,ios
-    en = 3D buildings are disabled in power saving mode
+    en = 3D buildings are turned off in power saving mode
     ar = يتم إيقاف تشغيل المباني ثلاثية الأبعاد في وضع توفير الطاقة
     be = У рэжыме энергазберажэння 3D-будынкі выключаны
     bg = 3D сградите са изключени в режим на пестене на енергия
@@ -4805,7 +4788,7 @@
     el = Τα τρισδιάστατα κτίρια απενεργοποιούνται σε λειτουργία εξοικονόμησης ενέργειας
     es = Los edificios 3D se apagan en el modo de ahorro de energía
     et = 3D-hooned lülitatakse energiasäästurežiimis välja
-    eu = 3D eraikinak desgaituta daude energia aurrezteko moduan
+    eu = 3D eraikinak itzalita daude energia aurrezteko moduan
     fa = ساختمان های سه بعدی در حالت صرفه جویی در مصرف برق خاموش می شوند
     fi = 3D-rakennukset sammutetaan virransäästötilassa
     fr = Les bâtiments 3D sont désactivés en mode d'économie d'énergie
@@ -5007,7 +4990,7 @@
     el = Πρόσφατη διαδρομή
     es = Trayecto reciente
     et = Hiljutine rada
-    eu = Azken arrastoa
+    eu = Azken bidaia
     fa = مسیر اخیر
     fi = Viimeisin reitti
     fr = Parcours récent
@@ -5124,7 +5107,7 @@
     el = 1 ώρα
     es = 1 hora
     et = 1 tund
-    eu = ordu 1
+    eu = 1 ordu
     fa = 1 ساعت
     fi = 1 tunti
     fr = 1 heure
@@ -5280,7 +5263,7 @@
     el = 1 ημέρα
     es = 1 día
     et = 1 päev
-    eu = egun 1
+    eu = 1 egun
     fa = 1 روز
     fi = 1 päivä
     fr = 1 jour
@@ -5319,7 +5302,7 @@
     el = Σας επιτρέπει να καταγράψετε τη διαδρομή που έχει διανυθεί για συγκεκριμένο χρονικό διάστημα και να την δείτε στο χάρτη. Λάβετε υπόψη: η ενεργοποίηση αυτής της λειτουργίας κάνει έντονη χρήση της μπαταρίας. Το τμήμα θα αφαιρεθεί αυτόματα από το χάρτη μετά τη λήξη του μεσοδιαστήματος.
     es = Permite registrar el recorrido realizado durante un determinado periodo de tiempo y verlo en el mapa. Tenga en cuenta que la activación de esta función aumenta el consumo de la batería. El registro del recorrido se eliminará automáticamente del mapa una vez vencido dicho periodo de tiempo.
     et = See valik võimaldab salvestada läbitud tee teatud ajaks ja näha seda kaardil. Pange tähele: selle funktsiooni aktiveerimine suurendab aku kasutust. Rada eemaldatakse automaatselt kaardilt pärast ajaintervalli möödumist.
-    eu = Denbora tarte jakin batean egindako arrastoa erregistratu eta mapan ikusteko aukera ematen du. Kontuan izan funtzio hau aktibatzea bateriaren kontsumoa handitzen dela. Ibilbide-erregistroa automatikoki kenduko da mapatik denbora-tarte hori igaro ondoren.
+    eu = Denbora tarte jakin batean egindako ibilbidea erregistratu eta mapan ikusteko aukera ematen du. Kontuan izan funtzio hau aktibatzea bateriaren kontsumoa handitzen dela. Ibilbide-erregistroa automatikoki kenduko da mapatik denbora-tarte hori igaro ondoren.
     fa = با این قابلیت شما می توانید مسیری که می پیمایید را در یک دوره مشخص ضبط نماید و آن را بر روی نقشه ببینید.لطفا توجه نمایید:فعال سازی این قابلیت باعث افزایش مصرف باتری موبایل شما می شود.مسیر به طور خودکار بعد از مدت مشخص شده حذف خواهد شد
     fi = Toiminnon avulla voit tallentaa kuljetun reitin tietyltä ajalta ja nähdä sen kartalla: Huomautus: tämän toiminnon aktivoiminen lisää akun käyttöä. Reitti poistetaan kartalta automaattisesti ajanjakson päätyttyä.
     fr = Ceci vous permet d’enregistrer le chemin emprunté pendant un certain temps et de le voir sur la carte. Veuillez noter : l’activation de cette fonction entraîne une grande utilisation de la batterie. La route sera supprimée automatiquement de la carte lorsque l’intervalle de temps sera arrivé à expiration.
@@ -5430,7 +5413,6 @@
     en = Menu
     ca = Menú
     es = Menú
-    eu = Menua
     fr = Menu
     nb = Meny
     pl = Menu
@@ -5491,12 +5473,11 @@
     el = Νέα
     es = Noticias
     et = Uudised
-    eu = Albisteak
     fa = اخبار
     fi = Uutiset
     fr = Nouvelles
     he = תוֹשׁדָחֲ
-    hu = Újdonságok
+    hu = Hírek
     id = Berita
     it = Notizia
     ja = ニュース
@@ -5531,7 +5512,7 @@
   [matrix]
     comment = Text in menu
     tags = android,ios
-    en = [Matrix]
+    en = [matrix]
 
   [mastodon]
     comment = Text in menu
@@ -5710,12 +5691,12 @@
     el = Ερωτήσεις και απαντήσεις
     es = Preguntas frecuentes
     et = Korduma kippuvad küsimused
-    eu = Ohiko galderak
+    eu = Maiz galderak
     fa = پرسش‌های زیاد پرسیده شده
     fi = Kysymykset ja vastaukset
     fr = Foire aux questions
     he = תובושתו תולאש
-    hu = Gyakran Ismételt Kérdések
+    hu = Kérdések és válaszok
     id = Pertanyaan dan jawaban
     it = Domande frequenti
     ja = 質問と回答
@@ -5793,7 +5774,7 @@
     el = Υποστηρίξτε το έργο
     es = Apoya el proyecto
     et = Toetage projekti
-    eu = Proiektuari laguntza eman
+    eu = Proiektuari laguntza ematea
     fa = ﺪﯿﻨﮐ ﺖﯾﺎﻤﺣ ﻩﮊﻭﺮﭘ ﺯﺍ
     fi = Tue projektia
     fr = Soutenir le projet
@@ -5835,7 +5816,7 @@
     el = Πνευματικά δικαιώματα
     es = Derechos de autor
     et = Autoriõigused
-    eu = Egile eskubideak
+    eu = Copyright
     fa = حق نشر و کپی رایت
     fi = Tekijänoikeudet
     fr = Tous droits réservés
@@ -5876,7 +5857,7 @@
     el = Αναφορά σφάλματος
     es = Informar de un fallo
     et = Teata veast
-    eu = Errore baten berri eman
+    eu = Errore bat dago
     fa = گزارش خطا
     fi = Ilmoita virheestä
     fr = Signaler un bug
@@ -5906,7 +5887,7 @@
   [email_error_body]
     comment = Alert text
     tags = ios
-    en = The email client has not been set up. Please configure it or contact us at %@
+    en = The email client has not been set up. Please configure it or use any other way to contact us at %@
     ar = لم يتم تنصيب البريد الإلكتروني. يرجى تفعيله أو استخدام أي وسيلة أخرى للاتصال بنا على %@
     be = Паштовы кліент не наладжаны. Наладзьце яго альбо звяжыцеся з намі па адрасе %@ іншым чынам.
     bg = Имейл клиентът не е настроен. Моля, конфигурирайте го или използвайте друг начин, за да се свържете с нас на %@
@@ -5947,7 +5928,7 @@
   [email_error_title]
     comment = Alert title
     tags = ios
-    en = Error sending email
+    en = Mail sending error
     ar = حذث خطأ في إرسال البريد الإلكتروني
     be = Памылка адпраўкі пошты
     bg = Грешка при изпращане на поща
@@ -5999,7 +5980,7 @@
     el = Βαθμονόμηση πυξίδας
     es = Calibración de la brújula
     et = Kompassi kalibreerimine
-    eu = Iparrorratzaren kalibrazioa
+    eu = Konpas kalibrazioa
     fa = تنظیم کردن قطب نما
     fi = Kompassin kalibrointi
     fr = Étalonnage de la boussole
@@ -6080,7 +6061,7 @@
     el = Ακύρωση όλων
     es = Cancelar todo
     et = Tühista kõik
-    eu = Utzi guztiak
+    eu = Guztiak bertan behera utzi
     fa = لغو همه
     fi = Peruuta kaikki
     fr = Tout annuler
@@ -6121,7 +6102,7 @@
     el = Έγινε λήψη
     es = Descargado
     et = Alla laetud
-    eu = Deskargatuta
+    eu = Alta
     fa = دانلود شده
     fi = Ladatut
     fr = Téléchargé
@@ -6160,7 +6141,7 @@
     el = Διαθέσιμη
     es = Disponible
     et = Saadaval
-    eu = Eskuragarria
+    eu = Eskuragarri
     fa = موجود
     fi = Saatavilla
     fr = Disponible
@@ -6436,7 +6417,7 @@
     el = Ενημέρωση
     es = Actualizar
     et = Värskenda
-    eu = Eguneratu
+    eu = Eguneratzeko
     fa = بروزرسانی
     fi = Päivitä
     fr = Mettre à jour
@@ -6477,7 +6458,7 @@
     el = Απέτυχε
     es = Fallo
     et = Ebaõnnestus
-    eu = Huts eginda
+    eu = Porrota
     fa = ناموفق
     fi = Epäonnistunut
     fr = Echec
@@ -6518,7 +6499,7 @@
     el = Για να διαγράψετε το χάρτη, σταματήστε την πλοήγηση.
     es = Para eliminar el mapa, por favor, detenga la navegación.
     et = Kaardi kustutamiseks palun lõpeta navigeerimine.
-    eu = Mapa ezabatzeko, gelditu nabigazioa.
+    eu = Mapa kentzeko, utzi nabigazioa.
     fa = برای حذف نقشه لطفا مسیر‌یابی را متوقف کنید
     fi = Pysäytä navigointi poistaaksesi kartan.
     fr = Veuillez interrompre la navigation pour supprimer la carte.
@@ -6558,7 +6539,7 @@
     el = Μπορούν να δημιουργηθούν μόνο διαδρομές που περιέχονται πλήρως μέσα σε ένα χάρτη σε μια ενιαία περιοχή.
     es = Sólo se pueden crear rutas que estén totalmente contenidas en un mapa de una sola región.
     et = Luua saab ainult täielikult ühe regiooni kaardi piiridesse jäävaid marsruute.
-    eu = Eskualde bakarreko mapa batean guztiz bilduta dauden arrastoak soilik sor daitezke.
+    eu = Eskualde bakarreko mapa batean guztiz bilduta dauden ibilbideak soilik sor daitezke.
     fa = تنها مسیر‌هایی می توانند ایجاد شوند که به طور کامل در یک نقشه از یک منطقه واحد قرار داشته باشند.
     fi = Vain kokonaisuudessaan yhdelle kartalle mahtuvia reittejä voidaan luoda.
     fr = Les itinéraires ne peuvent être créés que s'ils sont entièrement contenus dans la carte d'une seule région.
@@ -6680,7 +6661,7 @@
     el = Διαγραφή χάρτη
     es = Eliminar mapa
     et = Kustuta kaart
-    eu = Ezabatu mapa
+    eu = Mapa ezabatu
     fa = حذف نقشه
     fi = Poista kartta
     fr = Supprimer carte
@@ -6802,7 +6783,7 @@
     el = Χρησιμοποιήστε υπηρεσίες Google Play για να προσδιορίσετε την τρέχουσα τοποθεσία σας
     es = Usar los servicios de Google Play para obtener su ubicación actual
     et = Kasuta Google Play teenuseid oma hetkeasukoha määramiseks
-    eu = Erabili Google Play zerbitzuak zure uneko kokapena zehazteko
+    eu = Erabili Google Play zerbitzuak zure uneko kokapena lortzeko
     fa = استفاده از Google Play Services برای تعیین موقعیت کنونی شما
     fi = Käytä Google Play -palveluita sijaintisi selvittämiseksi
     fr = Utilisez l'application Google Play Services pour obtenir votre emplacement actuel
@@ -6842,7 +6823,7 @@
     el = Κατεβάστε όλους τους χάρτες για ολόκληρο το μήκος της διαδρομής σας
     es = Descargue todos los mapas de su ruta
     et = Lae alla kõik kaardid oma marsruudil
-    eu = Deskargatu zure arrastoaren mapa guztiak
+    eu = Deskargatu zure ibilbidearen mapa guztiak
     fa = دانلود تمامی نقشه‌ها در طول مسیر‌تان
     fi = Lataa karttoja matkalla
     fr = Téléchargez toutes les cartes le long de votre itinéraire
@@ -6882,7 +6863,7 @@
     el = Για να δημιουργήσετε μια διαδρομή, πρέπει να κατεβάσετε και να ενημερώσετε όλους τους χάρτες από τη θέση σας στον προορισμό σας.
     es = Para crear una ruta es necesario descargar y actualizar todos los mapas desde su ubicación a su destino.
     et = Marsruudi loomiseks on meil vaja alla laadida ja värskendada kõiki sinu lähte- ja sihtkoha vahele jäävaid kaarte.
-    eu = Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.
+    eu = Ibilbide bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatu eta eguneratzea.
     fa = به منظور ایجاد مسیر ما نیاز داریم تا تمامی نقشه‌های شما از مبدا تا مقصد را بروزرسانی کنیم.
     fi = Reitin luominen vaatii karttojen lataamisen ja päivityksen oman sijaintisi ja kohteeen väliltä.
     fr = La création d'un itinéraire nécessite que toutes les cartes de votre localisation vers votre destination soient téléchargées et actualisées.
@@ -6921,7 +6902,7 @@
     el = Δεν υπάρχει αρκετός χώρος
     es = No hay suficiente espacio
     et = Ei ole piisavalt ruumi
-    eu = Leku nahikorik ez
+    eu = Leku nahikoa ez
     fa = فضای کافی موجود نیست
     fi = Ei tarpeeksi tilaa
     fr = Pas assez d'espace
@@ -6961,7 +6942,7 @@
     el = αγαπημένο
     es = marcador
     et = järjehoidja
-    eu = Markagailua
+    eu = Markatzailea
     fa = نشانه‌ها
     fi = kirjanmerkki
     fr = signet
@@ -7045,7 +7026,7 @@
     fa = ذخیره
     fi = Tallenna
     fr = Sauvegarder
-    hu = Mentés
+    hu = Simpan
     id = Simpan
     it = Salva
     ja = 保存
@@ -7569,7 +7550,7 @@
     es = Cian
     es-MX = Cian
     et = Siniroheline
-    eu = Ziana
+    eu = Zian
     fa = فیروزه‌ای
     fi = Sinivihreä
     fr = Cyan
@@ -7651,7 +7632,7 @@
     es = Lima
     es-MX = Lima
     et = Laimiroheline
-    eu = Lima
+    eu = Karea
     fa = زرد لیمویی
     fi = Limen värinen
     fr = Vert citron
@@ -7723,7 +7704,6 @@
     comment = gray color
     tags = android,ios
     en = Gray
-    en-GB = Grey
     ar = رمادي
     be = Шэры
     ca = Gris
@@ -7765,7 +7745,6 @@
     comment = blue gray color
     tags = android,ios
     en = Blue Gray
-    en-GB = Blue Grey
     ar = رمادي أزرق
     be = Блакітна-шэры
     ca = Gris blavós
@@ -7818,7 +7797,7 @@
     el = Όταν ακολουθείτε την διαδρομή, να θυμάστε:
     es = Al seguir la ruta, tenga en cuenta:
     et = Marsruuti järgides palun pea meeles:
-    eu = Arrastoa jarraitzean, kontuan izan:
+    eu = Ibilbidea jarraitzean, kontuan izan:
     fa = زمانی که مسیری را دنبال می کنید لطفا به یاد داشته باشید:
     fi = Muista seuraavat asiat seuratessasi reittiä:
     fr = Lorsque vous suivez l'itinéraire, gardez à l'esprit les points suivants :
@@ -7858,7 +7837,7 @@
     el = — Οι οδικές συνθήκες, ο κώδικας οδικής κυκλοφορίας και οι σημάνσεις στο δρόμο έχουν πάντα μεγαλύτερη προτεραιότητα από τις συμβουλές πλοήγησης,
     es = — Las condiciones de la ruta, las reglas de tráfico y las señales de carretera siempre tienen prioridad sobre las sugerencias de navegación;
     et = - Teeolud, liikluseeskirjad ja liiklusmärgid omavad alati prioriteeti navigeerimisjuhiste üle;
-    eu = — Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;
+    eu = — Ibilbideen baldintzek, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;
     fa = —شرایط جاده قوانین راهنمایی و رانندگی و علائم جاده همیشه بر نکات مسیریابی اولویت دارند;
     fi = — Tien kunto, liikennesäännöt ja tiekyltit ovat aina tärkeämpiä kuin navigointilaitteen ohjeet;
     fr = — Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur l'appareil de navigation;
@@ -7898,7 +7877,7 @@
     el = — Ο Χάρτης μπορεί να είναι ανακριβής, και η προτεινόμενη διαδρομή μπορεί να μην είναι πάντα ο βέλτιστος τρόπος να φτάσετε στον προορισμό,
     es = — El mapa puede ser impreciso y sugerir una ruta que no siempre puede ser el mejor camino para llegar al destino;
     et = - Kaart võib olla ebatäpne ja soovitatud marsruut ei pruugi alati olla kõige optimaalsem viis sihtkohta jõudmiseks;
-    eu = — Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;
+    eu = — Mapa zehaztugabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;
     fa = —نقشه ممکن است اشتباه باشد و مسیر پیشنهادی همیشه بهترین مسیر برای رسید به مقصد شما نباشد;
     fi = — Kartta saattaa olla epätarkka, joten ehdotettu reitti ei välttämättä ole paras mahdollinen tapa päästä määränpäähän;
     fr = — La carte peut être imprécise et l'itinéraire proposé n'est pas forcément le plus direct pour arriver à destination;
@@ -7938,7 +7917,7 @@
     el = — Οι προτεινόμενες διαδρομές πρέπει να ερμηνεύονται μόνο ως συστάσεις·
     es = — Las rutas sugeridas deben entenderse solo como recomendaciones;
     et = - Soovitatud marsruute tuleks võtta just sellistena;
-    eu = — Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;
+    eu = — Iradokitako ibilbideak gomendio gisa soilik ulertu behar dira;
     fa = —مسیر پیشنهادی باید فقط به عنوان یک توصیه دانست
     fi = — Ehdotettuja reittejä tulee pitää vain suosituksina;
     fr = — L'itinéraire proposé doit être considéré comme une simple recommandation;
@@ -7968,7 +7947,6 @@
   [dialog_routing_disclaimer_borders]
     tags = android,ios
     en = — Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorized places.
-    en-GB = — Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.
     ar = — تحذير بشأن المسارات في المناطق الحدودية: المسارات التي تم إنشاؤها بواسطة تطبيقنا قد تعبر  أحياناً حدود الدول في أماكن غير مصرح بها;
     be = — Будзьце ўважлівы з маршрутамі ў памежных зонах: маршруты, пракладзеныя нашай праграмай, часамі могуць перасякаць мяжу ў недазволеных месцах.
     bg = - Бъдете внимателни с маршрутите в гранични зони: маршрутите, създадени от нашето приложение, понякога могат да пресичат границите на страната на неразрешени места.
@@ -8138,7 +8116,7 @@
     el = Ελέγξτε το σήμα GPS. Η ενεργοποίηση του Wi-Fi θα βελτιώσει την ακρίβεια της τοποθεσίας σας.
     es = Verifique la señal del GPS. Activar la Wi-Fi mejorará la precisión de su ubicación.
     et = Palun kontrolli GPS signaali. WiFi lubamine parandab asukoha täpsust.
-    eu = Egiaztatu GPS seinalea. WiFi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da.
+    eu = Egiaztatu GPS seinalea. Wi-Fi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da.
     fa = لطفا سیگنال GPS موبایتان راچک کنید.و WiFi موبایلتان را جهت دقت بیشتر در موقعیت‌یابی فعال کنید.
     fi = Tarkista GPS-signaali. Wi-Fi-signaalin käyttöönotto parantaa sijainnin tarkkuutta.
     fr = Vérifiez le signal GPS. Activez le Wi-Fi pour améliorer la précision de votre localisation.
@@ -8218,7 +8196,7 @@
     el = Δεν είναι δυνατός ο εντοπισμός των τρεχουσών συντεταγμένων GPS. Ενεργοποιήστε τις υπηρεσίες εντοπισμού τοποθεσίας για τον υπολογισμό της διαδρομής.
     es = No se pueden encontrar las coordenadas del GPS. Active los servicios de ubicación para calcular la ruta.
     et = Ei suuda praeguseid GPS koordinaate määrata. Marsruudi arvutamiseks luba asukoha teenused.
-    eu = Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.
+    eu = Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak ibilbidea kalkulatzeko.
     fa = ناتوان از مشخص کردن موقعیت مکانی شما.لطفا سرویس موقعیت مکانی خود را فعال کنید.
     fi = Tämänhetkisiä GPS-koordinaatteja ei löydy. Ota sijaintipalvelut käyttöön reitin laskemista varten.
     fr = Impossible d'identifier les coordonnées GPS actuelles. Activez les services de localisation pour calculer l'itinéraire.
@@ -8287,7 +8265,7 @@
 
   [dialog_routing_download_and_update_all]
     tags = ios
-    en = Download or update all maps along the projected path to calculate a route.
+    en = Download and update all map and routing information along the projected path to calculate route.
     ar = قم بتنزيل وتحديث كافة الخرائط ومعلومات التوجيه على طول الطريق المتوقع لحساب المسار.
     be = Спампуйце і абнавіце ўсе мапы і дадзеныя навігацыі на планаваным шляху, каб пракласці маршрут.
     bg = За да изчислите маршрут, изтеглете и актуализирайте всички карти и пътища по маршрута.
@@ -8298,7 +8276,7 @@
     el = Κατεβάσετε και να ενημερώσετε όλους τους χάρτες και τις πληροφορίες δρομολόγησης για όλη την απόσταση της προβαλλόμενης διαδρομής για τον υπολογισμό της.
     es = Descargue y actualice toda la información de mapas y rutas junto con el trayecto proyectado para calcular la ruta.
     et = Marsruudi arvutamiseks lae alla ja värskenda kogu kavandatud teekonna kaart ja marsruuditeave.
-    eu = Deskargatu eta eguneratu mapa eta ibilbideen informazio guztia aurreikusitako ibilbidearekin batera arrastoa kalkulatzeko.
+    eu = Deskargatu eta eguneratu mapa eta ibilbideen informazio guztia aurreikusitako ibilbidearekin batera ibilbidea kalkulatzeko.
     fi = Lataa ja päivitä kaikki suunnitellun reitin kartta- ja reititystiedot, jotta reitin voi laskea.
     fr = Téléchargez et mettez à jour les informations de carte et d'itinéraire de votre trajet pour calculer l'itinéraire.
     he = הורד ועדכן את כל מידע המפות ויצירת המסלולים לאורך הנתיב הצפוי, כדי לחשב מסלול.
@@ -8406,7 +8384,7 @@
 
   [dialog_routing_change_start_or_end]
     tags = android,ios
-    en = Please adjust your starting point or destination.
+    en = Please adjust your starting point or your destination.
     ar = الرجاء تعديل نقطة بدء أو تعديل وجهتك.
     be = Калі ласка, змяніце пункт адпраўлення альбо прызначэння.
     bg = Моля, коригирайте началната точка или дестинацията си.
@@ -8537,7 +8515,7 @@
     el = Επιλέξτε σημείο εκκίνησης πιο κοντά σε ένα δρόμο.
     es = Seleccione un punto de inicio cercano a una carretera.
     et = Palun vali alguspunkt teele lähemal.
-    eu = Hautatu errepide batetik gertuko abiapuntua.
+    eu = Hautatu errepide batetik gertu abiapuntua.
     fa = لطفا نقطه شروع را نزدیک‌تر به جاده انتخاب کنید.
     fi = Valitse lähempänä tietä oleva aloituskohta.
     fr = Choisissez un point de départ à proximité d'une route.
@@ -8577,7 +8555,7 @@
     el = Ρύθμιση προορισμού
     es = Ajustar destino
     et = Kohanda sihtkohta
-    eu = Zehaztu helmuga
+    eu = Helmuga ezarri
     fa = تنظیم مقصد
     fi = Muuta määränpäätä
     fr = Ajustez la destination
@@ -8697,7 +8675,7 @@
     el = Δεν είναι δυνατός ο εντοπισμός ενδιάμεσου σημείου.
     es = No se ha podido ubicar la parada intermedia.
     et = Ei suuda määrata vahepunkti.
-    eu = Ezin izan da tarteko puntua kokatu.
+    eu = Ezin izan da tarteko geralekua kokatu.
     fa = ناتوان در تعیین نقطه میانی.
     fi = Välipisteen paikallistaminen ei onnistunut.
     fr = Impossible de localiser le point intermédiaire.
@@ -8736,7 +8714,7 @@
     el = Ρυθμίστε το ενδιάμεσο σημείο.
     es = Por favor, ajuste la parada intermedia.
     et = Palun kohanda vahepunkti.
-    eu = Mesedez, zehaztu tarteko puntua.
+    eu = Mesedez, egokitu tarteko geldialdia.
     fa = لطفا نقطه میانی را تنظیم کنید.
     fi = Siirrä välipistettä.
     fr = Veuillez modifier votre point intermédiaire
@@ -9219,7 +9197,7 @@
     el = Άφιξη στις %s
     es = Llegada: %s
     et = Saabumine: %s
-    eu = Iristeko unea: %s
+    eu = Iritsiera: %s
     fa = ورود به: %s
     fi = Saavut: %s
     fr = Arrivée: %s
@@ -9334,7 +9312,7 @@
     el = Ιστορικό
     es = Historial
     et = Ajalugu
-    eu = Historiala
+    eu = Grabatu
     fa = تاریخچه
     fi = Historia
     fr = Historique
@@ -9412,7 +9390,7 @@
     el = Δοκιμάστε να αλλάξετε τα κριτήρια αναζήτησής σας.
     es = Por favor, pruebe con otra consulta.
     et = Proovi muuta otsingutingimusi.
-    eu = Saiatu bilaketa-irizpideak aldatzen.
+    eu = Mesedez, saiatu beste kontsulta bat.
     fa = با تغییر در معیار‌های جستجو دوباره امتحان کنید
     fi = Yritä jotain toista hakusanaa.
     fr = Veuillez essayer un autre mot-clé.
@@ -9451,7 +9429,7 @@
     el = Ιστορικό αναζήτησης
     es = Historial de búsquedas
     et = Otsinguajalugu
-    eu = Bilaketa historia
+    eu = Bilaketa-historia
     fa = سوابق جستجو
     fi = Hakuhistoria
     fr = Historique de recherche
@@ -9479,7 +9457,7 @@
 
   [search_history_text]
     tags = android,ios
-    en = View your recent searches.
+    en = View recent searches.
     ar = عرض عمليات البحث الأخيرة.
     be = Праглядзець нядаўныя пошукі.
     bg = Преглед на последните търсения.
@@ -9529,7 +9507,7 @@
     el = Εκκαθάριση ιστορικού αναζήτησης
     es = Eliminar el historial de búsqueda
     et = Tühjenda otsinguajalugu
-    eu = Garbitu bilaketa historia
+    eu = Ezabatu bilaketa-historia
     fa = پاک کردن سابقه جستجوها
     fi = Poista hakuhistoria
     fr = Effacer l'historique de recherche
@@ -9679,7 +9657,7 @@
     fa = مسیر از
     fi = Lähtöpaikka
     fr = Depuis
-    hu = Kiindulópont
+    hu = Innen
     id = Dari
     it = Da
     ja = 出発地
@@ -9718,7 +9696,7 @@
     fa = مسیر به
     fi = Reitin loppupiste
     fr = Itinéraire vers
-    hu = Célpont
+    hu = Ide
     id = Rute ke
     it = A
     ja = 目的地
@@ -9742,7 +9720,7 @@
 
   [p2p_only_from_current]
     tags = android,ios
-    en = Navigation is only available from your current location.
+    en = Navigation is available only from your current location.
     ar = تتوفر الملاحة من خلال موقعك الحالي فقط.
     be = Навігацыя магчыма толькі ад цяперашняга месцазнаходжання.
     bg = Навигацията е възможна само от текущото ви местоположение.
@@ -9781,7 +9759,7 @@
 
   [p2p_reroute_from_current]
     tags = android,ios
-    en = Do you want to plan a route from your current location?
+    en = Do you want us to plan a route from your current location?
     ar = هل ترغب في أن نرسم مسار لك من موقعك الحالي؟
     be = Хочаце перапракласці маршрут ад цяперашняга месцазнаходжання?
     bg = Искате ли да планираме маршрут от текущото ви местоположение?
@@ -9832,7 +9810,7 @@
     el = Επόμενη
     es = Siguiente
     et = Järgmine
-    eu = Hurrengoa
+    eu = Jarraian
     fa = بعدی
     fi = Seuraava
     fr = Suivant
@@ -9858,86 +9836,6 @@
     zh-Hans = 下一页
     zh-Hant = 下一頁
 
-  [editor_time_from]
-    comment = Tab title in the Edit Opening Hours time picker
-    tags = android
-    en = From
-    ar = من الساعة
-    be = З
-    bg = От
-    ca = De
-    cs = Od
-    da = Fra
-    de = Von
-    el = Από τις
-    es = De
-    et = Kell
-    eu = etatik
-    fa = از ساعت
-    fi = alkaen
-    fr = De
-    he = משעה
-    hu = tól
-    id = Dari pukul
-    it = Dalle
-    ja = から
-    ko = 부터
-    mr = ते
-    nb = Fra
-    nl = Van
-    pl = Od
-    pt = Das
-    ro = De la
-    ru = С
-    sk = Od
-    sv = Från
-    th = เวลา
-    tr = Den itibaren
-    uk = З
-    vi = Từ
-    zh-Hans = 从
-    zh-Hant = 從
-
-  [editor_time_to]
-    comment = Tab title in the Edit Opening Hours time picker
-    tags = android
-    en = To
-    ar = إلى
-    be = Да
-    bg = До
-    ca = A
-    cs = Do
-    da = Til
-    de = Bis
-    el = Έως Τις
-    es = A
-    et = Kuni
-    eu = Etara
-    fa = الی
-    fi = Asti
-    fr = À
-    he = עד
-    hu = Ig
-    id = Hingga
-    it = Alle
-    ja = まで
-    ko = 까지
-    mr = पर्यंत
-    nb = Til
-    nl = Tot
-    pl = Do
-    pt = Às
-    ro = La
-    ru = До
-    sk = Do
-    sv = Till
-    th = น
-    tr = A
-    uk = До
-    vi = Đến
-    zh-Hans = 到
-    zh-Hant = 到
-
   [editor_time_add]
     tags = android,ios
     en = Add Schedule
@@ -10186,7 +10084,7 @@
     el = Εργάσιμες ώρες
     es = Horario de apertura
     et = Tööaeg
-    eu = Irekitzeko ordutegia
+    eu = Ordutegiak
     fa = ساعات کاری
     fi = Aukioloajat
     fr = Heures d'ouverture
@@ -10342,7 +10240,7 @@
     el = Παράδειγμα τιμών
     es = Valores de ejemplo
     et = Näidisväärtused
-    eu = Adibide balioak
+    eu = Adibide-balioak
     fa = مقادیر پیش فرض
     fi = Esimerkkiarvot
     fr = Exemple de valeurs
@@ -10381,7 +10279,7 @@
     el = Διόρθωση λάθους
     es = Corregir error
     et = Paranda viga
-    eu = Konpondu akatsa
+    eu = Akats zuzena
     fa = تصحیح خطا
     fi = Korjaa virhe
     fr = Corriger l'erreur
@@ -10448,7 +10346,7 @@
 
   [editor_done_dialog_1]
     tags = ios
-    en = You’ve changed the world map! Don't keep it to yourself; tell your friends and edit it together.
+    en = You’ve changed the world map. Do not keep it to yourself! Tell your friends, and edit it together.
     ar = لقد ساهمت بتحسين خريطة العالم. لا تخفي ذلك! أخبر أصدقائك، وحسنوها معاً.
     be = Вы змянілі мапу свету. Не прыхоўвайце гэта! Расскажыце сябрам і праўце разам.
     bg = Променили сте картата на света. Не го крийте, кажете на приятелите си и редактирайте заедно.
@@ -10526,7 +10424,7 @@
 
   [editor_report_problem_desription_1]
     tags = android
-    en = Please describe the problem in detail so that the OpenStreetMap community can fix it.
+    en = Please describe the problem in detail so that the OpenStreetMap community can fix the error.
     ar = يرجى وصف المشكلة بالتفاصيل حتى يتسنى لفريق خريطة الشارع المفتوح إصلاح الخطأ.
     be = Калі ласка, падрабязна апішыце праблему, каб супольнасць OpenStreetMap магла выправіць памылку.
     bg = Моля, опишете подробно проблема, за да може общността на OpenStreetMap да отстрани грешката.
@@ -10576,7 +10474,7 @@
     el = Ή κάντε το μόνοι σας στη διεύθυνση https://www.openstreetmap.org/
     es = O hágalo usted mismo en https://www.openstreetmap.org/
     et = Või tee seda ise aadressil https://www.openstreetmap.org/
-    eu = Edo zuk zeuk egin hemen https://www.openstreetmap.org/ helbidean
+    eu = Edo egin ezazu zeure burua https://www.openstreetmap.org/ helbidean
     fa = یا خودتان آن را انجام دهید در وبسایت https://www.openstreetmap.org/
     fi = Tai tee se itse osoitteessa https://www.openstreetmap.org/
     fr = Ou faites-le vous-même sur https://www.openstreetmap.org/
@@ -10682,7 +10580,7 @@
 
   [editor_report_problem_no_place_title]
     tags = android
-    en = This place does not exist
+    en = The place does not exist
     ar = المكان غير موجود
     be = Месца не існуе
     bg = Мястото не съществува
@@ -10732,7 +10630,7 @@
     el = Εκτός λειτουργίας για συντήρηση
     es = Сerrado por mantenimiento
     et = Suletud hoolduseks
-    eu = Mantentze lanetarako itxita
+    eu = Mantentze-lanetarako itxita
     fa = به علت تعمیرات بسته است
     fi = Suljettu huoltoa varten
     fr = Fermé pour cause de maintenance
@@ -10760,7 +10658,7 @@
 
   [editor_report_problem_duplicate_place_title]
     tags = android
-    en = Duplicate place
+    en = Duplicated place
     ar = مكان مكرر
     be = Паўтараючаеся месца
     bg = Дубликат
@@ -10799,7 +10697,7 @@
 
   [autodownload]
     tags = android,ios
-    en = Auto-download maps
+    en = Auto-download
     ar = التنزيل التلقائي
     be = Аўтаматычная спампоўка
     bg = Автоматично изтегляне
@@ -11008,7 +10906,7 @@
     el = Κλειστό
     es = Cerrado
     et = Suletud
-    eu = Itxita
+    eu = Egun librea
     fa = تعطیل است
     fi = Suljettu
     fr = Fermé
@@ -11100,7 +10998,7 @@
     de = Öffnet %1$@ um %2$@
     es = Abre el %1$@ a las %2$@
     et = Avatakse %1$@ kell %2$@
-    eu = %1$@ean %2$@etan irekiko da
+    eu = %1$@ean %2$@ean irekiko da
     fr = Ouvre le %1$@ à %2$@
     it = Apre %1$@ alle %2$@
     nb = Åpner %1$@ klokka %2$@
@@ -11119,7 +11017,7 @@
     de = Öffnet um %@
     es = Abre a las %@
     et = Avatakse kell %@
-    eu = %@etan irekiko da
+    eu = %@ean irekiko da
     fr = Ouvre à %@
     it = Apre alle %@
     nb = Åpner klokka %@
@@ -11139,7 +11037,7 @@
     de = Öffnet in %@
     es = Abre en %@
     et = Avatakse %@ jooksul
-    eu = %@ barru irekiko da
+    eu = %@ barru irekitzen da
     fr = Ouvert dans %@
     it = Apre tra %@
     nb = Åpner om %@
@@ -11158,7 +11056,7 @@
     de = Schließt um %@
     es = Cierra a las %@
     et = Suletakse kell %@
-    eu = %@etan itxiko da
+    eu = %@ean itxiko da
     fr = Ferme à %@
     it = Chiude alle %@
     nb = Stenger %@
@@ -11178,7 +11076,7 @@
     de = Schließt in %@
     es = Cierra en %@
     et = Suletakse %@ jooksul
-    eu = %@ barru itxiko da
+    eu = %@ barru ixten da
     fr = Fermé dans %@
     it = Chiude tra %@
     nb = Stenger om %@
@@ -11358,7 +11256,7 @@
     el = Εγγραφείτε στο OpenStreetMap
     es = Registrarse en OpenStreetMap
     et = Registreeru
-    eu = Eman izena OpenStreetMap-en
+    eu = Eman izena OpenStreetMap
     fa = ثبت نام در OpenStreetMap
     fi = Rekisteröidy
     fr = S'inscrire sur OpenStreetMap
@@ -11436,7 +11334,7 @@
     el = Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης.
     es = Usuario o contraseña incorrectos.
     et = Vigane kasutajanimi või salasõna.
-    eu = Erabiltzaile izena edo pasahitza baliogabea.
+    eu = Erabiltzaile-izena edo pasahitza okerra.
     fa = نام کاربری یا رمز عبور نامعتبر است.
     fi = Virheellinen käyttäjätunnus tai salasana
     fr = Nom d'utilisateur ou mot de passe invalide.
@@ -11464,7 +11362,7 @@
 
   [login]
     tags = android,ios
-    en = OpenStreetMap Login
+    en = Log In
     ar = تسجيل الدخول
     be = Увайсці
     bg = Вход
@@ -11592,7 +11490,7 @@
     el = Ξαχάσατε τον κωδικό πρόσβασης;
     es = ¿Ha olvidado su contraseña?
     et = Unustasid oma salasõna?
-    eu = Pasahitza ahaztu duzu?
+    eu = Pasahitza ahaztu al duzu?
     fa = رمز عبور خود را فراموش کردید؟
     fi = Unohtuiko salasana?
     fr = Mot de passe oublié ?
@@ -11945,7 +11843,7 @@
     el = Αριθμός κτιρίου
     es = Número de casa
     et = Majanumber
-    eu = Etxeko zenbakia
+    eu = Etxe zenbakia
     fa = شماره ساختمان
     fi = Talon numero
     fr = Numéro de la maison
@@ -12064,7 +11962,7 @@
     el = Εισαγάγετε ένα όνομα οδού
     es = Ingrese un nombre de calle
     et = Palun sisesta tänava nimi
-    eu = Sartu kalearen izena
+    eu = Sartu kale-izena
     fa = نام خیابان را وارد کنید
     fr = Veuillez entrer un nom de rue
     it = Inserire il nome della via
@@ -12091,7 +11989,7 @@
     el = Επιλέξτε μια γλώσσα
     es = Elegir un idioma
     et = Vali keel
-    eu = Aukeratu hizkuntza bat
+    eu = Hizkuntza bat aukeratu
     fa = انتخاب یک زبان
     fi = Valitse kieli
     fr = Choisir une langue
@@ -12130,7 +12028,7 @@
     el = Επιλέξτε μια οδό
     es = Elija una calle
     et = Vali tänav
-    eu = Aukeratu kale bat
+    eu = Kale bat aukeratu
     fa = انتخاب یک خیابان
     fi = Valitse katu
     fr = Choisir une rue
@@ -12359,7 +12257,6 @@
     de = Telefon hinzufügen
     es = Añadir teléfono
     et = Lisa telefon
-    eu = Gehitu telefonoa
     fr = Ajouter un numéro de téléphone
     it = Aggiungi numero
     mr = फोन जोडा
@@ -12452,7 +12349,7 @@
 
   [downloader_delete_map_dialog]
     tags = android,ios
-    en = All of your map edits will be deleted with the map.
+    en = All of your map edits will be deleted together with the map.
     ar = سيتم حذف جميع التغييرات بالخريطة بالإضافة إلى حذف الخريطة نفسها.
     be = Усе вашы праўкі мапы будуць выдаленыя разам з мапай.
     bg = Всички ваши редакции на картата ще бъдат изтрити заедно с нея.
@@ -12502,7 +12399,7 @@
     el = Ενημέρωση χαρτών
     es = Autodescarga de mapas
     et = Värskenda kaarte
-    eu = Eguneratu mapak
+    eu = Mapak deskargatu automatikoki
     fa = بروزرسانی نقشه‌ها
     fi = Päivitä kartat
     fr = Mettre à jour les cartes
@@ -12580,7 +12477,7 @@
     el = Ανεύρεση χάρτη
     es = Buscar en el mapa
     et = Leia kaart
-    eu = Bilatu mapa
+    eu = Bilatu mapan
     fa = یافتن نقشه
     fi = Etsi kartta
     fr = Trouver la carte
@@ -12619,7 +12516,7 @@
     el = Σφάλμα λήψης
     es = Error de descarga
     et = Allalaadimise viga
-    eu = Deskargaren errorea
+    eu = Deskargatzeko errorea
     fa = خطا در دانلود
     fi = Latausvirhe
     fr = Erreur de téléchargement
@@ -12647,7 +12544,7 @@
 
   [common_check_internet_connection_dialog]
     tags = android,ios
-    en = Please make sure your device is connected to the Internet.
+    en = Please check your settings and make sure your device is connected to the Internet.
     ar = يرجى التحقق من الإعدادات والتأكد من اتصال جهازك بالإنترنت.
     be = Праверце налады і ўпэўніцеся, што прылада падключана да інтэрнэту.
     bg = Моля, проверете настройките си и се уверете, че устройството ви е свързано с интернет.
@@ -12697,7 +12594,7 @@
     el = Δεν υπάρχει αρκετός χώρος
     es = No hay suficiente espacio
     et = Ei ole piisavalt ruumi
-    eu = Leku nahikorik ez
+    eu = Leku nahikoa ez
     fa = فظای کافی موجود نیست
     fi = Ei tarpeeksi tilaa
     fr = Espace insuffisant
@@ -12931,7 +12828,7 @@
     el = Δημοφιλή
     es = Popular
     et = Populaarne
-    eu = Ospetsua
+    eu = Herrikoia
     fa = پرطرفدار
     fi = Suositut
     fr = Populaire
@@ -13009,7 +12906,7 @@
     el = Επεξεργασία
     es = Editar
     et = Muutmine
-    eu = Editatzen
+    eu = Editatu
     fa = درحال ویرایش
     fi = Muokkaus
     fr = Modification
@@ -13048,7 +12945,7 @@
     el = Προσθήκη
     es = Añadir
     et = Lisamine
-    eu = Gehitzen
+    eu = Gehitu
     fa = درحال افزودن
     fi = Lisääminen
     fr = Ajout
@@ -13243,7 +13140,7 @@
     el = Προσθήκη επιχείρησης
     es = Añadir organización
     et = Lisa ettevõte
-    eu = Gehitu aktibitatea
+    eu = Negozioa gehitu
     fa = اضافه کردن یک تجارت
     fi = Lisää organisaatio
     fr = Ajouter une entreprise
@@ -13389,7 +13286,7 @@
   [osm_presentation]
     comment = Text in About and OSM Login screens. %@ is replaced by a local, human readable date.
     tags = android
-    en = Cartographic data from OpenStreetMap as of %@. OSM is like Wikipedia for maps, where you can add and edit places for users around the world.
+    en = Cartographic data from OpenStreetMap as of %@. OSM is like Wikipedia for maps, where you can add or edit places for all users around the world.
     ar = بيانات رسم الخرائط من OpenStreetMap اعتبارًا من %@. إنه مثل ويكيبيديا حيث يمكنك إضافة أو تحرير أماكن لجميع المستخدمين في جميع أنحاء العالم.
     be = Картаграфічныя дадзеныя OpenStreetMap па стане на %@. Гэта як Вікіпедыя, дзе вы можаце дадаць або рэдагаваць месцы для ўсіх карыстальнікаў па ўсім свеце.
     bg = Картографски данни от OpenStreetMap към %@. Това е като Wikipedia, където можете да добавяте или редактирате места за всички потребители по света.
@@ -13398,7 +13295,6 @@
     de = Kartografische Daten von OpenStreetMap vom %@. OSM ist wie Wikipedia für Karten, wo Sie Orte hinzufügen oder bearbeiten können.
     el = Χαρτογραφικά δεδομένα από το OpenStreetMap από το %@. Είναι σαν τη Wikipedia όπου μπορείτε να προσθέσετε ή να επεξεργαστείτε θέσεις για όλους τους χρήστες του κόσμου.
     es = Datos cartográficos del OpenStreetMap a partir de %@. Es como Wikipedia donde puede agregar o editar lugares para todos los usuarios del mundo.
-    eu = OpenStreetMap-eko datu kartografikoak %@-tik aurrera. OSM mapen Wikipedia bezalakoa da, non mundu osoko erabiltzaile guztientzat lekuak gehitu edo edita ditzakezun
     fa = داده های نقشه برداری از OpenStreetMap از %@. این مانند ویکی پدیا است که می توانید مکانهایی را برای همه کاربران در سراسر جهان اضافه یا ویرایش کنید.
     fi = Kartografiset tiedot OpenStreetMapista vuodesta %@. Se on kuin Wikipedia, johon voit lisätä tai muokata paikkoja kaikille käyttäjille ympäri maailmaa.
     fr = Données cartographiques provenant d'OpenStreetMap en date du %@. OSM est comme Wikipedia pour les cartes, où vous pouvez ajouter ou modifier des lieux.
@@ -13427,7 +13323,7 @@
 
   [login_to_make_edits_visible]
     tags = android,ios
-    en = Log in to openstreetmap.org to publish your changes to the world.
+    en = Log in to OpenStreetMap.org so other users can see the changes you have made.
     ar = قم بتسجيل الدخول حتى يتمكن باقي المستخدمين من رؤية التغييرات التي قمت بها.
     be = Аўтарызуйцеся ў OpenStreetMap.org, каб іншыя карыстальнікі бачылі вашыя змены.
     bg = Влезте в системата, за да могат другите потребители да видят направените от вас промени
@@ -13438,7 +13334,7 @@
     el = Συνδεθείτε ώστε άλλοι χρήστες να μπορούν να δουν τις αλλαγές που έχετε κάνει
     es = Inicie sesión en OpenStreetMap.org para que otros usuarios puedan ver los cambios que haya efectuado.
     et = Logi sisse OpenStreetMap.org keskkonda, et teised kasutajad näeksid Sinu tehtud muudatusi.
-    eu = Hasi saioa OpenStreetMapen beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.
+    eu = Hasi saioa beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.
     fa = وارد شوید تا دیگر کاربران نیز بتوانند تغییرات ایجاد شده توسط شما را ببینند
     fi = Kirjaudu sisään jotta muut käyttäjät voivat nähdä tekemäsi muokkaukset.
     fr = Connectez vous à votre compte openstreetmap.org pour que d'autres utilisateurs puissent voir vos changements.
@@ -13635,7 +13531,7 @@
     el = Αυτό μπορεί να είναι σημαντικά πιο ακριβό για μερικά πακέτα ή στην περίπτωση περιαγωγής
     es = Podría ser muy caro con ciertos planes o con itinerancia de datos.
     et = See võib mõningate lepingute või roamingu korral olla märgatavalt kallim.
-    eu = Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.
+    eu = Oso garestia izan daiteke plan batzuekin edo datu-ibiltaritzarekin.
     fa = این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد.
     fi = Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä.
     fr = Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement.
@@ -13674,7 +13570,7 @@
     el = Εισαγάγετε έναν έγκυρο αριθμό κτιρίου
     es = Introducir el número de domicilio correcto
     et = Sisesta kehtiv majanumber
-    eu = Sartu etxeko zenbaki baliozkoa
+    eu = Sartu etxe-zenbaki zuzena
     fa = وارد کردن شماره ساختمان معتبر
     fi = Syötä oikea talon numero
     fr = Saisir un numéro de maison correct
@@ -13753,7 +13649,7 @@
     el = Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d
     es = El número de plantas no debe superar %d
     et = Korruste arv ei või olla üle %d
-    eu = Solairu kopurua ez da %d-tik gorakoa izan behar
+    eu = Landare kopurua ez da %detik gorakoa izan behar
     fa = تعداد طبقات نباید بیش از %d باشد
     fi = Muokkaa kerroksia, enintään %d kerrosta
     fr = Le nombre d'étages ne doit pas dépasser %d
@@ -13833,7 +13729,7 @@
     el = Πληκτρολογήστε έναν έγκυρο ταχυδρομικό κώδικα
     es = Introduzca el código postal correcto
     et = Sisesta korrektne postiindeks
-    eu = Sartu baliozko posta-kodea
+    eu = Mesedez, idatzi posta-kode zuzena
     fa = یک کد‌ پستی معتبر وارد کنید
     fi = Anna kelvollinen postinumero
     fr = Entrer un code postal correct
@@ -13981,7 +13877,7 @@
 
   [editor_detailed_description]
     tags = android,ios
-    en = Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in Organic Maps.
+    en = Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in Organic Maps.
     ar = سيتم إرسال التغييرات التي اقترحتها إلى مجتمع خريطة الشارع المفتوحة. اذكر التفاصيل التي لا يمكن تحريرها في Organic Maps
     be = Запрапанаваныя вамі змены будуць дасланыя суполцы OpenStreetMap. Апішыце любыя іншыя падрабязнасці, каторыя нельга паправіць у Organic Maps.
     bg = Предложените от вас промени по картата ще бъдат изпратени до общността на OpenStreetMap. Опишете всички допълнителни подробности, които не могат да бъдат въведени в Organic Maps.
@@ -14137,7 +14033,7 @@
 
   [downloader_no_downloaded_maps_message]
     tags = android,ios
-    en = Download maps to search and navigate offline.
+    en = Download maps to search for a location and use navigation offline.
     ar = قم بتنزيل خرائط للبحث عن مكان واستخدام الملاحة بدون اتصال بالإنترنت.
     be = Спампуйце мапы, каб шукаць месцы і карыстацца навігацыяй без інтэрнэту.
     bg = Изтеглете картите, от които се нуждаете, за да намирате места и да навигирате без интернет.
@@ -14177,7 +14073,7 @@
   [current_location_unknown_title]
     comment = Error title that appears after certain time without location.
     tags = android,ios
-    en = Continue detecting your location?
+    en = Continue detecting your current location?
     ar = هل تريد متابعة اكتشاف موقعك الحالي؟
     be = Працягнуць вызначэнне месцазнаходжання?
     bg = Да продължаваме ли да ви засичаме местоположението?
@@ -14217,7 +14113,7 @@
   [current_location_unknown_message]
     comment = Error that appears after certain time without location.
     tags = android,ios
-    en = Current location is unknown. You may be in a building or tunnel.
+    en = Current location is unknown. Maybe you are in a building or in a tunnel.
     ar = الموقع الحالي غير معروف. ربما تتواجد داخل مبنى أو نفق.
     be = Месцазнаходжанне невядома. Магчыма вы ў будынку альбо ў танэлі.
     bg = Настоящото местоположение е неизвестно. Може би се намирате в сграда или тунел.
@@ -14228,7 +14124,7 @@
     el = Η τρέχουσα τοποθεσία είναι άγνωστη. Ίσως είστε σε ένα κτίριο ή σε μια σήραγγα.
     es = La ubicación actual es desconocida. Quizá esté en un edificio o en un túnel.
     et = Hetkeasukoht on teadmata. Võib-olla oled hoones sees või tunnelis.
-    eu = Uneko kokapena ezezaguna da. Agian eraikin batean edo tunel batean zaudelako.
+    eu = Uneko kokapena ezezaguna da. Eraikin batean edo tunel batean egon daiteke.
     fa = مکان شما ناشناس مانده است.ممکن است شما داخل یک ساختمان یا تونل باشید.
     fi = Nykyistä sijaintiasi ei voitu määrittää. Kenties olet rakennuksessa tai tunnelissa.
     fr = L'emplacement actuel est inconnu. Vous êtes peut-être dans un bâtiment ou sous un tunnel.
@@ -14372,7 +14268,7 @@
 
   [current_location_unknown_error_message]
     tags = ios
-    en = An error occurred while determining your location. Check that your device is working properly and try again later.
+    en = An error occurred while searching for your location. Check that your device is working properly and try again later.
     ar = حدث خطأ أثناء البحث عن موقعك. تأكد من أن جهازك يعمل بشكل صحيح وأعد المحاولة لاحقًا.
     be = Адбылася памылка пры пошуку месцазнаходжання. Праверце, што ваша прылада працуе як трэба, і паспрабуйце зноў.
     bg = Възникна грешка при търсенето на вашето местоположение. Проверете дали устройството ви работи правилно и опитайте отново по-късно.
@@ -14422,7 +14318,7 @@
     el = Οι υπηρεσίες εντοπισμού τοποθεσίας είναι απενεργοποιημένες
     es = La identificación de la ubicación está desactivada
     et = Asukohateenused on keelatud
-    eu = Kokapen zerbitzuak desaktibatuta daude
+    eu = Kokapenaren identifikazioa desaktibatuta dago
     fa = سرویس موقعیت مکانی شما غیرفعال است
     fi = Sijaintipalvelut on poistettu käytöstä
     fr = L'identification de la localisation est désactivée
@@ -14732,7 +14628,7 @@
     de = mi
     es = mi
     et = mi
-    eu = mi
+    eu = ni
     fa = مایل
     fi = mi
     fr = mi
@@ -14771,7 +14667,7 @@
     de = ft
     es = pie
     et = jalga
-    eu = oin
+    eu = oina
     fa = فوت
     fi = ft
     fr = ft
@@ -14957,7 +14853,7 @@
     el = Περισσότερα
     es = Más
     et = Veel
-    eu = Gehiago
+    eu = Gainera
     fa = بیشتر
     fi = Lisää
     fr = Plus
@@ -15034,7 +14930,7 @@
     el = Κλήση
     es = Llamar
     et = Helista
-    eu = Deitu
+    eu = Deitzeko
     fa = تماس
     fi = Soita
     fr = Appeler
@@ -15073,7 +14969,7 @@
     el = Επεξεργασία αγαπημένου
     es = Editar marcador
     et = Muuda järjehoidjat
-    eu = Editatu markagailua
+    eu = Editatu laster-marka
     fa = ویرایش نشانه‌ها
     fi = Muokkaa kirjanmerkkiä
     fr = Éditer le signet
@@ -15112,7 +15008,7 @@
     el = Όνομα αγαπημένου
     es = Nombre del marcador
     et = Järjehoidja nimi
-    eu = Markagailuaren izena
+    eu = Laster-markaren izena
     fa = نام نشانه‌ها
     fi = Kirjanmerkin nimi
     fr = Nom du signet
@@ -15188,7 +15084,7 @@
     el = Διαγραφή αγαπημένου
     es = Eliminar marcador
     et = Kustuta järjehoidja
-    eu = Ezabatu markagailua
+    eu = Ezabatu laster-marka
     fa = حذف نشانه
     fi = Poista kirjanmerkki
     fr = Supprimer le signet
@@ -15422,7 +15318,7 @@
     el = Διαγραφή
     es = Eliminar
     et = Kustuta
-    eu = Ezabatu
+    eu = Kendu
     fa = حذف
     fi = Poista
     fr = Supprimer
@@ -15497,7 +15393,6 @@
     de = Geben Sie bitte den Grund für die Löschung an
     es = Indique por favor la razón para eliminar el lugar
     et = Palun märgi põhjus koha kustutamiseks
-    eu = Zehaztu tokia ezabatzeko arrazoia
     fr = Veuillez indiquer la raison pour laquelle vous effacez cet endroit
     it = Indicare il motivo dell' eliminazione del luogo
     mr = कृपया ठिकाण हटवण्याचे कारण सूचित करा
@@ -15523,7 +15418,7 @@
     el = …περισσότερα
     es = …más
     et = …veel
-    eu = …gehiago
+    eu = …gehi
     fa = بیشتر….
     fi = …Näytä
     fr = …plus
@@ -15563,7 +15458,7 @@
     el = Εισάγετε έναν έγκυρο αριθμό τηλεφώνου
     es = Introduzca un número de teléfono correcto
     et = Sisesta kehtiv telefoninumber
-    eu = Idatzi baliozko telefono zenbaki bat
+    eu = Mesedez, idatzi telefono-zenbaki zuzena
     fa = شماره تلفن معتبری وارد نمایید
     fi = Syötä kelvollinen puhelinnumero
     fr = Saisissez un numéro de téléphone valide
@@ -15602,7 +15497,7 @@
     el = Εισάγετε μια έγκυρη διεύθυνση ιστοτόπου
     es = Introduzca una dirección web válida
     et = Sisesta kehtiv veebiaadress
-    eu = Sartu baliozko web helbide bat
+    eu = Mesedez, sartu baliozko web-helbide bat
     fa = ادرس وب معتبری وارد نمایید
     fi = Syötä kelvollinen verkko-osoite
     fr = Saisissez une adresse Internet valide
@@ -15675,7 +15570,7 @@
     de = Geben Sie eine gültige Facebook-Webadresse, ein Konto oder einen Seitennamen ein
     es = Introduzca una dirección web, una cuenta o un nombre de página de Facebook válidos
     et = Sisesta kehtiv Facebooki veebiaadress, konto või lehekülje nimi
-    eu = Idatzi baliozko Facebook-eko web helbide, kontu edo orri izena
+    eu = Mesedez, idatzi baliozko Facebook-eko web-helbide, kontu edo orri-izena
     fr = Saisissez une adresse web, un compte ou un nom de page Facebook valide
     it = Inserisci un indirizzo web, un account o un nome di pagina Facebook valido
     mr = वैध Facebook वेब पत्ता, खाते किंवा पृष्ठ नाव प्रविष्ट करा
@@ -15690,7 +15585,7 @@
 
   [error_enter_correct_instagram_page]
     tags = android
-    en = Enter a valid Instagram username or web address
+    en = Enter a valid Instagram web address or account name
     ar = أدخل اسم حساب أو عنوان ويب خاص بإنستغرام صالح
     ca = Introduïu una adreça web d'Instagram o un nom de compte vàlids
     de = Geben Sie eine gültige Instagram-Webadresse oder einen Kontonamen ein
@@ -15711,13 +15606,13 @@
 
   [error_enter_correct_twitter_page]
     tags = android
-    en = Enter a valid Twitter username or web address
+    en = Enter a valid Twitter web address or username
     ar = أدخل اسم مستخدم او موقع ويب خاص بتويتر صالح
     ca = Introduïu una adreça web de Twitter o un nom d'usuari vàlids
     de = Geben Sie eine gültige Twitter-Webadresse oder einen Benutzernamen ein
     es = Introduzca una dirección web o un nombre de usuario válido de Twitter
     et = Sisesta kehtiv Twitteri veebiaadress või kasutajanimi
-    eu = Sartu baliozko Twitter erabiltzaile izena edo web helbide bat
+    eu = Sartu baliozko Twitter erabiltzaile-izena edo web-helbide bat
     fr = Saisissez une adresse web, un nom de compte Twitter valide
     it = Inserisci un indirizzo web o un nome utente Twitter valido
     mr = वैध Twitter वेब पत्ता किंवा वापरकर्तानाव प्रविष्ट करा
@@ -15732,13 +15627,13 @@
 
   [error_enter_correct_vk_page]
     tags = android
-    en = Enter a valid VK username or web address
+    en = Enter a valid VK web address or account name
     ar = أدخل اسم حساب أو عنوان ويب خاص بموقع VK صالح
     ca = Introduïu una adreça web de VK o un nom de compte vàlids
     de = Geben Sie eine gültige VK-Webadresse oder einen Kontonamen ein
     es = Introduzca una dirección web o un nombre de cuenta de VK válidos
     et = Sisesta kehtiv VK veebiaadress või konto nimi
-    eu = Sartu baliozko web helbide bat edo VK kontuaren izena
+    eu = Mesedez, idatzi baliozko web helbide bat edo VK kontuaren izena
     fr = Saisissez une adresse web, un nom de compte VK valide
     it = Inserisci un indirizzo web o un nome di account VK valido
     nb = Skriv inn en gyldig VB-adresse eller -kontonavn
@@ -15752,14 +15647,13 @@
 
   [error_enter_correct_line_page]
     tags = android
-    en = Enter a valid LINE ID or web address
+    en = Enter a valid LINE web address or LINE ID
     ar = أدخل رقم تعريفي خاص بتطبيق LINE أو موقع ويب خاص بتطيق LINE صالح
     be = Упішыце вэб-адрас LINE старонкі або LINE ID
     ca = Introduïu una adreça web de LINE o un ID LINE vàlids
     de = Geben Sie eine gültige LINE-Webadresse oder LINE ID ein
     es = Introduzca una dirección web o ID de LINE válidos
     et = Sisesta kehtiv LINE veebiaadress või LINE ID
-    eu = Sartu baliozko web helbidea edo LINEko IDa
     fr = Entrez une adresse web ou un ID de LINE valide
     it = Inserisca un indirizzo web LINE valido o un ID LINE
     nb = Skriv inn en gyldig LINE-adresse eller -ID.
@@ -15783,7 +15677,7 @@
     el = Ενημέρωση
     es = Actualizar
     et = Värskenda
-    eu = Eguneratu
+    eu = Eguneratzeko
     fa = بروزرسانی
     fi = Päivitä
     fr = Mettre à jour
@@ -15891,7 +15785,7 @@
   [editor_share_to_all_dialog_message_1]
     comment = Dialog before publishing the modifications to the public map.
     tags = android,ios
-    en = Make sure you did not enter any private or personal data.
+    en = Make sure you did not enter any personal data.
     ar = تأكد من أنك لم تقم بإدخال أية بيانات شخصية.
     be = Упэўніцеся, што вы не ўвялі ніякіх асабістых дадзеных.
     bg = Уверете се, че не сте въвели никакви лични данни.
@@ -15930,7 +15824,7 @@
 
   [editor_share_to_all_dialog_message_2]
     tags = android,ios
-    en = OpenStreetMap editors will check the changes and contact you if they have any questions.
+    en = OpenStreetMap editors will check the changes and get in contact with you if they have any questions.
     ar = .ﺔﻠﺌﺳﺃ ﻱﺃ ﻢﻬﻳﺪﻟ ﻥﺎﻛ ﺍﺫﺇ ﻚﻌﻣ ﻥﻮﻠﺻﺍﻮﺘﻳﻭ ﺕﺍﺮﻴﻴﻐﺘﻟﺍ ﻦﻣ OpenStreetMap ﻭﺭﺮﺤﻣ ﻖﻘﺤﺘﻴﺳ
     be = Рэдактары OpenStreetMap правераць змены і звяжуцца з вамі, калі ў іх узнікнуць пытанні.
     bg = Редакторите на OpenStreetMap ще проверят промените и ще се свържат с вас, ако имат въпроси.
@@ -16008,7 +15902,7 @@
   [recent_track_background_dialog_title]
     tags = ios
     comment = iOS dialog for the case when recent track recording is on and the app comes back from background
-    en = Disable recording of your recently travelled route?
+    en = Disable recording of your recently traveled route?
     ar = هل تريد تعطيل تسجيل مسارات سفرك؟
     be = Выключыць запіс вашага нядаўна пройдзенага маршрута?
     bg = Деактивиране на записването на последния ви маршрут?
@@ -16058,7 +15952,7 @@
     el = Απενεργοποίηση
     es = Deshabilitar
     et = Keela
-    eu = Desgaitu
+    eu = Desgaitzeko
     fa = غیرفعال
     fi = Poista
     fr = Désactiver
@@ -16126,7 +16020,7 @@
 
   [recent_track_background_dialog_message]
     tags = ios
-    en = Organic Maps uses your location in the background to record your recently travelled route.
+    en = Organic Maps uses your geoposition in the background for recording your recently traveled route.
     ar = يستخدم Organic Maps موقعك الجغرافي في الخلفية لتسجيل مسار سفرك الأخير.
     be = Organic Maps ужывае вашу геалакацыю ў фонавым рэжыме, каб запісваць ваш нядаўна пройдзены маршрут.
     bg = Organic Maps използва геопозицията ви във фонов режим за записване на последния ви маршрут.
@@ -16177,7 +16071,7 @@
     el = Οι Organic Maps είναι μια δωρεάν και ανοιχτού κώδικα εφαρμογή χαρτών εκτός σύνδεσης. Χωρίς διαφημίσεις. Χωρίς εντοπισμό. Εάν δείτε κάποιο σφάλμα στον χάρτη, διορθώστε το στο OpenStreetMap. Το έργο δημιουργείται από λάτρεις στον ελεύθερο χρόνο μας, επομένως χρειαζόμαστε τα σχόλια και την υποστήριξή σας.
     es = Organic Maps es una aplicación de mapas sin conexión gratuita y de código abierto. Sin anuncios. Sin seguimiento. Si ve un error en el mapa, corríjalo en OpenStreetMap. El proyecto está creado por entusiastas en nuestro tiempo libre, por lo que necesitamos tus comentarios y tu apoyo.
     et = Organic Maps on kiire ja tasuta võrguühenduseta kaartide rakendus ilma reklaamide ja jälgimiseta. Kaardid põhinevad vabatahtlike loodud OpenStreetMap.org-i andmetel, nii et saate kaardistamise vigu parandada ja ise funktsioone lisada. Organic Maps on avatud lähtekoodiga projekt, mille on loonud entusiastid oma vabast ajast. Teie tagasiside ja toetus on väga teretulnud!
-    eu = Organic Maps lineaz kanpoko mapa aplikazio doako eta irekia da. Iragarkirik ez. Ez dago jarraipenik. Mapan errore bat ikusten baduzu, konpondu OpenStreetMap-en. Proiektua zaleek sortu dute haien aisialdian, beraz, zure iritzia eta laguntza behar dugu.
+    eu = Organic Maps lineaz kanpoko mapa aplikazio doako eta irekia da. Iragarkirik ez. Ez dago jarraipenik. Mapan errore bat ikusten baduzu, konpondu OpenStreetMap-en. Proiektua zaleek sortu dute gure aisialdian, beraz, zure iritzia eta laguntza behar dugu.
     fa = Organic Maps یک برنامه نقشه آفلاین رایگان و منبع باز است. بدون تبلیغات بدون ردیابی اگر خطایی روی نقشه مشاهده کردید، لطفاً آن را در OpenStreetMap برطرف کنید. این پروژه توسط علاقه مندان در اوقات فراغت ما ایجاد می شود، بنابراین ما به بازخورد و پشتیبانی شما نیاز داریم.
     fi = Organic Maps on ilmainen ja avoimen lähdekoodin offline-karttasovellus. Ei mainoksia. Ei seurantaa. Jos näet virheen kartalla, korjaa se OpenStreetMapissa. Hankkeen ovat luoneet harrastajat vapaa-ajallamme, joten tarvitsemme palautettasi ja tukeasi.
     fr = Organic Maps est une application de cartographie hors ligne gratuite et open source. Pas de pubs. Pas de localisation. Si vous voyez une erreur sur la carte, veuillez la corriger dans OpenStreetMap. Le projet est créé par des passionnés pendant notre temps libre, nous avons donc besoin de vos commentaires et de votre soutien.
@@ -16218,7 +16112,7 @@
     el = Γενικές ρυθμίσεις
     es = Ajustes generales
     et = Üldseaded
-    eu = Ezarpen orokorrak
+    eu = Doikuntza orokorrak
     fa = تنظیمات عمومی
     fi = Yleiset asetukset
     fr = Paramètres généraux
@@ -16258,7 +16152,7 @@
     el = Συμφωνώ
     es = Aceptar
     et = Nõustu
-    eu = Onartu
+    eu = Onartzeko
     fa = موافقم
     fi = Hyväksy
     fr = Accepter
@@ -16298,7 +16192,7 @@
     el = Διαφωνώ
     es = Declinar
     et = Keeldu
-    eu = Ukatu
+    eu = Gainbehera
     fa = کاهش
     fi = Hylkää
     fr = Refuser
@@ -16338,7 +16232,7 @@
     el = Λίστα
     es = Lista
     et = Loetelu
-    eu = Zerrenda
+    eu = Prest
     fa = لیست
     fi = Luettelo
     fr = Liste
@@ -16416,7 +16310,7 @@
     el = Να χρησιμοποιείται πάντα
     es = Usar siempre
     et = Kasuta alati
-    eu = Erabili beti
+    eu = Beti erabili
     fa = همیشه استفاده کن
     fi = Käytä aina
     fr = Toujours utiliser
@@ -16562,7 +16456,7 @@
   [mobile_data_description]
     comment = NOTE to translators: please synchronize your translation with the English one.
     tags = android,ios
-    en = Mobile internet is required for map update notifications and uploading edits.
+    en = Mobile internet is required for map update notifications and for displaying detailed information about places and bookmarks.
     ar = إننا نحتاج بيانات الجوال لعرض معلومات تفصيلية عن الأماكن والإشارات المرجعية.
     be = Мабільны інтэрнэт неабходны для апавяшчэнняў аб абнаўленні мапы і для адлюстравання падрабязнай інфармацыі аб месцах і закладках.
     bg = Мобилните данни са необходими за показване на подробна информация за местата, като например снимки, цени и отзиви.
@@ -16577,7 +16471,7 @@
     fa = برای نمایش جزئیات مکان مانند تصاویر قیمت‌ها و بازخورد‌ها به اینترنت همراه نیاز است
     fi = Mobiili-internet vaaditaan paikkojen lisätietojen näyttämiseen, kuten valokuviin, hintoihin ja arvioihin.
     fr = L'Internet mobile est nécessaire pour afficher des informations détaillées sur les lieux, telles que les photos, les prix et les avis.
-    hu = Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.
+    hu = Mobil internetre van szükség helyszínekre vonatkozó részletes információ, mint például fotók, árak és szemlék megjelenítéséhez.
     id = Internet seluler diperlukan untuk menampilkan informasi terperinci tentang tempat, seperti foto, harga, dan ulasan.
     it = L'Internet mobile è necessario per visualizzare informazioni dettagliate sulle località, ad esempio foto, prezzi e recensioni.
     ja = モバイルインターネットは場所、写真、価格やレビューのような詳細情報を表示するのに必要です。
@@ -16612,7 +16506,7 @@
     el = Να μην χρησιμοποιείται ποτέ
     es = No usar nunca
     et = Ära kasuta kunagi
-    eu = Ez erabili inoiz
+    eu = Inoiz erabili
     fa = هرگز
     fi = Älä käytä koskaan
     fr = Ne jamais utiliser
@@ -16651,7 +16545,7 @@
     el = Να γίνεται ερώτηση πάντα
     es = Preguntar siempre
     et = Küsi alati
-    eu = Galdetu beti
+    eu = Beti galdetu
     fa = همیشه بپرس
     fi = Kysy aina
     fr = Toujours demander
@@ -16718,7 +16612,7 @@
 
   [big_font]
     tags = android,ios
-    en = Increase size for map labels
+    en = Increase font size on the map
     ar = زيادة حجم الخط على الخريطة
     be = Павялічыць шрыфт мапы
     bg = Увеличаване на размера на шрифта в картата
@@ -16729,7 +16623,7 @@
     el = Αύξηση μεγέθους γραμματοσειράς στο χάρτη
     es = Aumentar el tamaño de fuente en el mapa
     et = Suurenda teksti suurust kaardil
-    eu = Handitu letra tamaina mapan
+    eu = Handitu letra-tamaina mapan
     fa = افزایش اندازه متن بر روی نقشه
     fi = Suurenna fonttikokoa kartalla
     fr = Augmenter la taille de police sur la carte
@@ -16768,7 +16662,7 @@
     el = Κάντε ενημέρωση του Organic Maps
     es = Por favor, actualice Organic Maps
     et = Palun uuenda Organic Maps
-    eu = Eguneratu Organic Maps
+    eu = Mesedez, eguneratu Organic Maps
     fa = لطفا Organic Maps را بروزرسانی کنید
     fi = Päivitä Organic Maps
     fr = Veuillez mettre à jour Organic Maps
@@ -16967,7 +16861,7 @@
     el = Ενεργ.
     es = Act.
     et = Sees
-    eu = Martxan
+    eu = Ekin.
     fa = روشن
     fi = Käytössä
     fr = On
@@ -17007,7 +16901,7 @@
     el = Απενεργ.
     es = Desact.
     et = Väljas
-    eu = Itzalita
+    eu = Itzali
     fa = خاموش
     fi = Ei käytössä
     fr = Off
@@ -17047,7 +16941,7 @@
     el = Χρησιμοποιούμε σύστημα TTS για τις φωνητικές οδηγίες. Αρκετές συσκευές Android χρησιμοποιούν Google TTS, μπορείτε να το κατεβάσετε ή να το ενημερώσετε από το Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)
     es = Utilizamos el sistema TTS para las instrucciones de voz. Muchos dispositivos de Android usan Google TTS. Puede descargar o actualizarlo desde Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)
     et = Hääljuhiste jaoks kasutame TTS süsteemi. Paljud Android-seadmed kasutavad Google'i TTS-i, saate selle alla laadida või värskendada teenusest Google Play (https:play.google.comstoreappsdetails?id=com.google.android.tts)
-    eu = TTS sistema erabiltzen dugu ahots argibideetarako. Android gailu askok Google TTS erabiltzen dute. Google Play-tik deskargatu edo egunera dezakezu (https://play.google.com/store/apps/details?idu003dcom.google.android.tts)
+    eu = TTS sistema erabiltzen dugu ahots-argibideetarako. Android gailu askok Google TTS erabiltzen dute. Google Play-tik deskargatu edo egunera dezakezu (https://play.google.com/store/apps/details?idu003dcom.google.android.tts)
     fa = ما از TTS سیستم برای دستورالعمل‌های صوتی استفاده می کنیم. بسیاری از دستگاه‌های Android از Google TTS استفاده می کنند، شما می توانید آن را از Google Play دانلود کنید (https://play.google.com/store/apps/details؟id=com.google.android.tts)
     fi = Käytämme ääniohjeisiin tekstistä puheeksi -järjestelmää. Monet Android-laitteet käyttävät Googlen tekstistä puheeksi -sovellusta, jonka voit ladata tai päivittää Google Playssä (https://play.google.com/store/apps/details?id=com.google.android.tts)
     fr = Nous utilisons le système TTS pour les instructions vocales. De nombreux appareils Android utilisent Google TTS, vous pouvez le télécharger ou le mettre à jour depuis Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)
@@ -17155,7 +17049,7 @@
 
   [transliteration_title]
     tags = android,ios
-    en = Transliteration into Latin alphabet
+    en = Transliteration into Latin
     ar = كتابة جميع الاسماء بالحروف اللاتينية بشكل حرفي
     be = Транслітарацыя лацінкай
     bg = Латинска транслитерация
@@ -17251,7 +17145,7 @@
     el = Έξοδος
     es = Salida
     et = Välju
-    eu = Irten
+    eu = Irteera
     fa = خروج
     fi = Poistu
     fr = Sortie
@@ -17291,7 +17185,7 @@
     el = Προσθέστε αφετηρία για να σχεδιάσετε μια διαδρομή
     es = Buscar un origen para el plan de ruta
     et = Marsruudi planeerimiseks lisa lähtepunkt
-    eu = Gehitu abiapuntu bat ibilbide bat antolatzeko
+    eu = Bilatu ibilbide-planaren iturria
     fa = یک نقطه شروع برای برنامه ریزی یک مسیر اضافه کنید
     fi = Lisää alkupiste reitin suunnittelua varten
     fr = Ajouter un point de départ pour planifier un itinéraire
@@ -17331,7 +17225,7 @@
     el = Προσθέστε τελικό προορισμό, για να σχεδιάσετε μια διαδρομή
     es = Buscar un destino para el plan de ruta
     et = Marsruudi planeerimiseks lisa sihtkoht
-    eu = Gehitu helmuga bat ibilbide bat antolatzeko
+    eu = Bilatu ibilbide-planaren helmuga
     fa = یک مقصد برای برنامه ریزی یک مسیر اضافه کنید
     fi = Lisää määränpää reitin suunnittelua varten
     fr = Ajouter un point d'arrivée pour planifier un itinéraire
@@ -17371,7 +17265,7 @@
     el = Έξοδος
     es = Salir
     et = Välju
-    eu = Irten
+    eu = Utzi
     fa = خروج
     fi = Poistu
     fr = Quitter
@@ -17411,7 +17305,7 @@
     el = Διαχείριση διαδρομής
     es = Administrar ruta
     et = Halda marsruuti
-    eu = Kudeatu ibilbidea
+    eu = Ibilbidea kudeatu
     fa = مدیریت مسیر
     fi = Hallitse reittiä
     fr = Gérer l’itinéraire
@@ -17451,7 +17345,7 @@
     el = Σχέδιο
     es = Planificar
     et = Planeeri
-    eu = Planifikatu
+    eu = Planifikatzeko
     fa = برنامه
     fi = Suunnittele
     fr = Planifier
@@ -17571,7 +17465,7 @@
     el = Προσθήκη στάσης
     es = Añadir parada
     et = Lisa peatus
-    eu = Gehitu geldiunea
+    eu = Gehitu stop
     fa = اضافه کردن توقف
     fi = Lisää pysähdys
     fr = Ajouter un arrêt
@@ -17610,11 +17504,11 @@
     el = Έναρξη από
     es = Empezar desde
     et = Alusta kohast
-    eu = Hasi hemendik
+    eu = Hasi
     fa = شروع از
     fi = Aloita kohdasta
     fr = Commencer à partir de
-    hu = Kiindulás innen:
+    hu = Elkezdi innen:
     id = Mulai dari
     it = Parti da
     ja = 開始位置
@@ -17639,7 +17533,7 @@
 
   [profile_authorization_error]
     tags = ios
-    en = Oops, there was an error. Try signing in again.
+    en = Oops, there was an error. Try to sign in again.
     ar = عفوًا، كان هناك خطأ. حاول تسجيل الدخول مرة اخرى.
     be = Ой-ёй, здарылася памылка. Паспрабуйце аўтарызавацца зноў.
     bg = За съжаление има грешка. Опитайте да влезете отново.
@@ -17650,7 +17544,7 @@
     el = Ωχ, παρουσιάστηκε σφάλμα. Προσπαθήστε να συνδεθείτε ξανά.
     es = Vaya, se ha producido un error. Intente iniciar sesión de nuevo.
     et = Vabandust, tekkis viga. Proovi uuesti sisse logida.
-    eu = Errore bat gertatu da. Saiatu berriro saioa hasten.
+    eu = Errore bat gertatu da. Mesedez, saiatu berriro saioa hasten.
     fa = اوه، یک خطا وجود داشت سعی کنید دوباره وارد سیستم شوید
     fi = Tapahtui virhe. Yritä kirjautua sisään uudelleen.
     fr = Oups, une erreur s'est produite. Essayez de vous connecter à nouveau.
@@ -17732,7 +17626,7 @@
     es = El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébelo ó escríbanos a support@organicmaps.app
     es-MX = El almacenamiento externo no está disponible. Es posible que se haya quitado o dañado la tarjeta SD, o que el sistema de archivos solo permita la lectura. Revíselo y escríbanos a support@organicmaps.app
     et = Välismälu pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrollige oma SD-kaarti või võtke meiega ühendust aadressil support@organicmaps.app
-    eu = Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support@organicmaps.app helbidera
+    eu = Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi-sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support@organicmaps.app helbidera
     fa = ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@organicmaps.app تماس بگیرید
     fi = Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista ja ota yhteyttä osoitteeseen support@organicmaps.app
     fr = Le stockage externe n'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@organicmaps.app
@@ -17843,7 +17737,7 @@
 
   [error_enter_correct_name]
     tags = android,ios
-    en = Please enter a correct name
+    en = Please, enter a correct name
     ar = الرجاء إدخال اسم صحيح
     be = Калі ласка, увядзіце назву правільна
     bg = Моля, въведете правилно име
@@ -17855,7 +17749,7 @@
     es = Por favor, introduzca el nombre correcto
     es-MX = Introduzca el nombre correcto
     et = Palun sisesta korrektne nimi
-    eu = Mesedez, idatzi baliozko izen bat
+    eu = Mesedez, idatzi izen zuzena
     fa = لطفا نام صحیح را وارد کنید
     fi = Anna oikea nimi
     fr = Veuillez entrer un nom correct
@@ -17900,7 +17794,7 @@
     fa = لیست‌ها
     fi = Listat
     fr = Listes
-    hu = Listák
+    hu = List
     id = Daftar
     it = Elenchi
     ja = リスト
@@ -17979,7 +17873,7 @@
     es = Mostrar todo
     es-MX = Mostrar todo
     et = Kuva kõik
-    eu = Erakutsi guztiak
+    eu = Erakutsi dena
     fa = نمایش همه
     fi = Näytä kaikki
     fr = Tout afficher
@@ -18024,7 +17918,7 @@
     es-MX = %d marcadores
     et:one = %d järjehoidja
     et:other = %d järjehoidjat
-    eu = %d markagailu
+    eu = %d laster-marka
     fa:one = %d نشانه
     fa:other = %d نشانه‌ها
     fi = %d kirjanmerkkiä
@@ -18064,7 +17958,7 @@
 
   [bookmarks_create_new_group]
     tags = android,ios
-    en = Create a new list
+    en = Create new list
     ar = إنشاء قائمة جديدة
     be = Стварыць новы спіс
     bg = Създаване на нов списък
@@ -18115,10 +18009,9 @@
     de = Lesezeichen importieren
     es = Importar marcadores
     et = Impordi järjehoidjad
-    eu = Inportatu markagailuak
+    eu = Inportatu laster-markak
     fi = Tuo kirjamerkit
     fr = Importer des signets
-    hu = Könyvjelzők importálása
     it = Importa luoghi preferiti
     mr = खूणपत्रे आयात करा
     nb = Importer bokmerker
@@ -18145,7 +18038,7 @@
     es = Ocultar pantalla
     es-MX = Ocultar pantalla
     et = Peida vaade
-    eu = Ezkutatu pantaila
+    eu = Pantaila ezkutatu
     fa = پنهان کردن صفحه
     fi = Piilota näyttö
     fr = Masquer l’écran
@@ -18420,7 +18313,7 @@
 
   [bookmarks_error_title_empty_list_name]
     tags = android
-    en = The name can't be empty
+    en = The name couldn't be empty
     ar = لا يمكن للاسم أن يكون فارغًا
     be = Назва не можа быць пустой
     bg = Името не може да бъде празно
@@ -18473,7 +18366,7 @@
     es = Por favor ingrese el nombre de la lista
     es-MX = Escriba el nombre
     et = Palun sisesta loetelu nimi
-    eu = Idatzi zerrendaren izena
+    eu = Mesedez, idatzi zerrendaren izena
     fa = لطفا نام لیست را وارد کنید
     fi = Anna luettelon nimi
     fr = Veuillez entrer le nom de la liste
@@ -18596,7 +18489,7 @@
     es = Por favor elija otro nombre
     es-MX = Por favor elige otro nombre
     et = Palun vali teine nimi
-    eu = Aukeratu beste izen bat
+    eu = Mesedez, aukeratu beste izen bat
     fa = لطفا نام دیگری را انتخاب کنید
     fi = Valitse toinen nimi
     fr = Merci de choisir un autre nom
@@ -18848,8 +18741,6 @@
     es:other = Se han encontrado %d archivos. Los verá después de la conversión.
     et:one = %d fail leiti. Näed seda peale teisendamist.
     et:other = %d faili leiti. Näed neid peale teisendamist.
-    eu:one = fitxategi %d aurkitu da. Elkarrizketaren ondoren ikusiko duzu.
-    eu:other = %d fitxategi aurkitu dira. Elkarrizketaren ondoren ikusiko dituzu.
     fa:one = %d فایل پیدا شد. بعد از تبدیل آن را می‌بینید.
     fa:other = %d فایل پیدا شد. بعد از تبدیل آن‌ها را می‌بینید.
     fi:one = %d tiedosto löydettiin. Näet sen muunnoksen jälkeen.
@@ -19208,8 +19099,6 @@
     es:other = %d objetos
     et:one = %d objekt
     et:other = %d objekti
-    eu:one = objektu %d
-    eu:other = %d objektu
     fa:one = %d شیء
     fa:other = %d شیء
     fi = %d paikka
@@ -19266,8 +19155,6 @@
     es:other = %d lugares
     et:one = %d koht
     et:other = %d kohta
-    eu:one = toki %d
-    eu:other = %d toki
     fa:one = %d مکان
     fa:other = %d مکان
     fi = %d paikat
@@ -19324,8 +19211,6 @@
     es:one = %d ruta
     es:other = %d rutas
     et = %d rada
-    eu:one = arrasto %d
-    eu:other = %d arrasto
     fa:one = %d رد
     fa:other = %d رد
     fi = %d radat
@@ -19415,7 +19300,7 @@
     es = Informe de incidentes
     es-MX = Reporte de fallas
     et = Krahhi raport
-    eu = Akatsen txostena
+    eu = Gertakarien txostena
     fa = گزارش خرابی
     fi = Kaatumisraportti
     fr = Rapport d'accident
@@ -19444,7 +19329,7 @@
 
   [crash_reports_description]
     tags = android
-    en = We may use your crash reports to improve Organic Maps. Changes will take effect after you restart the app.
+    en = We may use your data to improve Organic Maps experience. Changes will take effect after you restart the app.
     ar = قد نستخدم بياناتك لتحسين تجربة Organic Maps. سوف تكون التغييرات نافذة المفعول بعد إعادة تشغيل التطبيق.
     be = Мы можам выкарыстоўваць вашы дадзеныя, каб палепшыць Organic Maps. Змены набудуць сілу пасля перапуску праграмы.
     bg = Можем да използваме данни ви, за да подобрим изживяването с Organic Maps. Промените ще влязат в сила, след рестартиране на приложението.
@@ -19497,7 +19382,7 @@
     es = Política de privacidad
     es-MX = Política de Privacidad
     et = Privaatsuspoliitika
-    eu = Pribatutasun politika
+    eu = Pribatutasun-politika
     fa = سیاست حریم خصوصی
     fi = Yksityisyyskäytäntö
     fr = Politique de confidentialité
@@ -19662,7 +19547,7 @@
     es = Capas del mapa
     es-MX = Capas del mapa
     et = Kaardikihid
-    eu = Mapako geruzak
+    eu = Mapa geruzak
     fa = لایه‌های نقشه
     fi = Karttatasot
     fr = Couches de carte
@@ -19786,7 +19671,7 @@
     es = Para agregar un marcador, toque un lugar en el mapa y después toque el icono de la estrella
     es-MX = Para añadir un marcador, toque un lugar en el mapa y después toque el ícono de estrella
     et = Järjehoidja lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni
-    eu = Markagailu bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa
+    eu = Pin bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa
     fa = برای افزودن یک نشانه، روی یک مکان روی نقشه ضربه بزنید و سپس روی نماد ستاره ضربه بزنید
     fi = Lisätäksesi kirjanmerkin, paina kartasta ja sitten paina tähden kuvaa
     fr = Pour ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l'icône étoile
@@ -19827,7 +19712,7 @@
     es = …más
     es-MX = …más
     et = …veel
-    eu = …gehiago
+    eu = …gehi
     fa = بیشتر…
     fi = …lisää
     fr = …plus
@@ -19905,7 +19790,6 @@
     de = Beliebt
     es = Popular
     et = Populaarne
-    eu = Ospetsua
     fa = مشهور
     fr = Populaire
     it = Popolare
@@ -19934,7 +19818,7 @@
     es = Exportar archivo
     es-MX = Exportar archivo
     et = Ekspordi fail
-    eu = Esportatu fitxategia
+    eu = Esportatu fitxategi gisa
     fa = ارسال فایل
     fi = Viedä tiedosto
     fr = Exporter le fichier
@@ -19975,7 +19859,7 @@
     es = Ajustes de la lista
     es-MX = Ajustes de lista
     et = Loetelu seaded
-    eu = Zerrendaren ezarpenak
+    eu = Zerrenda konfiguratu
     fa = تنظیمات لیست
     fi = Listan asetukset
     fr = Paramètres de la liste
@@ -20016,7 +19900,7 @@
     es = Eliminar lista
     es-MX = Eliminar lista
     et = Kustuta loetelu
-    eu = Ezabatu zerrenda
+    eu = Zerrenda ezabatu
     fa = حذف لیست
     fi = Poista lista
     fr = Supprimer la liste
@@ -20060,7 +19944,7 @@
     fa = پنهان کردن از نقشه
     fi = Piilota kartalta
     fr = Masquer sur la carte
-    hu = Elrejtés a térképről
+    hu = Lefedés a térképen
     id = Sembunyikan dari peta
     it = Nascondi sulla mappa
     ja = マップから隠す
@@ -20138,7 +20022,7 @@
     es = Acceso limitado
     es-MX = Acceso limitado
     et = Piiratud ligipääs
-    eu = Sarbide mugatua
+    eu = Sarbide pribatua
     fa = دسترسی محدود
     fi = Yksityinen pääsy
     fr = Accès limité
@@ -20167,7 +20051,7 @@
 
   [bookmark_list_description_hint]
     tags = android,ios
-    en = Enter a description (text or html)
+    en = Type a description (text or html)
     ar = اكتب وصفًا (نص أو html)
     be = Дабаўце апісанне (тэкст альбо html)
     bg = Добавяне на описание (текст или html)
@@ -20383,11 +20267,11 @@
     es = Auto
     es-MX = Automático
     et = Automaatne
-    eu = Automatikoa
+    eu = Kotxea
     fa = خودکار
     fi = Auto
     fr = Auto
-    hu = Automatikus
+    hu = Autó
     id = Auto
     it = Auto
     ja = 自動
@@ -20589,11 +20473,11 @@
     es = Auto - Advierte sobre las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - Siempre alerta sobre las cámaras\nNunca - Nunca advierte acerca de las cámaras
     es-MX = Automático - Aviso de las cámaras de velocidad si existe el riesgo de exceder el límite de velocidad\nSiempre - Siempre dar aviso de las cámaras de velocidad\nNunca - Nunca dar aviso de las cámaras de velocidad
     et = Automaatne - kiiruskaamerate hoiatused, kui on oht ületada piirkiirust\nAlati - hoiata alati kiiruskaamerate eest\nMitte kunagi - ära kunagi hoiata kiiruskaamerate eest
-    eu = Automatikoa - abiadura-kamerei buruz ohartarazten du abiadura muga gainditzeko arriskua badago\nBeti - beti abisatu kamerei buruz\nInoiz - inoiz ez abisatu kamerei buruz
+    eu = Auto - abiadura-kamerei buruz ohartarazten du abiadura muga gainditzeko arriskua badago\nBeti - beti erne kamerei buruz\nInoiz - inoiz ez abisatu kamerari buruz
     fa = خودکار- در صورتی که خطر تجاوز از سرعت مجاز وجود داشت، نسبت به دوربین‌های کنترل سرعت هشدار دهد\nهمیشه-همیشه درباره دوربین‌های کنترل سرعت هشدار دهد\nهرگز-هرگز درباره دوربین‌های کنترل سرعت هشدار ندهد
     fi = Auto - Varoita nopeuskameroista, jos tuntuu siltä, että nopeusrajan ylitys on mahdollista\nAina - Varoita kameroista aina\nEi koskaan - älä koskaan varoita kameroista
     fr = Auto - Alerte sur les radars en cas de risque de dépassement de la limite de vitesse\nToujours - Toujours avertir des radars\nJamais - Jamais avertir à propos des radars
-    hu = Automatikus - Figyelmeztetés a sebesség kamerákról, ha van kockázat a sebesség korlátozás megsértéséről\nMindig - Mindig figyelmeztet a kamerákról\nSoha - Soha ne figyelmezet a kamerákról
+    hu = Autó - Figyelmeztetés a sebesség kamerákról, ha van kockázat a sebesség korlátozás megsértéséről\nMindig - Mindig figyelmeztet a kamerákról\nSoha - Soha ne figyelmezet a kamerákról
     id = Auto - Peringatkan tentang kamera kecepatan saat terdapat risiko melebihi batas kecepatan\nSelalu - Selalu peringatkan tentang kamera kecepatan\nTidak pernah - Jangan pernah peringatkan tentang kamera kecepatan
     it = Auto - Avvisare di autovelox in caso di rischio eccesso velocità\nSempre - Avvisare sempre di autovelox\nMai - Non avvisare mai di autovelox
     ja = 自動－速度制限超過の危険性がある場合には、自動速度違反取締装置について警告します\n常時－自動速度違反取締装置について常に警告します\n無効－自動速度違反取締装置を警告しません
@@ -20659,7 +20543,7 @@
 
   [power_managment_description]
     tags = android,ios
-    en = Try to reduce power usage at the expense of some functionality.
+    en = When automatic mode is selected the application starts to disable battery draining features depending on the current battery charge level
     ar = عندما يتم اختيار الوضع التلقائي، يبدأ التطبيق بتعطيل الخصائص التي تستهلك البطارية بناءً على مستوى شحن البطارية الحالي
     be = Калі ўключаны рэжым захавання энергіі, праграма пачынае выключаць энергазатратныя функцыі ў залежнасці ад зарада батарэі
     bg = Ако е активиран режима пестене на енергия, приложението ще деактивира функциите, консумиращи енергия, в зависимост от текущия заряд на телефона.
@@ -20741,7 +20625,7 @@
 
   [power_managment_setting_auto]
     tags = android,ios
-    en = When battery is low
+    en = Automatic
     ar = تلقائي
     be = Аўтаматычна
     bg = Автоматично
@@ -20782,7 +20666,7 @@
 
   [power_managment_setting_manual_max]
     tags = android,ios
-    en = Always
+    en = Maximum power saving
     ar = توفير الطاقة الأقصى
     be = Максімальнае захаванне энергіі
     bg = Максимално пестене на енергия
@@ -20794,7 +20678,7 @@
     es = Ahorro de energía máximo
     es-MX = Máximo ahorro de energía
     et = Maksimaalne energiasääst
-    eu = Energia aurrezpen handiena
+    eu = Energia-aurrezpen handiena
     fa = حداکثر ذخیره انرژی
     fi = Täysi virransäästö
     fr = Économie d'énergie maximale
@@ -20823,7 +20707,7 @@
 
   [enable_logging_warning_message]
     tags = android
-    en = Enable this option temporarily to record and manually send detailed diagnostic logs about your issue to us using "Report a bug" in the Help dialog. Logs may include location info.
+    en = The option turns on logging for diagnostic purposes. It can be helpful for our team to troubleshoot issues with the app. Enable this option temporarily to record and send detailed logs about your issue to us.
     ar = هذا الخيار يقوم ببدأ تسجيل سجلات التطبيق لإغراض التشخيصة. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا لحل المشاكل التي تواجهكم داخل التطبيق. قم بتفعيل هذا الخيار بشكل مؤقت فقط في حالة طلب الدعم من Organic Maps.
     be = Опцыя ўключае запіс журнала падзей для мэтаў дыягностыкі. Гэта можа дапамагчы нашай камандзе вырашаць праблемы з праграмай. Уключайце гэтую опцыю часова, каб запісаць і паслаць нам дэталёвую інфармацыю, пра знойденую вамі праблему.
     bg = Тази настройка е разрешена, за да се записват действия за диагностични цели, които помагат на нашия екип да идентифицира проблеми с приложението. Временно активирайте тази настройка само за изпращане на подробна информация за проблема, който сте открили с приложението.
@@ -20835,7 +20719,7 @@
     es = Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de Organic Maps.
     es-MX = Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de Organic Maps.
     et = See valik lülitab sisse logimise diagnostilistel eesmärkidel. Meie meeskonnale võib olla abi rakendusega seotud probleemide tõrkeotsingul. Lubage see valik ajutiselt, et salvestada ja saata meile oma probleemi üksikasjalikud logid.
-    eu = Aukera hau diagnostiko helburua duten erregistro ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera Organic Maps laguntzari eskatuta soilik.
+    eu = Aukera hau diagnostiko-helburuetarako erregistro-ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera Organic Maps laguntzari eskatuta soilik.
     fa = این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی Organic Maps فعال کنید.
     fi = Valinta ottaa käyttöön lokikirjaukset diagnostiikkaa varten. Se voi auttaa tukihenkilöstöämme, kun he korjaavat sovelluksen ongelmia. Ota tämä ominaisuus käyttöön vain, jos Organic Maps:n tuki pyytää.
     fr = Cette option est activée pour l'identification des actions à des fins de diagnostic. Cela aide l’équipe à identifier les problèmes liés à l’application. Activez cette option uniquement à la demande du support Organic Maps.
@@ -20876,7 +20760,7 @@
     es = Edición en línea
     es-MX = Se edita en línea
     et = Online muutmine
-    eu = Sarean editatzen
+    eu = Sarean editatzen da
     fa = ویرایش آنلاین
     fi = Nettimuokkaus
     fr = Édition en ligne
@@ -20917,7 +20801,7 @@
     es = Opciones de enrutamiento
     es-MX = Ajustes de desvío
     et = Marsruutimise valikud
-    eu = Bideratzeko aukerak
+    eu = Birbidali ezarpenak
     fa = گزینه‌های رانندگی
     fi = Kiertotien asetukset
     fr = Paramètres des itinéraires
@@ -21035,7 +20919,7 @@
     ca = Vies sense pavimentar
     cs = Nezpevněná silnice
     da = Grusveje
-    de = Unbefestigte Straßen
+    de = Erdwege
     el = Χωματόδρομοι
     es = Caminos sin pavimento
     es-MX = Caminos de tierra
@@ -21163,7 +21047,7 @@
     es = No se puede calcular la ruta
     es-MX = No se puede construir una ruta
     et = Marsruudi arvutamine ei õnnestu
-    eu = Ezin da ibilbidea proposatu
+    eu = Ezin da ibilbiderik eraiki
     fa = امکان محاسبه مسیر نیست
     fi = Reittiä ei voi luoda
     fr = Impossible de calculer l'itinéraire
@@ -21192,7 +21076,7 @@
 
   [unable_to_calc_alert_subtitle]
     tags = android,ios
-    en = A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.
+    en = Unfortunately, we couldn't find a route, probably due to the options you have chosen. Please change the settings and try again.
     ar = نأسف، لم نعثر على الطريق ربما بسبب الخيارات التي قمت بتحديدها. يرجى تغيير الإعدادات والمحاولة مجددًا
     be = Нажаль, мы не змаглі пракласці маршрут, магчыма з-за абраных вамі налад. Змяніце налады і паспрабуйце зноў.
     bg = За съжаление не успяхме да намерим маршрут, вероятно поради избраните от вас параметри. Моля, променете настройките и опитайте отново.
@@ -21204,7 +21088,7 @@
     es = Desafortunadamente, no pudimos encontrar una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo
     es-MX = Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo
     et = Kahjuks ei leidnud me marsruuti tõenäoliselt teie valitud võimaluste tõttu. Muutke seadeid ja proovige uuesti.
-    eu = Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik proposatu. Aldatu ezarpenak eta saiatu berriro
+    eu = Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik egin. Aldatu ezarpenak eta saiatu berriro
     fa = متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید
     fi = Valitettavasti emme voineet luoda reittiä valituilla vaihtoehdoilla. Vaihda asetuksia ja yritä uudelleen
     fr = Malheureusement, nous n'avons pas pu créer l'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez
@@ -21245,7 +21129,7 @@
     es = Defina las carreteras a evitar
     es-MX = Configurar rutas de desvío
     et = Määra välditavad teed
-    eu = Zehaztu saihestu beharreko bideak
+    eu = Pertsonalizatu saihesbidearen ibilbidea
     fa = جاده‌های لغو شده را تعریف نمایید
     fi = Muodosta kiertotietä
     fr = Définissez les routes à éviter
@@ -21286,7 +21170,7 @@
     es = Opciones de enrutamiento habilitadas
     es-MX = Ajustes de desvío habilitados
     et = Marsruutimise valikud lubatud
-    eu = Bideratze aukerak gaituta
+    eu = Birbidaltze ezarpena aktibatuta dago
     fa = گزینه‌های مسیریابی فعال شد
     fi = Kiertotien asetukset on päällä
     fr = Paramètres d'itinéraire activés
@@ -21326,7 +21210,7 @@
     es = Carretera con pago de peaje
     es-MX = Carretera de peaje
     et = Tasuline tee
-    eu = Ordainpeko errepidea
+    eu = Bidesaria
     fa = جاده دارای عوارض
     fi = Maksullinen tie
     fr = Route à péage
@@ -21569,7 +21453,7 @@
     es = Vamos
     es-MX = Vamos
     et = Liigume
-    eu = Goazen
+    eu = Zoaz
     fa = برویم
     fi = Mennään
     fr = On y va
@@ -21609,7 +21493,7 @@
     es = Destino
     es-MX = Objetivo
     et = Sihtkoht
-    eu = Helmuga
+    eu = Helburua
     fa = مقصد
     fi = Kohde
     fr = Point d'arrivée
@@ -21639,7 +21523,6 @@
   [follow_my_position]
     tags = ios
     en = Re-center
-    en-GB = Re-centre
     ar = العودة إلى الوسط
     be = Па цэнтры
     ca = Centra
@@ -21650,7 +21533,7 @@
     es = Centrar
     es-MX = Centrar
     et = Keskkoht
-    eu = Berriz zentratu
+    eu = Zentroa
     fa = نشان دادن مجدد در مرکز
     fi = Kohdista
     fr = Recentrer
@@ -21690,7 +21573,7 @@
     es = Resultados de búsqueda
     es-MX = Resultados de la búsqueda
     et = Otsingutulemused
-    eu = Bilaketa emaitzak
+    eu = Bilaketa-emaitzak
     fa = نتایج جستجو
     fi = Hakutulokset
     fr = Résultats de la recherche
@@ -21889,7 +21772,6 @@
     ca = sí
     es = sí
     et = jah
-    eu = bai
     fa = بلی
     fr = oui
     he = כן
@@ -21905,7 +21787,6 @@
     ca = no
     es = no
     et = ei
-    eu = ez
     fr = non
     nl = nee
     tr = Yok
@@ -22032,7 +21913,7 @@
 
   [dialog_routing_change_end_carplay]
     tags = ios
-    en = Unable to find a route to your destination. Please choose another end point
+    en = Unable to build a route to your destination. Please choose another point
     ar = لا يمكن رسم طريق لجهة الوصول. يرجي اختيار مكان آخر
     be = Не атрымалася пракласці маршрут да вашага пункту прызначэння. Выберыце іншы пункт прызначэння.
     ca = No es pot calcular cap ruta a la vostra destinació. Trieu un altre punt
@@ -22043,7 +21924,7 @@
     es = No se puede construir una ruta al destino. Elija por favor otro punto
     es-MX = No se puede construir una ruta hasta el punto final. Seleccione otra
     et = Ei õnnestu luua marsruuti Sinu asukohta. Palun vali teine punkt
-    eu = Ezin da sortu helmugarako ibilbidea. Aukeratu beste bat
+    eu = Ezin da sortu amaiera punturako ibilbidea. aukeratu beste bat
     fa = امکان ایجاد مسیر به مقصد شما نیست. لطفاً نقطه دیگری را انتخاب کنید
     fi = Reittiä ei ole mahdollista luoda loppupisteeseen. Valitse toinen
     fr = Impossible de créer un itinéraire jusqu'au point final. Choisissez-en un autre
@@ -22243,7 +22124,7 @@
     es = La ruta se reconstruirá desde su ubicación actual
     es-MX = La ruta se reconstruirá desde su ubicación actual
     et = Marsruut luuakse uuesti sinu hetkeasukohast
-    eu = Ibilbidea zure uneko kokapenetik birkalkulatuko da
+    eu = Ibilbidea zure uneko kokapenetik berregin egingo da
     fa = مسیر از مکان فعلی شما بازسازی خواهد شد
     fi = Reitti luodaan nykyisestä sijainnista
     fr = L'itinéraire sera reconstruit à partir de votre position actuelle
@@ -22283,7 +22164,7 @@
     es = La ruta se cambiará a coche
     es-MX = La ruta se cambiará a en auto
     et = See marsruut teisendatakse autoga läbitavaks
-    eu = Ibilbidea auto modura aldatuko da
+    eu = Ibilbidea autoz aldatuko da
     fa = مسیر به مسیر خودرویی تغییر خواهد کرد
     fi = Reitti muutetaan autoilijan reitiksi
     fr = L'itinéraire sera changé en mode Voiture
@@ -22324,7 +22205,7 @@
     es = Ok
     es-MX = Ok
     et = Ok
-    eu = Ados
+    eu = Ok
     fa = موافقت کردن
     fi = Ok
     fr = Ok
@@ -22524,7 +22405,7 @@
     es = Sin peaje
     es-MX = Sin peaje
     et = Väldi tasulisi teid
-    eu = Bidesaririk ez
+    eu = Bidesaria ez
     fa = بدون عوارضی
     fi = Ei maksua
     fr = Sans péage
@@ -22564,7 +22445,7 @@
     es = Evitar peaje de pago
     es-MX = Sin peaje
     et = Väldi tasulisi teid
-    eu = Bidesaririk ez
+    eu = Bidesaria ez
     fa = اجتناب از عوارض
     fi = Ei maksua
     fr = Éviter les routes à péages
@@ -22604,7 +22485,7 @@
     es = Cám.velocidad
     es-MX = Cám.velocidad.
     et = Kiiruskaamerad
-    eu = Abiadura kamerak.
+    eu = Abiadura kamera.
     fa = دوربین سرعت
     fi = Nopeuskamera
     fr = Radars de vitesse
@@ -22644,7 +22525,7 @@
     es = Alerta velocidad
     es-MX = Alerta velocidad.
     et = Kiiruse hoiatused
-    eu = Abiadura alertak.
+    eu = Abiadura alerta.
     fa = هشدارهای سرعت
     fi = Nopeuskamerat
     fr = Avertissements radars de vitesse
@@ -22673,7 +22554,7 @@
 
   [download_map_carplay]
     tags = ios
-    en = Please download maps in the app on your mobile device
+    en = Please download maps in Organic Maps app on your device
     ar = يُرجى تحميل الخرائط في تطبيق Organic Maps على جهازك
     be = Спампуйце мапы ў праграме Organic Maps на вашай прыладзе
     ca = Baixeu els mapes en l'aplicació Organic Maps del vostre aparell
@@ -22724,7 +22605,7 @@
     es = %s desviación
     es-MX = %s desviación
     et = %s väljumine
-    eu = %s irteera
+    eu = %s desbideratzea
     fa = خروجی %s
     fi = Poistumisramppi %s
     fr = %s sortie
@@ -22766,7 +22647,7 @@
     es = Ordenar…
     es-MX = Ordenar…
     et = Sorteeri…
-    eu = Ordenatu…
+    eu = Agindu…
     fa = مرتب سازی…
     fi = Järjestä…
     fr = Trier…
@@ -22808,7 +22689,7 @@
     es = Ordenar marcadores
     es-MX = Ordenar marcadores
     et = Sorteeri järjehoidjad
-    eu = Ordenatu markagailuak
+    eu = Ordenatu laster-markak
     fa = مرتب سازی نشانه‌ها
     fi = Järjestä kirjanmerkit
     fr = Trier les signets
@@ -22889,7 +22770,7 @@
     es = Ordenar por tipo
     es-MX = Ordenar por tipo
     et = Sorteeri liigiti
-    eu = Ordenatu motaren arabera
+    eu = Motaren arabera ordenatu
     fa = مرتب سازی بر اساس نوع
     fi = Järjestä: tyyppi
     fr = Trier par type
@@ -22969,7 +22850,7 @@
     es = Ordenar por fecha
     es-MX = Ordenar por fecha
     et = Sorteeri kuupäeva järgi
-    eu = Ordenatu dataren arabera
+    eu = Dataren arabera ordenatzeko
     fa = مرتب سازی بر اساس تاریخ
     fi = Järjestä: päivämäärä
     fr = Classer par date
@@ -23095,7 +22976,7 @@
     es = Por distancia
     es-MX = Por distancia
     et = Kauguse järgi
-    eu = Distantziaren arabera
+    eu = Distantziaz
     fa = بر اساس فاصله
     fi = Etäisyys
     fr = Par distance
@@ -23419,7 +23300,7 @@
     es = Comida
     es-MX = Comida
     et = Toit
-    eu = Janariak
+    eu = Janari
     fa = غذا
     fi = Ruoka
     fr = Aliments
@@ -23579,7 +23460,7 @@
     es = Natación
     es-MX = Natación
     et = Ujumine
-    eu = Igerilekua
+    eu = Igeriketa
     fa = شنا
     fi = Uiminen
     fr = Natation
@@ -23859,7 +23740,7 @@
     es = Estacionamiento
     es-MX = Aparcamientos
     et = Parkimine
-    eu = Aparkalekuak
+    eu = Aparkaleku
     fa = پارکینگها
     fi = Pysäköinti
     fr = Parkings
@@ -23889,7 +23770,6 @@
   [fuel_places]
     tags = android,ios
     en = Gas stations
-    en-GB = Petrol Stations
     ar = محطات وقود
     be = Запраўкі
     ca = Gasolineres
@@ -23900,7 +23780,7 @@
     es = Gasolineras
     es-MX = Gasolinería
     et = Tanklad
-    eu = Gasolindegiak
+    eu = Erregai-geltokia
     fa = پمپ بنزین
     fi = Huoltoasemat
     fr = Stations-service
@@ -24021,7 +23901,7 @@
     es = Lugares sagrados
     es-MX = Sitios religiosos
     et = Religioossed kohad
-    eu = Erlijio guneak
+    eu = Erlijio-guneak
     fa = اماکن مقدس
     fi = Pyhät paikat
     fr = Lieux saints
@@ -24104,7 +23984,7 @@
     es = Navegación en Metro aún no disponible en esta región
     es-MX = Navegación por metro aún no disponible en esta región
     et = Metroo navigeerimine selles piirkonnas pole veel saadaval
-    eu = Metroko nabigazioa oraindik ez dago erabilgarri eskualde honetan
+    eu = Metro-nabigazioa oraindik ez dago erabilgarri eskualde honetan
     fa = راهنمای مترو در این منطقه هنوز دردسترس نیست
     fi = Metron reittiohjeet eivät ole vielä saatavilla tällä alueella
     fr = La navigation en métro n'est pas encore disponible dans la région
@@ -24146,7 +24026,7 @@
     es = Ruta de metro no encontrada
     es-MX = Ruta de metro no encontrada
     et = Metroo marsruuti ei leidu
-    eu = Ez da aurkitu metroko ibilbiderik
+    eu = Ez da aurkitu metroko ibilbidea
     fa = مسیر مترو یافت نشد
     fi = Metroreittiä ei löytynyt
     fr = Itinéraire de métro non trouvé
@@ -24217,7 +24097,7 @@
 
   [button_layer_isolines]
     tags = android,ios
-    en = Contour Lines
+    en = Terrain
     ar = تضاريس
     be = Рэльеф
     bg = Терен
@@ -24229,11 +24109,11 @@
     es = Alturas
     es-MX = Alturas
     et = Maastik
-    eu = Sestra kurbak
+    eu = Altuerak
     fa = ایزومپ
     fi = Maasto
     fr = Terrain
-    hu = Domborzat
+    hu = Terep
     id = Isometrik
     it = Terreno
     ja = 地形
@@ -24258,7 +24138,7 @@
 
   [isolines_activation_error_dialog]
     tags = android,ios
-    en = Activating contour lines requires downloading map data for this area
+    en = To activate and use the topographic layer please update or download the map of the area
     ar = لتفعيل الطبقة الطبوغرافية واستخدامها ، يرجى تحديث أو تنزيل خريطة المنطقة
     be = Каб карыстацца мапай рэльефа, абнавіце альбо спампуйце мапу патрэбнай мясцовасці
     bg = За да активирате и използвате топографския слой, моля, актуализирайте или изтеглете картата на района
@@ -24270,7 +24150,7 @@
     es = Para usar la altitud de relieve, actualice o descargue el mapa del área deseada
     es-MX = Para usar la altitud de relieve, actualice o descargue el mapa del área deseada
     et = Topograafilise kihi aktiveerimiseks ja kasutamiseks värskenda või lae alla piirkonna kaart
-    eu = Sestra kurbak erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa
+    eu = Erliebe-altuera erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa
     fa = برای فعال سازی و استفاده از لایه توپوگرافی نقشه منطقه را به روزرسانی یا دانلود کنید
     fi = Päivitä tai lataa haluamasi alueen kartta, voidaksesi käyttää korkeuskäyriä
     fr = Pour activer et utiliser la couche topographique, mettez à jour ou téléchargez la carte de l'endroit désiré
@@ -24299,7 +24179,7 @@
 
   [isolines_location_error_dialog]
     tags = android,ios
-    en = Contour lines are not yet available in this area
+    en = The topographic layer is not yet available in this area
     ar = الطبقة الطبوغرافية ليست متاحة بعد في هذه المنطقة
     be = Мапы рэльефа для гэтай мясцовасці пакуль што няма
     bg = Топографският слой все още не е наличен в тази област
@@ -24472,7 +24352,7 @@
     es = Difícil
     es-MX = Difícil
     et = Raske
-    eu = Zaila
+    eu = Gogorra
     fa = دشوار
     fi = Vaikea
     fr = Difficile
@@ -24513,7 +24393,7 @@
     es = Ascenso
     es-MX = Ascenso
     et = Tõus
-    eu = Maldan gora
+    eu = Igoera
     fa = بالا رفتن
     fi = Nousua
     fr = Montée
@@ -24554,7 +24434,7 @@
     es = Descenso
     es-MX = Descenso
     et = Langus
-    eu = Maldan behera
+    eu = Gainbehera
     fa = پایین آمدن
     fi = Laskua
     fr = Descente
@@ -24759,7 +24639,7 @@
     es = Tiempo:
     es-MX = Lapso:
     et = Aeg:
-    eu = Denbora:
+    eu = Hutsunea:
     fa = زمان:
     fi = Aika:
     fr = Temps:
@@ -24800,7 +24680,7 @@
     es = Amplíe el mapa para ver las isolíneas
     es-MX = Amplíe el mapa para ver las isolíneas
     et = Isojoonte sirvimiseks suurenda kaarti
-    eu = Handitu mapa sestra kurbak ikusteko
+    eu = Handitu mapa isolineak ikusteko
     fa = برای بررسی خطوط تراز زوم کنید
     fi = Suurenna kartta nähdäksesi korkeuskäyrät
     fr = Zoomez pour voir les courbes de niveaux
@@ -24840,7 +24720,7 @@
     es = Actualizando
     es-MX = Actualización
     et = Värskendamine
-    eu = Eguneratzen
+    eu = Eguneratu
     fa = در حال بروزرسانی
     fi = Päivitys
     fr = Misе à jour
@@ -24880,7 +24760,7 @@
     es = Descargando
     es-MX = Cargando
     et = Allalaadimine
-    eu = Deskargatzen
+    eu = Kargatzen
     fa = در حال دانلود
     fi = Lataus
     fr = Téléchargement
@@ -24940,7 +24820,6 @@
     de = Ordner kann nicht erstellt und Dateien können nicht auf den Gerätespeicher oder die SD-Karte verschoben werden
     es = No se ha podido crear la carpeta y mover los ficheros en la memoria interna del dispositivo o en la tarjeta SD
     et = Seadme sisemällu või mälukaardile ei saa kausta luua ja faile teisaldada
-    eu = Ezin da karpeta sortu eta fitxategiak mugitu barneko gailuaren memorian edo sd txartelan
     fr = Impossible de créer un dossier et de déplacer les fichiers vers la mémoire interne de l'appareil ou la carte SD
     mr = उपकरणाच्या अंतर्गत मेमरी किंवा SD-card वर फोल्डर तयार करण्यात आणि फायली हलविण्यात अक्षम
     nb = Klarte ikke opprette mappe og flytte filer i enhetens minne eller SD-kort
@@ -24959,7 +24838,6 @@
     de = Speicherfehler
     es = Error de disco
     et = Salvestusseadme viga
-    eu = Diskoaren akatsa
     fr = Erreur disque
     mr = डिस्क त्रुटी
     nb = Diskfeil
@@ -25020,7 +24898,7 @@
 
   [enable_screen_sleep]
     tags = android
-    en = Allow the screen to sleep
+    en = Allow screen to sleep
     ar = اسمح للشاشة بالنوم
     be = Дазволіць экрану засынаць
     bg = Позволяване на екрана да заспи
@@ -25061,7 +24939,7 @@
   [enable_screen_sleep_description]
     comment = Description in preferences
     tags = android
-    en = When enabled, the screen will be allowed to sleep after a period of inactivity.
+    en = When enabled the screen will be allowed to sleep after a period of inactivity.
     ar = عند التفعيل ، سيتم السماح للشاشة بالنوم بعد فترة من عدم النشاط.
     be = Дазваляе экрану засынаць пасля перыяда бездзеяння.
     bg = Когато е разрешено, екранът ще бъде оставен да заспи след определен период на неактивност.
@@ -25110,7 +24988,6 @@
     de = Auf dem Sperrbildschirm anzeigen
     es = Mostrar en la pantalla de bloqueo
     et = Kuva lukustusekraanil
-    eu = Erakutsi pantaila blokeatuan
     fr = Afficher sur l'écran de verrouillage
     hu = Megjelenítés a zárolt képernyőn
     it = Mostra sulla schermata di blocco
@@ -25127,7 +25004,7 @@
   [enable_show_on_lock_screen_description]
     tags = android
     comment = Description in preferences
-    en = When enabled, the app will work on the lockscreen even when the device is locked.
+    en = When enabled, you don't need to unlock your device every time while the app is running.
     ar = عند التفعيل، لن تحتاج لفتح قفل جهازك كل مرة أثناء تشغيل التطبيق
     be = Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы праграмы.
     ca = Si està activa, no cal desblocar l'aparell cada vegada mentre l'aplicació està funcionant.
@@ -25135,7 +25012,6 @@
     de = Wenn aktiviert, muss das Gerät nicht jedes Mal entsperrt werden, wenn die App ausgeführt wird.
     es = Cuando está habilitado, no tiene que desbloquear su dispositivo mientras la aplicación se está ejecutando.
     et = Kui lubatud, ei pea te seadet iga kord avama, kui rakendus töötab.
-    eu = Gaituta dagoenean, ez duzu gailua desblokeatu beharrik aplikazioa abian dagoen bitartean.
     fr = Lorsqu'il est activé, vous n'avez pas besoin de déverrouiller votre appareil à chaque fois que l'application est en fonctionnement.
     hu = Ha engedélyezve van, nem kell minden alkalommal feloldanod a telefonod, amíg az alkalmazás fut.
     it = Quando è abilitata, non è necessario sbloccare il dispositivo ogni volta mentre l'app è in esecuzione.
@@ -25152,7 +25028,7 @@
   [whats_new_auto_update_title]
     comment = Autoupdate dialog on start
     tags = ios
-    en = Update downloaded maps
+    en = Update your downloaded maps
     ar = قم بتحديث الخرائط المُنزلة
     be = Абнавіце спампаваныя мапы
     bg = Актуализиране на изтеглените карти
@@ -25339,7 +25215,7 @@
     de = Strecke löschen
     es = Borrar ruta
     et = Kustuta rada
-    eu = Ezabatu arrastoa
+    eu = Ibilbide garbia
     fi = Poista reitti
     fr = Supprimer la route
     it = Elimina percorso
@@ -25363,7 +25239,7 @@
     de = Name der Strecke
     es = Nombre de la ruta
     et = Raja nimi
-    eu = Arrastoaren izena
+    eu = Bide-izena
     fi = Reitin nimi
     fr = Nom de la route
     it = Nome percorso
@@ -25415,7 +25291,7 @@
     el = Τροχιά
     es = Ruta
     et = Rada
-    eu = Arrastoa
+    eu = Ibilbidea
     fa = مسیر
     fi = Reitti
     fr = Route
@@ -25456,7 +25332,7 @@
     el = Δεδομένα χάρτη από το OpenStreetMap
     es = Datos de mapas de OpenStreetMap
     et = OpenStreetMap kaardiandmed
-    eu = Maparen datuak OpenStreetMap-etik
+    eu = Maparen datuak OpenStreetMap-en
     fa = OpenStreetMap داده‌های نقشه از
     fi = OpenStreetMapin karttatiedot
     fr = Données cartographiques d'OpenStreetMap
@@ -25503,24 +25379,10 @@
     tags = android,ios
     en = https://organicmaps.app/
     be = https://organicmaps.app/ru/
-    ca = https://organicmaps.app/ca/
     cs = https://organicmaps.app/cs/
-    de = https://organicmaps.app/de/
-    es = https://organicmaps.app/es/
-    eu = https://organicmaps.app/eu/
-    fr = https://organicmaps.app/fr/
-    hi = https://organicmaps.app/hi/
-    hu = https://organicmaps.app/hu/
-    id = https://organicmaps.app/id/
     it = https://organicmaps.app/it/
-    mr = https://organicmaps.app/mr/
-    nl = https://organicmaps.app/nl/
-    pl = https://organicmaps.app/pl/
-    pt-BR = https://organicmaps.app/pt-BR/
     ru = https://organicmaps.app/ru/
-    sv = https://organicmaps.app/sv/
     tr = https://organicmaps.app/tr/
-    uk = https://organicmaps.app/uk/
 
   [osm_wiki_about_url]
     comment = Link to OSM wiki for Editor, Profile and About pages
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index e3888273f5..042a5bb7ec 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -1,51 +1,5 @@
 [[Types]]
 
-  [type.addr_interpolation]
-    en = Address/Block
-    ar = العنوان / البلوك
-    be = Адрас/Блок
-    bg = Адрес/Блок
-    ca = Adreça/Bloc
-    cs = Adresa/blok
-    da = Adresse/blok
-    de = Adresse/Block
-    el = Διεύθυνση/Μπλοκ
-    es = Dirección/Bloque
-    et = Aadress/plokk
-    eu = Helbidea/Blokea
-    fa = آدرس/بلاک
-    fi = Osoite/lohko
-    fr = Adresse/Bloc
-    he = כתובת/חסימה
-    hu = Cím/blokk
-    id = Alamat/Blokir
-    it = Indirizzo/Blocco
-    ja = アドレス/ブロック
-    ko = 주소/블록
-    mr = पत्ता/ब्लॉक
-    nb = Adresse/blokk
-    nl = Adres/blok
-    pl = Adres/Blok
-    pt = Endereço/Bloco
-    pt-BR = Endereço/Bloco
-    ro = Adresă/Bloc
-    ru = Адрес/Блок
-    sk = Adresa/blok
-    sv = Adress/Block
-    sw = Anwani/Zuia
-    th = ที่อยู่/บล็อค
-    tr = Adres/Blok
-    uk = Адреса/блок
-    vi = Địa chỉ/Khối
-    zh-Hans = 地址/区块
-    zh-Hant = 地址/區塊
-
-  [type.addr_interpolation.even]
-    ref = type.addr_interpolation
-
-  [type.addr_interpolation.odd]
-    ref = type.addr_interpolation
-
   [type.aerialway]
     en = Aerialway
     de = Seilbahn
@@ -470,8 +424,7 @@
     zh-Hant = 設施
 
   [type.amenity.arts_centre]
-    en = Arts Center
-    en-GB = Arts Centre
+    en = Art Center
     ar = مركز فن
     cs = Umělecké centrum
     da = Kunsthus
@@ -1138,7 +1091,7 @@
     zh-Hant = 自行車充電站
 
   [type.amenity.charging_station.motorcar]
-    en = Car Charging Station
+    en = Motorcar Charging Station
     ar = محطة شحن Motorcar
     be = Аўтамабільная зарадная станцыя
     bg = Станция за зареждане на автомобили
@@ -2177,7 +2130,6 @@
 
   [type.amenity.loading_dock]
     en = Loading Dock
-    en-GB = Loading Bay
     ar = رصيف التحميل
     be = Пагрузная платформа
     bg = Товарен док
@@ -2515,7 +2467,7 @@
     zh-Hant = 私人停車場
 
   [type.amenity.parking.park_and_ride]
-    en = Park And Ride Parking
+    en = Parking
     ar = موقف سيارات
     cs = Parkoviště
     da = Parkering
@@ -2587,7 +2539,7 @@
     zh-Hant = 地下停車場
 
   [type.amenity.parking_entrance]
-    en = Parking Entrance
+    en = Parking entrance
     ar = مدخل موقف سيارات
     be = Уваход на паркоўку
     bg = Вход за паркинг
@@ -2666,13 +2618,112 @@
     zh-Hant = 停車地點
 
   [type.amenity.parking_space.permissive]
-    ref = type.amenity.parking_space
+    en = Parking Space
+    ar = مكان لوقوف السيارات
+    cs = Prostor pro parkování
+    da = Parkeringsplads
+    de = Parkplatz
+    el = Χώρος στάθμευσης
+    es = Plaza de aparcamiento
+    es-MX = Plaza de aparcamiento
+    et = Parkimiskoht
+    eu = Aparkaleku
+    fa = جای پارک
+    fi = Parkkipaikka
+    fr = Place de stationnement
+    hu = Parkolóhely
+    id = Tempat parkir
+    it = Parcheggio
+    ja = 駐車スペース
+    ko = 주차장
+    mr = पार्किंगची जागा
+    nb = Parkeringsplass
+    nl = Parkeerplek
+    pl = Miejsce parkingowe
+    pt = Lugar de estacionamento
+    ro = Loc de parcare
+    ru = Парковочное место
+    sk = Parkovacie miesto
+    sv = Parkeringsplats
+    sw = Sehemu ya maegesho
+    th = พื้นที่จอดรถ
+    tr = Park Alanı
+    uk = Паркувальне місце
+    vi = Chỗ để xe
+    zh-Hans = 停车位
+    zh-Hant = 停車地點
 
   [type.amenity.parking_space.private]
-    ref = type.amenity.parking_space
+    en = Parking Space
+    ar = مكان لوقوف السيارات
+    cs = Prostor pro parkování
+    da = Parkeringsplads
+    de = Parkplatz
+    el = Χώρος στάθμευσης
+    es = Plaza de aparcamiento
+    es-MX = Plaza de aparcamiento
+    et = Parkimiskoht
+    eu = Aparkaleku
+    fa = جای پارک
+    fi = Parkkipaikka
+    fr = Place de stationnement
+    hu = Parkolóhely
+    id = Tempat parkir
+    it = Parcheggio
+    ja = 駐車スペース
+    ko = 주차장
+    mr = पार्किंगची जागा
+    nb = Parkeringsplass
+    nl = Privé parkeerplek
+    pl = Miejsce parkingowe
+    pt = Lugar de estacionamento privado
+    ro = Loc de parcare
+    ru = Парковочное место
+    sk = Parkovacie miesto
+    sv = Parkeringsplats
+    sw = Sehemu ya maegesho
+    th = พื้นที่จอดรถ
+    tr = Park Alanı
+    uk = Паркувальне місце
+    vi = Chỗ để xe
+    zh-Hans = 停车位
+    zh-Hant = 停車地點
 
   [type.amenity.parking_space.underground]
-    ref = type.amenity.parking_space
+    en = Parking Space
+    ar = مكان لوقوف السيارات
+    cs = Prostor pro parkování
+    da = Parkeringsplads
+    de = Parkplatz
+    el = Χώρος στάθμευσης
+    es = Plaza de aparcamiento
+    es-MX = Plaza de aparcamiento
+    et = Parkimiskoht
+    eu = Aparkaleku
+    fa = جای پارک
+    fi = Parkkipaikka
+    fr = Place de stationnement
+    hu = Parkolóhely
+    id = Tempat parkir
+    it = Parcheggio
+    ja = 駐車スペース
+    ko = 주차장
+    mr = पार्किंगची जागा
+    nb = Parkeringsplass
+    nl = Ondergrondse parkeerplek
+    pl = Miejsce parkingowe
+    pt = Lugar de estacionamento subterrâneo
+    ro = Loc de parcare
+    ru = Парковочное место
+    sk = Parkovacie miesto
+    sv = Parkeringsplats
+    sw = Sehemu ya maegesho
+    th = พื้นที่จอดรถ
+    tr = Park Alanı
+    uk = Паркувальне місце
+    vi = Chỗ để xe
+    zh-Hans = 停车位
+    zh-Hant = 停車地點
 
   [type.amenity.parking_space.disabled]
     en = Disabled Parking Space
@@ -2817,7 +2868,7 @@
     zh-Hant = 寺廟
 
   [type.amenity.place_of_worship.buddhist]
-    en = Buddhist Temple
+    en = Temple
     ar = معبد بوذي
     cs = Chrám
     da = Tempel
@@ -2886,7 +2937,7 @@
     zh-Hant = 基督教堂
 
   [type.amenity.place_of_worship.hindu]
-    en = Hindu Temple
+    en = Temple
     ar = معبد هندوسي
     cs = Chrám
     da = Tempel
@@ -2989,7 +3040,7 @@
     zh-Hant = 清真寺
 
   [type.amenity.place_of_worship.shinto]
-    en = Shinto Shrine
+    en = Shrine
     ar = معبد شنتو
     cs = Posvátné místo
     da = Helligdom
@@ -3024,7 +3075,7 @@
     zh-Hant = 聖殿
 
   [type.amenity.place_of_worship.taoist]
-    en = Taoist Temple
+    en = Temple
     ar = معبد طاوي
     cs = Chrám
     da = Tempel
@@ -3092,8 +3143,7 @@
     zh-Hant = 警察局
 
   [type.amenity.post_box]
-    en = Mailbox
-    en-GB = Postbox
+    en = Post Box
     ar = صندوق بريد
     be = Паштовая скрыня
     cs = Poštovní schránka
@@ -3253,7 +3303,6 @@
 
   [type.amenity.recycling.centre]
     en = Recycling Center
-    en-GB = Recycling Centre
     ar = مركز إعادة تدوير
     be = Прыём другсыравіны
     cs = Recyklační středisko
@@ -3328,7 +3377,7 @@
     ref = type.amenity.recycling
 
   [type.recycling.batteries]
-    en = Batteries
+    en = Household Batteries
     ar = بطاريات
     be = Батарэйкі
     bg = Батерии
@@ -3687,7 +3736,7 @@
     uk = Органіка / Харчові відходи
 
   [type.recycling.cartons]
-    en = Cartons
+    en = Beverage Cartons
     ar = علب مشروبات
     be = Тэтрапак і аналагі
     de = Getränkekarton
@@ -4196,7 +4245,7 @@
     uk = Автомат з їжею
 
   [type.amenity.vending_machine.newspapers]
-    en = Newspaper Dispenser
+    en = Newspapers Dispenser
     be = Газетны аўтамат
     de = Zeitungsautomat
     es = Máquina expendedora de periódicos
@@ -4212,7 +4261,7 @@
     uk = Газетний автомат
 
   [type.amenity.vending_machine.parking_tickets]
-    en = Parking Meter
+    en = Parking Tickets
     ar = ماكينة دفع تذاكر الموقف
     be = Паркамат
     cs = Parkovací automat
@@ -4337,7 +4386,7 @@
     uk = Поштомат
 
   [type.amenity.vending_machine.fuel]
-    en = Fuel Pump
+    en = Fuel Dispenser
     ar = ماكينة بيع الوقود
     be = Паліўная калонка
     de = Tankautomat
@@ -4388,7 +4437,6 @@
 
   [type.amenity.waste_basket]
     en = Trash Bin
-    en-GB = Rubbish Bin
     ar = صندوق قمامة
     cs = Odpadkový koš
     da = Skraldespand
@@ -4474,7 +4522,7 @@
     uk = Станція передачі сміття
 
   [type.amenity.water_point]
-    en = Water Tank Refill Point
+    en = RV Water Point
     ar = نقطة مائية
     be = Вада для аўтадомаў
     cs = Vodní zdroj
@@ -4565,7 +4613,7 @@
     zh-Hant = 街區
 
   [type.barrier.bollard]
-    en = Bollard
+    en = Pillar
     ar = عمود حاجز قصير
     cs = Pilíř
     da = Søjle
@@ -5292,13 +5340,39 @@
     zh-Hant = 建築物
 
   [type.building.address]
-    ref = type.building
-
-  [type.building.has_parts]
-    ref = type.building
-
-  [type.building_part]
-    ref = type.building
+    en = Building
+    ar = مبنى
+    cs = Stavba
+    da = Bygning
+    de = Gebäude
+    el = Κτίριο
+    es = Edificio
+    et = Hoone
+    eu = Eraikin
+    fa = ساختمان
+    fi = Rakennus
+    fr = Bâtiment
+    hu = Épület
+    id = Gedung
+    it = Edificio
+    ja = 建物
+    ko = 건물
+    mr = इमारत
+    nb = Bygning
+    nl = Gebouw
+    pl = Adres
+    pt = Edifício
+    pt-BR = Edifício
+    ro = Clădire
+    ru = Здание
+    sk = Budova
+    sv = Byggnad
+    th = อาคาร
+    tr = Bina
+    uk = Будівля
+    vi = Tòa nhà
+    zh-Hans = 建筑物
+    zh-Hant = 建築物
 
   [type.building.garage]
     en = Garage
@@ -5331,6 +5405,41 @@
     zh-Hans = 独立1车库
     zh-Hant = 車庫
 
+  [type.building.has_parts]
+    en = Building
+    ar = مبنى
+    cs = Stavba
+    da = Bygning
+    de = Gebäude
+    el = Κτίριο
+    es = Edificio
+    et = Hoone
+    eu = Eraikin
+    fa = ساختمان
+    fi = Rakennus
+    fr = Bâtiment
+    hu = Épület
+    id = Gedung
+    it = Edificio
+    ja = 建物
+    ko = 건물
+    mr = इमारत
+    nb = Bygning
+    nl = Gebouw
+    pl = Część budynku
+    pt = Edifício
+    pt-BR = Edifício
+    ro = Clădire
+    ru = Здание
+    sk = Budova
+    sv = Byggnad
+    th = อาคาร
+    tr = Bina
+    uk = Будівля
+    vi = Tòa nhà
+    zh-Hans = 建筑物
+    zh-Hant = 建築物
+
   [type.building.train_station]
     en = Train Station
     ar = محطة سكك حديدية
@@ -5613,7 +5722,7 @@
     zh-Hant = 木工
 
   [type.craft.confectionery]
-    en = Confectioner
+    en = Confectionery
     ar = حلواني
     be = Кандытар
     bg = Сладкарски изделия
@@ -5805,7 +5914,7 @@
 
   [type.craft.hvac]
     comment = Heating, Ventilation, and Air Conditioning
-    en = HVAC Shop
+    en = HVAC
     ar = تكييف
     be = Ацяпленне, вентыляцыя і кандыцыянаванне
     bg = Отопление, вентилация и климатизация
@@ -6036,46 +6145,6 @@
     zh-Hans = 摄影棚
     zh-Hant = 攝影師
 
-  [type.shop.camera]
-    en = Camera Shop
-    ar = متجر الكاميرا
-    be = Крама фотаапаратаў
-    bg = Магазин за фотоапарати
-    ca = Botiga de càmeres
-    cs = Obchod s fotoaparáty
-    da = Kamera butik
-    de = Kamerageschäft
-    el = Κατάστημα φωτογραφικών μηχανών
-    es = Tienda de cámaras
-    et = Kaamerapood
-    eu = Kamera Denda
-    fa = فروشگاه دوربین
-    fi = Kamerakauppa
-    fr = Boutique d'appareils photo
-    he = חנות מצלמות
-    hu = Fényképezőgép bolt
-    id = Toko Kamera
-    it = Negozio di macchine fotografiche
-    ja = カメラショップ
-    ko = 카메라 샵
-    mr = कॅमेरा शॉप
-    nb = Kamerabutikk
-    nl = Camerawinkel
-    pl = Sklep z aparatami
-    pt = Loja de câmeras
-    pt-BR = Loja de câmeras
-    ro = Magazin de aparate foto
-    ru = Магазин фотоаппаратов
-    sk = Obchod s fotoaparátmi
-    sv = Kameraaffär
-    sw = Duka la Kamera
-    th = ร้านกล้อง
-    tr = Kamera Dükkanı
-    uk = Магазин фотоапаратів
-    vi = Cửa hàng máy ảnh
-    zh-Hans = 相机店
-    zh-Hant = 相機店
-
   [type.craft.plumber]
     en = Plumber
     ar = سباك
@@ -7141,7 +7210,6 @@
 
   [type.cuisine.donut]
     en = Donut
-    en-GB = Doughnut
     ar = الكعك المحلاة
     cs = Kobliha
     da = Donuts
@@ -7315,19 +7383,26 @@
     en = Fish and Chips
     ar = سمك ورقائق البطاطا
     cs = Ryba a hranolky
+    da = Fish and chips
+    de = Fish and Chips
     el = Ψάρια και πατάτες
     es = Pescado rebozado con patatas
     et = Kala ja krõpsud
     eu = Arrain arrautza patatekin
+    fi = Fish & chips
+    fr = Fish and chips
     he = פיש אנד צ'יפס
     hu = Hal és sültkrumpli
     id = Ikan dan kentang goreng
+    it = Fish and chips
     ja = フィッシュ・アンド・チップス
     ko = 피쉬 앤 칩스
     nb = Fisk og pommes frites
+    nl = Fish and chips
     pl = Ryba i frytki
     pt = Peixe e batatas fritas
     pt-BR = Peixe e batatas fritas
+    ro = Restaurant fish and chips
     ru = Рыба и картофель фри
     sk = Ryba s hranolkami
     sv = Friterad fisk och pommes frites
@@ -8298,7 +8373,7 @@
     zh-Hant = 麵食
 
   [type.cuisine.oriental]
-    en = East Asian
+    en = Far Eastern
     ar = مطبخ شرقي
     cs = Orientální kuchyně
     da = Orientalsk
@@ -8745,7 +8820,6 @@
 
   [type.cuisine.savory_pancakes]
     en = Savory Pancakes
-    en-GB = Savoury Pancakes
     ar = بان كيك السافوري
     cs = Pikantní palačinky
     da = Madpandekager
@@ -9468,7 +9542,7 @@
     zh-Hant = 物理治療師
 
   [type.healthcare.alternative]
-    en = Alternative Medicine
+    en = Alternative medicine
     ar = الطب البديل
     be = Альтэрнатыўная медыцына
     bg = Алтернативна медицина
@@ -9507,7 +9581,7 @@
     zh-Hant = 替代藥物
 
   [type.healthcare.audiologist]
-    en = Audiologist
+    en = Audiology
     ar = السمع
     be = Аўдыялогія
     bg = Аудиология
@@ -9546,8 +9620,7 @@
     zh-Hant = 聽力學
 
   [type.healthcare.blood_donation]
-    en = Blood Donation Center
-    en-GB = Blood Donation Centre
+    en = Blood donation center
     ar = مركز التبرع بالدم
     be = Цэнтр донарства крыві
     bg = Център за кръводаряване
@@ -9586,7 +9659,7 @@
     zh-Hant = 捐血中心
 
   [type.healthcare.optometrist]
-    en = Optometrist
+    en = Optometry
     ar = قياس البصر
     be = Оптаметрыя
     bg = Оптометрия
@@ -9625,7 +9698,7 @@
     zh-Hant = 驗光
 
   [type.healthcare.podiatrist]
-    en = Podiatrist
+    en = Podiatry
     ar = علاج الأرجل
     be = Подологія
     bg = Подиология
@@ -9664,7 +9737,7 @@
     zh-Hant = 足病學
 
   [type.healthcare.psychotherapist]
-    en = Psychotherapist
+    en = Psychotherapy
     ar = العلاج النفسي
     be = Псіхатэрапія
     bg = Психотерапия
@@ -9703,7 +9776,7 @@
     zh-Hant = 心理治療
 
   [type.healthcare.sample_collection]
-    en = Sample Collection Centre
+    en = Sample collection
     ar = أخذ العينات
     be = Збор аналізаў
     bg = Вземане на проби
@@ -9836,7 +9909,7 @@
     pt-BR = Túnel para cavaleiros
 
   [type.highway.busway]
-    en = Dedicated Bus Road
+    en = Dedicated bus road
     ar = ﺺﺼﺨﻣ ﺕﻼﻓﺎﺣ ﻖﻳﺮﻃ
     be = Выдзеленая аўтобусная дарога
     bg = Обособен автобусен път
@@ -10056,7 +10129,7 @@
 
   [type.highway.footway.area]
     ref = type.highway.footway
-    en = Pedestrian Area
+    en = Pedestrian Zone
     ar = منطقة مشاة
     es = Zona peatonal
     et = Jalakäijate ala
@@ -10477,7 +10550,7 @@
 
   [type.highway.pedestrian.area]
     ref = type.highway.pedestrian
-    en = Pedestrian Area
+    en = Pedestrian Zone
     es = Zona peatonal
     et = Jalakäijate ala
     it = Area pedonale
@@ -10608,7 +10681,7 @@
     zh-Hant = 跑道
 
   [type.highway.residential]
-    en = Residential Street
+    en = Street
     ar = شارع
     cs = Ulice
     da = Gade
@@ -11387,7 +11460,7 @@
 [[Types: Historic]]
 
   [type.historic]
-    en = Historic Object
+    en = Historic object
     ar = مكان تاريخي
     be = Гістарычны аб'ект
     bg = Исторически обект
@@ -11463,7 +11536,7 @@
     zh-Hant = 考古遺址
 
   [type.historic.battlefield]
-    en = Historic Battlefield
+    en = Battlefield
     ar = ساحة معركة تاريخية
     be = Поле бітвы
     bg = Бойно поле
@@ -11577,7 +11650,7 @@
     zh-Hant = 城堡
 
   [type.historic.castle.castrum]
-    en = Roman Fort
+    en = Roman fort
     ar = كاسترا
     be = Каструм
     bg = Каструм
@@ -11615,7 +11688,7 @@
     zh-Hant = 古羅馬兵營
 
   [type.historic.castle.defensive]
-    en = Stronghold Castle
+    en = Castle
     ar = قلعة
     be = Замак
     bg = Замък
@@ -11653,7 +11726,7 @@
     zh-Hant = 城堡
 
   [type.historic.castle.fortified_church]
-    en = Fortified Church
+    en = Fortified church
     ar = الكنيسة المحصنة
     be = Абарончы храм
     bg = Укрепена църква
@@ -11805,7 +11878,7 @@
     zh-Hant = 克里姆林
 
   [type.historic.castle.manor]
-    en = Manor House
+    en = Manor house
     ar = قصر مالك العزبة
     be = Сядзіба
     bg = Усадба
@@ -11881,7 +11954,7 @@
     zh-Hant = 宮殿
 
   [type.historic.castle.shiro]
-    en = Japanese Castle
+    en = Japanese castle
     ar = قلعة يابانية
     be = Японскі замак
     bg = Японски замък
@@ -11919,7 +11992,7 @@
     zh-Hant = 城
 
   [type.historic.castle.stately]
-    en = Stately Castle
+    en = Castle
     ar = شاتو
     be = Замак
     bg = Замък
@@ -11957,7 +12030,7 @@
     zh-Hant = 法式城堡
 
   [type.historic.city_gate]
-    en = City Gate
+    en = City gate
     ar = بوابة مدينة
     be = Гарадская брама
     bg = Градска порта
@@ -12147,7 +12220,7 @@
     zh-Hant = 紀念館
 
   [type.historic.memorial.cross]
-    en = Memorial Cross
+    en = Memorial cross
     ar = الصليب التذكاري
     be = Памятны крыж
     bg = Мемориален кръст
@@ -12186,7 +12259,7 @@
     zh-Hant = 紀念十字架
 
   [type.historic.memorial.plaque]
-    en = Commemorative Plaque
+    en = Commemorative plaque
     ar = لوحة تذكارية
     be = Памятная дошка
     bg = Паметна плоча
@@ -12338,7 +12411,7 @@
     zh-Hant = 絆腳石
 
   [type.historic.memorial.war_memorial]
-    en = War Memorial
+    en = War memorial
     ar = نصب حرب
     be = Ваенны мемарыял
     bg = Военен паметник
@@ -12451,7 +12524,7 @@
     zh-Hant = 刑柱
 
   [type.historic.ruins]
-    en = Historic Ruins
+    en = Ruins
     ar = آثار
     be = Руіны
     bg = Развалина
@@ -12565,7 +12638,7 @@
     zh-Hant = 陵墓
 
   [type.historic.wayside_cross]
-    en = Wayside Cross
+    en = Wayside cross
     ar = صليب مسيحي
     be = Прыдарожны крыж
     bg = Крайпътен кръст
@@ -12603,7 +12676,7 @@
     zh-Hant = 路旁十字架
 
   [type.historic.wayside_shrine]
-    en = Wayside Shrine
+    en = Wayside shrine
     ar = ضريح
     be = Прыдарожная святыня
     bg = Крайпътно светилище
@@ -12908,7 +12981,7 @@
     zh-Hans = 商务办公用地
 
   [type.landuse.construction]
-    en = Construction Area
+    en = Construction
     ar = منطقة بناء
     de = Baustelle
     es = Construcción
@@ -12927,7 +13000,7 @@
     zh-Hans = 建设区域
 
   [type.landuse.education]
-    en = Educational Facility
+    en = Educational Facilities
     ar = مؤسسات تعليمية
     be = Адукацыйныя ўстановы
     es = Instalaciones educativas
@@ -13134,7 +13207,7 @@
     zh-Hant = 樹林
 
   [type.landuse.forest.mixed]
-    en = Mixed-Leaf Forest
+    en = Mixed Forest
     ar = غابة مختلطة
     cs = Les
     da = Skov
@@ -13186,7 +13259,7 @@
     zh-Hans = 车库用地
 
   [type.landuse.grass]
-    en = Grass
+    en = Lawn
     ar = عشب
     cs = Trávník
     da = Græsplæne
@@ -13440,7 +13513,7 @@
     zh-Hans = 康体场地
 
   [type.landuse.reservoir]
-    en = Reservoir
+    en = Water
     ar = مياه
     cs = Voda
     da = Vand
@@ -13512,7 +13585,7 @@
     zh-Hans = 零售用地
 
   [type.landuse.salt_pond]
-    en = Salt Pond
+    en = Pond
     ar = مستنقع
     de = Saline
     es = Estanque
@@ -13943,15 +14016,115 @@
     zh-Hant = 公園
 
   [type.leisure.park.no.access]
-    ref = type.leisure.park
-    en = Private Park
+    en = Park
+    ar = موقف سيارات
+    cs = Park
+    da = Park
+    de = Park
+    el = Πάρκο
+    es = Parque
+    es-MX = Parque
+    et = Park
+    eu = Parkea
+    fa = پارک
+    fi = Puisto
+    fr = Parc
+    hu = Park
+    id = Taman
+    it = Parco
+    ja = 公園
+    ko = 공원
+    mr = उद्यान
+    nb = Park
+    nl = Ontoegankelijk park
+    pl = Park
+    pt = Parque urbano
+    pt-BR = Parque
+    ro = Parc
+    ru = Парк
+    sk = Park
+    sv = Parken
+    sw = Hifadhi
+    th = สวนสาธารณะ
+    tr = Park
+    uk = Парк
+    vi = Công viên
+    zh-Hans = 公园
+    zh-Hant = 公園
 
   [type.leisure.park.permissive]
-    ref = type.leisure.park
+    en = Park
+    ar = موقف سيارات
+    cs = Park
+    da = Park
+    de = Park
+    el = Πάρκο
+    es = Parque
+    es-MX = Parque
+    et = Park
+    eu = Parkea
+    fa = پارک
+    fi = Puisto
+    fr = Parc
+    hu = Park
+    id = Taman
+    it = Parco
+    ja = 公園
+    ko = 공원
+    mr = उद्यान
+    nb = Park
+    nl = Park
+    pl = Park
+    pt = Parque urbano
+    pt-BR = Parque
+    ro = Parc
+    ru = Парк
+    sk = Park
+    sv = Parken
+    sw = Hifadhi
+    th = สวนสาธารณะ
+    tr = Park
+    uk = Парк
+    vi = Công viên
+    zh-Hans = 公园
+    zh-Hant = 公園
 
   [type.leisure.park.private]
-    ref = type.leisure.park
-    en = Private Park
+    en = Park
+    ar = موقف سيارات خاص
+    cs = Park
+    da = Park
+    de = Park
+    el = Πάρκο
+    es = Parque
+    es-MX = Parque
+    et = Park
+    eu = Parkea
+    fa = پارک
+    fi = Puisto
+    fr = Parc
+    hu = Park
+    id = Taman
+    it = Parco privato
+    ja = 公園
+    ko = 공원
+    mr = उद्यान
+    nb = Park
+    nl = Privé park
+    pl = Park
+    pt = Parque urbano privado
+    pt-BR = Parque
+    ro = Parc
+    ru = Парк
+    sk = Park
+    sv = Parken
+    sw = Hifadhi
+    th = สวนสาธารณะ
+    tr = Park
+    uk = Парк
+    vi = Công viên
+    zh-Hans = 公园
+    zh-Hant = 公園
 
   [type.leisure.picnic_table]
     en = Picnic Table
@@ -13993,7 +14166,7 @@
     zh-Hant = 野餐桌
 
   [type.leisure.pitch]
-    en = Sport Pitch
+    en = Sports Ground
     ar = ملعب رياضي
     cs = Sportovní hřiště
     da = Sportsplads
@@ -14130,7 +14303,6 @@
 
   [type.leisure.sports_centre]
     en = Sports Center
-    en-GB = Sports Centre
     ar = مركز رياضي
     cs = Sportovní centrum
     da = Idrætscenter
@@ -14428,7 +14600,7 @@
     uk = Тур
 
   [type.man_made.chimney]
-    en = Chimney
+    en = Factory Chimney
     ar = مدخنة مصنع
     cs = Tovární komín
     da = Fabriksskorsten
@@ -14744,7 +14916,7 @@
     zh-Hant = 通訊塔
 
   [type.man_made.wastewater_plant]
-    en = Wastewater Treatment Plant
+    en = Wastewater treatment plant
     de = Kläranlage
     es = Planta de tratamiento de aguas residuales
     et = Reoveepuhasti
@@ -15135,7 +15307,7 @@
     zh-Hant = 海灘
 
   [type.natural.beach.sand]
-    en = Sandy Beach
+    en = Sand Beach
     ar = شاطئ رملي
     be = Пяшчаны пляж
     bg = Пясъчен плаж
@@ -15249,7 +15421,7 @@
     zh-Hant = 海角
 
   [type.natural.cave_entrance]
-    en = Cave Entrance
+    en = Cave
     ar = كهف
     be = Пячора
     bg = Пещера
@@ -16156,7 +16328,7 @@
     zh-Hant = 叢林
 
   [type.natural.spring]
-    en = Natural Spring
+    en = Spring
     ar = ينبوع
     be = Крыніца
     bg = Извор
@@ -16385,7 +16557,7 @@
     zh-Hant = 火山
 
   [type.natural.water]
-    en = Water
+    en = Waterbody
     ar = مسطح مائي
     be = Вадаём
     bg = Воден басейн
@@ -16564,7 +16736,7 @@
     fa = اداره
     fi = Toimisto
     fr = Bureau
-    hu = Iroda
+    hu = Hivatal
     id = Kantor
     it = Ufficio
     ja = オフィス
@@ -16658,7 +16830,6 @@
 
   [type.office.government]
     en = Government Office
-    en-GB = Governmental Office
     ar = مكتب حكومي
     cs = Úřad vlády
     da = Regeringskontor
@@ -17190,7 +17361,7 @@
     zh-Hant = 島
 
   [type.place.islet]
-    en = Islet
+    en = Island
     ar = جزيرة
     be = Астравок
     bg = Острови
@@ -17702,7 +17873,7 @@
     zh-Hans = 电力要素
 
   [type.power.generator]
-    en = Power Generator
+    en = Generator
     de = Generator
     es = Generador
     et = Generaator
@@ -17797,7 +17968,7 @@
     zh-Hant = 風力發電機
 
   [type.power.generator.gas]
-    en = Gas Turbine Power Plant
+    en = Gas turbine Power Plant
     ar = محطة توليد الكهرباء بالغاز
     be = Газатурбінная электрастанцыя
     bg = Газотурбинна електроцентрала
@@ -18093,7 +18264,7 @@
     zh-Hant = 風力發電廠
 
   [type.power.pole]
-    en = Power Pole
+    en = Power Tower
     ar = عمود كهرباء
     cs = Sloup elektrického vedení
     da = El-pol
@@ -18366,7 +18537,7 @@
     uk = Пішохідний перехід
 
   [type.railway.disused]
-    en = Disused Railway
+    en = Disused railway
     de = Stillgelegte Bahnstrecke
     es = Vía férrea en desuso
     et = Kasutamata raudtee
@@ -18428,7 +18599,6 @@
 
   [type.railway.halt]
     ref = type.railway.station
-    en = Rail Halt
     de = Haltepunkt
     es = Punto de parada
     et = Murdepunkt
@@ -18890,20 +19060,18 @@
 
   [type.railway.station.light_rail]
     ref = type.railway.station
-    en = Light Rail Station
     de = Stadtbahnbahnhof
     zh-Hans = 轻轨车站
     zh-Hant = 輕軌車站
 
   [type.railway.station.monorail]
     ref = type.railway.station
-    en = Monorail Station
     zh-Hans = 单轨车站
     zh-Hant = 單軌車站
 
   [type.railway.station.subway]
-    en = Subway Station
-    en-GB = Metro Station
+    en = Subway
+    en-GB = Metro
     ar = محطة مترو
     cs = Metro
     da = Metro
@@ -19805,7 +19973,7 @@
     zh-Hans = 铁路货场
 
   [type.route]
-    en = Route
+    en = route
     de = Route
     es = Ruta
     et = Tee
@@ -19882,7 +20050,7 @@
     zh-Hant = 購物
 
   [type.shop.alcohol]
-    en = Liquor Shop
+    en = Liquor Store
     ar = متجر مشروبات كحولية
     cs = Obchod s alkoholem
     da = Alkohol
@@ -20129,7 +20297,6 @@
 
   [type.shop.books]
     en = Bookstore
-    en-GB = Bookshop
     ar = مكتبة لبيع الكتب
     cs = Knihkupectví
     da = Boghandel
@@ -20164,7 +20331,7 @@
     zh-Hant = 書店
 
   [type.shop.butcher]
-    en = Butcher
+    en = Butcher’s
     ar = جزار
     cs = Řeznictví
     da = Slagter
@@ -20199,7 +20366,7 @@
     zh-Hant = 肉商
 
   [type.shop.cannabis]
-    en = Cannabis Shop
+    en = Cannabis Store
     ar = متجر القنب
     be = Крама канабіса
     bg = Магазин за канабис
@@ -20274,7 +20441,7 @@
     zh-Hant = 買車
 
   [type.shop.car_parts]
-    en = Car Parts Shop
+    en = Car Parts
     ar = ﺓﺭﺎﻴﺴﻟﺍ ءﺍﺰﺟﺃ
     cs = Autodíly
     da = Bildele
@@ -20309,8 +20476,7 @@
     zh-Hant = 汽車零件
 
   [type.shop.car_repair]
-    en = Car Repair Workshop
-    en-GB = Car Repair Garage
+    en = Car Repair Shop
     ar = محل صيانة السيارات
     cs = Auto opravna
     da = Garage
@@ -20381,7 +20547,6 @@
 
   [type.shop.caravan]
     en = RV Dealership
-    en-GB = Caravan Dealership
     be = Продаж аўтадамоў
     de = Wohnmobilhändler
     es = Concesionario de caravanas
@@ -20393,7 +20558,7 @@
     uk = Продаж автобудинків
 
   [type.shop.carpet]
-    en = Carpet Shop
+    en = Carpets
     ar = السجاد
     be = Дываны
     bg = Килими
@@ -20433,7 +20598,7 @@
     zh-Hant = 地毯
 
   [type.shop.chemist]
-    en = Chemist
+    en = Chemist Shop
     ar = متجر كيماويات
     cs = Drogerie
     da = Materialist
@@ -20539,7 +20704,7 @@
     zh-Hant = 買衣服
 
   [type.shop.coffee]
-    en = Coffee Shop
+    en = Coffee Store
     ar = متجر
     be = Крама кавы
     cs = Obchod
@@ -20576,7 +20741,6 @@
 
   [type.shop.computer]
     en = Computer Store
-    en-GB = Computer Shop
     ar = متجر كمبيوتر
     cs = Obchod s počítači
     da = Computerforretning
@@ -20611,8 +20775,7 @@
     zh-Hant = 電腦商店
 
   [type.shop.confectionery]
-    en = Candy Shop
-    en-GB = Sweet Shop
+    en = Sweets
     ar = متجر حلويات
     cs = Cukrárna
     da = Slikbutik
@@ -20648,7 +20811,6 @@
 
   [type.shop.convenience]
     en = Convenience Store
-    en-GB = Convenience Shop
     ar = متجر صغير
     cs = Smíšené zboží
     da = Døgnbutik
@@ -20683,7 +20845,7 @@
     zh-Hant = 便利商店
 
   [type.shop.copyshop]
-    en = Copyshop
+    en = Copy Shop
     ar = محل نسخ
     cs = Kopírovací obchod
     da = Kopieringsbutik
@@ -20717,7 +20879,7 @@
     zh-Hant = 復印店
 
   [type.shop.cosmetics]
-    en = Cosmetics Shop
+    en = Cosmetics
     ar = مستحضرات تجميل
     be = Касметыка
     cs = Kosmetika
@@ -20753,7 +20915,7 @@
     zh-Hant = 化妆品
 
   [type.shop.curtain]
-    en = Curtain Shop
+    en = Curtains
     ar = ستائر
     be = Шторы
     bg = Пердета
@@ -20793,7 +20955,7 @@
     zh-Hant = 窗簾
 
   [type.shop.deli]
-    en = Delicatessen
+    en = Delicatessen Shop
     ar = ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ
     be = Дэлікатэсная крама
     bg = Магазин за деликатеси
@@ -20866,8 +21028,7 @@
     zh-Hant = 百貨公司
 
   [type.shop.doityourself]
-    en = Home Improvement Store
-    en-GB = DIY Shop
+    en = Hardware Store
     ar = متجر عدد وأدوات
     cs = Železářství
     da = Isenkræmmer
@@ -20902,7 +21063,7 @@
     zh-Hant = 五金行
 
   [type.shop.dry_cleaning]
-    en = Dry Cleaner
+    en = Dry Cleaning
     ar = غسيل جاف
     cs = Chemické čištění
     da = Renseri
@@ -20937,7 +21098,7 @@
     zh-Hant = 乾洗
 
   [type.shop.electronics]
-    en = Electronics Shop
+    en = Electronics
     ar = متجر إلكترونيات
     cs = Elektronika
     da = Elektronikbutik
@@ -21119,7 +21280,7 @@
     zh-Hant = 時尚配飾
 
   [type.shop.florist]
-    en = Florist
+    en = Florist’s
     ar = متجر زهور
     cs = Květinářství
     da = Blomsterbutik
@@ -21191,7 +21352,6 @@
 
   [type.shop.furniture]
     en = Furniture Store
-    en-GB = Furniture Shop
     ar = معرض أثاث
     cs = Nábytek
     da = Møbelbutik
@@ -21226,8 +21386,7 @@
     zh-Hant = 家具店
 
   [type.shop.garden_centre]
-    en = Garden Center
-    en-GB = Garden Centre
+    en = Garden Store
     ar = حضانة
     cs = Školka
     da = Planteskole
@@ -21372,8 +21531,7 @@
     zh-Hant = 蔬果零售店
 
   [type.shop.grocery]
-    en = Grocery Store
-    en-GB = Grocery Shop
+    en = Grocery
     ar = ﺕﺍﻭﺮﻀﺧ
     be = Бакалея
     bg = Хранителни стоки
@@ -21446,8 +21604,7 @@
     zh-Hant = 理髮師
 
   [type.shop.hardware]
-    en = Hardware Store
-    en-GB = Ironmongers
+    ref = type.shop.doityourself
     ar = ﺕﺍﺪﻌﻣ ﻞﺤﻣ
     be = Будаўнічы магазін
     bg = Магазин за хардуер
@@ -21512,7 +21669,7 @@
     zh-Hant = 保健食品店
 
   [type.shop.herbalist]
-    en = Herbalist
+    en = Herbs Store
     ar = متجر أعشاب
     be = Магазін траў
     bg = Магазин за билки
@@ -21552,7 +21709,7 @@
     zh-Hant = 香草店
 
   [type.shop.hifi]
-    en = HiFi Audio Shop
+    en = HiFi Audio
     ar = صوت هاي فاي
     be = HiFi аўдыё
     bg = HiFi аудио
@@ -21593,8 +21750,7 @@
 
   [type.shop.houseware]
     ref = type.shop.doityourself
-    en = Housewares Store
-    en-GB = Housewares Shop
+    en = Houseware
     ar = ﺔﻴﻟﺰﻨﻣ ﺕﺍﻭﺩﺃ ﻞﺤﻣ
     be = Крама посуду
     bg = Магазин за домакински принадлежности
@@ -21631,8 +21787,7 @@
     zh-Hant = 家居用品店
 
   [type.shop.jewelry]
-    en = Jewelry Store
-    en-GB = Jewellery Shop
+    en = Jewelry
     ar = مجوهرات
     cs = Klenotnictví
     da = Smykkebutik
@@ -21696,7 +21851,6 @@
 
   [type.shop.kitchen]
     en = Kitchen Store
-    en-GB = Kitchen Shop
     ar = ﺦﺒﻄﻤﻟﺍ ﺮﺠﺘﻣ
     be = Крама для кухні
     bg = Магазин за кухня
@@ -21735,7 +21889,6 @@
 
   [type.shop.laundry]
     en = Laundry
-    en-GB = Launderette
     ar = مغسلة ملابس
     cs = Prádelna
     da = Vaskeri
@@ -21771,7 +21924,6 @@
 
   [type.shop.mall]
     en = Mall
-    en-GB = Shopping Centre
     ar = مركز تسوق
     cs = Obchoďák
     da = Indkøbscenter
@@ -21840,8 +21992,8 @@
     zh-Hant = 按摩館
 
   [type.shop.mobile_phone]
-    en = Cell Phone Store
-    en-GB = Mobile Phone Shop
+    en = Cell Phones
+    en-GB = Mobile Phones
     ar = متجر هواتف محمولة
     cs = Mobily
     da = Mobiltelefonbutik
@@ -21988,7 +22140,6 @@
 
   [type.shop.music]
     en = Record Store
-    en-GB = Record Shop
     ar = متجر
     be = Музычная крама
     cs = Obchod
@@ -22024,7 +22175,7 @@
     zh-Hant = 購物
 
   [type.shop.musical_instrument]
-    en = Musical Instrument Shop
+    en = Musical Instruments
     ar = متجر
     be = Музычныя інструменты
     cs = Obchod
@@ -22095,7 +22246,7 @@
     zh-Hant = 報攤
 
   [type.shop.optician]
-    en = Optician
+    en = Optician’s
     ar = مركز بصريات
     cs = Optika
     da = Optiker
@@ -22130,7 +22281,7 @@
     zh-Hant = 眼鏡店
 
   [type.shop.outdoor]
-    en = Outdoor Equipment Shop
+    en = Outdoor Equipment
     ar = معدات خارجية
     cs = Venkovní vybavení
     da = Fritidsudstyr
@@ -22206,7 +22357,7 @@
 
   [type.shop.pastry]
     ref = type.shop.bakery
-    en = Pastry Shop
+    en = Pastry
     ar = ﺕﺎﻨﺠﻌﻣ
     be = Кандытарскія вырабы
     bg = Тестени изделия
@@ -22278,7 +22429,6 @@
 
   [type.shop.pet]
     en = Pet Store
-    en-GB = Pet Shop
     ar = متجر للحيوانات الأليفة
     cs = Zverimex
     da = Dyrehandel
@@ -22388,7 +22538,7 @@
     zh-Hant = 照片店
 
   [type.shop.seafood]
-    en = Fishmonger
+    en = Seafood Shop
     ar = سماك
     cs = Prodej ryb
     da = Fiskehandler
@@ -22423,7 +22573,7 @@
     zh-Hant = 魚販
 
   [type.shop.second_hand]
-    en = Second Hand Shop
+    en = Second Hand
     ar = ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ
     be = Крама сэканд-хэнд
     bg = Магазин втора употреба
@@ -22461,7 +22611,7 @@
     zh-Hant = 二手店
 
   [type.shop.shoes]
-    en = Shoe Shop
+    en = Shoe Store
     ar = متجر أحذية
     cs = Obuv
     da = Skobutik
@@ -22496,7 +22646,7 @@
     zh-Hant = 鞋店
 
   [type.shop.sports]
-    en = Sports Shop
+    en = Sports Goods
     ar = أدوات رياضية
     cs = Sportovní zboží
     da = Sportsudstyr
@@ -22631,7 +22781,7 @@
     zh-Hant = 刺青店
 
   [type.shop.tea]
-    en = Tea Shop
+    en = Tea Store
     ar = متجر
     be = Крама гарбаты
     cs = Obchod
@@ -22703,7 +22853,6 @@
 
   [type.shop.toys]
     en = Toy Store
-    en-GB = Toy Shop
     ar = متجر ألعاب
     cs = Hračkářství
     da = Legetøjsbutik
@@ -22809,7 +22958,6 @@
 
   [type.shop.variety_store]
     en = Variety Store
-    en-GB = Variety Shop
     ar = متجر متنوع\n
     cs = Smíšené zboží
     da = Småtingsbutik
@@ -22881,7 +23029,7 @@
     zh-Hant = 視頻商城
 
   [type.shop.video_games]
-    en = Video Game Shop
+    en = Video Games Shop
     ar = متجر ألعاب فيديو
     cs = Obchod s videohrami
     da = Computerspilbutik
@@ -22993,7 +23141,7 @@
     zh-Hant = 農產品店
 
   [type.shop.antiques]
-    en = Antiques Shop
+    en = Antiques
     ar = ﻒﺤﺘﻟﺍ
     be = Антыкварыят
     bg = Антики
@@ -23031,7 +23179,7 @@
     zh-Hant = 古董
 
   [type.shop.appliance]
-    en = Appliance Shop
+    en = Appliances Shop
     ar = متجر الأجهزة
     be = Крама бытавой тэхнікі
     bg = Магазин за техника
@@ -23071,8 +23219,7 @@
     zh-Hant = 家電店
 
   [type.shop.art]
-    comment = maybe change to Art Gallery for en-US when supported
-    en = Artwork Shop
+    en = Arts Shop
     ar = ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ
     be = Крама мастацтваў
     bg = Магазин за изкуства
@@ -23110,7 +23257,7 @@
     zh-Hant = 藝術商店
 
   [type.shop.baby_goods]
-    en = Baby Goods Shop
+    en = Baby Goods
     ar = ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ
     be = Дзіцячая крама
     bg = Детски магазин
@@ -23148,7 +23295,7 @@
     zh-Hant = 兒童商店
 
   [type.shop.bag]
-    en = Bag Shop
+    en = Bags Store
     ar = ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ
     be = Крама сумак
     bg = Магазин за чанти
@@ -23186,7 +23333,7 @@
     zh-Hant = 箱包店
 
   [type.shop.bed]
-    en = Bed Shop
+    en = Beds Shop
     ar = متجر الأسرة
     be = Крама ложкаў
     bg = Магазин за легла
@@ -23302,7 +23449,7 @@
     zh-Hant = 慈善商店
 
   [type.shop.cheese]
-    en = Cheese Shop
+    en = Cheese Store
     ar = ﻦﺒﺠﻟﺍ ﺮﺠﺘﻣ
     be = Сырны магазін
     bg = Магазин за сирене
@@ -23340,8 +23487,7 @@
     zh-Hant = 奶酪店c
 
   [type.shop.craft]
-    en = Craft Supplies Store
-    en-GB = Arts and Crafts Shop
+    en = Arts and Crafts
     ar = ﺔﻳﻭﺪﻴﻟﺍ ﻑﺮﺤﻟﺍﻭ ﻥﻮﻨﻔﻟﺍ
     be = Мастацтва і рамёствы
     bg = Изкуства и занаяти
@@ -23379,7 +23525,7 @@
     zh-Hant = 美術和工藝
 
   [type.shop.dairy]
-    en = Dairy Shop
+    en = Dairy Products
     ar = ﻥﺎﺒﻟﻷﺍ ﺕﺎﺠﺘﻨﻣ
     be = Малочныя прадукты
     bg = Млечни продукти
@@ -23417,8 +23563,7 @@
     zh-Hant = 乳製品
 
   [type.shop.electrical]
-    en = Electrical Supplies Store
-    en-GB = Electrical Supplies Shop
+    en = Electrical Store
     ar = ﺔﻴﺋﺎﺑﺮﻬﻜﻟﺍ ﺕﺍﻭﺩﻷﺍ ﺮﺠﺘﻣ
     be = Крама электратэхнікі
     bg = Електрически магазин
@@ -23457,7 +23602,6 @@
 
   [type.shop.fishing]
     en = Fishing Store
-    en-GB = Fishing Shop
     ar = ﺪﻴﺻ ﺮﺠﺘﻣ
     be = Рыбалоўны магазін
     bg = Риболовен магазин
@@ -23495,8 +23639,7 @@
     zh-Hant = 釣魚店
 
   [type.shop.interior_decoration]
-    en = Interior Decorations Store
-    en-GB = Interior Decorations Shop
+    en = Interior Decorations
     ar = ﺔﻴﻠﺧﺍﺩ ﺕﺍﺭﻮﻜﻳﺩ
     be = Ўпрыгажэнні інтэр'еру
     bg = Вътрешни декорации
@@ -23572,8 +23715,7 @@
     zh-Hant = 彩票
 
   [type.shop.medical_supply]
-    en = Medical Supplies Store
-    en-GB = Medical Supplies Shop
+    en = Medical Supplies
     ar = ﺔﻴﺒﻄﻟﺍ ﺕﺍﺩﺍﺪﻣﻹﺍ
     be = Медыцынскія прыналежнасці
     bg = Медицински изделия
@@ -23611,8 +23753,7 @@
     zh-Hant = 醫療用品
 
   [type.shop.nutrition_supplements]
-    en = Nutrition Supplement Store
-    en-GB = Nutrition Supplement Shop
+    en = Nutrition Supplements
     ar = ﺔﻴﺋﺍﺬﻏ ﺕﻼﻤﻜﻣ
     be = Харчовыя дабаўкі
     bg = Хранителни добавки
@@ -23650,7 +23791,7 @@
     zh-Hant = 營養補充劑
 
   [type.shop.paint]
-    en = Paint Shop
+    en = Paints
     ar = ﺕﺎﻧﺎﻫﺪﻟﺍ
     be = Фарбы
     bg = Бои
@@ -23688,7 +23829,7 @@
     zh-Hant = 油漆
 
   [type.shop.perfumery]
-    en = Perfume Shop
+    en = Perfumery
     ar = ﺭﻮﻄﻌﻟﺍ
     be = Парфумерыя
     bg = Парфюмерия
@@ -23726,7 +23867,7 @@
     zh-Hant = 香水
 
   [type.shop.sewing]
-    en = Sewing Supplies Shop
+    en = Sewing Supplies
     ar = ﺔﻃﺎﻴﺨﻟﺍ ﺕﺍﺪﻌﻣ
     be = Швейныя прыналежнасці
     bg = Шивашки консумативи
@@ -23802,8 +23943,7 @@
     zh-Hant = 存儲租賃
 
   [type.shop.tobacco]
-    en = Smoke Shop
-    en-GB = Tobacco Shop
+    en = Tobacco
     ar = ﻎﺒﺗ
     be = Тытунь
     bg = Тютюн
@@ -23841,7 +23981,7 @@
     zh-Hant = 煙草
 
   [type.shop.trade]
-    en = Trade Supplies
+    en = Trades Supplies
     ar = ﺔﻳﺭﺎﺠﺘﻟﺍ ﺕﺍﺪﻳﺭﻮﺘﻟﺍ
     be = Гандлёвая прыналежнасць
     bg = Търговия с консумативи
@@ -23879,8 +24019,7 @@
     zh-Hant = 貿易用品
 
   [type.shop.watches]
-    en = Watch Store
-    en-GB = Watch Shop
+    en = Watches
     ar = ﺕﺎﻋﺎﺳ
     be = Гадзіннік
     bg = Часовници
@@ -23919,7 +24058,6 @@
 
   [type.shop.wholesale]
     en = Wholesale Store
-    en-GB = Wholesale Shop
     ar = ﺔﻠﻤﺠﻟﺎﺑ ﺔﻴﺋﺍﺬﻐﻟﺍ ﺩﺍﻮﻤﻟﺍ ﺓﺭﺎﺠﺗ
     be = Аптовая крама
     bg = Магазин на едро
@@ -24222,7 +24360,7 @@
     zh-Hant = 籃球
 
   [type.sport.beachvolleyball]
-    en = Beach Volleyball
+    en = Beach volleyball
     ar = كرة طائرة شاطئية
     be = Пляжны валейбол
     bg = Плажен волейбол
@@ -24588,7 +24726,7 @@
 
   [type.sport.scuba_diving]
     comment = Used to tag a scuba diving site.
-    en = Scuba Diving Site
+    en = Scuba diving site
     ar = الغوص
     be = Месца для дайвінга
     cs = Potápění
@@ -24741,7 +24879,6 @@
 
   [type.sport.soccer]
     en = Soccer
-    en-GB = Football
     ar = كرة القدم
     be = Футбол
     cs = Fotbal
@@ -24818,7 +24955,7 @@
     zh-Hant = 游泳
 
   [type.sport.table_tennis]
-    en = Table Tennis
+    en = Table tennis
     ar = كرة الطاولة
     be = Настольны тэніс
     bg = Тенис на маса
@@ -25161,7 +25298,7 @@
     zh-Hant = 羽毛球
 
   [type.sport.pelota]
-    en = Basque Pelota
+    en = Basque pelota
     ar = ﻚﺳﺎﺒﻟﺍ ﺎﺗﻮﻠﻴﺑ
     be = Баскская пелота
     bg = Баска пелота
@@ -25218,7 +25355,7 @@
     zh-Hans = 旅游要素
 
   [type.tourism.alpine_hut]
-    en = Alpine Lodging
+    en = Mountains Lodging
     ar = مساكن جبلية
     cs = Ubytování v horách
     da = Bjerg logi
@@ -25251,7 +25388,7 @@
     zh-Hant = 山上住宿
 
   [type.tourism.apartment]
-    en = Holiday Apartment
+    en = Apartments
     ar = شُقَق
     cs = Byty
     da = Lejligheder
@@ -25321,7 +25458,7 @@
     zh-Hant = 藝術品
 
   [type.tourism.artwork.architecture]
-    en = Architectural Artwork
+    en = Artwork
     ar = عمل فني
     cs = Umělecké dílo
     da = Kunstværk
@@ -25356,7 +25493,7 @@
     zh-Hant = 藝術品
 
   [type.tourism.artwork.painting]
-    en = Painting
+    en = Artwork
     ar = عمل فني
     cs = Umělecké dílo
     da = Kunstværk
@@ -25391,7 +25528,7 @@
     zh-Hant = 藝術品
 
   [type.tourism.artwork.sculpture]
-    en = Sculpture
+    en = Artwork
     ar = عمل فني
     cs = Umělecké dílo
     da = Kunstværk
@@ -25426,7 +25563,7 @@
     zh-Hant = 藝術品
 
   [type.tourism.artwork.statue]
-    en = Statue
+    en = Artwork
     ar = عمل فني
     cs = Umělecké dílo
     da = Kunstværk
@@ -25496,7 +25633,7 @@
 
   [type.tourism.attraction.animal]
     ref = type.tourism.attraction
-    en = Animal Enclosure
+    en = Animal enclosure
     et = Loomade aedik
     it = Recinto
     ja = 動物
@@ -25508,8 +25645,7 @@
     ref = type.tourism.attraction
 
   [type.tourism.camp_site]
-    en = Campground
-    en-GB = Campsite
+    en = Camping
     ar = تخييم
     cs = Kempování
     de = Zeltplatz
@@ -25540,7 +25676,6 @@
 
   [type.tourism.caravan_site]
     en = RV Park
-    en-GB = Caravan Park
     ar = موقع البيت المتنقل
     be = Кемпінг для аўтадамоў
     cs = Kemp pro obytné přívěsy
@@ -25605,7 +25740,7 @@
     zh-Hant = 木屋
 
   [type.tourism.gallery]
-    en = Art Gallery
+    en = Gallery
     ar = سياحة
     cs = Pamětihodnost
     da = Turisme
@@ -26279,7 +26414,7 @@
     zh-Hant = 運河
 
   [type.waterway.canal.tunnel]
-    en = Canal Tunnel
+    en = Canal
     ar = قناة
     cs = Kanál
     da = Kanal
@@ -26496,7 +26631,7 @@
     zh-Hant = 河流
 
   [type.waterway.stream]
-    en = Stream
+    en = River
     ar = نهر
     be = Рака
     cs = Řeka
@@ -26532,7 +26667,7 @@
     zh-Hant = 溪
 
   [type.waterway.stream.ephemeral]
-    en = Ephemeral Stream
+    en = River
     ar = نهر
     be = Рака
     cs = Řeka
@@ -26568,7 +26703,7 @@
     zh-Hant = 溪
 
   [type.waterway.stream.intermittent]
-    en = Intermittent Stream
+    en = River
     ar = نهر
     be = Рака
     cs = Řeka
@@ -26879,7 +27014,6 @@
 
   [type.piste_type.downhill.advanced]
     ref = type.piste_type.downhill
-    en = Advanced Downhill Ski Run
     de = Schwierige Abfahrt
     et = Raske laskumine
     nl = Moeilijke afdaling
@@ -26891,7 +27025,6 @@
 
   [type.piste_type.downhill.easy]
     ref = type.piste_type.downhill
-    en = Easy Downhill Ski Run
     de = Leichte Abfahrt
     et = Kerge laskumine
     nl = Makkelijke afdaling
@@ -26903,7 +27036,6 @@
 
   [type.piste_type.downhill.expert]
     ref = type.piste_type.downhill
-    en = Expert Downhill Ski Run
     de = Profi Abfahrt
     et = Professionaalne laskumine
     nl = Afdaling voor experts
@@ -26924,7 +27056,6 @@
 
   [type.piste_type.downhill.intermediate]
     ref = type.piste_type.downhill
-    en = Intermediate Downhill Ski Run
     de = Mittelschwere Abfahrt
     et = Keskmise raskusastmega laskumine
     nl = Gemiddelde afdaling
@@ -26936,7 +27067,6 @@
 
   [type.piste_type.downhill.novice]
     ref = type.piste_type.downhill
-    en = Novice Downhill Ski Run
     de = Anfängerfreundliche Abfahrt
     et = Algajasõbralik laskumine
     nl = Beginnersafdaling
@@ -26975,6 +27105,41 @@
     tr = Kızak Pisti
     uk = Траса для санок
 
+  [type.building_part]
+    en = Building
+    ar = مبنى
+    cs = Stavba
+    da = Bygning
+    de = Gebäude
+    el = Κτίριο
+    es = Edificio
+    et = Hoone
+    eu = Eraikin
+    fa = ساختما
+    fi = Rakennus
+    fr = Bâtiment
+    hu = Épület
+    id = Gedung
+    it = Edificio
+    ja = 建物
+    ko = 건물
+    mr = इमारत
+    nb = Bygning
+    nl = Gebouw
+    pl = Część budynku
+    pt = Parte de edifício
+    pt-BR = Parte de edifício
+    ro = Clădire
+    ru = Здание
+    sk = Budova
+    sv = Byggnad
+    th = อาคาร
+    tr = Bina
+    uk = Будівля
+    vi = Tòa nhà
+    zh-Hans = 建筑部分
+    zh-Hant = 建築物
+
   [type.amenity.events_venue]
     en = Events Venue
     ar = مكان الأحداث
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 3b6d718c78..1fca776e3d 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -274,8 +274,6 @@ node[shop=charity],
 area[shop=charity],
 node[shop=second_hand],
 area[shop=second_hand],
-node[shop=antiques],
-area[shop=antiques],
 {z-index: 2500;}
 
 node[amenity=fuel],
@@ -1982,13 +1980,11 @@ node|z15-[barrier=border_control]
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
 node|z16-[barrier=chain],
-node|z16-[barrier=stile],
-{icon-image: dot-m.svg;font-size: 11;}
-
 node|z16-[barrier=entrance],
 node|z16-[barrier=gate],
 node|z16-[barrier=kissing_gate],
-{icon-image: gate-s.svg;font-size: 11;}
+node|z16-[barrier=stile],
+{icon-image: dot-m.svg;font-size: 11;}
 
 node|z16-[highway=ford],
 /* ToDo: Make separate tower icon? Because of a good landmark */
@@ -2158,10 +2154,10 @@ area|z18-[amenity=vending_machine][vending=fuel]
 
 node|z17-[aeroway=gate],
 area|z17-[aeroway=gate]
-{icon-image: airport_gate-m.svg;font-size: 11;}
+{icon-image: gate-m.svg;font-size: 11;}
 node|z18-[aeroway=gate],
 area|z18-[aeroway=gate]
-{icon-image: airport_gate-m.svg;font-size: 11;z-index: 24200;}/*check*/
+{icon-image: gate-m.svg;font-size: 11;z-index: 24200;}/*check*/
 
 area|z17-[amenity=bureau_de_change],
 node|z17-[amenity=bureau_de_change],
@@ -2248,12 +2244,8 @@ node|z15-[shop=car_repair][service=tyres],
 area|z15-[shop=car_repair][service=tyres],
 node|z16-[shop=supermarket],
 area|z16-[shop=supermarket],
-node|z16-[shop=cheese],
-area|z16-[shop=cheese],
 node|z16-[shop=alcohol],
 area|z16-[shop=alcohol],
-node|z16-[shop=art],
-area|z16-[shop=art],
 node|z16-[shop=wine],
 area|z16-[shop=wine],
 node|z16-[shop=books],
@@ -2262,8 +2254,6 @@ node|z16-[shop=charity],
 area|z16-[shop=charity],
 node|z16-[shop=second_hand],
 area|z16-[shop=second_hand],
-node|z16-[shop=antiques],
-area|z16-[shop=antiques],
 node|z16-[shop=bookmaker],
 area|z16-[shop=bookmaker],
 node|z16-[shop=bakery],
@@ -2324,14 +2314,10 @@ node|z16-[shop=copyshop],
 area|z16-[shop=copyshop],
 node|z16-[shop=photo],
 area|z16-[shop=photo],
-node|z16-[shop=camera],
-area|z16-[shop=camera],
 node|z16-[shop=pet],
 area|z16-[shop=pet],
 node|z16-[shop=department_store],
 area|z16-[shop=department_store],
-node|z16-[shop=interior_decoration],
-area|z16-[shop=interior_decoration],
 node|z16-[shop=doityourself],
 area|z16-[shop=doityourself],
 node|z16-[shop=electronics],
@@ -2421,15 +2407,9 @@ node|z17-[shop=supermarket],
 area|z17-[shop=supermarket],
 {icon-image: grocery-m.svg;font-size: 11;icon-min-distance: 8;}
 
-node|z16[shop=cheese],
-area|z16[shop=cheese]
-{icon-image: cheese-m.svg;}
 node|z16[shop=alcohol],
 area|z16[shop=alcohol]
 {icon-image: alcohol-m.svg;}
-node|z16[shop=art],
-area|z16[shop=art]
-{icon-image: art-m.svg;}
 node|z16[shop=wine],
 area|z16[shop=wine]
 {icon-image: alcohol-m.svg;}
@@ -2442,9 +2422,6 @@ area|z16[shop=charity]
 node|z16[shop=second_hand],
 area|z16[shop=second_hand]
 {icon-image: second_hand_shop-m.svg;}
-node|z16[shop=antiques],
-area|z16[shop=antiques]
-{icon-image: antiques-m.svg;}
 node|z16[shop=bookmaker],
 area|z16[shop=bookmaker]
 {icon-image: bookmaker-m.svg;}
@@ -2529,9 +2506,6 @@ area|z16[shop=health_food],
 node|z16[shop=copyshop],
 area|z16[shop=copyshop]
 {icon-image: copyshop-m.svg;}
-node|z16[shop=camera],
-area|z16[shop=camera]
-{icon-image: photo-shop-m.svg;}
 node|z16[shop=photo],
 area|z16[shop=photo]
 {icon-image: photo-shop-m.svg;}
@@ -2541,9 +2515,6 @@ area|z16[shop=pet]
 node|z16[shop=department_store],
 area|z16[shop=department_store]
 {icon-image: department_store-m.svg;}
-node|z16[shop=interior_decoration],
-area|z16[shop=interior_decoration]
-{icon-image: interior_decoration-m.svg;}
 node|z16[shop=doityourself],
 area|z16[shop=doityourself]
 {icon-image: doityourself-m.svg;}
@@ -2630,15 +2601,9 @@ node|z16[shop=fabric],
 area|z16[shop=fabric]
 {icon-image: shop-m.svg;}
 
-node|z17-[shop=cheese],
-area|z17-[shop=cheese]
-{icon-image: cheese-m.svg;icon-min-distance: 24;}
 node|z17-[shop=alcohol],
 area|z17-[shop=alcohol]
 {icon-image: alcohol-m.svg;icon-min-distance: 24;}
-node|z17-[shop=art],
-area|z17-[shop=art]
-{icon-image: art-m.svg;icon-min-distance: 24;}
 node|z17-[shop=wine],
 area|z17-[shop=wine]
 {icon-image: alcohol-m.svg;icon-min-distance: 24;}
@@ -2651,9 +2616,6 @@ area|z17-[shop=charity]
 node|z17-[shop=second_hand],
 area|z17-[shop=second_hand]
 {icon-image: second_hand_shop-m.svg;icon-min-distance: 24;}
-node|z17-[shop=antiques],
-area|z17-[shop=antiques]
-{icon-image: antiques-m.svg;icon-min-distance: 24;}
 node|z17-[shop=bookmaker],
 area|z17-[shop=bookmaker]
 {icon-image: bookmaker-m.svg;icon-min-distance: 24;}
@@ -2738,9 +2700,6 @@ area|z17-[shop=health_food],
 node|z17-[shop=copyshop],
 area|z17-[shop=copyshop]
 {icon-image: copyshop-m.svg;icon-min-distance: 24;}
-node|z17-[shop=camera],
-area|z17-[shop=camera]
-{icon-image: photo-shop-m.svg;icon-min-distance: 24;}
 node|z17-[shop=photo],
 area|z17-[shop=photo]
 {icon-image: photo-shop-m.svg;icon-min-distance: 24;}
@@ -2750,9 +2709,6 @@ area|z17-[shop=pet]
 node|z17-[shop=department_store],
 area|z17-[shop=department_store]
 {icon-image: department_store-m.svg;icon-min-distance: 24;}
-node|z17-[shop=interior_decoration],
-area|z17-[shop=interior_decoration]
-{icon-image: interior_decoration-m.svg;icon-min-distance: 24;}
 node|z17-[shop=doityourself],
 area|z17-[shop=doityourself]
 {icon-image: doityourself-m.svg;icon-min-distance: 24;}
diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss
index 338e3c114a..776f2c7404 100644
--- a/data/styles/clear/style-clear/style.mapcss
+++ b/data/styles/clear/style-clear/style.mapcss
@@ -40,14 +40,10 @@ colors
   RoutePreview-opacity: 0.3;
   RouteMaskCar-color: #000000;
   RouteMaskCar-opacity: 0.3;
-  RouteFirstSegmentArrowsMaskCar-color: #033B80;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
   RouteArrowsMaskCar-color: #033B80;
   RouteArrowsMaskCar-opacity: 0.2;
   RouteMaskBicycle-color: #000000;
   RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
   RouteArrowsMaskBicycle-color: #9C27B0;
   RouteArrowsMaskBicycle-opacity: 0.2;
   RouteMaskPedestrian-color: #000000;
diff --git a/data/styles/clear/style-clear/symbols/antiques-m.svg b/data/styles/clear/style-clear/symbols/antiques-m.svg
deleted file mode 100644
index fc20e540b5..0000000000
--- a/data/styles/clear/style-clear/symbols/antiques-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<title>antiques-m</title>
-    <g id="alcohol-m" fill-rule="nonzero">
-        <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-        <path d="m9.054 3.7417c-0.53095 0-0.79495 0.64599-0.41591 1.0147l0.48376 0.48376c-0.41444 0.5752-0.66221 1.2787-0.66221 2.0383 0 0.76693 0.24778 1.4704 0.66221 2.0456l-0.32742 0.32889c-0.41444 0.35692-0.32889 0.62829-0.32889 1.1696v7.513c-0.2935 0.2522-0.68581 0.61059-0.88197 0.93211-0.2581 0.38052-0.23008 0.57667-0.3053 0.99111h1.4011s0.51178-0.44393 0.68581-0.83477c0.033922-0.09292 0.067844-0.22565 0.10324-0.34659h5.0691c0.0354 0.12094 0.06342 0.25368 0.10472 0.34659 0.17256 0.39084 0.67991 0.83477 0.67991 0.83477h1.3996c-0.07522-0.41444-0.04572-0.61059-0.3053-0.99111-0.19616-0.32152-0.58847-0.67991-0.88197-0.93211v-7.513c0-0.54128 0.08702-0.81265-0.32889-1.1696l-0.32742-0.32889c0.41444-0.5752 0.66221-1.2787 0.66221-2.0456 0-0.75955-0.24778-1.4631-0.66221-2.0383l0.48376-0.48376c0.38641-0.37462 0.10914-1.0324-0.42624-1.0147h-0.0059c-0.15044 0.0059-0.2935 0.069319-0.40264 0.17846l-0.48523 0.48376c-0.5752-0.41444-1.2787-0.66221-2.0383-0.66221-0.76693 0-1.4704 0.24778-2.0456 0.66221l-0.48376-0.48376c-0.10914-0.11504-0.26548-0.17846-0.42034-0.17846zm2.9497 1.0147c1.3996 0 2.5235 1.1224 2.5235 2.522 0 1.407-1.1238 2.5294-2.5235 2.5294-1.407 0-2.5294-1.1224-2.5294-2.5294 0-1.3996 1.1224-2.522 2.5294-2.522zm-0.12684 0.61059c-0.0295 0.00442-0.05752 0.010324-0.08112 0.016224-0.17846 0.041296-0.3053 0.20206-0.2994 0.38051v1.7049l0.15486 0.11061 1.0147 0.75955c0.41444 0.44983 0.99701-0.33332 0.44393-0.59879l-0.85394-0.64599v-1.3303c0.0059-0.21238-0.16666-0.39674-0.37904-0.39674zm-0.66811 6.1871h0.49408v2.8686c-0.49998 0.13274-0.88049 0.57077-0.88049 1.1179 0 0.65042 0.52948 1.1814 1.1814 1.1814 0.65042 0 1.174-0.53095 1.174-1.1814 0-0.54717-0.37904-0.98521-0.88049-1.1179v-2.8686h0.49555c1.9807 0 1.8259 4.3037 1.2035 5.6281-0.18436 0.36282-0.60469 0.59437-0.99701 0.72121-0.63272 0.20058-1.3642 0.20058-1.9984 0-0.39231-0.12684-0.81265-0.35839-0.99701-0.72121-0.60469-2.1887-0.75513-5.6281 1.205-5.6281z" fill="#fff" fill-rule="nonzero"/>
-        </g>
-</svg>
diff --git a/data/styles/clear/style-clear/symbols/art-m.svg b/data/styles/clear/style-clear/symbols/art-m.svg
deleted file mode 100644
index 44ba3ebef8..0000000000
--- a/data/styles/clear/style-clear/symbols/art-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <title>art-m</title>
-    <g id="alcohol-m" fill-rule="nonzero">
-        <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-        <path d="m12 5c-3.8656 0-7 3.1344-7 7 0 3.8656 3.1344 7 7 7 0.64556 0 1.166-0.52046 1.166-1.166 0-0.30333-0.11218-0.57709-0.30273-0.7832-0.18278-0.20611-0.29102-0.47399-0.29102-0.77344 0-0.64556 0.52046-1.166 1.166-1.166h1.373c2.1467 0 3.8887-1.742 3.8887-3.8887 0-3.4378-3.1344-6.2227-7-6.2227zm1.9336 1.3047a1.3892 1.3892 0 0 1 1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887-1.3906 1.3892 1.3892 0 0 1 1.3887-1.3887zm-3.8945 0.019531a1.3892 1.3892 0 0 1 1.3906 1.3906 1.3892 1.3892 0 0 1-1.3906 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906zm-2.332 3.123a1.3892 1.3892 0 0 1 1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906zm8.5586 0a1.3892 1.3892 0 0 1 1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906z" fill="#fff"/>
-    </g>
- </svg>
diff --git a/data/styles/clear/style-clear/symbols/cheese-m.svg b/data/styles/clear/style-clear/symbols/cheese-m.svg
deleted file mode 100644
index c4854e1a71..0000000000
--- a/data/styles/clear/style-clear/symbols/cheese-m.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <title>cheese-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="alcohol-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path d="m13.053 5.1621c-1.1318-0.012343-2.2129 0.089844-2.2129 0.089844l-5.127 5.9316 12.574-3.9336s-2.124-1.5543-3.3652-1.8965c-0.49204-0.13566-1.1901-0.184-1.8691-0.19141zm1.8516 1.1484a0.51126 0.9813 71.912 0 1 0.56641 0.54883 0.51126 0.9813 71.912 0 1-1.2129 0.59766 0.51126 0.9813 71.912 0 1-0.56641-0.54883 0.51126 0.9813 71.912 0 1 1.2129-0.59766zm-3.9375 0.76953a0.51126 0.9813 71.912 0 1 0.56836 0.54883 0.51126 0.9813 71.912 0 1-1.2129 0.59766 0.51126 0.9813 71.912 0 1-0.56641-0.54688 0.51126 0.9813 71.912 0 1 1.2109-0.59961zm7.3203 0.97266-12.574 3.7832v7.3594l12.574-3.9336v-7.209zm-1.3008 1.7734a0.78667 1.2141 19.086 0 1 0.61719 0.87305 0.78667 1.2141 19.086 0 1-0.85156 1.4395 0.78667 1.2141 19.086 0 1-0.83398-0.83398 0.78667 1.2141 19.086 0 1 0.84961-1.4395 0.78667 1.2141 19.086 0 1 0.21875-0.039062zm-3.5645 0.66797a0.52909 0.76697 23.373 0 1 0.41992 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.51953 0.52909 0.76697 23.373 0 1 0.58008-0.90039 0.52909 0.76697 23.373 0 1 0.14648-0.023437zm-3.5098 1.9395a0.75222 1.3337 13.619 0 1 0.58203 0.97266 0.75222 1.3337 13.619 0 1-0.80273 1.5996 0.75222 1.3337 13.619 0 1-0.78906-0.92578 0.75222 1.3337 13.619 0 1 0.80469-1.6016 0.75222 1.3337 13.619 0 1 0.20508-0.044922zm-2.6484 0.037109a0.52909 0.76697 23.373 0 1 0.41992 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.90039 0.52909 0.76697 23.373 0 1-0.56836-0.52148 0.52909 0.76697 23.373 0 1 0.57812-0.89844 0.52909 0.76697 23.373 0 1 0.14844-0.025391zm5.6836 0.875a0.85989 1.2083 26.467 0 1 0.6875 0.85352 0.85989 1.2083 26.467 0 1-0.94727 1.4023 0.85989 1.2083 26.467 0 1-0.93164-0.8125 0.85989 1.2083 26.467 0 1 0.94922-1.4043 0.85989 1.2083 26.467 0 1 0.24219-0.039063zm2.9355 0.61328a0.52909 0.76697 23.373 0 1 0.41992 0.54688 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.52148 0.52909 0.76697 23.373 0 1 0.57812-0.89844 0.52909 0.76697 23.373 0 1 0.14844-0.025391zm-8.0449 2.1914a0.52909 0.76697 23.373 0 1 0.41797 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.51953 0.52909 0.76697 23.373 0 1 0.58008-0.90039 0.52909 0.76697 23.373 0 1 0.14844-0.023437z" fill="#fff"/>
-  </g>
- </g>
-</svg>
diff --git a/data/styles/clear/style-clear/symbols/airport_gate-m.svg b/data/styles/clear/style-clear/symbols/gate-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/airport_gate-m.svg
rename to data/styles/clear/style-clear/symbols/gate-m.svg
diff --git a/data/styles/clear/style-clear/symbols/gate-s.svg b/data/styles/clear/style-clear/symbols/gate-s.svg
deleted file mode 100644
index 6e29c6eab9..0000000000
--- a/data/styles/clear/style-clear/symbols/gate-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12pt" height="12pt" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.7144 0.85719c-0.29402 9.9153e-4 -0.58285 0.16454-0.73337 0.4171l-0.77921 1.2972h-5.3445c-0.22461-3.163e-4 -0.44851 0.090982-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498-0.22461-3.163e-4 -0.44851 0.090981-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498h1.2307l-0.25209 0.4171c-0.15527 0.25857-0.16021 0.60164-0.01146 0.86402 0.14875 0.26238 0.44552 0.4336 0.74713 0.43315h1.7143c0.29351-4.33e-4 0.58218-0.16325 0.73337-0.41481l0.77921-1.2995h5.3445c0.22462 3.164e-4 0.44851-0.090982 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.12e-4 -0.22461-0.09099-0.44851-0.24981-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498 0.22461 3.163e-4 0.44851-0.090981 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.16e-4 -0.22461-0.090986-0.44851-0.2498-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498h-1.2307l0.25209-0.4171c0.15527-0.25857 0.16021-0.60164 0.01146-0.86402-0.14875-0.26238-0.44552-0.4336-0.74713-0.43315z" fill="#fff" opacity=".6" stroke-width="1.2"/>
- <path d="m7.7145 1.7136-1.0281 1.7145h-5.8302v1.7145h4.8021l-1.0314 1.7145h-3.7706v1.7145h2.7426l-1.0281 1.7145h1.7145l1.0281-1.7145h5.8302v-1.7145h-4.8021l1.0314-1.7145h3.7706v-1.7145h-2.7426l1.0281-1.7145z" fill="#555" stroke-width="1.2"/>
-</svg>
diff --git a/data/styles/clear/style-clear/symbols/interior_decoration-m.svg b/data/styles/clear/style-clear/symbols/interior_decoration-m.svg
deleted file mode 100644
index 9a6bf52057..0000000000
--- a/data/styles/clear/style-clear/symbols/interior_decoration-m.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <title>interior_decoration-m</title>
-    <g id="interior_decoration-m" fill-rule="nonzero">
-        <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-        <path d="m16.246 5.543c-0.52905 8.118e-4 -0.99393 0.35107-1.1406 0.85938-0.09265-0.023045-0.18773-0.034849-0.2832-0.035156-0.657-2.11e-4 -1.1897 0.53245-1.1895 1.1895 1e-3 0.37613 0.17992 0.7296 0.48242 0.95312-0.30305 0.22394-0.48203 0.57826-0.48242 0.95508-2.1e-4 0.657 0.53245 1.1897 1.1895 1.1895 0.10086-2.93e-4 0.20128-0.01342 0.29883-0.03906 0.11406 0.34283 0.37781 0.61521 0.7168 0.74024v4.3008h0.8125v-4.2988c0.38406-0.13857 0.67018-0.4645 0.75781-0.86328 0.12882 0.0478 0.26495 0.07291 0.40234 0.07422 0.657 2.057e-4 1.1897-0.53245 1.1895-1.1895-9.43e-4 -0.32709-0.13658-0.63935-0.375-0.86328 0.23891-0.2244 0.37459-0.53747 0.375-0.86523 2.11e-4 -0.657-0.53245-1.1897-1.1895-1.1895-0.13388 0.00117-0.26661 0.02494-0.39258 0.070312-0.0978-0.57087-0.59269-0.98822-1.1719-0.98828zm0.07031 2.0586c0.48871-1.605e-4 0.88493 0.39606 0.88477 0.88477 1.6e-4 0.48871-0.39606 0.88493-0.88477 0.88477-0.48871 1.599e-4 -0.88492-0.39606-0.88476-0.88477-1.6e-4 -0.48871 0.39606-0.88493 0.88476-0.88477z" fill="#fff" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-        <path d="m6.1756 5.4825-1.0446 3.8474a0.38235 0.38235 52.595 0 0 0.36899 0.48253h1.8613a0.5 0.5 45 0 1 0.5 0.5v7.0664a0.5 0.5 135 0 1-0.5 0.5h-0.3457a0.5 0.5 135 0 0-0.5 0.5v0.12109a0.5 0.5 45 0 0 0.5 0.5h2.8145a0.5 0.5 135 0 0 0.5-0.5v-0.12109a0.5 0.5 45 0 0-0.5-0.5h-0.3457a0.5 0.5 45 0 1-0.5-0.5v-7.0664a0.5 0.5 135 0 1 0.5-0.5h1.8613a0.38145 0.38145 127.34 0 0 0.3679-0.48223l-1.0541-3.848a0.65539 0.65539 37.34 0 0-0.6321-0.48223h-3.2207a0.65386 0.65386 142.6 0 0-0.63101 0.48253zm7.464 8.6643 0.85945 4.3626a0.60811 0.60811 39.428 0 0 0.59664 0.49057h2.3633a0.6068 0.6068 140.51 0 0 0.59561-0.49077l0.8498-4.3622a0.41199 0.41199 50.512 0 0-0.40439-0.49077h-4.457a0.41111 0.41111 129.43 0 0-0.40336 0.49057z" fill="#fff" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-    </g>
-</svg>
diff --git a/data/styles/clear/style-clear/symbols/jewelry-m.svg b/data/styles/clear/style-clear/symbols/jewelry-m.svg
index 3b2df400b6..28d9450752 100644
--- a/data/styles/clear/style-clear/symbols/jewelry-m.svg
+++ b/data/styles/clear/style-clear/symbols/jewelry-m.svg
@@ -1,21 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>jewelry-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="jewelry-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
    <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
    <g id="ring" transform="translate(7,6)" fill="#fff">
-    <path d="m6.6516 4.0727v-1.1636c-6.754e-4 -0.076831-0.044-0.14688-0.11242-0.18182l0.89912-1.1443c0.00353-0.00457 0.00519-0.00977 0.00831-0.014545 0.00418-0.00504 0.00805-0.010312 0.011636-0.015792 0.00187-0.00353 0.00249-0.00748 0.00416-0.011221 0.00356-0.0081 0.00662-0.016442 0.00914-0.024935 0.00314-0.00951 0.00558-0.019221 0.00727-0.029091 0.00127-0.0086 0.00205-0.017273 0.00229-0.025974 7.272e-4 -0.0099 7.272e-4 -0.019818 0-0.029714-9.611e-4 -0.00875-0.00257-0.017454-0.00478-0.025974-0.00231-0.00984-0.00538-0.019507-0.00914-0.028883-0.00187-0.00436-0.00229-0.00894-0.00436-0.013091-0.00208-0.00416-0.00519-0.00727-0.00748-0.011429-0.00229-0.00416-0.00374-0.00894-0.00644-0.013091l-0.83118-1.2468c-0.004935-0.0063896-0.010208-0.012494-0.015792-0.018286-0.0051428-0.0065195-0.010623-0.012753-0.016416-0.018701-0.0085974-0.0077143-0.017844-0.014649-0.027636-0.020779-0.0047792-0.0031169-0.0091429-0.0070649-0.014338-0.0097662-0.0098182-0.0049351-0.020026-0.009039-0.030545-0.01226-0.0066494-0.0022857-0.012883-0.0051948-0.020779-0.0068571-0.0087792-0.0017403-0.017662-0.0028571-0.026597-0.0033247-0.0072207-0.0012468-0.014494-0.0020779-0.021818-0.0024935h-2.9091c-0.00727 0-0.013922 0.0020779-0.020779 0.0027013-0.00927 5.4545e-4 -0.01852 0.0017143-0.027636 0.0035325-0.00644 0.0016623-0.012468 0.0043636-0.018909 0.0064416-0.010727 0.0033507-0.021143 0.0076104-0.031169 0.012675-0.00499 0.0027013-0.00914 0.0062338-0.013922 0.0093506-0.00995 0.0060779-0.019351 0.013039-0.028052 0.020779-0.00577 0.0057662-0.011117 0.011948-0.016 0.018494-0.00579 0.0058182-0.011195 0.012-0.016208 0.018494l-0.83117 1.2468c-0.0027 0.00416-0.00395 0.00893-0.00644 0.013091-0.00249 0.00416-0.00561 0.00727-0.00748 0.011429-0.00187 0.00416-0.00249 0.00873-0.00436 0.013091-0.00377 0.00938-0.00683 0.019039-0.00914 0.028883-0.00221 0.00852-0.00382 0.017221-0.00478 0.025974-0.00106 0.00987-0.00143 0.019792-0.00104 0.029714 2.338e-4 0.0087 0.00101 0.017377 0.00229 0.025974 0.00169 0.00987 0.00413 0.019584 0.00727 0.029091 0.00252 0.00849 0.00558 0.016831 0.00914 0.024935 0.00166 0.00374 0.00229 0.00769 0.00416 0.011221 0.00358 0.00548 0.00745 0.010753 0.011636 0.015792 0.00312 0.00478 0.00478 0.00997 0.00831 0.014545l0.89911 1.1443c-0.06852 0.034857-0.11192 0.10496-0.11262 0.18182v1.1636z"/>
-    <circle cx="4.9892" cy="8.0854" r="3.8307" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="1.5" style="paint-order:markers stroke fill"/>
+    <path d="m9.0239 6.445c-0.44304-1.0753-1.297-1.9292-2.3723-2.3723v-1.1636c-6.754e-4 -0.076831-0.044-0.14688-0.11242-0.18182l0.89912-1.1443c0.00353-0.00457 0.00519-0.00977 0.00831-0.014545 0.00418-0.00504 0.00805-0.010312 0.011636-0.015792 0.00187-0.00353 0.00249-0.00748 0.00416-0.011221 0.00356-0.0081 0.00662-0.016442 0.00914-0.024935 0.00314-0.00951 0.00558-0.019221 0.00727-0.029091 0.00127-0.0086 0.00205-0.017273 0.00229-0.025974 7.272e-4 -0.0099 7.272e-4 -0.019818 0-0.029714-9.611e-4 -0.00875-0.00257-0.017454-0.00478-0.025974-0.00231-0.00984-0.00538-0.019507-0.00914-0.028883-0.00187-0.00436-0.00229-0.00894-0.00436-0.013091-0.00208-0.00416-0.00519-0.00727-0.00748-0.011429-0.00229-0.00416-0.00374-0.00894-0.00644-0.013091l-0.83118-1.2468c-0.004935-0.0063896-0.010208-0.012494-0.015792-0.018286-0.0051428-0.0065195-0.010623-0.012753-0.016416-0.018701-0.0085974-0.0077143-0.017844-0.014649-0.027636-0.020779-0.0047792-0.0031169-0.0091429-0.0070649-0.014338-0.0097662-0.0098182-0.0049351-0.020026-0.009039-0.030545-0.01226-0.0066494-0.0022857-0.012883-0.0051948-0.020779-0.0068571-0.0087792-0.0017403-0.017662-0.0028571-0.026597-0.0033247-0.0072207-0.0012468-0.014494-0.0020779-0.021818-0.0024935h-2.9091c-0.00727 0-0.013922 0.0020779-0.020779 0.0027013-0.00927 5.4545e-4 -0.01852 0.0017143-0.027636 0.0035325-0.00644 0.0016623-0.012468 0.0043636-0.018909 0.0064416-0.010727 0.0033507-0.021143 0.0076104-0.031169 0.012675-0.00499 0.0027013-0.00914 0.0062338-0.013922 0.0093506-0.00995 0.0060779-0.019351 0.013039-0.028052 0.020779-0.00577 0.0057662-0.011117 0.011948-0.016 0.018494-0.00579 0.0058182-0.011195 0.012-0.016208 0.018494l-0.83117 1.2468c-0.0027 0.00416-0.00395 0.00893-0.00644 0.013091-0.00249 0.00416-0.00561 0.00727-0.00748 0.011429-0.00187 0.00416-0.00249 0.00873-0.00436 0.013091-0.00377 0.00938-0.00683 0.019039-0.00914 0.028883-0.00221 0.00852-0.00382 0.017221-0.00478 0.025974-0.00106 0.00987-0.00143 0.019792-0.00104 0.029714 2.338e-4 0.0087 0.00101 0.017377 0.00229 0.025974 0.00169 0.00987 0.00413 0.019584 0.00727 0.029091 0.00252 0.00849 0.00558 0.016831 0.00914 0.024935 0.00166 0.00374 0.00229 0.00769 0.00416 0.011221 0.00358 0.00548 0.00745 0.010753 0.011636 0.015792 0.00312 0.00478 0.00478 0.00997 0.00831 0.014545l0.89911 1.1443c-0.06852 0.034857-0.11192 0.10496-0.11262 0.18182v1.1636c-2.2282 0.91808-3.2903 3.4687-2.3723 5.6969 0.91808 2.2282 3.4687 3.2903 5.6969 2.3723s3.2903-3.4687 2.3723-5.6969zm-7.4239 1.7147c-0.20828-4.509 7.3032-4.437 6.74 3.317e-4 -0.56315 4.4373-6.5317 4.5086-6.74-3.317e-4z"/>
    </g>
   </g>
  </g>
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:title>jewelry-m</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-lyon-m.svg b/data/styles/clear/style-clear/symbols/subway-lyon-m.svg
index 0f59848860..586a6f4454 100644
--- a/data/styles/clear/style-clear/symbols/subway-lyon-m.svg
+++ b/data/styles/clear/style-clear/symbols/subway-lyon-m.svg
@@ -1,5 +1,7 @@
-<svg viewBox="0 0 25 20.36">
-<path fill="#fff" opacity=".6" d="m2.798 0-.271.41C.173 3.97 0 9.526 0 10.18c0 .672.18 6.22 2.529 9.77l.27.409h22.2V-.001z"/>
-<path fill="#ec2227" d="M3.289.912S.913 4.507.913 10.18c0 5.677 2.376 9.267 2.376 9.267h20.796V.912z"/>
-<path fill="#fff" d="M14.61 16.34h-2.501L9.9 9.118a15.076 15.076 0 0 1-.337-1.467l-.066 8.69H6.902l.386-12.332h3.321l2.42 7.946c.144.5.29 1.163.29 1.597h.08c0-.434.145-1.097.29-1.596l2.418-7.948h3.321l.386 12.332H17.22l-.066-8.69a14.883 14.883 0 0 1-.338 1.468z"/>
+<svg viewBox="0 0 25 25" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m12.5 0.5c-6.6 0-12 5.4-12 12s5.4 12 12 12 12-5.4 12-12-5.4-12-12-12z" fill="#FFF" opacity=".6"/>
+  <path d="m12.5 23.7c-6.2 0-11.2-5-11.2-11.2s5-11.2 11.2-11.2 11.2 5 11.2 11.2-5 11.2-11.2 11.2z" fill="#F50000"/>
+  <path d="m6 6h2.6l0.4 0.9 3.4 7.3 0.1 0.1 3.5-7.5 0.4-0.8h2.6v13h-3v-6.7l-3.2 6.7h-0.3-0.4l-1-2-2.1-4.6v6.6h-3v-13z" fill="#FFF"/>
+ </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-lyon-s.svg b/data/styles/clear/style-clear/symbols/subway-lyon-s.svg
index ae75c0d0f1..3a37b9add3 100644
--- a/data/styles/clear/style-clear/symbols/subway-lyon-s.svg
+++ b/data/styles/clear/style-clear/symbols/subway-lyon-s.svg
@@ -1,5 +1,7 @@
-<svg viewBox="0 0 18 14.659">
-  <path fill="#fff" opacity=".6" d="m2.015 0-.196.295C.125 2.859 0 6.859 0 7.33c0 .484.129 4.479 1.82 7.035l.195.294H18V0z"/>
-  <path fill="#ec2227" d="M16.964 1.034v12.59H2.61c-.435-.728-.85-1.83-.989-2.29a13.825 13.825 0 0 1-.586-4.004c0-1.592.267-2.949.586-4.004.14-.46.552-1.56.989-2.29z"/>
-  <path fill="#fff" d="M10.414 11.247h-1.59L7.42 6.655a9.586 9.586 0 0 1-.214-.934l-.042 5.526h-1.65l.245-7.841H7.87l1.538 5.052c.092.318.184.74.184 1.016h.052c0-.277.092-.698.184-1.015l1.537-5.054h2.112l.246 7.841h-1.65l-.042-5.525a9.464 9.464 0 0 1-.215.933z"/>
+<svg viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m9 0c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9z" fill="#FFF" opacity=".6"/>
+  <path d="m9 17c-4.4 0-8-3.6-8-8s3.6-8 8-8 8 3.6 8 8-3.6 8-8 8z" fill="#F50000"/>
+  <path d="m5 5h1.6l2.4 5v0.1l2-4.3 0.4-0.8h1.6v8h-2v-3.7895l-1.8 3.7895h-0.5l-1.7-3.6757v3.6757h-2v-8z" fill="#FFF"/>
+ </g>
 </svg>
diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss
index dc1da1d58e..378b96eca1 100644
--- a/data/styles/clear/style-night/style.mapcss
+++ b/data/styles/clear/style-night/style.mapcss
@@ -40,14 +40,10 @@ colors
   RoutePreview-opacity: 0.3;
   RouteMaskCar-color: #000000;
   RouteMaskCar-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
   RouteArrowsMaskCar-color: #055FCD;
   RouteArrowsMaskCar-opacity: 0.3;
   RouteMaskBicycle-color: #000000;
   RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
   RouteArrowsMaskBicycle-color: #FF4B8C;
   RouteArrowsMaskBicycle-opacity: 0.5;
   RouteMaskPedestrian-color: #000000;
diff --git a/data/styles/clear/style-night/symbols/antiques-m.svg b/data/styles/clear/style-night/symbols/antiques-m.svg
deleted file mode 100644
index 8e236e1974..0000000000
--- a/data/styles/clear/style-night/symbols/antiques-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<title>antiques-m</title>
-    <g id="alcohol-m" fill-rule="nonzero">
-        <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-        <path d="m9.054 3.7417c-0.53095 0-0.79495 0.64599-0.41591 1.0147l0.48376 0.48376c-0.41444 0.5752-0.66221 1.2787-0.66221 2.0383 0 0.76693 0.24778 1.4704 0.66221 2.0456l-0.32742 0.32889c-0.41444 0.35692-0.32889 0.62829-0.32889 1.1696v7.513c-0.2935 0.2522-0.68581 0.61059-0.88197 0.93211-0.2581 0.38052-0.23008 0.57667-0.3053 0.99111h1.4011s0.51178-0.44393 0.68581-0.83477c0.033922-0.09292 0.067844-0.22565 0.10324-0.34659h5.0691c0.0354 0.12094 0.06342 0.25368 0.10472 0.34659 0.17256 0.39084 0.67991 0.83477 0.67991 0.83477h1.3996c-0.07522-0.41444-0.04572-0.61059-0.3053-0.99111-0.19616-0.32152-0.58847-0.67991-0.88197-0.93211v-7.513c0-0.54128 0.08702-0.81265-0.32889-1.1696l-0.32742-0.32889c0.41444-0.5752 0.66221-1.2787 0.66221-2.0456 0-0.75955-0.24778-1.4631-0.66221-2.0383l0.48376-0.48376c0.38641-0.37462 0.10914-1.0324-0.42624-1.0147h-0.0059c-0.15044 0.0059-0.2935 0.069319-0.40264 0.17846l-0.48523 0.48376c-0.5752-0.41444-1.2787-0.66221-2.0383-0.66221-0.76693 0-1.4704 0.24778-2.0456 0.66221l-0.48376-0.48376c-0.10914-0.11504-0.26548-0.17846-0.42034-0.17846zm2.9497 1.0147c1.3996 0 2.5235 1.1224 2.5235 2.522 0 1.407-1.1238 2.5294-2.5235 2.5294-1.407 0-2.5294-1.1224-2.5294-2.5294 0-1.3996 1.1224-2.522 2.5294-2.522zm-0.12684 0.61059c-0.0295 0.00442-0.05752 0.010324-0.08112 0.016224-0.17846 0.041296-0.3053 0.20206-0.2994 0.38051v1.7049l0.15486 0.11061 1.0147 0.75955c0.41444 0.44983 0.99701-0.33332 0.44393-0.59879l-0.85394-0.64599v-1.3303c0.0059-0.21238-0.16666-0.39674-0.37904-0.39674zm-0.66811 6.1871h0.49408v2.8686c-0.49998 0.13274-0.88049 0.57077-0.88049 1.1179 0 0.65042 0.52948 1.1814 1.1814 1.1814 0.65042 0 1.174-0.53095 1.174-1.1814 0-0.54717-0.37904-0.98521-0.88049-1.1179v-2.8686h0.49555c1.9807 0 1.8259 4.3037 1.2035 5.6281-0.18436 0.36282-0.60469 0.59437-0.99701 0.72121-0.63272 0.20058-1.3642 0.20058-1.9984 0-0.39231-0.12684-0.81265-0.35839-0.99701-0.72121-0.60469-2.1887-0.75513-5.6281 1.205-5.6281z" fill="#000" fill-rule="nonzero"/>
-        </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/art-m.svg b/data/styles/clear/style-night/symbols/art-m.svg
deleted file mode 100644
index dcab7e0d68..0000000000
--- a/data/styles/clear/style-night/symbols/art-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <title>art-m</title>
-    <g id="alcohol-m" fill-rule="nonzero">
-        <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-        <path d="m12 5c-3.8656 0-7 3.1344-7 7 0 3.8656 3.1344 7 7 7 0.64556 0 1.166-0.52046 1.166-1.166 0-0.30333-0.11218-0.57709-0.30273-0.7832-0.18278-0.20611-0.29102-0.47399-0.29102-0.77344 0-0.64556 0.52046-1.166 1.166-1.166h1.373c2.1467 0 3.8887-1.742 3.8887-3.8887 0-3.4378-3.1344-6.2227-7-6.2227zm1.9336 1.3047a1.3892 1.3892 0 0 1 1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887-1.3906 1.3892 1.3892 0 0 1 1.3887-1.3887zm-3.8945 0.019531a1.3892 1.3892 0 0 1 1.3906 1.3906 1.3892 1.3892 0 0 1-1.3906 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906zm-2.332 3.123a1.3892 1.3892 0 0 1 1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906zm8.5586 0a1.3892 1.3892 0 0 1 1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906z" fill="#000"/>
-    </g>
- </svg>
diff --git a/data/styles/clear/style-night/symbols/cheese-m.svg b/data/styles/clear/style-night/symbols/cheese-m.svg
deleted file mode 100644
index d85fdede31..0000000000
--- a/data/styles/clear/style-night/symbols/cheese-m.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <title>cheese-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="alcohol-m" fill-rule="nonzero">
-   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-   <path d="m13.053 5.1621c-1.1318-0.012343-2.2129 0.089844-2.2129 0.089844l-5.127 5.9316 12.574-3.9336s-2.124-1.5543-3.3652-1.8965c-0.49204-0.13566-1.1901-0.184-1.8691-0.19141zm1.8516 1.1484a0.51126 0.9813 71.912 0 1 0.56641 0.54883 0.51126 0.9813 71.912 0 1-1.2129 0.59766 0.51126 0.9813 71.912 0 1-0.56641-0.54883 0.51126 0.9813 71.912 0 1 1.2129-0.59766zm-3.9375 0.76953a0.51126 0.9813 71.912 0 1 0.56836 0.54883 0.51126 0.9813 71.912 0 1-1.2129 0.59766 0.51126 0.9813 71.912 0 1-0.56641-0.54688 0.51126 0.9813 71.912 0 1 1.2109-0.59961zm7.3203 0.97266-12.574 3.7832v7.3594l12.574-3.9336v-7.209zm-1.3008 1.7734a0.78667 1.2141 19.086 0 1 0.61719 0.87305 0.78667 1.2141 19.086 0 1-0.85156 1.4395 0.78667 1.2141 19.086 0 1-0.83398-0.83398 0.78667 1.2141 19.086 0 1 0.84961-1.4395 0.78667 1.2141 19.086 0 1 0.21875-0.039062zm-3.5645 0.66797a0.52909 0.76697 23.373 0 1 0.41992 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.51953 0.52909 0.76697 23.373 0 1 0.58008-0.90039 0.52909 0.76697 23.373 0 1 0.14648-0.023437zm-3.5098 1.9395a0.75222 1.3337 13.619 0 1 0.58203 0.97266 0.75222 1.3337 13.619 0 1-0.80273 1.5996 0.75222 1.3337 13.619 0 1-0.78906-0.92578 0.75222 1.3337 13.619 0 1 0.80469-1.6016 0.75222 1.3337 13.619 0 1 0.20508-0.044922zm-2.6484 0.037109a0.52909 0.76697 23.373 0 1 0.41992 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.90039 0.52909 0.76697 23.373 0 1-0.56836-0.52148 0.52909 0.76697 23.373 0 1 0.57812-0.89844 0.52909 0.76697 23.373 0 1 0.14844-0.025391zm5.6836 0.875a0.85989 1.2083 26.467 0 1 0.6875 0.85352 0.85989 1.2083 26.467 0 1-0.94727 1.4023 0.85989 1.2083 26.467 0 1-0.93164-0.8125 0.85989 1.2083 26.467 0 1 0.94922-1.4043 0.85989 1.2083 26.467 0 1 0.24219-0.039063zm2.9355 0.61328a0.52909 0.76697 23.373 0 1 0.41992 0.54688 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.52148 0.52909 0.76697 23.373 0 1 0.57812-0.89844 0.52909 0.76697 23.373 0 1 0.14844-0.025391zm-8.0449 2.1914a0.52909 0.76697 23.373 0 1 0.41797 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.51953 0.52909 0.76697 23.373 0 1 0.58008-0.90039 0.52909 0.76697 23.373 0 1 0.14844-0.023437z" fill="#000"/>
-  </g>
- </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/airport_gate-m.svg b/data/styles/clear/style-night/symbols/gate-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/airport_gate-m.svg
rename to data/styles/clear/style-night/symbols/gate-m.svg
diff --git a/data/styles/clear/style-night/symbols/gate-s.svg b/data/styles/clear/style-night/symbols/gate-s.svg
deleted file mode 100644
index e99f55549e..0000000000
--- a/data/styles/clear/style-night/symbols/gate-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12pt" height="12pt" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.7144 0.85719c-0.29402 9.9153e-4 -0.58285 0.16454-0.73337 0.4171l-0.77921 1.2972h-5.3445c-0.22461-3.163e-4 -0.44851 0.090982-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498-0.22461-3.163e-4 -0.44851 0.090981-0.60733 0.2498-0.15883 0.15883-0.25013 0.38271-0.2498 0.60733v1.7143c-3.1641e-4 0.22461 0.090982 0.44851 0.2498 0.60733 0.15883 0.15883 0.38271 0.25013 0.60733 0.2498h1.2307l-0.25209 0.4171c-0.15527 0.25857-0.16021 0.60164-0.01146 0.86402 0.14875 0.26238 0.44552 0.4336 0.74713 0.43315h1.7143c0.29351-4.33e-4 0.58218-0.16325 0.73337-0.41481l0.77921-1.2995h5.3445c0.22462 3.164e-4 0.44851-0.090982 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.12e-4 -0.22461-0.09099-0.44851-0.24981-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498 0.22461 3.163e-4 0.44851-0.090981 0.60733-0.2498 0.15883-0.15883 0.25013-0.38271 0.2498-0.60733v-1.7143c3.16e-4 -0.22461-0.090986-0.44851-0.2498-0.60733-0.15883-0.15883-0.38271-0.25013-0.60733-0.2498h-1.2307l0.25209-0.4171c0.15527-0.25857 0.16021-0.60164 0.01146-0.86402-0.14875-0.26238-0.44552-0.4336-0.74713-0.43315z" opacity=".6" stroke-width="1.2"/>
- <path d="m7.7145 1.7136-1.0281 1.7145h-5.8302v1.7145h4.8021l-1.0314 1.7145h-3.7706v1.7145h2.7426l-1.0281 1.7145h1.7145l1.0281-1.7145h5.8302v-1.7145h-4.8021l1.0314-1.7145h3.7706v-1.7145h-2.7426l1.0281-1.7145z" fill="#fff" opacity=".6" stroke-width="1.2"/>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/interior_decoration-m.svg b/data/styles/clear/style-night/symbols/interior_decoration-m.svg
deleted file mode 100644
index a70abfcb61..0000000000
--- a/data/styles/clear/style-night/symbols/interior_decoration-m.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <title>interior_decoration-m</title>
-    <g id="interior_decoration-m" fill-rule="nonzero">
-        <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
-        <path d="m16.246 5.543c-0.52905 8.118e-4 -0.99393 0.35107-1.1406 0.85938-0.09265-0.023045-0.18773-0.034849-0.2832-0.035156-0.657-2.11e-4 -1.1897 0.53245-1.1895 1.1895 1e-3 0.37613 0.17992 0.7296 0.48242 0.95312-0.30305 0.22394-0.48203 0.57826-0.48242 0.95508-2.1e-4 0.657 0.53245 1.1897 1.1895 1.1895 0.10086-2.93e-4 0.20128-0.01342 0.29883-0.03906 0.11406 0.34283 0.37781 0.61521 0.7168 0.74024v4.3008h0.8125v-4.2988c0.38406-0.13857 0.67018-0.4645 0.75781-0.86328 0.12882 0.0478 0.26495 0.07291 0.40234 0.07422 0.657 2.057e-4 1.1897-0.53245 1.1895-1.1895-9.43e-4 -0.32709-0.13658-0.63935-0.375-0.86328 0.23891-0.2244 0.37459-0.53747 0.375-0.86523 2.11e-4 -0.657-0.53245-1.1897-1.1895-1.1895-0.13388 0.00117-0.26661 0.02494-0.39258 0.070312-0.0978-0.57087-0.59269-0.98822-1.1719-0.98828zm0.07031 2.0586c0.48871-1.605e-4 0.88493 0.39606 0.88477 0.88477 1.6e-4 0.48871-0.39606 0.88493-0.88477 0.88477-0.48871 1.599e-4 -0.88492-0.39606-0.88476-0.88477-1.6e-4 -0.48871 0.39606-0.88493 0.88476-0.88477z" fill="#000" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-        <path d="m6.1756 5.4825-1.0446 3.8474a0.38235 0.38235 52.595 0 0 0.36899 0.48253h1.8613a0.5 0.5 45 0 1 0.5 0.5v7.0664a0.5 0.5 135 0 1-0.5 0.5h-0.3457a0.5 0.5 135 0 0-0.5 0.5v0.12109a0.5 0.5 45 0 0 0.5 0.5h2.8145a0.5 0.5 135 0 0 0.5-0.5v-0.12109a0.5 0.5 45 0 0-0.5-0.5h-0.3457a0.5 0.5 45 0 1-0.5-0.5v-7.0664a0.5 0.5 135 0 1 0.5-0.5h1.8613a0.38145 0.38145 127.34 0 0 0.3679-0.48223l-1.0541-3.848a0.65539 0.65539 37.34 0 0-0.6321-0.48223h-3.2207a0.65386 0.65386 142.6 0 0-0.63101 0.48253zm7.464 8.6643 0.85945 4.3626a0.60811 0.60811 39.428 0 0 0.59664 0.49057h2.3633a0.6068 0.6068 140.51 0 0 0.59561-0.49077l0.8498-4.3622a0.41199 0.41199 50.512 0 0-0.40439-0.49077h-4.457a0.41111 0.41111 129.43 0 0-0.40336 0.49057z" fill="#000" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-    </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/jewelry-m.svg b/data/styles/clear/style-night/symbols/jewelry-m.svg
index b6f4899f3e..7a5fbfd7a1 100644
--- a/data/styles/clear/style-night/symbols/jewelry-m.svg
+++ b/data/styles/clear/style-night/symbols/jewelry-m.svg
@@ -1,21 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
  <title>jewelry-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="jewelry-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
    <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
    <g id="ring" transform="translate(7,6)" fill="#000">
-    <path d="m6.6516 4.0727v-1.1636c-6.754e-4 -0.076831-0.044-0.14688-0.11242-0.18182l0.89912-1.1443c0.00353-0.00457 0.00519-0.00977 0.00831-0.014545 0.00418-0.00504 0.00805-0.010312 0.011636-0.015792 0.00187-0.00353 0.00249-0.00748 0.00416-0.011221 0.00356-0.0081 0.00662-0.016442 0.00914-0.024935 0.00314-0.00951 0.00558-0.019221 0.00727-0.029091 0.00127-0.0086 0.00205-0.017273 0.00229-0.025974 7.272e-4 -0.0099 7.272e-4 -0.019818 0-0.029714-9.611e-4 -0.00875-0.00257-0.017454-0.00478-0.025974-0.00231-0.00984-0.00538-0.019507-0.00914-0.028883-0.00187-0.00436-0.00229-0.00894-0.00436-0.013091-0.00208-0.00416-0.00519-0.00727-0.00748-0.011429-0.00229-0.00416-0.00374-0.00894-0.00644-0.013091l-0.83118-1.2468c-0.004935-0.0063896-0.010208-0.012494-0.015792-0.018286-0.0051428-0.0065195-0.010623-0.012753-0.016416-0.018701-0.0085974-0.0077143-0.017844-0.014649-0.027636-0.020779-0.0047792-0.0031169-0.0091429-0.0070649-0.014338-0.0097662-0.0098182-0.0049351-0.020026-0.009039-0.030545-0.01226-0.0066494-0.0022857-0.012883-0.0051948-0.020779-0.0068571-0.0087792-0.0017403-0.017662-0.0028571-0.026597-0.0033247-0.0072207-0.0012468-0.014494-0.0020779-0.021818-0.0024935h-2.9091c-0.00727 0-0.013922 0.0020779-0.020779 0.0027013-0.00927 5.4545e-4 -0.01852 0.0017143-0.027636 0.0035325-0.00644 0.0016623-0.012468 0.0043636-0.018909 0.0064416-0.010727 0.0033507-0.021143 0.0076104-0.031169 0.012675-0.00499 0.0027013-0.00914 0.0062338-0.013922 0.0093506-0.00995 0.0060779-0.019351 0.013039-0.028052 0.020779-0.00577 0.0057662-0.011117 0.011948-0.016 0.018494-0.00579 0.0058182-0.011195 0.012-0.016208 0.018494l-0.83117 1.2468c-0.0027 0.00416-0.00395 0.00893-0.00644 0.013091-0.00249 0.00416-0.00561 0.00727-0.00748 0.011429-0.00187 0.00416-0.00249 0.00873-0.00436 0.013091-0.00377 0.00938-0.00683 0.019039-0.00914 0.028883-0.00221 0.00852-0.00382 0.017221-0.00478 0.025974-0.00106 0.00987-0.00143 0.019792-0.00104 0.029714 2.338e-4 0.0087 0.00101 0.017377 0.00229 0.025974 0.00169 0.00987 0.00413 0.019584 0.00727 0.029091 0.00252 0.00849 0.00558 0.016831 0.00914 0.024935 0.00166 0.00374 0.00229 0.00769 0.00416 0.011221 0.00358 0.00548 0.00745 0.010753 0.011636 0.015792 0.00312 0.00478 0.00478 0.00997 0.00831 0.014545l0.89911 1.1443c-0.06852 0.034857-0.11192 0.10496-0.11262 0.18182v1.1636z"/>
-    <circle cx="4.9892" cy="8.0854" r="3.8307" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.5" style="paint-order:markers stroke fill"/>
+    <path d="m9.0239 6.445c-0.44304-1.0753-1.297-1.9292-2.3723-2.3723v-1.1636c-6.754e-4 -0.076831-0.044-0.14688-0.11242-0.18182l0.89912-1.1443c0.00353-0.00457 0.00519-0.00977 0.00831-0.014545 0.00418-0.00504 0.00805-0.010312 0.011636-0.015792 0.00187-0.00353 0.00249-0.00748 0.00416-0.011221 0.00356-0.0081 0.00662-0.016442 0.00914-0.024935 0.00314-0.00951 0.00558-0.019221 0.00727-0.029091 0.00127-0.0086 0.00205-0.017273 0.00229-0.025974 7.272e-4 -0.0099 7.272e-4 -0.019818 0-0.029714-9.611e-4 -0.00875-0.00257-0.017454-0.00478-0.025974-0.00231-0.00984-0.00538-0.019507-0.00914-0.028883-0.00187-0.00436-0.00229-0.00894-0.00436-0.013091-0.00208-0.00416-0.00519-0.00727-0.00748-0.011429-0.00229-0.00416-0.00374-0.00894-0.00644-0.013091l-0.83118-1.2468c-0.004935-0.0063896-0.010208-0.012494-0.015792-0.018286-0.0051428-0.0065195-0.010623-0.012753-0.016416-0.018701-0.0085974-0.0077143-0.017844-0.014649-0.027636-0.020779-0.0047792-0.0031169-0.0091429-0.0070649-0.014338-0.0097662-0.0098182-0.0049351-0.020026-0.009039-0.030545-0.01226-0.0066494-0.0022857-0.012883-0.0051948-0.020779-0.0068571-0.0087792-0.0017403-0.017662-0.0028571-0.026597-0.0033247-0.0072207-0.0012468-0.014494-0.0020779-0.021818-0.0024935h-2.9091c-0.00727 0-0.013922 0.0020779-0.020779 0.0027013-0.00927 5.4545e-4 -0.01852 0.0017143-0.027636 0.0035325-0.00644 0.0016623-0.012468 0.0043636-0.018909 0.0064416-0.010727 0.0033507-0.021143 0.0076104-0.031169 0.012675-0.00499 0.0027013-0.00914 0.0062338-0.013922 0.0093506-0.00995 0.0060779-0.019351 0.013039-0.028052 0.020779-0.00577 0.0057662-0.011117 0.011948-0.016 0.018494-0.00579 0.0058182-0.011195 0.012-0.016208 0.018494l-0.83117 1.2468c-0.0027 0.00416-0.00395 0.00893-0.00644 0.013091-0.00249 0.00416-0.00561 0.00727-0.00748 0.011429-0.00187 0.00416-0.00249 0.00873-0.00436 0.013091-0.00377 0.00938-0.00683 0.019039-0.00914 0.028883-0.00221 0.00852-0.00382 0.017221-0.00478 0.025974-0.00106 0.00987-0.00143 0.019792-0.00104 0.029714 2.338e-4 0.0087 0.00101 0.017377 0.00229 0.025974 0.00169 0.00987 0.00413 0.019584 0.00727 0.029091 0.00252 0.00849 0.00558 0.016831 0.00914 0.024935 0.00166 0.00374 0.00229 0.00769 0.00416 0.011221 0.00358 0.00548 0.00745 0.010753 0.011636 0.015792 0.00312 0.00478 0.00478 0.00997 0.00831 0.014545l0.89911 1.1443c-0.06852 0.034857-0.11192 0.10496-0.11262 0.18182v1.1636c-2.2282 0.91808-3.2903 3.4687-2.3723 5.6969 0.91808 2.2282 3.4687 3.2903 5.6969 2.3723s3.2903-3.4687 2.3723-5.6969zm-7.4239 1.7147c-0.20828-4.509 7.3032-4.437 6.74 3.317e-4 -0.56315 4.4373-6.5317 4.5086-6.74-3.317e-4z"/>
    </g>
   </g>
  </g>
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:title>jewelry-m</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-m.svg b/data/styles/clear/style-night/symbols/subway-lyon-m.svg
index f71266e34a..98745cf1ec 100644
--- a/data/styles/clear/style-night/symbols/subway-lyon-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-lyon-m.svg
@@ -1,5 +1,7 @@
-<svg viewBox="0 0 25 20.36">
-  <path fill="#fff" opacity=".4" d="m2.798 0-.271.41C.173 3.97 0 9.526 0 10.18c0 .672.18 6.22 2.529 9.77l.27.409h22.2V-.001z"/>
-  <path fill="#930000" d="M3.289.912S.913 4.507.913 10.18c0 5.677 2.376 9.267 2.376 9.267h20.796V.912z"/>
-  <path fill="#A3A3A3" d="M14.61 16.34h-2.501L9.9 9.118a15.076 15.076 0 0 1-.337-1.467l-.066 8.69H6.902l.386-12.332h3.321l2.42 7.946c.144.5.29 1.163.29 1.597h.08c0-.434.145-1.097.29-1.596l2.418-7.948h3.321l.386 12.332H17.22l-.066-8.69a14.883 14.883 0 0 1-.338 1.468z"/>
+<svg viewBox="0 0 25 25" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m12.5 0.5c-6.6 0-12 5.4-12 12s5.4 12 12 12 12-5.4 12-12-5.4-12-12-12z" fill="#FFF" opacity=".4"/>
+  <path d="m12.5 23.7c-6.2 0-11.2-5-11.2-11.2s5-11.2 11.2-11.2 11.2 5 11.2 11.2-5 11.2-11.2 11.2z" fill="#930000"/>
+  <path d="m6 6h2.6l0.4 0.9 3.4 7.3 0.1 0.1 3.5-7.5 0.4-0.8h2.6v13h-3v-6.7l-3.2 6.7h-0.3-0.4l-1-2-2.1-4.6v6.6h-3v-13z" fill="#A3A3A3"/>
+ </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-s.svg b/data/styles/clear/style-night/symbols/subway-lyon-s.svg
index b8440776c6..cd9601fb29 100644
--- a/data/styles/clear/style-night/symbols/subway-lyon-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-lyon-s.svg
@@ -1,5 +1,7 @@
-<svg viewBox="0 0 18 14.659">
-  <path fill="#fff" d="m2.015 0-.196.295C.125 2.859 0 6.859 0 7.33c0 .484.129 4.479 1.82 7.035l.195.294H18V0z" opacity=".4"/>
-  <path fill="#930000" d="M16.964 1.034v12.59H2.61c-.435-.728-.85-1.83-.989-2.29a13.825 13.825 0 0 1-.586-4.004c0-1.592.267-2.949.586-4.004.14-.46.552-1.56.989-2.29z"/>
-  <path fill="#A3A3A3" d="M10.414 11.247h-1.59L7.42 6.655a9.586 9.586 0 0 1-.214-.934l-.042 5.526h-1.65l.245-7.841H7.87l1.538 5.052c.092.318.184.74.184 1.016h.052c0-.277.092-.698.184-1.015l1.537-5.054h2.112l.246 7.841h-1.65l-.042-5.525a9.464 9.464 0 0 1-.215.933z"/>
+<svg viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m9 0c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9z" fill="#FFF" opacity=".4"/>
+  <path d="m9 17c-4.4 0-8-3.6-8-8s3.6-8 8-8 8 3.6 8 8-3.6 8-8 8z" fill="#930000"/>
+  <path d="m5 5h1.6l2.4 5v0.1l2-4.3 0.4-0.8h1.6v8h-2v-3.7895l-1.8 3.7895h-0.5l-1.7-3.6757v3.6757h-2v-8z" fill="#A3A3A3"/>
+ </g>
 </svg>
diff --git a/data/styles/vehicle/style-clear/style.mapcss b/data/styles/vehicle/style-clear/style.mapcss
index 1c7bc14404..69400d2db2 100644
--- a/data/styles/vehicle/style-clear/style.mapcss
+++ b/data/styles/vehicle/style-clear/style.mapcss
@@ -40,14 +40,10 @@ colors
   RoutePreview-opacity: 0.3;
   RouteMaskCar-color: #000000;
   RouteMaskCar-opacity: 0.3;
-  RouteFirstSegmentArrowsMaskCar-color: #033B80;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
   RouteArrowsMaskCar-color: #033B80;
   RouteArrowsMaskCar-opacity: 0.2;
   RouteMaskBicycle-color: #000000;
   RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
   RouteArrowsMaskBicycle-color: #9C27B0;
   RouteArrowsMaskBicycle-opacity: 0.2;
   RouteMaskPedestrian-color: #000000;
diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss
index fd3fa97c52..69c025afc9 100644
--- a/data/styles/vehicle/style-night/style.mapcss
+++ b/data/styles/vehicle/style-night/style.mapcss
@@ -40,14 +40,10 @@ colors
   RoutePreview-opacity: 0.3;
   RouteMaskCar-color: #000000;
   RouteMaskCar-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
-  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
   RouteArrowsMaskCar-color: #055FCD;
   RouteArrowsMaskCar-opacity: 0.3;
   RouteMaskBicycle-color: #000000;
   RouteMaskBicycle-opacity: 0.5;
-  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
-  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
   RouteArrowsMaskBicycle-color: #FF4B8C;
   RouteArrowsMaskBicycle-opacity: 0.5;
   RouteMaskPedestrian-color: #000000;
diff --git a/data/types.txt b/data/types.txt
index 8e605fbefa..69450d09b0 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -38,9 +38,9 @@ mapswithme
 *landuse|farm
 *amenity|place_of_worship
 *highway|track|grade1
-*addr:interpolation|odd
+mapswithme
 *highway|service|driveway
-*addr:interpolation|even
+mapswithme
 *highway|motorway_link
 *waterway|stream|intermittent
 *highway|track|grade4
@@ -538,7 +538,7 @@ mapswithme
 mapswithme
 *railway|funicular|tunnel
 *barrier|cycle_barrier
-*addr:interpolation
+mapswithme
 highway|speed_camera
 *area:highway|track
 *area:highway|primary
@@ -1559,4 +1559,3 @@ mapswithme
 *shop|fashion_accessories
 *shop|cannabis
 *shop|herbalist
-*shop|camera
diff --git a/data/visibility.txt b/data/visibility.txt
index cc57694a73..ef75548aca 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -1,8 +1,4 @@
 world  00000000000000000000  +
-    addr:interpolation  00000000000000000000  +
-        even  00000000000000000000  -
-        odd  00000000000000000000  -
-        {}
     aerialway  00000000000000000000  +
         cable_car  00000000000000000000  -
         chair_lift  00000000000000000000  -
@@ -1132,7 +1128,6 @@ world  00000000000000000000  +
         books  00000000000000000000  -
         boutique  00000000000000000000  -
         butcher  00000000000000000000  -
-        camera  00000000000000000000  -
         cannabis  00000000000000000000  -
         car  00000000000000000111  -
         car_parts  00000000000000000111  -
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 5e498ee75d..6ed31f973b 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -45,7 +45,7 @@ Please follow instructions in [INSTALL.md](INSTALL.md) to set up your developmen
 and check the [developer's guidelines](#developers-guidelines).
 You will find a list of issues for new contributors [here](https://github.com/organicmaps/organicmaps/labels/Good%20first%20issue) to help you get started with simple tasks. If you want to focus on the most important issues, please check our [Milestones](https://github.com/organicmaps/organicmaps/milestones).
 
-**Please do not ask for permission to work on the issue or to assign an issue to you**. We do not assign issues to first-time contributors. Any such comment notifies our contributors and the development team, and creates unnecessary noise that distracts us from the work. Just make a PR - and it will be reviewed.
+**Please do not ask for permission to work on the issue or to assign an issue to you**. We do not assign issues to first-time contributors. Any such comment notifies our contributors and the development team, and creates unnecessary noise that distracts us from the work.
 
 Reading everything in the [docs folder](docs/) of the repository is recommended.
 
diff --git a/docs/DEBUG_COMMANDS.md b/docs/DEBUG_COMMANDS.md
deleted file mode 100644
index d37d4ee060..0000000000
--- a/docs/DEBUG_COMMANDS.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Available debug commands
-
-Organic Maps exposes debug commands to help you control the native components (engine, editor, navigation, ...). **These commands are not intended for regular users** and are only used for debug purposes. Please only use these commands if you are working on Organic Maps.
-
-Each command is entered in the search input (Android and iOS) and are activated as soon as the full search keyword is entered. Unless specified, the effects triggered are discarded after a restart.
-
-For more information, please see the source code at [`Framework::ParseSearchQueryCommand`](../map/framework.cpp).
-
-## Drape
-
-### Themes
-
-- `?dark` or `mapstyle:dark`: Enable night mode for the map view only. You may need to change the zoom level to fully apply the new mode.
-- `?light` or `mapstyle:light`: Enable light mode for the map view only. You may need to change the zoom level to fully apply the new mode.
-- `?vdark` or `mapstyle:vdark`: Same as `?dark`, but using the vehicle variant.
-- `?vlight` or `mapstyle:vlight`: Same as `?light`, but using the vehicle variant.
-
-### Post processing
-
-- `?aa` or `effect:antialiasing`: Enable antialiasing.
-- `?no-aa` or `effect:no-antialiasing`: Disable antialiasing.
-
-### Map layers
-
-- `?scheme`: Enable the subway layer.
-- `?no-scheme`: Disable the subway layer.
-- `?isolines`: Enable the isolines layer.
-- `?no-isolines`: Disable the isolines layer.
-
-### Information
-
-- `?debug-info`: Show renderer version, zoom scale and FPS counter in the top left corner of the map.
-- `?debug-info-always`: Same as `?debug-info`, but persists across restarts.
-- `?debug-rect`: Shows boxes around icons and labels. When the icon/label is shown, the box is green. When the icon/label cannot be shown, the box is red with a blue arrow indicating which icon/label prevents rendering. When the icon/label is not ready for display, the box is yellow (check the `Update` method of [`dp::OverlayHandle`](../drape/overlay_handle.hpp) and derived classes for more information).
-- `?no-debug-rect`: Disables the debug boxes.
-
-### Drape rendering engine
-
-All the following commands require an app restart:
-
-- `?gl`: Forces the OpenGL renderer. OpenGL renderer is supported on all platforms and is used by default on older Android devices and on the desktop.
-- `?vulkan`: Forces the Vulkan renderer on Android. Vulkan is used by default on newer Android 7+ devices.
-- `?metal`: Forces the Metal renderer. It is used by default on iOS and can be ported/enabled with some effort on Mac OS X too.
-
-## Editor
-
-- `?edits`: Shows the list of map edits (local and uploaded) made with the app in the search results. Useful to debug what was not uploaded yet.
-- `?eclear`: Clears the locally stored list of edits. Warning: all local changes that are not yet uploaded to OpenStreetMap.org will be lost! Everything that was already uploaded to OSM stays there untouched.
-
-## Routing
-
-- `?debug-cam`: Force-enables speed cameras in all countries.
-- `?no-debug-cam`: Reverts speed camera setting to default.
-
-## GPS
-
-- `?gpstrackaccuracy:XXX`: Changes the accuracy of the GPS while recording tracks. Replace `XXX` by the desired horizontal accuracy. Works only on iOS for now.
diff --git a/docs/privacy/mm.jpg b/docs/privacy/mm.jpg
index b6dcd6789b..254d90d15d 100644
Binary files a/docs/privacy/mm.jpg and b/docs/privacy/mm.jpg differ
diff --git a/docs/privacy/om.jpg b/docs/privacy/om.jpg
index 375feada8e..ffe22f91ce 100644
Binary files a/docs/privacy/om.jpg and b/docs/privacy/om.jpg differ
diff --git a/drape/batcher.cpp b/drape/batcher.cpp
index c34ce65480..f11cf05472 100644
--- a/drape/batcher.cpp
+++ b/drape/batcher.cpp
@@ -199,9 +199,9 @@ IndicesRange Batcher::InsertLineRaw(ref_ptr<GraphicsContext> context, RenderStat
                                         0 /* vertexStride */, indices);
 }
 
-void Batcher::StartSession(TFlushFn && flusher)
+void Batcher::StartSession(TFlushFn const & flusher)
 {
-  m_flushInterface = std::move(flusher);
+  m_flushInterface = flusher;
 }
 
 void Batcher::EndSession(ref_ptr<GraphicsContext> context)
@@ -314,11 +314,11 @@ Batcher * BatcherFactory::GetNew() const
 }
 
 SessionGuard::SessionGuard(ref_ptr<GraphicsContext> context, Batcher & batcher,
-                           Batcher::TFlushFn && flusher)
+                           Batcher::TFlushFn const & flusher)
   : m_context(context)
   , m_batcher(batcher)
 {
-  m_batcher.StartSession(std::move(flusher));
+  m_batcher.StartSession(flusher);
 }
 
 SessionGuard::~SessionGuard()
diff --git a/drape/batcher.hpp b/drape/batcher.hpp
index 7a0c3cc5e2..0f7f6049f6 100644
--- a/drape/batcher.hpp
+++ b/drape/batcher.hpp
@@ -67,7 +67,7 @@ public:
                              drape_ptr<OverlayHandle> && handle);
 
   using TFlushFn = std::function<void (RenderState const &, drape_ptr<RenderBucket> &&)>;
-  void StartSession(TFlushFn && flusher);
+  void StartSession(TFlushFn const & flusher);
   void EndSession(ref_ptr<GraphicsContext> context);
   void ResetSession();
 
@@ -121,7 +121,7 @@ class SessionGuard
 {
 public:
   SessionGuard(ref_ptr<GraphicsContext> context, Batcher & batcher,
-               Batcher::TFlushFn && flusher);
+               Batcher::TFlushFn const & flusher);
   ~SessionGuard();
 
 private:
diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp
index df9df6f269..fcf3a311fd 100644
--- a/drape/render_bucket.cpp
+++ b/drape/render_bucket.cpp
@@ -36,7 +36,7 @@ drape_ptr<OverlayHandle> RenderBucket::PopOverlayHandle()
   ASSERT(!m_overlay.empty(), ());
   size_t lastElement = m_overlay.size() - 1;
   swap(m_overlay[0], m_overlay[lastElement]);
-  drape_ptr<OverlayHandle> h = std::move(m_overlay[lastElement]);
+  drape_ptr<OverlayHandle> h = move(m_overlay[lastElement]);
   m_overlay.pop_back();
   return h;
 }
@@ -48,7 +48,7 @@ ref_ptr<OverlayHandle> RenderBucket::GetOverlayHandle(size_t index)
 
 void RenderBucket::AddOverlayHandle(drape_ptr<OverlayHandle> && handle)
 {
-  m_overlay.push_back(std::move(handle));
+  m_overlay.push_back(move(handle));
 }
 
 void RenderBucket::BeforeUpdate()
diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp
index 6190fa0298..593cddf4d3 100644
--- a/drape/vertex_array_buffer.cpp
+++ b/drape/vertex_array_buffer.cpp
@@ -302,7 +302,7 @@ ref_ptr<DataBuffer> VertexArrayBuffer::GetOrCreateBuffer(BindingInfo const & bin
     drape_ptr<DataBuffer> dataBuffer =
         make_unique_dp<DataBuffer>(bindingInfo.GetElementSize(), m_dataBufferSize);
     ref_ptr<DataBuffer> result = make_ref(dataBuffer);
-    (*buffers).insert(std::make_pair(bindingInfo, std::move(dataBuffer)));
+    (*buffers).insert(std::make_pair(bindingInfo, move(dataBuffer)));
     return result;
   }
 
diff --git a/drape_frontend/animation/parallel_animation.cpp b/drape_frontend/animation/parallel_animation.cpp
index ead49f9fa4..8595bc29f7 100644
--- a/drape_frontend/animation/parallel_animation.cpp
+++ b/drape_frontend/animation/parallel_animation.cpp
@@ -143,7 +143,7 @@ void ParallelAnimation::AddAnimation(drape_ptr<Animation> && animation)
   SetCouldBeBlended(CouldBeBlended() && animation->CouldBeBlended());
   SetCouldBeRewinded(CouldBeRewinded() && animation->CouldBeRewinded());
 
-  m_animations.emplace_back(std::move(animation));
+  m_animations.emplace_back(move(animation));
   ObtainObjectProperties();
 }
 
diff --git a/drape_frontend/animation/sequence_animation.cpp b/drape_frontend/animation/sequence_animation.cpp
index 6bdda26189..9ad3e672d9 100644
--- a/drape_frontend/animation/sequence_animation.cpp
+++ b/drape_frontend/animation/sequence_animation.cpp
@@ -131,7 +131,7 @@ bool SequenceAnimation::GetTargetProperty(Object object, ObjectProperty property
 
 void SequenceAnimation::AddAnimation(drape_ptr<Animation> && animation)
 {
-  m_animations.emplace_back(std::move(animation));
+  m_animations.emplace_back(move(animation));
   if (m_animations.size() == 1)
     ObtainObjectProperties();
 }
diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp
index a1f835f647..122f111926 100644
--- a/drape_frontend/animation_system.cpp
+++ b/drape_frontend/animation_system.cpp
@@ -221,7 +221,7 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> && animation)
 #ifdef DEBUG_ANIMATIONS
       LOG(LINFO, ("Animation blended"));
 #endif
-      lst.emplace_back(std::move(animation));
+      lst.emplace_back(move(animation));
       if (startImmediately)
         lst.back()->OnStart();
 #ifdef DEBUG_ANIMATIONS
@@ -241,7 +241,7 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> && animation)
     startImmediately = false;
   }
   
-  PushAnimation(std::move(animation));
+  PushAnimation(move(animation));
 }
 
 void AnimationSystem::PushAnimation(drape_ptr<Animation> && animation)
@@ -251,7 +251,7 @@ void AnimationSystem::PushAnimation(drape_ptr<Animation> && animation)
 #endif
 
   auto pList = std::make_shared<TAnimationList>();
-  pList->emplace_back(std::move(animation));
+  pList->emplace_back(move(animation));
 
   bool startImmediately = m_animationChain.empty();
   m_animationChain.push_back(pList);
diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index 1db172551f..bb6c54f5b2 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -842,12 +842,16 @@ void ApplyLineFeatureGeometry::ProcessLineRule(Stylist::TRuleWrapper const & rul
     if (clippedPaths.empty())
       return;
 
-    m2::SmoothPaths(guidePointsForSmooth, 4 /* newPointsPerSegmentCount */, m2::kCentripetalAlpha, clippedPaths);
+    size_t const kExtraPointsPerSegment = 4;
+    m2::SmoothPaths(guidePointsForSmooth, kExtraPointsPerSegment, m2::kCentripetalAlpha,
+                    clippedPaths);
 
     m_clippedSplines.clear();
-    std::function<void (m2::SharedSpline &&)> inserter = base::MakeBackInsertFunctor(m_clippedSplines);
-    for (auto & path : clippedPaths)
-      m2::ClipPathByRect(m_tileRect, std::move(path), inserter);
+    for (auto const & path : clippedPaths)
+    {
+      auto splines = m2::ClipPathByRect(m_tileRect, path);
+      std::move(splines.begin(), splines.end(), std::back_inserter(m_clippedSplines));
+    }
   }
 
   if (m_clippedSplines.empty())
diff --git a/drape_frontend/colored_symbol_shape.cpp b/drape_frontend/colored_symbol_shape.cpp
index c7f254df64..8f1353b32e 100644
--- a/drape_frontend/colored_symbol_shape.cpp
+++ b/drape_frontend/colored_symbol_shape.cpp
@@ -306,7 +306,7 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::
 
   dp::AttributeProvider provider(1, static_cast<uint32_t>(buffer.size()));
   provider.InitStream(0, gpu::ColoredSymbolVertex::GetBindingInfo(), make_ref(buffer.data()));
-  batcher->InsertTriangleList(context, state, make_ref(&provider), std::move(handle));
+  batcher->InsertTriangleList(context, state, make_ref(&provider), move(handle));
 }
 
 uint64_t ColoredSymbolShape::GetOverlayPriority() const
diff --git a/drape_frontend/drape_api_builder.cpp b/drape_frontend/drape_api_builder.cpp
index bc4ee0b46d..d9ecaf80bf 100644
--- a/drape_frontend/drape_api_builder.cpp
+++ b/drape_frontend/drape_api_builder.cpp
@@ -34,7 +34,7 @@ void BuildText(ref_ptr<dp::GraphicsContext> context, std::string const & str,
 namespace df
 {
 void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
-                                 DrapeApi::TLines & lines, ref_ptr<dp::TextureManager> textures,
+                                 DrapeApi::TLines const & lines, ref_ptr<dp::TextureManager> textures,
                                  std::vector<drape_ptr<DrapeApiRenderProperty>> & properties)
 {
   properties.reserve(lines.size());
@@ -43,16 +43,10 @@ void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
   uint32_t constexpr kFontSize = 14;
   FeatureID fakeFeature;
 
-  for (auto & line : lines)
+  for (auto const & line : lines)
   {
-    std::string const & id = line.first;
-
-    DrapeApiLineData & data = line.second;
-    base::Unique(data.m_points, [](m2::PointD const & p1, m2::PointD const & p2)
-    {
-      return p1.EqualDxDy(p2, kMwmPointAccuracy);
-    });
-
+    std::string id = line.first;
+    DrapeApiLineData const & data = line.second;
     m2::RectD rect;
     for (auto const & p : data.m_points)
       rect.Add(p);
@@ -62,8 +56,8 @@ void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
     auto property = make_unique_dp<DrapeApiRenderProperty>();
     property->m_center = rect.Center();
     {
-      dp::SessionGuard guard(context, batcher, [&property, &id](dp::RenderState const & state,
-                                                                drape_ptr<dp::RenderBucket> && b)
+      dp::SessionGuard guard(context, batcher, [&property, id](dp::RenderState const & state,
+                                                               drape_ptr<dp::RenderBucket> && b)
       {
         property->m_id = id;
         property->m_buckets.emplace_back(state, std::move(b));
diff --git a/drape_frontend/drape_api_builder.hpp b/drape_frontend/drape_api_builder.hpp
index eac3d477c8..4de290782e 100644
--- a/drape_frontend/drape_api_builder.hpp
+++ b/drape_frontend/drape_api_builder.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "drape_frontend/drape_api.hpp"
+#include "drape_frontend/render_state_extension.hpp"
 
 #include "drape/render_bucket.hpp"
-#include "drape/render_state.hpp"
 #include "drape/texture_manager.hpp"
 
 #include <string>
@@ -22,7 +22,7 @@ struct DrapeApiRenderProperty
 class DrapeApiBuilder
 {
 public:
-  void BuildLines(ref_ptr<dp::GraphicsContext> context, DrapeApi::TLines & lines,
+  void BuildLines(ref_ptr<dp::GraphicsContext> context, DrapeApi::TLines const & lines,
                   ref_ptr<dp::TextureManager> textures,
                   std::vector<drape_ptr<DrapeApiRenderProperty>> & properties);
 };
diff --git a/drape_frontend/drape_api_renderer.cpp b/drape_frontend/drape_api_renderer.cpp
index 309d8c2f52..e37a63fda4 100644
--- a/drape_frontend/drape_api_renderer.cpp
+++ b/drape_frontend/drape_api_renderer.cpp
@@ -18,7 +18,7 @@ void DrapeApiRenderer::AddRenderProperties(
 
   size_t const startIndex = m_properties.size();
   m_properties.reserve(m_properties.size() + properties.size());
-  std::move(properties.begin(), properties.end(), std::back_inserter(m_properties));
+  move(properties.begin(), properties.end(), std::back_inserter(m_properties));
   for (size_t i = startIndex; i < m_properties.size(); i++)
   {
     for (auto const & bucket : m_properties[i]->m_buckets)
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 0efc5b251b..68cac0ede2 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -868,9 +868,11 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
     {
       ref_ptr<EnableTransitSchemeMessage > msg = message;
       m_transitSchemeEnabled = msg->IsEnabled();
-      // Enabling anti aliasing destroys performance on some Android devices
-      // Jagged lines on subway lines are only visible on low density screens
-      // so we don't enable it here
+#ifndef OMIM_OS_IPHONE_SIMULATOR
+      CHECK(m_context != nullptr, ());
+      m_postprocessRenderer->SetEffectEnabled(m_context, PostprocessRenderer::Effect::Antialiasing,
+                                              msg->IsEnabled() || m_isAntialiasingEnabled);
+#endif
       if (!msg->IsEnabled())
         m_transitSchemeRenderer->ClearContextDependentResources(make_ref(m_overlayTree));
       break;
@@ -978,7 +980,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
   case Message::Type::SetPosteffectEnabled:
     {
       ref_ptr<SetPosteffectEnabledMessage> msg = message;
-      // Enabling anti aliasing destroys performance on some Android devices
+      if (msg->GetEffect() == PostprocessRenderer::Effect::Antialiasing)
+        m_isAntialiasingEnabled = msg->IsEnabled();
 #ifndef OMIM_OS_IPHONE_SIMULATOR
       CHECK(m_context != nullptr, ());
       m_postprocessRenderer->SetEffectEnabled(m_context, msg->GetEffect(), msg->IsEnabled());
@@ -1202,7 +1205,7 @@ void FrontendRenderer::AddToRenderGroup(dp::RenderState const & state,
   drape_ptr<TRenderGroup> group = make_unique_dp<TRenderGroup>(state, newTile);
   group->AddBucket(std::move(renderBucket));
 
-  layer.m_renderGroups.push_back(std::move(group));
+  layer.m_renderGroups.push_back(move(group));
   layer.m_isDirty = true;
 }
 
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index 3c95763968..40575c685b 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -399,6 +399,7 @@ private:
   bool m_forceUpdateScene;
   bool m_forceUpdateUserMarks;
 
+  bool m_isAntialiasingEnabled = false;
   drape_ptr<PostprocessRenderer> m_postprocessRenderer;
   std::vector<PostprocessRenderer::Effect> m_enabledOnStartEffects;
 
diff --git a/drape_frontend/gui/gui_text.cpp b/drape_frontend/gui/gui_text.cpp
index 99c29ded9e..6007dde253 100644
--- a/drape_frontend/gui/gui_text.cpp
+++ b/drape_frontend/gui/gui_text.cpp
@@ -306,7 +306,9 @@ ref_ptr<dp::Texture> MutableLabel::SetAlphabet(std::string const & alphabet,
                                                ref_ptr<dp::TextureManager> mng)
 {
   strings::UniString str = strings::MakeUniString(alphabet + ".");
-  base::SortUnique(str);
+  std::sort(str.begin(), str.end());
+  strings::UniString::iterator it = std::unique(str.begin(), str.end());
+  str.resize(std::distance(str.begin(), it));
 
   dp::TextureManager::TGlyphsBuffer buffer;
   mng->GetGlyphRegions(str, dp::GlyphManager::kDynamicGlyphSize, buffer);
@@ -547,7 +549,7 @@ void MutableLabelHandle::SetContent(std::string const & content)
 
 m2::PointF MutableLabelDrawer::Draw(ref_ptr<dp::GraphicsContext> context, Params const & params,
                                     ref_ptr<dp::TextureManager> mng,
-                                    dp::Batcher::TFlushFn && flushFn)
+                                    dp::Batcher::TFlushFn const & flushFn)
 {
   uint32_t vertexCount = dp::Batcher::VertexPerQuad * params.m_maxLength;
   uint32_t indexCount = dp::Batcher::IndexPerQuad * params.m_maxLength;
@@ -579,9 +581,9 @@ m2::PointF MutableLabelDrawer::Draw(ref_ptr<dp::GraphicsContext> context, Params
   {
     dp::Batcher batcher(indexCount, vertexCount);
     batcher.SetBatcherHash(static_cast<uint64_t>(df::BatcherBucket::Default));
-    dp::SessionGuard guard(context, batcher, std::move(flushFn));
+    dp::SessionGuard guard(context, batcher, flushFn);
     batcher.InsertListOfStrip(context, staticData.m_state, make_ref(&provider),
-                              std::move(handle), dp::Batcher::VertexPerQuad);
+                              move(handle), dp::Batcher::VertexPerQuad);
   }
 
   return staticData.m_maxPixelSize;
diff --git a/drape_frontend/gui/gui_text.hpp b/drape_frontend/gui/gui_text.hpp
index c01b34de8d..71680e28d8 100644
--- a/drape_frontend/gui/gui_text.hpp
+++ b/drape_frontend/gui/gui_text.hpp
@@ -1,12 +1,14 @@
 #pragma once
 
 #include "drape_frontend/gui/shape.hpp"
+#include "drape_frontend/render_state_extension.hpp"
 
 #include "drape/binding_info.hpp"
 #include "drape/drape_global.hpp"
 #include "drape/glsl_types.hpp"
 #include "drape/texture_manager.hpp"
 
+#include <cstdint>
 #include <functional>
 #include <string>
 #include <unordered_set>
@@ -186,7 +188,7 @@ public:
 
   // Return maximum pixel size.
   static m2::PointF Draw(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                         ref_ptr<dp::TextureManager> mng, dp::Batcher::TFlushFn && flushFn);
+                         ref_ptr<dp::TextureManager> mng, dp::Batcher::TFlushFn const & flushFn);
 };
 
 class StaticLabelHandle : public Handle
diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp
index 65b9e1e027..5b7bfd7203 100644
--- a/drape_frontend/line_shape.cpp
+++ b/drape_frontend/line_shape.cpp
@@ -523,7 +523,7 @@ void LineShape::Prepare(ref_ptr<dp::TextureManager> textures) const
 
       auto builder = std::make_unique<SimpleSolidLineBuilder>(p, m_spline->GetPath().size(), lineWidth);
       Construct<SimpleSolidLineBuilder>(*builder);
-      m_lineShapeInfo = std::move(builder);
+      m_lineShapeInfo = move(builder);
     }
     else
     {
@@ -532,7 +532,7 @@ void LineShape::Prepare(ref_ptr<dp::TextureManager> textures) const
 
       auto builder = std::make_unique<SolidLineBuilder>(p, m_spline->GetPath().size());
       Construct<SolidLineBuilder>(*builder);
-      m_lineShapeInfo = std::move(builder);
+      m_lineShapeInfo = move(builder);
     }
   }
   else
@@ -548,7 +548,7 @@ void LineShape::Prepare(ref_ptr<dp::TextureManager> textures) const
 
     auto builder = std::make_unique<DashedLineBuilder>(p, m_spline->GetPath().size());
     Construct<DashedLineBuilder>(*builder);
-    m_lineShapeInfo = std::move(builder);
+    m_lineShapeInfo = move(builder);
   }
 }
 
diff --git a/drape_frontend/map_shape.hpp b/drape_frontend/map_shape.hpp
index af669c809f..41d4dca9ef 100644
--- a/drape_frontend/map_shape.hpp
+++ b/drape_frontend/map_shape.hpp
@@ -82,7 +82,7 @@ class MapShapeReadedMessage : public MapShapeMessage
 {
 public:
   MapShapeReadedMessage(TileKey const & key, TMapShapes && shapes)
-    : MapShapeMessage(key), m_shapes(std::move(shapes))
+    : MapShapeMessage(key), m_shapes(move(shapes))
   {}
 
   Type GetType() const override { return Type::MapShapeReaded; }
@@ -97,7 +97,7 @@ class OverlayMapShapeReadedMessage : public MapShapeReadedMessage
 {
 public:
   OverlayMapShapeReadedMessage(TileKey const & key, TMapShapes && shapes)
-    : MapShapeReadedMessage(key, std::move(shapes))
+    : MapShapeReadedMessage(key, move(shapes))
   {}
 
   Type GetType() const override { return Message::Type::OverlayMapShapeReaded; }
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index 1620dce98c..059ceff4f4 100644
--- a/drape_frontend/message_subclasses.hpp
+++ b/drape_frontend/message_subclasses.hpp
@@ -1198,7 +1198,7 @@ public:
 
   Type GetType() const override { return Type::DrapeApiAddLines; }
 
-  DrapeApi::TLines & GetLines() { return m_lines; }
+  DrapeApi::TLines const & GetLines() const { return m_lines; }
 
 private:
   DrapeApi::TLines m_lines;
diff --git a/drape_frontend/requested_tiles.cpp b/drape_frontend/requested_tiles.cpp
index 9341d2b96d..5717cf3e68 100755
--- a/drape_frontend/requested_tiles.cpp
+++ b/drape_frontend/requested_tiles.cpp
@@ -6,7 +6,7 @@ void RequestedTiles::Set(ScreenBase const & screen, bool have3dBuildings, bool f
                          bool forceUserMarksRequest, TTilesCollection && tiles)
 {
   std::lock_guard<std::mutex> lock(m_mutex);
-  m_tiles = std::move(tiles);
+  m_tiles = move(tiles);
   m_screen = screen;
   m_have3dBuildings = have3dBuildings;
   m_forceRequest = forceRequest;
diff --git a/drape_frontend/route_renderer.cpp b/drape_frontend/route_renderer.cpp
index 86cd564b66..8c486c25f3 100644
--- a/drape_frontend/route_renderer.cpp
+++ b/drape_frontend/route_renderer.cpp
@@ -19,10 +19,8 @@ std::string const kRoutePedestrian = "RoutePedestrian";
 std::string const kRouteBicycle = "RouteBicycle";
 std::string const kRoutePreview = "RoutePreview";
 std::string const kRouteMaskCar = "RouteMaskCar";
-std::string const kRouteFirstSegmentArrowsMaskCar = "RouteFirstSegmentArrowsMaskCar";
 std::string const kRouteArrowsMaskCar = "RouteArrowsMaskCar";
 std::string const kRouteMaskBicycle = "RouteMaskBicycle";
-std::string const kRouteFirstSegmentArrowsMaskBicycle = "RouteFirstSegmentArrowsMaskBicycle";
 std::string const kRouteArrowsMaskBicycle = "RouteArrowsMaskBicycle";
 std::string const kRouteMaskPedestrian = "RouteMaskPedestrian";
 std::string const kTransitStopInnerMarkerColor = "TransitStopInnerMarker";
@@ -385,43 +383,19 @@ CirclesPackHandle * RouteRenderer::GetPreviewHandle(size_t & index)
   return nullptr;
 }
 
-// Route mask is used to adjust line color for subroutes after the first stop. So subroute to the first stop
-// point has default color, while subsequent subroutes color is adjusted with RouteArrowsMaskCar,
-// RouteArrowsMaskBicycle and RouteMaskPedestrian properties.
-dp::Color RouteRenderer::GetRouteMaskColor(RouteType routeType, double baseDistance) const
+dp::Color RouteRenderer::GetMaskColor(RouteType routeType, double baseDistance,
+                                      bool arrows) const
 {
   if (baseDistance != 0.0 && m_distanceFromBegin < baseDistance)
   {
     if (routeType == RouteType::Car)
-      return GetColorConstant(kRouteMaskCar);
+      return GetColorConstant(arrows ? kRouteArrowsMaskCar : kRouteMaskCar);
     if (routeType == RouteType::Bicycle)
-      return GetColorConstant(kRouteMaskBicycle);
+      return GetColorConstant(arrows ? kRouteArrowsMaskBicycle : kRouteMaskBicycle);
     if (routeType == RouteType::Pedestrian)
       return GetColorConstant(kRouteMaskPedestrian);
   }
-  return dp::Color::Transparent();
-}
-
-// Arrow mask is used to adjust route arrow color. First subroute arrows color is defined
-// by RouteFirstSegmentArrowsMaskCar and RouteFirstSegmentArrowsMaskBicycle properties.
-// All following subroutes have arrow color defined by RouteArrowsMaskCar, RouteArrowsMaskBicycle.
-dp::Color RouteRenderer::GetArrowMaskColor(RouteType routeType, double baseDistance) const
-{
-  if (baseDistance == 0.0)
-  {
-    if (routeType == RouteType::Car)
-      return GetColorConstant(kRouteFirstSegmentArrowsMaskCar);
-    if (routeType == RouteType::Bicycle)
-      return GetColorConstant(kRouteFirstSegmentArrowsMaskBicycle);
-  }
-  else if (m_distanceFromBegin < baseDistance)
-  {
-    if (routeType == RouteType::Car)
-      return GetColorConstant(kRouteArrowsMaskCar);
-    if (routeType == RouteType::Bicycle)
-      return GetColorConstant(kRouteArrowsMaskBicycle);
-  }
-  return dp::Color::Transparent();
+  return {0, 0, 0, 0};
 }
 
 void RouteRenderer::RenderSubroute(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
@@ -459,11 +433,9 @@ void RouteRenderer::RenderSubroute(ref_ptr<dp::GraphicsContext> context, ref_ptr
   params.m_modelView = glsl::make_mat4(mv.m_data);
   params.m_color = glsl::ToVec4(df::GetColorConstant(style.m_color));
   params.m_routeParams = glsl::vec4(currentHalfWidth, screenHalfWidth, dist, trafficShown ? 1.0f : 0.0f);
-
-  // Adjust line color depending on route type and subroute distance. After the first stop point
-  // route color is adjusted according to RouteMaskCar, RouteMaskBicycle or RouteMaskPedestrian properties.
-  params.m_maskColor = glsl::ToVec4(GetRouteMaskColor(subrouteData->m_subroute->m_routeType,
-                                                      subrouteData->m_subroute->m_baseDistance));
+  params.m_maskColor = glsl::ToVec4(GetMaskColor(subrouteData->m_subroute->m_routeType,
+                                                 subrouteData->m_subroute->m_baseDistance,
+                                                 false /* arrows */));
   if (style.m_pattern.m_isDashed)
   {
     params.m_pattern = glsl::vec2(static_cast<float>(screenHalfWidth * style.m_pattern.m_dashLength),
@@ -518,9 +490,9 @@ void RouteRenderer::RenderSubrouteArrows(ref_ptr<dp::GraphicsContext> context, r
   auto const arrowHalfWidth = static_cast<float>(currentHalfWidth * kArrowHeightFactor);
   params.m_arrowHalfWidth = arrowHalfWidth;
 
-  // Adjust arrow color depending on route type and subroute distance
-  params.m_maskColor = glsl::ToVec4(GetArrowMaskColor(subrouteInfo.m_subroute->m_routeType,
-                                                      subrouteInfo.m_subroute->m_baseDistance));
+  params.m_maskColor = glsl::ToVec4(GetMaskColor(subrouteInfo.m_subroute->m_routeType,
+                                                 subrouteInfo.m_subroute->m_baseDistance,
+                                                 true /* arrows */));
 
   ref_ptr<dp::GpuProgram> prg = mng->GetProgram(gpu::Program::RouteArrow);
   prg->Bind();
@@ -565,10 +537,9 @@ void RouteRenderer::RenderSubrouteMarkers(ref_ptr<dp::GraphicsContext> context,
   params.m_angleCosSin = glsl::vec2(static_cast<float>(cos(screen.GetAngle())),
                                     static_cast<float>(sin(screen.GetAngle())));
 
-  // Adjust color depending on route type and subroute distance. After the first stop point
-  // marker color is adjusted according to RouteMaskCar, RouteMaskBicycle or RouteMaskPedestrian properties.
-  params.m_maskColor = glsl::ToVec4(GetRouteMaskColor(subrouteInfo.m_subroute->m_routeType,
-                                                      subrouteInfo.m_subroute->m_baseDistance));
+  params.m_maskColor = glsl::ToVec4(GetMaskColor(subrouteInfo.m_subroute->m_routeType,
+                                                 subrouteInfo.m_subroute->m_baseDistance,
+                                                 false /* arrows */));
 
   ref_ptr<dp::GpuProgram> prg = mng->GetProgram(gpu::Program::RouteMarker);
   prg->Bind();
diff --git a/drape_frontend/route_renderer.hpp b/drape_frontend/route_renderer.hpp
index 5a1b2ab7ce..c2e83cd757 100644
--- a/drape_frontend/route_renderer.hpp
+++ b/drape_frontend/route_renderer.hpp
@@ -115,8 +115,7 @@ private:
                          ScreenBase const & screen, FrameValues const & frameValues);
   void ClearPreviewHandles();
   CirclesPackHandle * GetPreviewHandle(size_t & index);
-  dp::Color GetRouteMaskColor(RouteType routeType, double baseDistance) const;
-  dp::Color GetArrowMaskColor(RouteType routeType, double baseDistance) const;
+  dp::Color GetMaskColor(RouteType routeType, double baseDistance, bool arrows) const;
 
   double m_distanceFromBegin;
   bool m_followingEnabled;
diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp
index a44366c093..2635527b2c 100644
--- a/drape_frontend/rule_drawer.cpp
+++ b/drape_frontend/rule_drawer.cpp
@@ -263,7 +263,7 @@ void RuleDrawer::ProcessAreaStyle(FeatureType & f, Stylist const & s,
     // Looks like nonsense, but there are some osm objects with types
     // highway-path-bridge and building (sic!) at the same time (pedestrian crossing).
     isBuilding = (isPart || IsBuildingChecker::Instance()(types)) &&
-                  !IsBridgeOrTunnelChecker::Instance()(types);
+                  !IsBridgeChecker::Instance()(types) && !IsTunnelChecker::Instance()(types);
 
     isBuildingOutline = isBuilding && hasParts && !isPart;
     is3dBuilding = m_context->Is3dBuildingsEnabled() && (isBuilding && !isBuildingOutline);
@@ -396,12 +396,12 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s,
       if (find(classes.begin(), classes.end(), highwayClass) != classes.end() &&
           zoomLevel >= checkers[i].m_zoomLevel)
       {
-        // Need reset, because (possible) simplified geometry was cached before.
-        f.ResetGeometry();
         std::vector<m2::PointD> points;
-        assign_range(points, f.GetPoints(FeatureType::BEST_GEOMETRY));
-
-        ExtractTrafficGeometry(f, checkers[i].m_roadClass, m2::PolylineD(std::move(points)), oneWay,
+        points.reserve(f.GetPointsCount());
+        f.ResetGeometry();
+        f.ForEachPoint([&points](m2::PointD const & p) { points.emplace_back(p); },
+                       FeatureType::BEST_GEOMETRY);
+        ExtractTrafficGeometry(f, checkers[i].m_roadClass, m2::PolylineD(points), oneWay,
                                zoomLevel, m_trafficScalePtoG, m_trafficGeometry);
         break;
       }
diff --git a/drape_frontend/screen_animations.cpp b/drape_frontend/screen_animations.cpp
index e2c15f74aa..50e3b36e57 100644
--- a/drape_frontend/screen_animations.cpp
+++ b/drape_frontend/screen_animations.cpp
@@ -54,9 +54,9 @@ drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen, d
   zoomInAnim->SetScale(startScale * scaleFactor, endScale);
   zoomInAnim->SetMaxDuration(kMaxAnimationTimeSec * 0.5);
 
-  sequenceAnim->AddAnimation(std::move(zoomOutAnim));
-  sequenceAnim->AddAnimation(std::move(moveAnim));
-  sequenceAnim->AddAnimation(std::move(zoomInAnim));
+  sequenceAnim->AddAnimation(move(zoomOutAnim));
+  sequenceAnim->AddAnimation(move(moveAnim));
+  sequenceAnim->AddAnimation(move(zoomInAnim));
   return sequenceAnim;
 }
 
@@ -86,21 +86,21 @@ drape_ptr<SequenceAnimation> GetPrettyFollowAnimation(ScreenBase const & startSc
     auto zoomOutAnim = make_unique_dp<MapLinearAnimation>();
     zoomOutAnim->SetScale(startScreen.GetScale(), tmp.GetScale());
     zoomOutAnim->SetMaxDuration(kMaxAnimationTimeSec * 0.5);
-    sequenceAnim->AddAnimation(std::move(zoomOutAnim));
+    sequenceAnim->AddAnimation(move(zoomOutAnim));
 
     tmp.MatchGandP3d(userPos, viewportRect.Center());
 
     auto moveAnim = make_unique_dp<MapLinearAnimation>();
     moveAnim->SetMove(startScreen.GetOrg(), tmp.GetOrg(), viewportRect, tmp.GetScale());
     moveAnim->SetMaxDuration(kMaxAnimationTimeSec);
-    sequenceAnim->AddAnimation(std::move(moveAnim));
+    sequenceAnim->AddAnimation(move(moveAnim));
   }
 
   auto followAnim = make_unique_dp<MapFollowAnimation>(tmp, userPos, endPixelPos,
                                                        targetScale, targetAngle,
                                                        false /* isAutoZoom */);
   followAnim->SetMaxDuration(kMaxAnimationTimeSec * 0.5);
-  sequenceAnim->AddAnimation(std::move(followAnim));
+  sequenceAnim->AddAnimation(move(followAnim));
   return sequenceAnim;
 }
 
diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp
index 0ba4e0f6e4..2a1be9e19d 100644
--- a/drape_frontend/stylist.cpp
+++ b/drape_frontend/stylist.cpp
@@ -51,6 +51,8 @@ inline drule::rule_type_t Convert(Type t)
   }
 }
 
+float constexpr kMinPriority = std::numeric_limits<float>::lowest();
+
 inline bool IsTypeOf(drule::Key const & key, int flags)
 {
   int currentFlag = Line;
@@ -211,6 +213,7 @@ void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int const zoom
   if (m_mainText.size() > kMaxTextSize)
     m_mainText = m_mainText.substr(0, kMaxTextSize) + "...";
 
+  m_roadNumber = f.GetRoadNumber();
   m_houseNumber = f.GetHouseNumber();
 
   ProcessZoomLevel(zoomLevel);
@@ -227,6 +230,11 @@ std::string const & CaptionDescription::GetAuxText() const
   return m_auxText;
 }
 
+std::string const & CaptionDescription::GetRoadNumber() const
+{
+  return m_roadNumber;
+}
+
 bool CaptionDescription::IsNameExists() const
 {
   return !m_mainText.empty() || !m_houseNumber.empty();
diff --git a/drape_frontend/stylist.hpp b/drape_frontend/stylist.hpp
index 8354cdb02b..f239e68673 100644
--- a/drape_frontend/stylist.hpp
+++ b/drape_frontend/stylist.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "indexer/feature_data.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/drawing_rule_def.hpp"
 
@@ -30,6 +31,7 @@ struct CaptionDescription
 
   std::string const & GetMainText() const;
   std::string const & GetAuxText() const;
+  std::string const & GetRoadNumber() const;
   bool IsNameExists() const;
   bool IsHouseNumberInMainText() const { return m_isHouseNumberInMainText; }
 
@@ -41,6 +43,7 @@ private:
 
   std::string m_mainText;
   std::string m_auxText;
+  std::string m_roadNumber;
   std::string m_houseNumber;
   bool m_isHouseNumberInMainText = false;
 };
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 96f97a7600..ecd17748dc 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -357,7 +357,7 @@ bool UserEventStream::OnSetScale(ref_ptr<ScaleEvent> scaleEvent)
         m_listener->OnAnimatedScaleEnded();
     });
 
-    m_animationSystem.CombineAnimation(std::move(anim));
+    m_animationSystem.CombineAnimation(move(anim));
     return false;
   }
 
@@ -558,12 +558,12 @@ bool UserEventStream::SetScreen(ScreenBase const & endScreen, bool isAnim,
         drape_ptr<ParallelAnimation> parallelAnim = make_unique_dp<ParallelAnimation>();
         parallelAnim->SetCustomType(kParallelLinearAnim);
         parallelAnim->AddAnimation(parallelAnimCreator(nullptr /* syncAnim */));
-        parallelAnim->AddAnimation(std::move(anim));
-        m_animationSystem.CombineAnimation(std::move(parallelAnim));
+        parallelAnim->AddAnimation(move(anim));
+        m_animationSystem.CombineAnimation(move(parallelAnim));
       }
       else
       {
-        m_animationSystem.CombineAnimation(std::move(anim));
+        m_animationSystem.CombineAnimation(move(anim));
       }
       return false;
     }
@@ -653,12 +653,12 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
       parallelAnim->SetCustomType(kParallelFollowAnim);
       parallelAnim->AddAnimation(parallelAnimCreator(anim->GetType() == Animation::Type::MapFollow ? make_ref(anim)
                                                                                                    : nullptr));
-      parallelAnim->AddAnimation(std::move(anim));
-      m_animationSystem.CombineAnimation(std::move(parallelAnim));
+      parallelAnim->AddAnimation(move(anim));
+      m_animationSystem.CombineAnimation(move(parallelAnim));
     }
     else
     {
-      m_animationSystem.CombineAnimation(std::move(anim));
+      m_animationSystem.CombineAnimation(move(anim));
     }
     return false;
   }
@@ -1078,7 +1078,7 @@ bool UserEventStream::EndDrag(Touch const & t, bool cancelled)
   {
     drape_ptr<Animation> anim = m_scroller.CreateKineticAnimation(m_navigator.Screen());
     if (anim != nullptr)
-      m_animationSystem.CombineAnimation(std::move(anim));
+      m_animationSystem.CombineAnimation(move(anim));
     return false;
   }
 
diff --git a/editor/edits_migration.cpp b/editor/edits_migration.cpp
index 5279444126..c1465a731c 100644
--- a/editor/edits_migration.cpp
+++ b/editor/edits_migration.cpp
@@ -62,14 +62,12 @@ FeatureID MigrateWayOrRelatonFeatureIndex(
   // This can be any point on a feature.
   auto const someFeaturePoint = geometry[0];
 
-  forEach([&fid, &geometry, &count, &bestScore](FeatureType & ft)
-      {
+  forEach(
+      [&fid, &geometry, &count, &bestScore](FeatureType & ft) {
         if (ft.GetGeomType() != feature::GeomType::Area)
           return;
         ++count;
-
-        std::vector<m2::PointD> ftGeometry;
-        assign_range(ftGeometry, ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY));
+        auto ftGeometry = ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY);
 
         double score = 0.0;
         try
diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 0cf46907a9..4a178c957a 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -776,10 +776,10 @@ void Editor::UploadChanges(string const & key, string const & secret, ChangesetT
   if (!m_isUploadingNow)
   {
     m_isUploadingNow = true;
-    GetPlatform().RunTask(Platform::Thread::Network, [upload = std::move(upload), key, secret,
-                                                      tags = std::move(tags), callback = std::move(callback)]()
+    GetPlatform().RunTask(Platform::Thread::Network, [upload = move(upload), key, secret,
+                                                      tags = move(tags), callback = move(callback)]()
     {
-      upload(std::move(key), std::move(secret), std::move(tags), std::move(callback));
+      upload(move(key), move(secret), move(tags), move(callback));
     });
   }
 }
@@ -1108,7 +1108,7 @@ void Editor::ForEachFeatureAtPoint(FeatureTypeFn && fn, m2::PointD const & point
     LOG(LERROR, ("Can't load features in point's vicinity, delegate is not set."));
     return;
   }
-  m_delegate->ForEachFeatureAtPoint(std::move(fn), point);
+  m_delegate->ForEachFeatureAtPoint(move(fn), point);
 }
 
 FeatureID Editor::GetFeatureIdByXmlFeature(FeaturesContainer const & features,
@@ -1116,7 +1116,7 @@ FeatureID Editor::GetFeatureIdByXmlFeature(FeaturesContainer const & features,
                                            FeatureStatus status, bool needMigrate) const
 {
   ForEachFeaturesNearByFn forEach = [this](FeatureTypeFn && fn, m2::PointD const & point) {
-    return ForEachFeatureAtPoint(std::move(fn), point);
+    return ForEachFeatureAtPoint(move(fn), point);
   };
 
   // TODO(mgsergio): Deleted features are not properly handled yet.
@@ -1156,7 +1156,7 @@ void Editor::LoadMwmEdits(FeaturesContainer & loadedFeatures, xml_node const & m
 
         logHelper.OnStatus(section.m_status);
 
-        loadedFeatures[fid.m_mwmId].emplace(fid.m_index, std::move(fti));
+        loadedFeatures[fid.m_mwmId].emplace(fid.m_index, move(fti));
       }
       catch (editor::XMLFeatureError const & ex)
       {
diff --git a/editor/xml_feature.cpp b/editor/xml_feature.cpp
index 4aa50d3446..51021c8376 100644
--- a/editor/xml_feature.cpp
+++ b/editor/xml_feature.cpp
@@ -43,7 +43,6 @@ constexpr char const * kNodeType = "node";
 constexpr char const * kWayType = "way";
 constexpr char const * kRelationType = "relation";
 
-string_view constexpr kColon = ":";
 
 pugi::xml_node FindTag(pugi::xml_document const & document, string_view k)
 {
@@ -245,22 +244,26 @@ std::vector<m2::PointD> XMLFeature::GetGeometry() const
   return geometry;
 }
 
-string XMLFeature::GetName(std::string_view lang) const
+string XMLFeature::GetName(string const & lang) const
 {
-  ASSERT_EQUAL(kDefaultLang, StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kDefaultCode), ());
-  ASSERT_EQUAL(kIntlLang, StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kInternationalCode), ());
-  ASSERT_EQUAL(kAltLang, StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kAltNameCode), ());
-  ASSERT_EQUAL(kOldLang, StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kOldNameCode), ());
+  using std::string;
+  ASSERT_EQUAL(string(kDefaultLang),
+               string(StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kDefaultCode)), ());
+  ASSERT_EQUAL(string(kIntlLang),
+               string(StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kInternationalCode)),
+               ());
+  ASSERT_EQUAL(string(kAltLang),
+               string(StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kAltNameCode)), ());
+  ASSERT_EQUAL(string(kOldLang),
+               string(StringUtf8Multilang::GetLangByCode(StringUtf8Multilang::kOldNameCode)), ());
   if (lang == kIntlLang)
     return GetTagValue(kIntlName);
   if (lang == kAltLang)
     return GetTagValue(kAltName);
   if (lang == kOldLang)
     return GetTagValue(kOldName);
-  if (lang == kDefaultLang || lang.empty())
-    return GetTagValue(kDefaultName);
-  return GetTagValue(std::string{kDefaultName}.append(kColon).append(lang));
-  //return GetTagValue(suffix.insert(0, kDefaultName));
+  auto const suffix = (lang == kDefaultLang || lang.empty()) ? "" : ":" + lang;
+  return GetTagValue(kDefaultName + suffix);
 }
 
 string XMLFeature::GetName(uint8_t const langCode) const
@@ -290,7 +293,9 @@ void XMLFeature::SetName(string_view lang, string_view name)
   }
   else
   {
-    SetTagValue(std::string{kDefaultName}.append(kColon).append(lang), name);
+    string key = kDefaultName;
+    key.append(":").append(lang);
+    SetTagValue(key, name);
   }
 }
 
diff --git a/editor/xml_feature.hpp b/editor/xml_feature.hpp
index ccaebbc893..a3421a2be2 100644
--- a/editor/xml_feature.hpp
+++ b/editor/xml_feature.hpp
@@ -30,15 +30,15 @@ DECLARE_EXCEPTION(NoHeader, XMLFeatureError);
 
 class XMLFeature
 {
-  static constexpr std::string_view kDefaultName = "name";
-  static constexpr std::string_view kLocalName = "name:";
-  static constexpr std::string_view kIntlName = "int_name";
-  static constexpr std::string_view kAltName = "alt_name";
-  static constexpr std::string_view kOldName = "old_name";
-  static constexpr std::string_view kDefaultLang = "default";
-  static constexpr std::string_view kIntlLang = kIntlName;
-  static constexpr std::string_view kAltLang = kAltName;
-  static constexpr std::string_view kOldLang = kOldName;
+  static constexpr char const * kDefaultName = "name";
+  static constexpr char const * kLocalName = "name:";
+  static constexpr char const * kIntlName = "int_name";
+  static constexpr char const * kAltName = "alt_name";
+  static constexpr char const * kOldName = "old_name";
+  static constexpr char const * kDefaultLang = "default";
+  static constexpr char const * kIntlLang = kIntlName;
+  static constexpr char const * kAltLang = kAltName;
+  static constexpr char const * kOldLang = kOldName;
 
 public:
   // Used in point to string serialization.
@@ -108,13 +108,13 @@ public:
     SetGeometry(begin(geometry), end(geometry));
   }
 
-  std::string GetName(std::string_view lang) const;
+  std::string GetName(std::string const & lang) const;
   std::string GetName(uint8_t const langCode = StringUtf8Multilang::kDefaultCode) const;
 
   template <typename Fn>
   void ForEachName(Fn && func) const
   {
-    size_t const kPrefixLen = kLocalName.size();
+    size_t const kPrefixLen = strlen(kLocalName);
 
     for (auto const & tag : GetRootNode().select_nodes("tag"))
     {
diff --git a/ge0/parser.cpp b/ge0/parser.cpp
index 6b7dab7656..ba48718a65 100644
--- a/ge0/parser.cpp
+++ b/ge0/parser.cpp
@@ -13,6 +13,8 @@
 #include <algorithm>
 #include <sstream>
 
+using namespace std;
+
 namespace ge0
 {
 Ge0Parser::Ge0Parser()
@@ -26,7 +28,7 @@ Ge0Parser::Ge0Parser()
   }
 }
 
-bool Ge0Parser::Parse(std::string const & url, Result & result)
+bool Ge0Parser::Parse(string const & url, Result & result)
 {
   // Original URL format:
   //
@@ -50,7 +52,7 @@ bool Ge0Parser::Parse(std::string const & url, Result & result)
   return false;
 }
 
-bool Ge0Parser::ParseAfterPrefix(std::string const & url, size_t from, Result & result)
+bool Ge0Parser::ParseAfterPrefix(string const & url, size_t from, Result & result)
 {
   size_t const kEncodedZoomAndCoordinatesLength = 10;
   if (url.size() < from + kEncodedZoomAndCoordinatesLength)
@@ -79,7 +81,7 @@ bool Ge0Parser::ParseAfterPrefix(std::string const & url, size_t from, Result &
     CHECK_GREATER(posName, 0, ());
     if (url[posName - 1] != '/')
       return false;
-    result.m_name = DecodeName(url.substr(posName, std::min(url.size() - posName, kMaxNameLength)));
+    result.m_name = DecodeName(url.substr(posName, min(url.size() - posName, kMaxNameLength)));
   }
 
   return true;
@@ -96,7 +98,7 @@ double Ge0Parser::DecodeZoom(uint8_t const zoomByte)
   return static_cast<double>(zoomByte) / 4 + 4;
 }
 
-bool Ge0Parser::DecodeLatLon(std::string const & s, double & lat, double & lon)
+bool Ge0Parser::DecodeLatLon(string const & s, double & lat, double & lon)
 {
   int latInt = 0;
   int lonInt = 0;
@@ -108,7 +110,7 @@ bool Ge0Parser::DecodeLatLon(std::string const & s, double & lat, double & lon)
   return true;
 }
 
-bool Ge0Parser::DecodeLatLonToInt(std::string const & s, int & lat, int & lon)
+bool Ge0Parser::DecodeLatLonToInt(string const & s, int & lat, int & lon)
 {
   int shift = kMaxCoordBits - 3;
   for (size_t i = 0; i < s.size(); ++i, shift -= 3)
@@ -138,7 +140,7 @@ double Ge0Parser::DecodeLonFromInt(int const lon, int const maxValue)
   return static_cast<double>(lon) / (maxValue + 1.0) * 360.0 - 180;
 }
 
-std::string Ge0Parser::DecodeName(std::string name)
+string Ge0Parser::DecodeName(string name)
 {
   ValidateName(name);
   name = url::UrlDecode(name);
@@ -146,7 +148,7 @@ std::string Ge0Parser::DecodeName(std::string name)
   return name;
 }
 
-void Ge0Parser::SpacesToUnderscore(std::string & name)
+void Ge0Parser::SpacesToUnderscore(string & name)
 {
   for (size_t i = 0; i < name.size(); ++i)
   {
@@ -157,7 +159,7 @@ void Ge0Parser::SpacesToUnderscore(std::string & name)
   }
 }
 
-void Ge0Parser::ValidateName(std::string & name)
+void Ge0Parser::ValidateName(string & name)
 {
   if (name.empty())
     return;
@@ -180,9 +182,9 @@ bool Ge0Parser::IsHexChar(char const a)
   return ((a >= '0' && a <= '9') || (a >= 'A' && a <= 'F') || (a >= 'a' && a <= 'f'));
 }
 
-std::string DebugPrint(Ge0Parser::Result const & r)
+string DebugPrint(Ge0Parser::Result const & r)
 {
-  std::ostringstream oss;
+  ostringstream oss;
   oss << "ParseResult [";
   oss << "zoom=" << r.m_zoomLevel << ", ";
   oss << "lat=" << r.m_lat << ", ";
diff --git a/ge0/url_generator.cpp b/ge0/url_generator.cpp
index 038b6fd968..41b4cd6b40 100644
--- a/ge0/url_generator.cpp
+++ b/ge0/url_generator.cpp
@@ -4,12 +4,14 @@
 
 #include <cmath>
 
+using namespace std;
+
 namespace
 {
 // Replaces ' ' with '_' and vice versa.
-std::string TransformName(std::string const & s)
+string TransformName(string const & s)
 {
-  std::string result = s;
+  string result = s;
   for (auto & c : result)
   {
     if (c == ' ')
@@ -25,9 +27,9 @@ std::string TransformName(std::string const & s)
 // See rfc3986, rfc1738, rfc2396.
 //
 // Not compatible with the url encode function from coding/.
-std::string UrlEncodeString(std::string const & s)
+string UrlEncodeString(string const & s)
 {
-  std::string result;
+  string result;
   result.reserve(s.size() * 3 + 1);
   for (size_t i = 0; i < s.size(); ++i)
   {
@@ -81,10 +83,10 @@ std::string UrlEncodeString(std::string const & s)
 
 namespace ge0
 {
-std::string GenerateShortShowMapUrl(double lat, double lon, double zoom, std::string const & name)
+string GenerateShortShowMapUrl(double lat, double lon, double zoom, string const & name)
 {
   size_t constexpr schemaLength = 5;  // strlen("om://")
-  std::string urlSample = "om://ZCoordba64";
+  string urlSample = "om://ZCoordba64";
 
   int const zoomI = (zoom <= 4 ? 0 : (zoom >= 19.75 ? 63 : static_cast<int>((zoom - 4) * 4)));
   urlSample[schemaLength] = Base64Char(zoomI);
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 07b948dff7..6c7ba2793c 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -210,14 +210,10 @@ bool FeatureBuilder::PreSerialize()
   if (!m_params.IsValid())
     return false;
 
-  // Conform serialization logic (see HeaderMask::HEADER_MASK_HAS_ADDINFO):
-  // - rank (city) is stored only for Point
-  // - ref (road number, address range) is stored only for Line
-  // - house is stored for PointEx and Area
   switch (m_params.GetGeomType())
   {
   case GeomType::Point:
-    // Store house number like HeaderGeomType::PointEx.
+    // Store house number like HEADER_GEOM_POINT_EX.
     if (!m_params.house.IsEmpty())
     {
       m_params.SetGeomTypePointEx();
@@ -226,6 +222,7 @@ bool FeatureBuilder::PreSerialize()
 
     if (!m_params.ref.empty())
     {
+
       if (ftypes::IsMotorwayJunctionChecker::Instance()(GetTypes()) ||
           (m_params.name.IsEmpty() &&
            (ftypes::IsPostBoxChecker::Instance()(GetTypes()) ||
@@ -235,15 +232,15 @@ bool FeatureBuilder::PreSerialize()
       {
         m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref);
       }
-
-      m_params.ref.clear();
     }
+
+    m_params.ref.clear();
     break;
 
   case GeomType::Line:
   {
-    // Ref is used for road's number or house number's range.
-    if (!routing::IsRoad(GetTypes()) && !ftypes::IsAddressInterpolChecker::Instance()(GetTypes()))
+    // We need refs for road's numbers.
+    if (!routing::IsRoad(GetTypes()))
       m_params.ref.clear();
 
     m_params.rank = 0;
@@ -390,7 +387,7 @@ void FeatureBuilder::SerializeForIntermediate(Buffer & data) const
   Buffer tmp(data);
   FeatureBuilder fb;
   fb.DeserializeFromIntermediate(tmp);
-  ASSERT(fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb));
+  ASSERT ( fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb) );
 #endif
 }
 
diff --git a/generator/generator_tests/descriptions_section_builder_tests.cpp b/generator/generator_tests/descriptions_section_builder_tests.cpp
index c0a65b9f02..a4771c85f8 100644
--- a/generator/generator_tests/descriptions_section_builder_tests.cpp
+++ b/generator/generator_tests/descriptions_section_builder_tests.cpp
@@ -32,7 +32,7 @@ using namespace generator;
 class TestDescriptionSectionBuilder
 {
 public:
-  using PageT = std::pair<std::string_view, std::string_view>;
+  using PageT = std::pair<std::string, std::string>;
   struct WikiData
   {
     std::string m_url;
@@ -52,11 +52,11 @@ public:
     {
       auto const dir = DescriptionsCollector::MakePathForWikipedia(m_wikiDir, m.m_url);
       CHECK(Platform::MkDirRecursively(dir), ());
-      for (auto const & [lang, content] : m.m_pages)
+      for (auto const & d : m.m_pages)
       {
-        auto const file = base::JoinPath(dir, std::string{lang} + ".html");
+        auto const file = base::JoinPath(dir, d.first + ".html");
         std::ofstream stream(file);
-        stream << content;
+        stream << d.second;
       }
     }
 
@@ -188,9 +188,9 @@ private:
       toDo(kWikiData[i].m_url, static_cast<uint32_t>(i));
   }
 
-  static std::map<std::string_view, size_t> GetTestDataMapLang()
+  static std::map<std::string, size_t> GetTestDataMapLang()
   {
-    std::map<std::string_view, size_t> langs;
+    std::map<std::string, size_t> langs;
     for (auto const & m : kWikiData)
     {
       for (auto const & d : m.m_pages)
@@ -231,7 +231,7 @@ private:
     return size;
   }
 
-  static bool IsSupportedLang(std::string_view lang)
+  static bool IsSupportedLang(std::string const & lang)
   {
     return StringUtf8Multilang::GetLangIndex(lang) != StringUtf8Multilang::kUnsupportedLanguageCode;
   }
@@ -246,17 +246,17 @@ private:
 
   static bool CheckLangs(DescriptionsCollectionBuilderStat::LangStatistics const & stat)
   {
-    auto const langs = GetTestDataMapLang();
+    auto const langs =  GetTestDataMapLang();
     for (size_t code = 0; code < stat.size(); ++code)
     {
       if (stat[code] == 0)
         continue;
 
-      auto const svLang = StringUtf8Multilang::GetLangByCode(static_cast<int8_t>(code));
-      if (langs.count(svLang) == 0)
+      auto const strLang = StringUtf8Multilang::GetLangByCode(static_cast<int8_t>(code));
+      if (langs.count(strLang) == 0)
         return false;
 
-      if (langs.at(svLang) != stat[code])
+      if (langs.at(strLang) != stat[code])
         return false;
     }
 
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 8db83e0b76..f795fb60ef 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -185,20 +185,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Combined)
 
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
 {
-  {
-    // Single house number tag is transformed into address type.
-    Tags const tags = { {"addr:housenumber", "42"} };
-
-    auto const params = GetFeatureBuilderParams(tags);
-
-    TEST_EQUAL(params.m_types.size(), 1, (params));
-    TEST(params.IsTypeExist(GetType({"building", "address"})), ());
-
-    TEST_EQUAL(params.house.Get(), "42", ());
-  }
-
-  using AddrType = feature::AddressData::Type;
-
   {
     Tags const tags = {
       { "addr:conscriptionnumber", "223" },
@@ -216,8 +202,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
     TEST(params.IsTypeExist(GetType({"building", "address"})), ());
 
     TEST_EQUAL(params.house.Get(), "223/5", ());
-    TEST_EQUAL(params.GetAddressData().Get(AddrType::Street), "Řetězová", ());
-    TEST_EQUAL(params.GetAddressData().Get(AddrType::Postcode), "11000", ());
   }
 
   {
@@ -239,8 +223,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
     TEST(!params.IsTypeExist(GetType({"entrance"})), ());
 
     TEST_EQUAL(params.house.Get(), "41", ());
-    TEST_EQUAL(params.GetAddressData().Get(AddrType::Street), "Leutschenbachstrasse", ());
-    TEST_EQUAL(params.GetAddressData().Get(AddrType::Postcode), "8050", ());
   }
 }
 
@@ -1656,8 +1638,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     // {"railway", "subway"},
     // {"traffic_calming", "bump"},
     // {"traffic_calming", "hump"},
-    {"addr:interpolation", "even"},
-    {"addr:interpolation", "odd"},
     {"aerialway", "cable_car"},
     {"aerialway", "chair_lift"},
     {"aerialway", "drag_lift"},
@@ -2256,7 +2236,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     //
     // Manually constructed type, not parsed from osm.
     // {{"building", "address"}, {{"addr:housenumber", "any_value"}, {"addr:street", "any_value"}}},
-    {{"addr:interpolation"}, {{"addr:interpolation", "all"}}},
     {{"aeroway", "aerodrome", "international"}, {{"aeroway", "aerodrome"}, {"aerodrome", "international"}}},
     {{"amenity", "grave_yard", "christian"}, {{"amenity", "grave_yard"}, {"religion", "christian"}}},
     {{"amenity", "parking", "fee"}, {{"amenity", "parking"}, {"fee", "any_value"}}},
diff --git a/generator/generator_tests/restriction_test.cpp b/generator/generator_tests/restriction_test.cpp
index 6cccb4d707..f106616116 100644
--- a/generator/generator_tests/restriction_test.cpp
+++ b/generator/generator_tests/restriction_test.cpp
@@ -256,7 +256,7 @@ std::pair<unique_ptr<IndexGraph>, string> BuildTwoCubeGraph()
                                               9, 9
                                               10, 10)";
 
-  return {BuildIndexGraph(std::move(loader), estimator, joints), osmIdsToFeatureIdsContent};
+  return {BuildIndexGraph(move(loader), estimator, joints), osmIdsToFeatureIdsContent};
 }
 
 UNIT_TEST(RestrictionGenerationTest_1)
@@ -274,7 +274,7 @@ UNIT_TEST(RestrictionGenerationTest_1)
   };
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -293,7 +293,7 @@ UNIT_TEST(RestrictionGenerationTest_2)
   };
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -314,7 +314,7 @@ UNIT_TEST(RestrictionGenerationTest_3)
   };
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -336,7 +336,7 @@ UNIT_TEST(RestrictionGenerationTest_BadConnection_1)
   };
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -358,7 +358,7 @@ UNIT_TEST(RestrictionGenerationTest_BadConnection_2)
   };
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -380,7 +380,7 @@ UNIT_TEST(RestrictionGenerationTest_WithUTurn_1)
     {Restriction::Type::OnlyUTurn, 6 /* featureId */, true /* viaIsFirstPoint */}
   };
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -410,7 +410,7 @@ UNIT_TEST(RestrictionGenerationTest_WithUTurn_2)
       {Restriction::Type::OnlyUTurn, 6 /* featureId */, false /* viaIsFirstPoint */}
   };
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 
@@ -431,7 +431,7 @@ UNIT_TEST(RestrictionGenerationTest_WithUTurn_BadConnection_1)
   vector<Restriction> expectedNotUTurn;
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, move(indexGraph),
                           expectedNotUTurn, expectedUTurn);
 }
 }  // namespace restriction_test
diff --git a/generator/generator_tests_support/test_feature.cpp b/generator/generator_tests_support/test_feature.cpp
index 9dfca671a5..070a1bfdb1 100644
--- a/generator/generator_tests_support/test_feature.cpp
+++ b/generator/generator_tests_support/test_feature.cpp
@@ -59,7 +59,6 @@ TestFeature::TestFeature(string const & name, string const & lang)
 TestFeature::TestFeature(StringUtf8Multilang const & name)
   : m_id(GenUniqueId()), m_center(0, 0), m_type(Type::Unknown), m_names(name)
 {
-  Init();
 }
 
 TestFeature::TestFeature(m2::PointD const & center, string const & name, string const & lang)
@@ -79,7 +78,6 @@ TestFeature::TestFeature(m2::PointD const & center, StringUtf8Multilang const &
 TestFeature::TestFeature(m2::RectD const & boundary, string const & name, string const & lang)
   : TestFeature(MakePoly(boundary), name, lang)
 {
-  Init();
 }
 
 TestFeature::TestFeature(vector<m2::PointD> const & boundary, string const & name, string const & lang)
diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index da8b88b32b..990bbc15c6 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -14,11 +14,11 @@
 #include "indexer/classificator.hpp"
 #include "indexer/data_source.hpp"
 #include "indexer/feature_algo.hpp"
+#include "indexer/feature_utils.hpp"
 #include "indexer/feature_visibility.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/postcodes_matcher.hpp"
-#include "indexer/road_shields_parser.hpp"
 #include "indexer/scales_patch.hpp"
 #include "indexer/search_string_utils.hpp"
 #include "indexer/trie_builder.hpp"
@@ -314,7 +314,7 @@ public:
     // Road number.
     if (hasStreetType)
     {
-      for (auto const & shield : ftypes::GetRoadShieldsNames(f))
+      for (auto const & shield : feature::GetRoadShieldsNames(f.GetRoadNumber()))
         inserter(StringUtf8Multilang::kDefaultCode, shield);
     }
 
diff --git a/generator/srtm_parser.cpp b/generator/srtm_parser.cpp
index e4c2aab8e2..d611802498 100644
--- a/generator/srtm_parser.cpp
+++ b/generator/srtm_parser.cpp
@@ -50,7 +50,7 @@ SrtmTile::SrtmTile()
   Invalidate();
 }
 
-SrtmTile::SrtmTile(SrtmTile && rhs) : m_data(std::move(rhs.m_data)), m_valid(rhs.m_valid)
+SrtmTile::SrtmTile(SrtmTile && rhs) : m_data(move(rhs.m_data)), m_valid(rhs.m_valid)
 {
   rhs.Invalidate();
 }
diff --git a/generator/translators_pool.cpp b/generator/translators_pool.cpp
index 5cdb0e390a..801c706235 100644
--- a/generator/translators_pool.cpp
+++ b/generator/translators_pool.cpp
@@ -49,7 +49,7 @@ bool TranslatorsPool::Finish()
     std::future<TranslatorPtr> right;
     queue.WaitAndPop(left);
     queue.WaitAndPop(right);
-    queue.Push(pool.Submit([left{std::move(left)}, right{std::move(right)}]() mutable {
+    queue.Push(pool.Submit([left{move(left)}, right{move(right)}]() mutable {
       auto leftTranslator = left.get();
       auto rigthTranslator = right.get();
       rigthTranslator->Finish();
diff --git a/generator/water_boundary_checker.hpp b/generator/water_boundary_checker.hpp
index fce3a125fa..b35617ee9e 100644
--- a/generator/water_boundary_checker.hpp
+++ b/generator/water_boundary_checker.hpp
@@ -49,7 +49,7 @@ public:
 
         std::vector<m2::PointD> points(numPoints);
         file.Read(points.data(), sizeof(m2::PointD) * numPoints);
-        m_tree.Add(m2::RegionD(std::move(points)));
+        m_tree.Add(m2::RegionD(move(points)));
       }
     }
     LOG_SHORT(LINFO, ("Load", total, "water geometries"));
diff --git a/geometry/clipping.cpp b/geometry/clipping.cpp
index 558e6d0b7d..00a7a590dc 100644
--- a/geometry/clipping.cpp
+++ b/geometry/clipping.cpp
@@ -1,9 +1,6 @@
 #include "geometry/clipping.hpp"
 
 #include "geometry/rect_intersect.hpp"
-#include "geometry/triangle2d.hpp"
-
-#include "base/stl_helpers.hpp"
 
 #include <algorithm>
 
@@ -134,46 +131,49 @@ void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::Point
     resultIterator(polygon[0], polygon[i + 1], polygon[i + 2]);
 }
 
-template <class FnT>
-void ClipPathByRectImpl(m2::RectD const & rect, std::vector<m2::PointD> const & path, FnT && fn)
+std::vector<m2::SharedSpline> ClipPathByRectImpl(m2::RectD const & rect,
+                                                 std::vector<m2::PointD> const & path)
 {
-  size_t const sz = path.size();
-  if (sz < 2)
-    return;
+  std::vector<m2::SharedSpline> result;
+
+  if (path.size() < 2)
+    return result;
 
   // Divide spline into parts.
+  result.reserve(2);
   m2::PointD p1, p2;
   int code1 = 0;
   int code2 = 0;
   m2::SharedSpline s;
-  s.Reset(new m2::Spline(sz));
+  s.Reset(new m2::Spline(path.size()));
 
-  for (size_t i = 0; i < sz - 1; i++)
+  for (size_t i = 0; i < path.size() - 1; i++)
   {
     p1 = path[i];
     p2 = path[i + 1];
     if (m2::Intersect(rect, p1, p2, code1, code2))
     {
       if (s.IsNull())
-        s.Reset(new m2::Spline(sz - i));
+        s.Reset(new m2::Spline(path.size() - i));
 
       s->AddPoint(p1);
       s->AddPoint(p2);
 
-      if (code2 != 0 || i + 2 == sz)
+      if (code2 != 0 || i + 2 == path.size())
       {
         if (s->GetSize() > 1)
-            fn(std::move(s));
+          result.push_back(s);
         s.Reset(nullptr);
       }
     }
     else if (!s.IsNull() && !s->IsEmpty())
     {
       if (s->GetSize() > 1)
-        fn(std::move(s));
+        result.push_back(s);
       s.Reset(nullptr);
     }
   }
+  return result;
 }
 
 enum class RectCase
@@ -204,27 +204,23 @@ std::vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect, m2::Share
   {
   case RectCase::Inside: return {spline};
   case RectCase::Outside: return {};
-  case RectCase::Intersect:
-  {
-    std::vector<m2::SharedSpline> res;
-    res.reserve(2); // keep previous behavior, but not sure that its actually needed
-    ClipPathByRectImpl(rect, spline->GetPath(), base::MakeBackInsertFunctor(res));
-    return res;
-  }
+  case RectCase::Intersect: return ClipPathByRectImpl(rect, spline->GetPath());
   }
   CHECK(false, ("Unreachable"));
   return {};
 }
 
-void ClipPathByRect(m2::RectD const & rect, std::vector<m2::PointD> && path,
-                    std::function<void (m2::SharedSpline &&)> const & fn)
+std::vector<m2::SharedSpline> ClipPathByRect(m2::RectD const & rect,
+                                             std::vector<m2::PointD> const & path)
 {
   switch (GetRectCase(rect, path))
   {
-  case RectCase::Inside: fn(m2::SharedSpline(std::move(path))); break;
-  case RectCase::Outside: break;
-  case RectCase::Intersect: ClipPathByRectImpl(rect, path, fn); break;
+  case RectCase::Inside: return {m2::SharedSpline(path)};
+  case RectCase::Outside: return {};
+  case RectCase::Intersect: return ClipPathByRectImpl(rect, path);
   }
+  CHECK(false, ("Unreachable"));
+  return {};
 }
 
 void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector<m2::PointD> const & path,
diff --git a/geometry/clipping.hpp b/geometry/clipping.hpp
index 4ba9063514..e85d31d28e 100644
--- a/geometry/clipping.hpp
+++ b/geometry/clipping.hpp
@@ -3,6 +3,7 @@
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
 #include "geometry/spline.hpp"
+#include "geometry/triangle2d.hpp"
 
 #include <functional>
 #include <vector>
@@ -15,8 +16,8 @@ using ClipTriangleByRectResultIt =
 void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::PointD const & p2,
                         m2::PointD const & p3, ClipTriangleByRectResultIt const & resultIterator);
 
-void ClipPathByRect(m2::RectD const & rect, std::vector<m2::PointD> && path,
-                    std::function<void (m2::SharedSpline &&)> const & fn);
+std::vector<m2::SharedSpline> ClipPathByRect(m2::RectD const & rect,
+                                             std::vector<m2::PointD> const & path);
 std::vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect,
                                                m2::SharedSpline const & spline);
 
diff --git a/geometry/geometry_tests/clipping_test.cpp b/geometry/geometry_tests/clipping_test.cpp
index 182fcc5451..a9a3322daa 100644
--- a/geometry/geometry_tests/clipping_test.cpp
+++ b/geometry/geometry_tests/clipping_test.cpp
@@ -54,7 +54,7 @@ vector<m2::SharedSpline> ConstructSplineList(vector<vector<m2::PointD>> const &
     s.Reset(new m2::Spline(segments[i].size()));
     for (size_t j = 0; j < segments[i].size(); j++)
       s->AddPoint(segments[i][j]);
-    result.push_back(std::move(s));
+    result.push_back(move(s));
   }
   return result;
 }
diff --git a/geometry/parametrized_segment.hpp b/geometry/parametrized_segment.hpp
index 7b62a2bf07..cf5f22c8ca 100644
--- a/geometry/parametrized_segment.hpp
+++ b/geometry/parametrized_segment.hpp
@@ -30,7 +30,7 @@ public:
   ParametrizedSegment(Point const & p0, Point const & p1) : m_p0(p0), m_p1(p1)
   {
     m_d = m_p1 - m_p0;
-    m_length = m_d.Length();
+    m_length = std::sqrt(m_d.SquaredLength());
     if (m_d.IsAlmostZero())
       m_d = Point::Zero();
     else
diff --git a/geometry/polyline2d.hpp b/geometry/polyline2d.hpp
index 506570d5f3..c419c556c3 100644
--- a/geometry/polyline2d.hpp
+++ b/geometry/polyline2d.hpp
@@ -64,7 +64,7 @@ public:
     ASSERT_GREATER(m_points.size(), 1, ());
   }
 
-  explicit Polyline(std::vector<Point<T>> && points) : m_points(std::move(points))
+  explicit Polyline(std::vector<Point<T>> && points) : m_points(move(points))
   {
     ASSERT_GREATER(m_points.size(), 1, ());
   }
diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp
index f49b517a6f..e09a3f33ba 100644
--- a/geometry/screenbase.cpp
+++ b/geometry/screenbase.cpp
@@ -128,14 +128,15 @@ void ScreenBase::SetAutoPerspective(bool isAutoPerspective)
 void ScreenBase::SetFromRects(m2::AnyRectD const & glbRect, m2::RectD const & pxRect)
 {
   m2::RectD const & lRect = glbRect.GetLocalRect();
-  ASSERT(lRect.IsValid(), (lRect));
+  ASSERT(!lRect.IsEmptyInterior(), (lRect));
   ASSERT(!pxRect.IsEmptyInterior(), (pxRect));
 
   double const hScale = lRect.SizeX() / pxRect.SizeX();
   double const vScale = lRect.SizeY() / pxRect.SizeY();
-  m_Scale = std::max(hScale, vScale);
-  ASSERT_GREATER(m_Scale, 0.0, ());
 
+  ASSERT_GREATER(hScale, 0.0, ());
+  ASSERT_GREATER(vScale, 0.0, ());
+  m_Scale = std::max(hScale, vScale);
   m_Angle = glbRect.Angle();
   m_Org = glbRect.GlobalCenter();
 
diff --git a/geometry/spline.cpp b/geometry/spline.cpp
index aea5c865af..1ecd97735d 100644
--- a/geometry/spline.cpp
+++ b/geometry/spline.cpp
@@ -106,7 +106,7 @@ double Spline::GetLength() const
 template <typename T>
 void Spline::Init(T && path)
 {
-  ASSERT_GREATER(path.size(), 1, ());
+  ASSERT(path.size() > 1, ("Wrong path size!"));
   m_position = std::forward<T>(path);
   size_t cnt = m_position.size() - 1;
   m_direction = std::vector<PointD>(cnt);
@@ -243,7 +243,7 @@ SharedSpline::SharedSpline(std::vector<PointD> && path)
 
 bool SharedSpline::IsNull() const
 {
-  return m_spline == nullptr;
+  return m_spline == NULL;
 }
 
 void SharedSpline::Reset(Spline * spline)
@@ -251,10 +251,10 @@ void SharedSpline::Reset(Spline * spline)
   m_spline.reset(spline);
 }
 
-//void SharedSpline::Reset(std::vector<PointD> const & path)
-//{
-//  m_spline.reset(new Spline(path));
-//}
+void SharedSpline::Reset(std::vector<PointD> const & path)
+{
+  m_spline.reset(new Spline(path));
+}
 
 Spline::iterator SharedSpline::CreateIterator() const
 {
diff --git a/geometry/spline.hpp b/geometry/spline.hpp
index b06eee3af5..b11abe39cf 100644
--- a/geometry/spline.hpp
+++ b/geometry/spline.hpp
@@ -96,7 +96,7 @@ public:
 
   bool IsNull() const;
   void Reset(Spline * spline);
-  //void Reset(std::vector<PointD> const & path);
+  void Reset(std::vector<PointD> const & path);
 
   Spline::iterator CreateIterator() const;
 
diff --git a/indexer/altitude_loader.cpp b/indexer/altitude_loader.cpp
index f63b5b9511..cec86111ea 100644
--- a/indexer/altitude_loader.cpp
+++ b/indexer/altitude_loader.cpp
@@ -26,7 +26,7 @@ void LoadAndMap(size_t dataSize, ReaderSource<FilesContainerR::TReader> & src, T
 {
   std::vector<uint8_t> data(dataSize);
   src.Read(data.data(), data.size());
-  region = std::make_unique<CopiedMemoryRegion>(std::move(data));
+  region = std::make_unique<CopiedMemoryRegion>(move(data));
   coding::MapVisitor visitor(region->ImmutableData());
   cont.map(visitor);
 }
diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index 8b93f8ed1d..221d39688a 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -179,9 +179,14 @@ namespace ftype
     set_value(type, cl+1, 1);
   }
 
-  uint8_t GetValue(uint32_t type, uint8_t level)
+  bool GetValue(uint32_t type, uint8_t level, uint8_t & value)
   {
-    return get_value(type, level);
+    if (level < get_control_level(type))
+    {
+      value = get_value(type, level);
+      return true;
+    }
+    return false;
   }
 
   void PopValue(uint32_t & type)
@@ -415,10 +420,13 @@ void Classificator::Clear()
 template <class ToDo> void Classificator::ForEachPathObject(uint32_t type, ToDo && toDo) const
 {
   ClassifObject const * p = &m_root;
-  uint8_t const level = ftype::GetLevel(type);
-  for (uint8_t i = 0; i < level; ++i)
+  uint8_t i = 0;
+
+  uint8_t v;
+  while (ftype::GetValue(type, i, v))
   {
-    p = p->GetObject(ftype::GetValue(type, i));
+    ++i;
+    p = p->GetObject(v);
     toDo(p);
   }
 }
diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp
index d72787451c..c0cd39f23a 100644
--- a/indexer/classificator.hpp
+++ b/indexer/classificator.hpp
@@ -22,8 +22,7 @@ namespace ftype
   inline uint32_t GetEmptyValue() { return 1; }
 
   void PushValue(uint32_t & type, uint8_t value);
-  /// @pre level < GetLevel(type).
-  uint8_t GetValue(uint32_t type, uint8_t level);
+  bool GetValue(uint32_t type, uint8_t level, uint8_t & value);
   void PopValue(uint32_t & type);
   void TruncValue(uint32_t & type, uint8_t level);
   uint8_t GetLevel(uint32_t type);
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 8addfbdcac..17ea2d4843 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -24,7 +24,7 @@ void ReadCommon(std::unique_ptr<Reader> classificator,
 
   {
     //LOG(LINFO, ("Reading classificator"));
-    ReaderStreamBuf buffer(std::move(classificator));
+    ReaderStreamBuf buffer(move(classificator));
 
     std::istream s(&buffer);
     c.ReadClassificator(s);
@@ -32,7 +32,7 @@ void ReadCommon(std::unique_ptr<Reader> classificator,
 
   {
     //LOG(LINFO, ("Reading types mapping"));
-    ReaderStreamBuf buffer(std::move(types));
+    ReaderStreamBuf buffer(move(types));
 
     std::istream s(&buffer);
     c.ReadTypesMapping(s);
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 3047b172fa..54ebfc4d13 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -104,7 +104,7 @@ bool BaseRule::TestFeature(FeatureType & ft, int /* zoom */) const
 
 void BaseRule::SetSelector(unique_ptr<ISelector> && selector)
 {
-  m_selector = std::move(selector);
+  m_selector = move(selector);
 }
 
 RulesHolder::RulesHolder()
@@ -381,7 +381,7 @@ namespace
       }
 
       BaseRule * obj = new TRule(rule);
-      obj->SetSelector(std::move(selector));
+      obj->SetSelector(move(selector));
       Key k = m_holder.AddRule(scale, type, obj);
       p->SetVisibilityOnScale(true, scale);
       k.SetPriority(rule.priority());
diff --git a/indexer/drules_selector.cpp b/indexer/drules_selector.cpp
index 3908913c95..de274c5cbe 100644
--- a/indexer/drules_selector.cpp
+++ b/indexer/drules_selector.cpp
@@ -25,7 +25,7 @@ public:
 
   void Add(unique_ptr<ISelector> && selector)
   {
-    m_selectors.emplace_back(std::move(selector));
+    m_selectors.emplace_back(move(selector));
   }
 
   // ISelector overrides:
@@ -223,7 +223,7 @@ unique_ptr<ISelector> ParseSelector(vector<string> const & strs)
       LOG(LDEBUG, ("Invalid composite selector:", str));
       return unique_ptr<ISelector>();
     }
-    cs->Add(std::move(s));
+    cs->Add(move(s));
   }
 
   return unique_ptr<ISelector>(cs.release());
diff --git a/indexer/drules_selector_parser.cpp b/indexer/drules_selector_parser.cpp
index 6e7633ca75..f621565996 100644
--- a/indexer/drules_selector_parser.cpp
+++ b/indexer/drules_selector_parser.cpp
@@ -48,7 +48,7 @@ bool ParseSelector(string const & str, SelectorExpression & e)
       return false; // invalid format
 
     e.m_operator = SelectorOperatorIsNotSet;
-    e.m_tag = std::move(tag);
+    e.m_tag = move(tag);
     e.m_value.clear();
     return true;
   }
@@ -117,7 +117,7 @@ bool ParseSelector(string const & str, SelectorExpression & e)
     return false; // invalid format
 
   e.m_operator = op;
-  e.m_tag = std::move(tag);
+  e.m_tag = move(tag);
   e.m_value = string(str.begin() + pos + len, str.end());
   return true;
 }
diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index dc874b8d95..9f61d8afe5 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -276,7 +276,7 @@ void EditableMapObject::ForEachMetadataItem(function<void(string_view tag, strin
         if (code == StringUtf8Multilang::kDefaultCode)
           fn("description", v);
         else
-          fn(string("description:").append(StringUtf8Multilang::GetLangByCode(code)), v);
+          fn(string("description:") + StringUtf8Multilang::GetLangByCode(code), v);
       });
     }
     else
@@ -409,7 +409,7 @@ void EditableMapObject::SetStreet(LocalizedStreet const & st) { m_street = st; }
 
 void EditableMapObject::SetNearbyStreets(vector<LocalizedStreet> && streets)
 {
-  m_nearbyStreets = std::move(streets);
+  m_nearbyStreets = move(streets);
 }
 
 void EditableMapObject::SetHouseNumber(string const & houseNumber)
diff --git a/indexer/editable_map_object.hpp b/indexer/editable_map_object.hpp
index d088d8ff93..323db6d00a 100644
--- a/indexer/editable_map_object.hpp
+++ b/indexer/editable_map_object.hpp
@@ -40,8 +40,8 @@ struct LocalizedName
   /// m_code, m_lang and m_langName are defined in StringUtf8Multilang.
   int8_t const m_code;
   /// Non-owning pointers to internal static char const * array.
-  std::string_view const m_lang;
-  std::string_view const m_langName;
+  char const * const m_lang;
+  char const * const m_langName;
   std::string const m_name;
 };
 
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index cbc105d65d..34d697dbfa 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -206,13 +206,13 @@ std::unique_ptr<FeatureType> FeatureType::CreateFromMapObject(osm::MapObject con
     break;
   case feature::GeomType::Line:
     headerGeomType = HeaderGeomType::Line;
-    assign_range(ft->m_points, emo.GetPoints());
+    ft->m_points = FeatureType::Points(emo.GetPoints().begin(), emo.GetPoints().end());
     for (auto const & p : ft->m_points)
       ft->m_limitRect.Add(p);
     break;
   case feature::GeomType::Area:
     headerGeomType = HeaderGeomType::Area;
-    assign_range(ft->m_triangles, emo.GetTriangesAsPoints());
+    ft->m_triangles = FeatureType::Points(emo.GetTriangesAsPoints().begin(), emo.GetTriangesAsPoints().end());
     for (auto const & p : ft->m_triangles)
       ft->m_limitRect.Add(p);
     break;
@@ -447,7 +447,7 @@ void FeatureType::ParseGeometry(int scale)
       {
         // filter inner geometry
 
-        PointsBufferT points;
+        FeatureType::Points points;
         points.reserve(pointsCount);
 
         int const scaleIndex = GetScaleIndex(*m_loadInfo, scale);
@@ -488,7 +488,7 @@ FeatureType::GeomStat FeatureType::GetOuterGeometryStats()
       // Outer geometry present.
       ASSERT_EQUAL(pointsCount, 1, ());
 
-      PointsBufferT points;
+      FeatureType::Points points;
 
       for (size_t ind = 0; ind < scalesCount; ++ind)
       {
@@ -734,16 +734,10 @@ m2::PointD const & FeatureType::GetPoint(size_t i) const
   return m_points[i];
 }
 
-FeatureType::PointsBufferT const & FeatureType::GetPoints(int scale)
-{
-  ParseGeometry(scale);
-  return m_points;
-}
-
-FeatureType::PointsBufferT const & FeatureType::GetTrianglesAsPoints(int scale)
+vector<m2::PointD> FeatureType::GetTrianglesAsPoints(int scale)
 {
   ParseTriangles(scale);
-  return m_triangles;
+  return {m_triangles.begin(), m_triangles.end()};
 }
 
 void FeatureType::ParseGeometryAndTriangles(int scale)
@@ -823,7 +817,7 @@ uint8_t FeatureType::GetRank()
 
 uint64_t FeatureType::GetPopulation() { return feature::RankToPopulation(GetRank()); }
 
-string const & FeatureType::GetRef()
+string const & FeatureType::GetRoadNumber()
 {
   ParseCommon();
   return m_params.ref;
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index f0952b9acb..a3d379fce2 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -69,12 +69,7 @@ public:
 
   int8_t GetLayer();
 
-  // For better result this value should be greater than 17
-  // (number of points in inner triangle-strips).
-  using PointsBufferT = buffer_vector<m2::PointD, 32>;
-
-  PointsBufferT const & GetPoints(int scale);
-  PointsBufferT const & GetTrianglesAsPoints(int scale);
+  std::vector<m2::PointD> GetTrianglesAsPoints(int scale);
 
   void SetID(FeatureID id) { m_id = std::move(id); }
   FeatureID const & GetID() const { return m_id; }
@@ -157,7 +152,7 @@ public:
 
   uint8_t GetRank();
   uint64_t GetPopulation();
-  std::string const & GetRef();
+  std::string const & GetRoadNumber();
 
   feature::Metadata const & GetMetadata();
 
@@ -233,7 +228,11 @@ private:
   m2::PointD m_center;
   m2::RectD m_limitRect;
 
-  PointsBufferT m_points, m_triangles;
+  // For better result this value should be greater than 17
+  // (number of points in inner triangle-strips).
+  static const size_t kStaticBufferSize = 32;
+  using Points = buffer_vector<m2::PointD, kStaticBufferSize>;
+  Points m_points, m_triangles;
   feature::Metadata m_metadata;
   indexer::MetadataDeserializer::MetaIds m_metaIds;
 
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 082a281580..82adfb4ac8 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -311,7 +311,7 @@ bool FeatureParams::AddHouseName(string const & s)
 
   // If we got a clear number, replace the house number with it.
   // Example: housename=16th Street, housenumber=34
-  if (strings::IsASCIINumeric(s))
+  if (strings::is_number(s))
   {
     string housename(house.Get());
     if (AddHouseNumber(s))
diff --git a/indexer/feature_impl.cpp b/indexer/feature_impl.cpp
index 8cebd6a47d..81e07059b4 100644
--- a/indexer/feature_impl.cpp
+++ b/indexer/feature_impl.cpp
@@ -1,13 +1,20 @@
 #include "indexer/feature_impl.hpp"
 
+#include "base/string_utils.hpp"
 #include "base/math.hpp"
 
 namespace feature
 {
+using namespace std;
+
+bool IsHouseNumber(string const & s)
+{
+  return !s.empty() && strings::IsASCIIDigit(s[0]);
+}
 
 uint8_t PopulationToRank(uint64_t p)
 {
-  return static_cast<uint8_t>(std::min(0xFF, base::SignedRound(log(double(p)) / log(1.1))));
+  return static_cast<uint8_t>(min(0xFF, base::SignedRound(log(double(p)) / log(1.1))));
 }
 
 uint64_t RankToPopulation(uint8_t r)
diff --git a/indexer/feature_impl.hpp b/indexer/feature_impl.hpp
index d0dd719dfd..7a59160d29 100644
--- a/indexer/feature_impl.hpp
+++ b/indexer/feature_impl.hpp
@@ -4,6 +4,7 @@
 
 #include "base/assert.hpp"
 
+#include <cstring>
 #include <string>
 
 namespace strings { class UniString; }
@@ -20,6 +21,8 @@ inline std::string GetTagForIndex(std::string const & prefix, size_t ind)
   return prefix + char('0' + ind);
 }
 
+bool IsHouseNumber(std::string const & s);
+
 uint8_t PopulationToRank(uint64_t p);
 uint64_t RankToPopulation(uint8_t r);
 } // namespace feature
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index ed465f9750..d0a6565690 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -182,7 +182,7 @@ public:
 
   void Add(Type type, std::string const & s)
   {
-    // Store single value only.
+    /// @todo Probably, we need to add separator here and store multiple values.
     MetadataBase::Set(base::Underlying(type), s);
   }
 
diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp
index 62ea4ca6c2..a055ca0959 100644
--- a/indexer/feature_utils.cpp
+++ b/indexer/feature_utils.cpp
@@ -1,9 +1,11 @@
 #include "indexer/feature_utils.hpp"
 
 #include "indexer/classificator.hpp"
+#include "indexer/feature.hpp"
 #include "indexer/feature_data.hpp"
 #include "indexer/feature_visibility.hpp"
 #include "indexer/ftypes_matcher.hpp"
+#include "indexer/road_shields_parser.hpp"
 #include "indexer/scales.hpp"
 
 #include "platform/localization.hpp"
@@ -11,6 +13,7 @@
 #include "coding/string_utf8_multilang.hpp"
 #include "coding/transliteration.hpp"
 
+#include "base/base.hpp"
 #include "base/control_flow.hpp"
 
 #include <unordered_map>
@@ -126,10 +129,6 @@ vector<int8_t> MakeLanguagesPriorityList(int8_t deviceLang, bool preferDefault)
   if (preferDefault)
     langPriority.push_back(StrUtf8::kDefaultCode);
 
-  /// @DebugNote
-  // Add ru lang for descriptions/rendering tests.
-  //langPriority.push_back(StrUtf8::GetLangIndex("ru"));
-
   auto const similarLangs = GetSimilarLanguages(deviceLang);
   langPriority.insert(langPriority.cend(), similarLangs.cbegin(), similarLangs.cend());
   langPriority.insert(langPriority.cend(), {StrUtf8::kInternationalCode, StrUtf8::kEnglishCode});
@@ -437,4 +436,12 @@ vector<string> GetLocalizedRecyclingTypes(TypesHolder const & types)
   auto const & isRecyclingType = ftypes::IsRecyclingTypeChecker::Instance();
   return GetLocalizedTypes(isRecyclingType, types);
 }
+
+vector<string> GetRoadShieldsNames(string const & rawRoadNumber)
+{
+  vector<string> names;
+  for (auto && shield : ftypes::GetRoadShields(rawRoadNumber))
+    names.push_back(std::move(shield.m_name));
+  return names;
+}
 } // namespace feature
diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp
index e76ca05762..fdfdeab075 100644
--- a/indexer/feature_utils.hpp
+++ b/indexer/feature_utils.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "geometry/rect2d.hpp"
+
+#include "base/base.hpp"
+
 #include <string>
 #include <vector>
 
@@ -8,9 +12,6 @@ class StringUtf8Multilang;
 
 namespace feature
 {
-  // Address house numbers interpolation.
-  enum class InterpolType { None, Odd, Even, Any };
-
   class TypesHolder;
   class RegionData;
 
@@ -125,4 +126,7 @@ namespace feature
 
   // Returns vector of recycling types localized by platform.
   std::vector<std::string> GetLocalizedRecyclingTypes(TypesHolder const & types);
+
+  // Returns names of feature road shields. Applicable for road features.
+  std::vector<std::string> GetRoadShieldsNames(std::string const & rawRoadNumber);
 }  // namespace feature
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 22f21cf647..b86dc48598 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -113,11 +113,6 @@ namespace
     if ((geomType == GeomType::Point || geomType == GeomType::Undefined) && type == region)
       return scales::GetUpperWorldScale();
 
-    ftype::TruncValue(type, 1);
-    static uint32_t const addr = cl.GetTypeByPath({"addr:interpolation"});
-    if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == addr)
-      return scales::GetUpperScale();
-
     return -1;
   }
 
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 8c065b6990..4878a414cf 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -31,8 +31,6 @@ public:
     auto const & c = classif();
     m_map[c.GetTypeByPath({"route", "ferry"})] = ftypes::HighwayClass::Transported;
     m_map[c.GetTypeByPath({"route", "shuttle_train"})] = ftypes::HighwayClass::Transported;
-    /// @todo Wow, actual highway type is railway-rail-motor_vehicle.
-    /// Should be carefull with GetHighwayClass function.
     m_map[c.GetTypeByPath({"railway", "rail"})] = ftypes::HighwayClass::Transported;
 
     m_map[c.GetTypeByPath({"highway", "motorway"})] = ftypes::HighwayClass::Trunk;
@@ -72,7 +70,7 @@ public:
   {
     auto const it = m_map.find(t);
     if (it == m_map.cend())
-      return ftypes::HighwayClass::Undefined;
+      return ftypes::HighwayClass::Error;
     return it->second;
   }
 };
@@ -82,6 +80,7 @@ char const * HighwayClassToString(ftypes::HighwayClass const cls)
   switch (cls)
   {
   case ftypes::HighwayClass::Undefined: return "Undefined";
+  case ftypes::HighwayClass::Error: return "Error";
   case ftypes::HighwayClass::Transported: return "Transported";
   case ftypes::HighwayClass::Trunk: return "Trunk";
   case ftypes::HighwayClass::Primary: return "Primary";
@@ -121,17 +120,18 @@ string DebugPrint(LocalityType const localityType)
 
 HighwayClass GetHighwayClass(feature::TypesHolder const & types)
 {
+  uint8_t constexpr kTruncLevel = 2;
   static HighwayClasses highwayClasses;
 
   for (auto t : types)
   {
-    ftype::TruncValue(t, 2);
+    ftype::TruncValue(t, kTruncLevel);
     HighwayClass const hc = highwayClasses.Get(t);
-    if (hc != HighwayClass::Undefined)
+    if (hc != HighwayClass::Error)
       return hc;
   }
 
-  return HighwayClass::Undefined;
+  return HighwayClass::Error;
 }
 
 uint32_t BaseChecker::PrepareToMatch(uint32_t type, uint8_t level)
@@ -385,9 +385,7 @@ IsStreetOrSquareChecker::IsStreetOrSquareChecker()
 
 IsAddressObjectChecker::IsAddressObjectChecker() : BaseChecker(1 /* level */)
 {
-  base::StringIL const paths = {
-    "building", "amenity", "shop", "tourism", "historic", "office", "craft", "addr:interpolation"
-  };
+  auto const paths = {"building", "amenity", "shop", "tourism", "historic", "office", "craft"};
 
   Classificator const & c = classif();
   for (auto const & p : paths)
@@ -564,20 +562,18 @@ IsPlaceChecker::IsPlaceChecker() : BaseChecker(1 /* level */)
   m_types.push_back(classif().GetTypeByPath({"place"}));
 }
 
-IsBridgeOrTunnelChecker::IsBridgeOrTunnelChecker() : BaseChecker(3 /* level */) {}
+IsBridgeChecker::IsBridgeChecker() : BaseChecker(3 /* level */) {}
 
-bool IsBridgeOrTunnelChecker::IsMatched(uint32_t type) const
+bool IsBridgeChecker::IsMatched(uint32_t type) const
 {
-  if (ftype::GetLevel(type) != 3)
-    return false;
+  return IsTypeConformed(type, {"highway", "*", "bridge"});
+}
 
-  ClassifObject const * p = classif().GetRoot()->GetObject(ftype::GetValue(type, 0));
-  if (p->GetName() != "highway")
-    return false;
+IsTunnelChecker::IsTunnelChecker() : BaseChecker(3 /* level */) {}
 
-  p = p->GetObject(ftype::GetValue(type, 1));
-  p = p->GetObject(ftype::GetValue(type, 2));
-  return (p->GetName() == "bridge" || p->GetName() == "tunnel");
+bool IsTunnelChecker::IsMatched(uint32_t type) const
+{
+  return IsTypeConformed(type, {"highway", "*", "tunnel"});
 }
 
 IsHotelChecker::IsHotelChecker()
@@ -877,32 +873,6 @@ IsRailwaySubwayEntranceChecker::IsRailwaySubwayEntranceChecker()
   m_types.push_back(c.GetTypeByPath({"railway", "subway_entrance"}));
 }
 
-IsAddressInterpolChecker::IsAddressInterpolChecker() : BaseChecker(1 /* level */)
-{
-  Classificator const & c = classif();
-  m_types.push_back(c.GetTypeByPath({"addr:interpolation"}));
-  m_odd = c.GetTypeByPath({"addr:interpolation", "odd"});
-  m_even = c.GetTypeByPath({"addr:interpolation", "even"});
-}
-
-feature::InterpolType IsAddressInterpolChecker::GetInterpolType(FeatureType & ft) const
-{
-  for (uint32_t t : feature::TypesHolder(ft))
-  {
-    if (t == m_odd)
-      return feature::InterpolType::Odd;
-    if (t == m_even)
-      return feature::InterpolType::Even;
-
-    ftype::TruncValue(t, 1);
-    if (t == m_types[0])
-      return feature::InterpolType::Any;
-  }
-
-  return feature::InterpolType::None;
-}
-
-
 uint64_t GetPopulation(FeatureType & ft)
 {
   uint64_t population = ft.GetPopulation();
@@ -950,4 +920,26 @@ uint64_t GetPopulationByRadius(double r)
   return base::SignedRound(pow(r / 550.0, 3.6));
 }
 
+bool IsTypeConformed(uint32_t type, base::StringIL const & path)
+{
+  ClassifObject const * p = classif().GetRoot();
+  ASSERT(p, ());
+
+  uint8_t val = 0, i = 0;
+  for (char const * s : path)
+  {
+    if (!ftype::GetValue(type, i, val))
+      return false;
+
+    p = p->GetObject(val);
+    if (p == 0)
+      return false;
+
+    if (p->GetName() != s && strcmp(s, "*") != 0)
+      return false;
+
+    ++i;
+  }
+  return true;
+}
 }  // namespace ftypes
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 65eb507c9f..6a47e28e15 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "indexer/feature_data.hpp"
-#include "indexer/feature_utils.hpp"
 
 #include "base/small_map.hpp"
 #include "base/stl_helpers.hpp"
@@ -336,13 +335,22 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPlaceChecker);
 };
 
-class IsBridgeOrTunnelChecker : public BaseChecker
+class IsBridgeChecker : public BaseChecker
 {
   virtual bool IsMatched(uint32_t type) const override;
 
-  IsBridgeOrTunnelChecker();
+  IsBridgeChecker();
 public:
-  DECLARE_CHECKER_INSTANCE(IsBridgeOrTunnelChecker);
+  DECLARE_CHECKER_INSTANCE(IsBridgeChecker);
+};
+
+class IsTunnelChecker : public BaseChecker
+{
+  virtual bool IsMatched(uint32_t type) const override;
+
+  IsTunnelChecker();
+public:
+  DECLARE_CHECKER_INSTANCE(IsTunnelChecker);
 };
 
 class IsIslandChecker : public BaseChecker
@@ -580,18 +588,6 @@ public:
   DECLARE_CHECKER_INSTANCE(IsRailwaySubwayEntranceChecker);
 };
 
-class IsAddressInterpolChecker : public BaseChecker
-{
-  IsAddressInterpolChecker();
-
-  uint32_t m_odd, m_even;
-
-public:
-  DECLARE_CHECKER_INSTANCE(IsAddressInterpolChecker);
-
-  feature::InterpolType GetInterpolType(FeatureType & ft) const;
-};
-
 
 /// @name Get city radius and population.
 /// @param r Radius in meters.
@@ -602,11 +598,18 @@ double GetRadiusByPopulationForRouting(uint64_t p, LocalityType localityType);
 uint64_t GetPopulationByRadius(double r);
 //@}
 
+/// Check if type conforms the path. Strings in the path can be
+/// feature types like "highway", "living_street", "bridge" and so on
+///  or *. * means any class.
+/// The root name ("world") is ignored
+bool IsTypeConformed(uint32_t type, base::StringIL const & path);
+
 // Highway class. The order is important.
 // The enum values follow from the biggest roads (Trunk) to the smallest ones (Service).
 enum class HighwayClass
 {
   Undefined = 0,  // There has not been any attempt of calculating HighwayClass.
+  Error,          // There was an attempt of calculating HighwayClass but it was not successful.
   Trunk,
   Primary,
   Secondary,
diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp
index 304b605fd9..f720f40eed 100644
--- a/indexer/indexer_tests/checker_test.cpp
+++ b/indexer/indexer_tests/checker_test.cpp
@@ -2,9 +2,15 @@
 
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
+#include "indexer/data_source.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
+#include "base/logging.hpp"
+
+#include <cstddef>
+#include <cstdint>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace checker_test
@@ -55,6 +61,36 @@ vector<uint32_t> GetLinkTypes()
   return GetTypes(arr, ARRAY_SIZE(arr));
 }
 
+vector<uint32_t> GetBridgeTypes()
+{
+  char const * arr[][roadArrColumnCount] =
+  {
+    { "highway", "trunk", "bridge" },
+    { "highway", "tertiary", "bridge" }
+  };
+  return GetTypes(arr, ARRAY_SIZE(arr));
+}
+
+vector<uint32_t> GetTunnelTypes()
+{
+  char const * arr[][roadArrColumnCount] =
+  {
+    { "highway", "trunk", "tunnel" },
+    { "highway", "motorway_link", "tunnel" }
+  };
+  return GetTypes(arr, ARRAY_SIZE(arr));
+}
+
+vector<uint32_t> GetBridgeAndTunnelTypes()
+{
+  char const * arr[][roadArrColumnCount] =
+  {
+    { "highway", "trunk", "bridge" },
+    { "highway", "motorway_link", "tunnel" }
+  };
+  return GetTypes(arr, ARRAY_SIZE(arr));
+}
+
 uint32_t GetMotorwayJunctionType()
 {
   Classificator const & c = classif();
@@ -63,26 +99,23 @@ uint32_t GetMotorwayJunctionType()
 
 }  // namespace
 
-UNIT_TEST(IsBridgeOrTunnelChecker)
+UNIT_TEST(IsTypeConformed)
 {
   classificator::Load();
-  auto const & c = classif();
 
-  base::StringIL arrYes[] =
+  char const * arr[][roadArrColumnCount] =
   {
     {"highway", "trunk", "bridge"},
-    {"highway", "motorway_link", "tunnel"},
+    {"highway", "motorway_link", "tunnel"}
   };
-  for (auto const & e : arrYes)
-    TEST(ftypes::IsBridgeOrTunnelChecker::Instance()(c.GetTypeByPath(e)), ());
-
-  base::StringIL arrNo[] =
-  {
-    {"highway", "motorway_junction"},
-    {"highway", "service", "busway"},
-  };
-  for (auto const & e : arrNo)
-    TEST(!ftypes::IsBridgeOrTunnelChecker::Instance()(c.GetTypeByPath(e)), ());
+  vector<uint32_t> types = GetTypes(arr, ARRAY_SIZE(arr));
+  TEST(ftypes::IsTypeConformed(types[0], {"highway", "trunk", "bridge"}), ());
+  TEST(ftypes::IsTypeConformed(types[0], {"highway", "trunk"}), ());
+  TEST(ftypes::IsTypeConformed(types[1], {"highway", "*", "tunnel"}), ());
+  TEST(!ftypes::IsTypeConformed(types[0], {"highway", "trunk", "tunnel"}), ());
+  TEST(!ftypes::IsTypeConformed(types[0], {"highway", "abcd", "tunnel"}), ());
+  TEST(!ftypes::IsTypeConformed(types[1], {"highway", "efgh", "*"}), ());
+  TEST(!ftypes::IsTypeConformed(types[1], {"*", "building", "*"}), ());
 }
 
 UNIT_TEST(IsWayChecker)
@@ -106,6 +139,24 @@ UNIT_TEST(IsLinkChecker)
   TEST(!ftypes::IsLinkChecker::Instance()(GetStreetTypes()), ());
 }
 
+UNIT_TEST(IsBridgeChecker)
+{
+  classificator::Load();
+
+  TEST(ftypes::IsBridgeChecker::Instance()(GetBridgeTypes()), ());
+  TEST(ftypes::IsBridgeChecker::Instance()(GetBridgeAndTunnelTypes()), ());
+  TEST(!ftypes::IsBridgeChecker::Instance()(GetTunnelTypes()), ());
+}
+
+UNIT_TEST(IsTunnelChecker)
+{
+  classificator::Load();
+
+  TEST(ftypes::IsTunnelChecker::Instance()(GetTunnelTypes()), ());
+  TEST(ftypes::IsTunnelChecker::Instance()(GetBridgeAndTunnelTypes()), ());
+  TEST(!ftypes::IsTunnelChecker::Instance()(GetBridgeTypes()), ());
+}
+
 UNIT_TEST(GetHighwayClassTest)
 {
   classificator::Load();
@@ -126,7 +177,7 @@ UNIT_TEST(GetHighwayClassTest)
 
   feature::TypesHolder types4;
   types4.Add(c.GetTypeByPath({"highway"}));
-  TEST_EQUAL(ftypes::GetHighwayClass(types4), ftypes::HighwayClass::Undefined, ());
+  TEST_EQUAL(ftypes::GetHighwayClass(types4), ftypes::HighwayClass::Error, ());
 }
 
 UNIT_TEST(IsPoiChecker)
diff --git a/indexer/indexer_tests/test_type.cpp b/indexer/indexer_tests/test_type.cpp
index b67cdbaf76..eaa44d1639 100644
--- a/indexer/indexer_tests/test_type.cpp
+++ b/indexer/indexer_tests/test_type.cpp
@@ -7,21 +7,30 @@ namespace
   void check_values_array(uint8_t values[], uint8_t count)
   {
     uint32_t type = ftype::GetEmptyValue();
+    uint8_t value;
+    bool res = ftype::GetValue(type, 0, value);
+    TEST_EQUAL(res, false, ());
+    res = ftype::GetValue(type, 4, value);
+    TEST_EQUAL(res, false, ());
 
     for (uint8_t i = 0; i < count; ++i)
       ftype::PushValue(type, values[i]);
 
     for (uint8_t i = 0; i < count; ++i)
-      TEST_EQUAL(ftype::GetValue(type, i), values[i], ());
-
-    while (count > 0)
     {
-      TEST_EQUAL(ftype::GetLevel(type), count, ());
-      ftype::PopValue(type);
-      --count;
+      res = ftype::GetValue(type, i, value);
+      TEST_EQUAL(res, true, ());
+      TEST_EQUAL(value, values[i], (value, values[i]));
+    }
+
+    for (char i = count-1; i >= 0; --i)
+    {
+      ftype::PopValue(type);
+
+      res = ftype::GetValue(type, i, value);
+      TEST_EQUAL(res, false, ());
     }
 
-    TEST_EQUAL(ftype::GetLevel(type), 0, ());
     TEST_EQUAL(type, ftype::GetEmptyValue(), (type));
   }
 }
diff --git a/indexer/map_object.cpp b/indexer/map_object.cpp
index 50a31f1934..85b56e05a8 100644
--- a/indexer/map_object.cpp
+++ b/indexer/map_object.cpp
@@ -4,7 +4,6 @@
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_utils.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/road_shields_parser.hpp"
 
 #include "geometry/mercator.hpp"
 
@@ -59,14 +58,20 @@ void MapObject::SetFromFeatureType(FeatureType & ft)
 
   m_metadata = ft.GetMetadata();
   m_houseNumber = ft.GetHouseNumber();
-  m_roadShields = ftypes::GetRoadShieldsNames(ft);
+  m_roadNumber = ft.GetRoadNumber();
   m_featureID = ft.GetID();
   m_geomType = ft.GetGeomType();
-
   if (m_geomType == feature::GeomType::Area)
-    assign_range(m_triangles, ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY));
+  {
+    m_triangles = ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY);
+  }
   else if (m_geomType == feature::GeomType::Line)
-    assign_range(m_points, ft.GetPoints(FeatureType::BEST_GEOMETRY));
+  {
+    ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
+    m_points.reserve(ft.GetPointsCount());
+    ft.ForEachPoint([this](m2::PointD const & p) { m_points.push_back(p); },
+                    FeatureType::BEST_GEOMETRY);
+  }
 
 #ifdef DEBUG
   if (ftypes::IsWifiChecker::Instance()(ft))
@@ -160,9 +165,14 @@ string MapObject::FormatCuisines() const
   return strings::JoinStrings(GetLocalizedCuisines(), kFieldsSeparator);
 }
 
+vector<string> MapObject::GetRoadShields() const
+{
+  return feature::GetRoadShieldsNames(m_roadNumber);
+}
+
 string MapObject::FormatRoadShields() const
 {
-  return strings::JoinStrings(m_roadShields, kFieldsSeparator);
+  return strings::JoinStrings(GetRoadShields(), kFieldsSeparator);
 }
 
 int MapObject::GetStars() const
diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp
index cf5989ad78..47020f26ec 100644
--- a/indexer/map_object.hpp
+++ b/indexer/map_object.hpp
@@ -87,6 +87,7 @@ public:
   /// @returns translated and formatted cuisines.
   std::string FormatCuisines() const;
 
+  std::vector<std::string> GetRoadShields() const;
   std::string FormatRoadShields() const;
 
   std::string_view GetOpeningHours() const;
@@ -118,7 +119,7 @@ protected:
 
   StringUtf8Multilang m_name;
   std::string m_houseNumber;
-  std::vector<std::string> m_roadShields;
+  std::string m_roadNumber;
   feature::TypesHolder m_types;
   feature::Metadata m_metadata;
 
diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp
index 78b8a7fc77..faf6feaeaa 100644
--- a/indexer/mwm_set.cpp
+++ b/indexer/mwm_set.cpp
@@ -54,12 +54,12 @@ MwmSet::MwmHandle::MwmHandle() : m_mwmSet(nullptr), m_value(nullptr) {}
 
 MwmSet::MwmHandle::MwmHandle(MwmSet & mwmSet, MwmId const & mwmId,
                              unique_ptr<MwmValue> && value)
-  : m_mwmId(mwmId), m_mwmSet(&mwmSet), m_value(std::move(value))
+  : m_mwmId(mwmId), m_mwmSet(&mwmSet), m_value(move(value))
 {
 }
 
 MwmSet::MwmHandle::MwmHandle(MwmHandle && handle)
-  : m_mwmId(std::move(handle.m_mwmId)), m_mwmSet(handle.m_mwmSet), m_value(std::move(handle.m_value))
+  : m_mwmId(std::move(handle.m_mwmId)), m_mwmSet(handle.m_mwmSet), m_value(move(handle.m_value))
 {
   handle.m_mwmSet = nullptr;
   handle.m_mwmId.Reset();
@@ -69,7 +69,7 @@ MwmSet::MwmHandle::MwmHandle(MwmHandle && handle)
 MwmSet::MwmHandle::~MwmHandle()
 {
   if (m_mwmSet && m_value)
-    m_mwmSet->UnlockValue(m_mwmId, std::move(m_value));
+    m_mwmSet->UnlockValue(m_mwmId, move(m_value));
 }
 
 shared_ptr<MwmInfo> const & MwmSet::MwmHandle::GetInfo() const
@@ -284,7 +284,7 @@ unique_ptr<MwmValue> MwmSet::LockValueImpl(MwmId const & id, EventList & events)
   {
     if (it->first == id)
     {
-      unique_ptr<MwmValue> result = std::move(it->second);
+      unique_ptr<MwmValue> result = move(it->second);
       m_cache.erase(it);
       return result;
     }
@@ -314,7 +314,7 @@ void MwmSet::UnlockValue(MwmId const & id, unique_ptr<MwmValue> p)
 {
   WithEventLog([&](EventList & events)
                {
-                 UnlockValueImpl(id, std::move(p), events);
+                 UnlockValueImpl(id, move(p), events);
                });
 }
 
@@ -336,7 +336,7 @@ void MwmSet::UnlockValueImpl(MwmId const & id, unique_ptr<MwmValue> p, EventList
     /// @todo Probably, it's better to store only "unique by id" free caches here.
     /// But it's no obvious if we have many threads working with the single mwm.
 
-    m_cache.push_back(make_pair(id, std::move(p)));
+    m_cache.push_back(make_pair(id, move(p)));
     if (m_cache.size() > m_cacheSize)
     {
       LOG(LDEBUG, ("MwmValue max cache size reached! Added", id, "removed", m_cache.front().first));
@@ -390,7 +390,7 @@ MwmSet::MwmHandle MwmSet::GetMwmHandleByIdImpl(MwmId const & id, EventList & eve
   unique_ptr<MwmValue> value;
   if (id.IsAlive())
     value = LockValueImpl(id, events);
-  return MwmHandle(*this, id, std::move(value));
+  return MwmHandle(*this, id, move(value));
 }
 
 void MwmSet::ClearCacheImpl(Cache::iterator beg, Cache::iterator end) { m_cache.erase(beg, end); }
diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp
index d7511fbf6e..dc840d0e5b 100644
--- a/indexer/rank_table.cpp
+++ b/indexer/rank_table.cpp
@@ -71,7 +71,7 @@ unique_ptr<CopiedMemoryRegion> GetMemoryRegionForTag(FilesContainerR const & rco
   FilesContainerR::TReader reader = rcont.GetReader(tag);
   vector<uint8_t> buffer(static_cast<size_t>(reader.Size()));
   reader.Read(0, buffer.data(), buffer.size());
-  return make_unique<CopiedMemoryRegion>(std::move(buffer));
+  return make_unique<CopiedMemoryRegion>(move(buffer));
 }
 
 unique_ptr<MappedMemoryRegion> GetMemoryRegionForTag(FilesMappingContainer const & mcont,
@@ -80,7 +80,7 @@ unique_ptr<MappedMemoryRegion> GetMemoryRegionForTag(FilesMappingContainer const
   if (!mcont.IsExist(tag))
     return unique_ptr<MappedMemoryRegion>();
   FilesMappingContainer::Handle handle = mcont.Map(tag);
-  return make_unique<MappedMemoryRegion>(std::move(handle));
+  return make_unique<MappedMemoryRegion>(move(handle));
 }
 
 // RankTable version 1, uses simple dense coding to store and access
@@ -133,7 +133,7 @@ public:
 
     auto table = make_unique<RankTableV0>();
     coding::Map(table->m_coding, region->ImmutableData() + kHeaderSize, "SimpleDenseCoding");
-    table->m_region = std::move(region);
+    table->m_region = move(region);
     return table;
   }
 
@@ -153,12 +153,12 @@ public:
     case CheckResult::EndiannessMismatch:
       table.reset(new RankTableV0());
       coding::ReverseMap(table->m_coding, region->MutableData() + kHeaderSize, "SimpleDenseCoding");
-      table->m_region = std::move(region);
+      table->m_region = move(region);
       break;
     case CheckResult::EndiannessMatch:
       table.reset(new RankTableV0());
       coding::Map(table->m_coding, region->ImmutableData() + kHeaderSize, "SimpleDenseCoding");
-      table->m_region = std::move(region);
+      table->m_region = move(region);
       break;
     }
     return table;
@@ -211,7 +211,7 @@ unique_ptr<RankTable> LoadRankTable(unique_ptr<TRegion> && region)
 
   RankTable::Version const version = static_cast<RankTable::Version>(region->ImmutableData()[kVersionOffset]);
   if (version == RankTable::V0)
-    return RankTableV0::Load(std::move(region));
+    return RankTableV0::Load(move(region));
 
   LOG(LERROR, ("Wrong rank table version."));
   return {};
@@ -267,7 +267,7 @@ unique_ptr<RankTable> CreateSearchRankTableIfNotExists(FilesContainerR & rcont)
       // Try to copy whole serialized data and instantiate table via
       // reverse mapping.
       auto region = GetMemoryRegionForTag(rcont, SEARCH_RANKS_FILE_TAG);
-      table = LoadRankTable(std::move(region));
+      table = LoadRankTable(move(region));
       break;
     }
     case CheckResult::EndiannessMatch:
diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp
index 013dcb7e8e..9359333e9b 100644
--- a/indexer/road_shields_parser.cpp
+++ b/indexer/road_shields_parser.cpp
@@ -1,7 +1,6 @@
 #include "indexer/road_shields_parser.hpp"
 
 #include "indexer/feature.hpp"
-#include "indexer/ftypes_matcher.hpp"
 
 #include "base/string_utils.hpp"
 
@@ -190,7 +189,7 @@ public:
     {
       additionalInfo = shieldParts[2];
       // Process cases like "US Loop 16".
-      if (!strings::IsASCIINumeric(shieldParts[1]) && strings::IsASCIINumeric(shieldParts[2]))
+      if (!strings::is_number(shieldParts[1]) && strings::is_number(shieldParts[2]))
       {
         roadNumber = shieldParts[2];
         additionalInfo = shieldParts[1];
@@ -562,7 +561,7 @@ public:
     if (shieldParts.size() >= 3)
     {
       additionalInfo = shieldParts[2];
-      if (!strings::IsASCIINumeric(shieldParts[1]) && strings::IsASCIINumeric(shieldParts[2]))
+      if (!strings::is_number(shieldParts[1]) && strings::is_number(shieldParts[2]))
       {
         roadNumber = shieldParts[2];
         additionalInfo = shieldParts[1];
@@ -570,7 +569,7 @@ public:
     }
 
     // Remove possible leading zero.
-    if (strings::IsASCIINumeric(roadNumber) && roadNumber[0] == '0')
+    if (strings::is_number(roadNumber) && roadNumber[0] == '0')
       roadNumber.erase(0);
 
     if (shieldParts[0] == "MEX")
@@ -583,8 +582,8 @@ public:
 
 RoadShieldsSetT GetRoadShields(FeatureType & f)
 {
-  auto const & ref = f.GetRef();
-  if (ref.empty())
+  std::string const roadNumber = f.GetRoadNumber();
+  if (roadNumber.empty())
     return {};
 
   // Find out country name.
@@ -597,7 +596,7 @@ RoadShieldsSetT GetRoadShields(FeatureType & f)
   if (underlinePos != std::string::npos)
     mwmName = mwmName.substr(0, underlinePos);
 
-  return GetRoadShields(mwmName, ref);
+  return GetRoadShields(mwmName, roadNumber);
 }
 
 RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const & roadNumber)
@@ -641,19 +640,8 @@ RoadShieldsSetT GetRoadShields(std::string const & rawRoadNumber)
   if (rawRoadNumber.empty())
     return {};
 
-  return SimpleRoadShieldParser(rawRoadNumber, SimpleRoadShieldParser::ShieldTypes()).GetRoadShields();
-}
-
-std::vector<std::string> GetRoadShieldsNames(FeatureType & ft)
-{
-  std::vector<std::string> names;
-  auto const & ref = ft.GetRef();
-  if (!ref.empty() && IsStreetOrSquareChecker::Instance()(ft))
-  {
-    for (auto && shield : GetRoadShields(ref))
-      names.push_back(std::move(shield.m_name));
-  }
-  return names;
+  return SimpleRoadShieldParser(rawRoadNumber, SimpleRoadShieldParser::ShieldTypes())
+      .GetRoadShields();
 }
 
 std::string DebugPrint(RoadShieldType shieldType)
diff --git a/indexer/road_shields_parser.hpp b/indexer/road_shields_parser.hpp
index a0409c66c8..f7b4bc2f58 100644
--- a/indexer/road_shields_parser.hpp
+++ b/indexer/road_shields_parser.hpp
@@ -65,9 +65,6 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
 // Simple parsing without specific country styles.
 RoadShieldsSetT GetRoadShields(std::string const & rawRoadNumber);
 
-// Returns names of road shields if |ft| is a "highway" feature.
-std::vector<std::string> GetRoadShieldsNames(FeatureType & ft);
-
 std::string DebugPrint(RoadShieldType shieldType);
 std::string DebugPrint(RoadShield const & shield);
 }  // namespace ftypes
diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp
index 7ded9149e9..c55c55ba87 100644
--- a/indexer/search_string_utils.cpp
+++ b/indexer/search_string_utils.cpp
@@ -143,10 +143,10 @@ UniString NormalizeAndSimplifyString(std::string_view s)
   });
 
   // Replace sequence of spaces with single one.
-  base::Unique(uniString, [](UniChar l, UniChar r)
+  uniString.erase(std::unique(uniString.begin(), uniString.end(), [](UniChar l, UniChar r)
   {
     return (l == r && l == ' ');
-  });
+  }), uniString.end());
 
   return uniString;
 
diff --git a/indexer/succinct_trie_reader.hpp b/indexer/succinct_trie_reader.hpp
index d91f5da1f4..0ef8e87efa 100644
--- a/indexer/succinct_trie_reader.hpp
+++ b/indexer/succinct_trie_reader.hpp
@@ -189,7 +189,7 @@ public:
       auto nxt = ret->GoToEdge(bit);
       if (!nxt)
         return nullptr;
-      ret = std::move(nxt);
+      ret = move(nxt);
     }
     return ret;
   }
diff --git a/iphone/CoreApi/CoreApi/Common/MWMCommon.h b/iphone/CoreApi/CoreApi/Common/MWMCommon.h
index ec5d985080..c3c52938aa 100644
--- a/iphone/CoreApi/CoreApi/Common/MWMCommon.h
+++ b/iphone/CoreApi/CoreApi/Common/MWMCommon.h
@@ -32,7 +32,7 @@ static inline BOOL isIOSVersionLessThan(NSUInteger version)
   return isIOSVersionLessThanString([NSString stringWithFormat:@"%@", @(version)]);
 }
 
-static inline BOOL isInterfaceRightToLeft(void)
+static inline BOOL isInterfaceRightToLeft()
 {
   return UIApplication.sharedApplication.userInterfaceLayoutDirection ==
          UIUserInterfaceLayoutDirectionRightToLeft;
@@ -50,7 +50,7 @@ static inline BOOL equalScreenDimensions(CGFloat left, CGFloat right)
   return fabs(left - right) < 0.5;
 }
 
-static inline CGFloat statusBarHeight(void)
+static inline CGFloat statusBarHeight()
 {
   CGSize const statusBarSize = UIApplication.sharedApplication.statusBarFrame.size;
   return MIN(statusBarSize.height, statusBarSize.width);
diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
index bce287318d..5a88e7fd5a 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
@@ -91,7 +91,7 @@ static PlacePageDataHotelType convertHotelType(std::optional<ftypes::IsHotelChec
     _title = rawData.GetTitle().empty() ? nil : @(rawData.GetTitle().c_str());
     _secondaryTitle = rawData.GetSecondaryTitle().empty() ? nil : @(rawData.GetSecondaryTitle().c_str());
     _subtitle = rawData.GetSubtitle().empty() ? nil : @(rawData.GetSubtitle().c_str());
-    _coordinates = @(rawData.GetFormattedCoordinate(true).c_str());
+    _coordinates = rawData.GetFormattedCoordinate(true).empty() ? nil : @(rawData.GetFormattedCoordinate(true).c_str());
     _address = rawData.GetAddress().empty() ? nil : @(rawData.GetAddress().c_str());
     _isMyPosition = rawData.IsMyPosition();
     _isPopular = rawData.GetPopularity() > 0;
diff --git a/iphone/Maps/Classes/LocaleTranslator.mm b/iphone/Maps/Classes/LocaleTranslator.mm
index d46a786c14..1e774bc76a 100644
--- a/iphone/Maps/Classes/LocaleTranslator.mm
+++ b/iphone/Maps/Classes/LocaleTranslator.mm
@@ -2,22 +2,22 @@
 
 namespace locale_translator
 {
-std::string bcp47ToTwineLanguage(NSString const * bcp47)
+
+std::string bcp47ToTwineLanguage(NSString const * bcp47LangName)
 {
-  if (bcp47 == nil || bcp47.length < 2)
+  if (bcp47LangName == nil || [bcp47LangName length] < 2)
     return {};
 
-  // Update this array if new bcp47 languages are added into data/strings/sound.txt
-  if ([@[@"pt-BR", @"es-MX"] containsObject:bcp47])
-    return bcp47.UTF8String; // Unchanged original bcp47 string
-
-  if ([@[@"zh-CN", @"zh-CHS", @"zh-SG"] containsObject:bcp47])
+  if ([bcp47LangName isEqualToString:@"zh-CN"] || [bcp47LangName isEqualToString:@"zh-CHS"]
+      || [bcp47LangName isEqualToString:@"zh-SG"])
+  {
     return "zh-Hans"; // Chinese simplified
+  }
 
-  if ([bcp47 hasPrefix:@"zh"])
+  if ([bcp47LangName hasPrefix:@"zh"])
     return "zh-Hant"; // Chinese traditional
 
   // Taking two first symbols of a language name. For example ru-RU -> ru
-  return [bcp47 substringToIndex:2].UTF8String;
+  return [bcp47LangName substringToIndex:2].UTF8String;
 }
 } // namespace locale_translator
diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
index 3f65f982ef..388b320d95 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm
@@ -84,7 +84,7 @@
     }
     layout[w] = pivot;
   });
-  GetFramework().SetWidgetLayout(std::move(layout));
+  GetFramework().SetWidgetLayout(move(layout));
 }
 
 @end
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index cf018edad1..873a241661 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "موقعي";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "ًلاحقا";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "العنوان / البلوك";
-
-"type.addr_interpolation.even" = "العنوان / البلوك";
-
-"type.addr_interpolation.odd" = "العنوان / البلوك";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "تلفريك";
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "ماكينة بيع طعام";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "ماكينة دفع تذاكر الموقف";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "مبنى";
 
-"type.building.has_parts" = "مبنى";
-
-"type.building_part" = "مبنى";
-
 "type.building.garage" = "جراج";
 
+"type.building.has_parts" = "مبنى";
+
 "type.building.train_station" = "محطة سكك حديدية";
 
 "type.building.warehouse" = "مستودع";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "مصور فوتوغرافي";
 
-"type.shop.camera" = "متجر الكاميرا";
-
 "type.craft.plumber" = "سباك";
 
 "type.craft.sawmill" = "منشرة";
@@ -2413,7 +2403,7 @@
 
 "type.leisure.park.permissive" = "موقف سيارات";
 
-"type.leisure.park.private" = "موقف سيارات";
+"type.leisure.park.private" = "موقف سيارات خاص";
 
 "type.leisure.picnic_table" = "ﺔﻫﺰﻨﻟﺍ ﺔﻟﻭﺎﻃ";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "برج الاتصالات";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "حنفية مياه";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "مولد للطاقة الشمسية";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "متجر الأجهزة";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ";
 
 "type.shop.baby_goods" = "ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "مبنى";
+
 "type.amenity.events_venue" = "مكان الأحداث";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index fb78de67d0..886d3a32d7 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Маё месцазнаходжанне";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Потым";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Адрас/Блок";
-
-"type.addr_interpolation.even" = "Адрас/Блок";
-
-"type.addr_interpolation.odd" = "Адрас/Блок";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1285,7 +1279,7 @@
 
 "type.amenity" = "Amenity";
 
-"type.amenity.arts_centre" = "Arts Center";
+"type.amenity.arts_centre" = "Art Center";
 
 "type.amenity.atm" = "ATM";
 
@@ -1409,7 +1403,7 @@
 
 "type.amenity.parking.private" = "Прыватная паркоўка";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "Падземны паркінг";
 
@@ -1435,19 +1429,19 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
@@ -1558,7 +1552,7 @@
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Фатограф";
 
-"type.shop.camera" = "Крама фотаапаратаў";
-
 "type.craft.plumber" = "Вадаправодчык";
 
 "type.craft.sawmill" = "Лесапільня";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Мост";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2325,7 +2315,7 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
 "type.landuse.education" = "Адукацыйныя ўстановы";
 
@@ -2343,11 +2333,11 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
-"type.landuse.grass" = "Grass";
+"type.landuse.grass" = "Lawn";
 
 "type.landuse.greenfield" = "Greenfield";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2417,7 +2407,7 @@
 
 "type.leisure.picnic_table" = "Стол для пікніка";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Вежа сувязі";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Сонечны генератар";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "Ветраэлектрастанцыя";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Level Crossing";
 
@@ -2799,225 +2789,225 @@
 
 "type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Subway Station";
+"type.railway.station.subway" = "Subway";
 
-"type.railway.station.subway.adana" = "Subway Station";
+"type.railway.station.subway.adana" = "Subway";
 
-"type.railway.station.subway.algiers" = "Subway Station";
+"type.railway.station.subway.algiers" = "Subway";
 
-"type.railway.station.subway.almaty" = "Subway Station";
+"type.railway.station.subway.almaty" = "Subway";
 
-"type.railway.station.subway.amsterdam" = "Subway Station";
+"type.railway.station.subway.amsterdam" = "Subway";
 
-"type.railway.station.subway.ankara" = "Subway Station";
+"type.railway.station.subway.ankara" = "Subway";
 
-"type.railway.station.subway.athens" = "Subway Station";
+"type.railway.station.subway.athens" = "Subway";
 
-"type.railway.station.subway.baku" = "Subway Station";
+"type.railway.station.subway.baku" = "Subway";
 
-"type.railway.station.subway.bangkok" = "Subway Station";
+"type.railway.station.subway.bangkok" = "Subway";
 
-"type.railway.station.subway.barcelona" = "Subway Station";
+"type.railway.station.subway.barcelona" = "Subway";
 
-"type.railway.station.subway.beijing" = "Subway Station";
+"type.railway.station.subway.beijing" = "Subway";
 
-"type.railway.station.subway.bengalore" = "Subway Station";
+"type.railway.station.subway.bengalore" = "Subway";
 
-"type.railway.station.subway.berlin" = "Subway Station";
+"type.railway.station.subway.berlin" = "Subway";
 
-"type.railway.station.subway.bilbao" = "Subway Station";
+"type.railway.station.subway.bilbao" = "Subway";
 
-"type.railway.station.subway.brasilia" = "Subway Station";
+"type.railway.station.subway.brasilia" = "Subway";
 
-"type.railway.station.subway.brescia" = "Subway Station";
+"type.railway.station.subway.brescia" = "Subway";
 
-"type.railway.station.subway.brussels" = "Subway Station";
+"type.railway.station.subway.brussels" = "Subway";
 
-"type.railway.station.subway.bucharest" = "Subway Station";
+"type.railway.station.subway.bucharest" = "Subway";
 
-"type.railway.station.subway.budapest" = "Subway Station";
+"type.railway.station.subway.budapest" = "Subway";
 
-"type.railway.station.subway.buenos_aires" = "Subway Station";
+"type.railway.station.subway.buenos_aires" = "Subway";
 
-"type.railway.station.subway.bursa" = "Subway Station";
+"type.railway.station.subway.bursa" = "Subway";
 
-"type.railway.station.subway.cairo" = "Subway Station";
+"type.railway.station.subway.cairo" = "Subway";
 
-"type.railway.station.subway.caracas" = "Subway Station";
+"type.railway.station.subway.caracas" = "Subway";
 
-"type.railway.station.subway.catania" = "Subway Station";
+"type.railway.station.subway.catania" = "Subway";
 
-"type.railway.station.subway.changchun" = "Subway Station";
+"type.railway.station.subway.changchun" = "Subway";
 
-"type.railway.station.subway.chengdu" = "Subway Station";
+"type.railway.station.subway.chengdu" = "Subway";
 
-"type.railway.station.subway.chicago" = "Subway Station";
+"type.railway.station.subway.chicago" = "Subway";
 
-"type.railway.station.subway.chongqing" = "Subway Station";
+"type.railway.station.subway.chongqing" = "Subway";
 
-"type.railway.station.subway.dalian" = "Subway Station";
+"type.railway.station.subway.dalian" = "Subway";
 
-"type.railway.station.subway.delhi" = "Subway Station";
+"type.railway.station.subway.delhi" = "Subway";
 
-"type.railway.station.subway.dnepro" = "Subway Station";
+"type.railway.station.subway.dnepro" = "Subway";
 
-"type.railway.station.subway.dubai" = "Subway Station";
+"type.railway.station.subway.dubai" = "Subway";
 
-"type.railway.station.subway.ekb" = "Subway Station";
+"type.railway.station.subway.ekb" = "Subway";
 
-"type.railway.station.subway.fukuoka" = "Subway Station";
+"type.railway.station.subway.fukuoka" = "Subway";
 
-"type.railway.station.subway.glasgow" = "Subway Station";
+"type.railway.station.subway.glasgow" = "Subway";
 
-"type.railway.station.subway.guangzhou" = "Subway Station";
+"type.railway.station.subway.guangzhou" = "Subway";
 
-"type.railway.station.subway.hamburg" = "Subway Station";
+"type.railway.station.subway.hamburg" = "Subway";
 
-"type.railway.station.subway.helsinki" = "Subway Station";
+"type.railway.station.subway.helsinki" = "Subway";
 
-"type.railway.station.subway.hiroshima" = "Subway Station";
+"type.railway.station.subway.hiroshima" = "Subway";
 
-"type.railway.station.subway.isfahan" = "Subway Station";
+"type.railway.station.subway.isfahan" = "Subway";
 
-"type.railway.station.subway.istanbul" = "Subway Station";
+"type.railway.station.subway.istanbul" = "Subway";
 
-"type.railway.station.subway.izmir" = "Subway Station";
+"type.railway.station.subway.izmir" = "Subway";
 
-"type.railway.station.subway.kazan" = "Subway Station";
+"type.railway.station.subway.kazan" = "Subway";
 
-"type.railway.station.subway.kharkiv" = "Subway Station";
+"type.railway.station.subway.kharkiv" = "Subway";
 
-"type.railway.station.subway.kiev" = "Subway Station";
+"type.railway.station.subway.kiev" = "Subway";
 
-"type.railway.station.subway.kobe" = "Subway Station";
+"type.railway.station.subway.kobe" = "Subway";
 
-"type.railway.station.subway.kolkata" = "Subway Station";
+"type.railway.station.subway.kolkata" = "Subway";
 
-"type.railway.station.subway.kunming" = "Subway Station";
+"type.railway.station.subway.kunming" = "Subway";
 
-"type.railway.station.subway.kyoto" = "Subway Station";
+"type.railway.station.subway.kyoto" = "Subway";
 
-"type.railway.station.subway.la" = "Subway Station";
+"type.railway.station.subway.la" = "Subway";
 
-"type.railway.station.subway.lausanne" = "Subway Station";
+"type.railway.station.subway.lausanne" = "Subway";
 
-"type.railway.station.subway.lille" = "Subway Station";
+"type.railway.station.subway.lille" = "Subway";
 
-"type.railway.station.subway.lima" = "Subway Station";
+"type.railway.station.subway.lima" = "Subway";
 
-"type.railway.station.subway.lisboa" = "Subway Station";
+"type.railway.station.subway.lisboa" = "Subway";
 
-"type.railway.station.subway.london" = "Subway Station";
+"type.railway.station.subway.london" = "Subway";
 
-"type.railway.station.subway.lyon" = "Subway Station";
+"type.railway.station.subway.lyon" = "Subway";
 
-"type.railway.station.subway.madrid" = "Subway Station";
+"type.railway.station.subway.madrid" = "Subway";
 
-"type.railway.station.subway.malaga" = "Subway Station";
+"type.railway.station.subway.malaga" = "Subway";
 
-"type.railway.station.subway.manila" = "Subway Station";
+"type.railway.station.subway.manila" = "Subway";
 
-"type.railway.station.subway.maracaibo" = "Subway Station";
+"type.railway.station.subway.maracaibo" = "Subway";
 
-"type.railway.station.subway.mashhad" = "Subway Station";
+"type.railway.station.subway.mashhad" = "Subway";
 
-"type.railway.station.subway.mecca" = "Subway Station";
+"type.railway.station.subway.mecca" = "Subway";
 
-"type.railway.station.subway.medellin" = "Subway Station";
+"type.railway.station.subway.medellin" = "Subway";
 
-"type.railway.station.subway.mexico" = "Subway Station";
+"type.railway.station.subway.mexico" = "Subway";
 
-"type.railway.station.subway.milan" = "Subway Station";
+"type.railway.station.subway.milan" = "Subway";
 
-"type.railway.station.subway.minsk" = "Subway Station";
+"type.railway.station.subway.minsk" = "Subway";
 
-"type.railway.station.subway.montreal" = "Subway Station";
+"type.railway.station.subway.montreal" = "Subway";
 
-"type.railway.station.subway.moscow" = "Subway Station";
+"type.railway.station.subway.moscow" = "Subway";
 
-"type.railway.station.subway.munchen" = "Subway Station";
+"type.railway.station.subway.munchen" = "Subway";
 
-"type.railway.station.subway.nagoya" = "Subway Station";
+"type.railway.station.subway.nagoya" = "Subway";
 
-"type.railway.station.subway.newyork" = "Subway Station";
+"type.railway.station.subway.newyork" = "Subway";
 
-"type.railway.station.subway.nnov" = "Subway Station";
+"type.railway.station.subway.nnov" = "Subway";
 
-"type.railway.station.subway.novosibirsk" = "Subway Station";
+"type.railway.station.subway.novosibirsk" = "Subway";
 
-"type.railway.station.subway.osaka" = "Subway Station";
+"type.railway.station.subway.osaka" = "Subway";
 
-"type.railway.station.subway.oslo" = "Subway Station";
+"type.railway.station.subway.oslo" = "Subway";
 
-"type.railway.station.subway.palma" = "Subway Station";
+"type.railway.station.subway.palma" = "Subway";
 
-"type.railway.station.subway.panama" = "Subway Station";
+"type.railway.station.subway.panama" = "Subway";
 
-"type.railway.station.subway.paris" = "Subway Station";
+"type.railway.station.subway.paris" = "Subway";
 
-"type.railway.station.subway.philadelphia" = "Subway Station";
+"type.railway.station.subway.philadelphia" = "Subway";
 
-"type.railway.station.subway.pyongyang" = "Subway Station";
+"type.railway.station.subway.pyongyang" = "Subway";
 
-"type.railway.station.subway.rennes" = "Subway Station";
+"type.railway.station.subway.rennes" = "Subway";
 
-"type.railway.station.subway.rio" = "Subway Station";
+"type.railway.station.subway.rio" = "Subway";
 
-"type.railway.station.subway.roma" = "Subway Station";
+"type.railway.station.subway.roma" = "Subway";
 
-"type.railway.station.subway.rotterdam" = "Subway Station";
+"type.railway.station.subway.rotterdam" = "Subway";
 
-"type.railway.station.subway.samara" = "Subway Station";
+"type.railway.station.subway.samara" = "Subway";
 
-"type.railway.station.subway.santiago" = "Subway Station";
+"type.railway.station.subway.santiago" = "Subway";
 
-"type.railway.station.subway.santo_domingo" = "Subway Station";
+"type.railway.station.subway.santo_domingo" = "Subway";
 
-"type.railway.station.subway.saopaulo" = "Subway Station";
+"type.railway.station.subway.saopaulo" = "Subway";
 
-"type.railway.station.subway.sapporo" = "Subway Station";
+"type.railway.station.subway.sapporo" = "Subway";
 
-"type.railway.station.subway.sendai" = "Subway Station";
+"type.railway.station.subway.sendai" = "Subway";
 
-"type.railway.station.subway.sf" = "Subway Station";
+"type.railway.station.subway.sf" = "Subway";
 
-"type.railway.station.subway.shanghai" = "Subway Station";
+"type.railway.station.subway.shanghai" = "Subway";
 
-"type.railway.station.subway.shiraz" = "Subway Station";
+"type.railway.station.subway.shiraz" = "Subway";
 
-"type.railway.station.subway.sofia" = "Subway Station";
+"type.railway.station.subway.sofia" = "Subway";
 
-"type.railway.station.subway.spb" = "Subway Station";
+"type.railway.station.subway.spb" = "Subway";
 
-"type.railway.station.subway.stockholm" = "Subway Station";
+"type.railway.station.subway.stockholm" = "Subway";
 
-"type.railway.station.subway.tabriz" = "Subway Station";
+"type.railway.station.subway.tabriz" = "Subway";
 
-"type.railway.station.subway.taipei" = "Subway Station";
+"type.railway.station.subway.taipei" = "Subway";
 
-"type.railway.station.subway.taoyuan" = "Subway Station";
+"type.railway.station.subway.taoyuan" = "Subway";
 
-"type.railway.station.subway.tashkent" = "Subway Station";
+"type.railway.station.subway.tashkent" = "Subway";
 
-"type.railway.station.subway.tbilisi" = "Subway Station";
+"type.railway.station.subway.tbilisi" = "Subway";
 
-"type.railway.station.subway.tianjin" = "Subway Station";
+"type.railway.station.subway.tianjin" = "Subway";
 
-"type.railway.station.subway.tokyo" = "Subway Station";
+"type.railway.station.subway.tokyo" = "Subway";
 
-"type.railway.station.subway.valencia" = "Subway Station";
+"type.railway.station.subway.valencia" = "Subway";
 
-"type.railway.station.subway.vienna" = "Subway Station";
+"type.railway.station.subway.vienna" = "Subway";
 
-"type.railway.station.subway.warszawa" = "Subway Station";
+"type.railway.station.subway.warszawa" = "Subway";
 
-"type.railway.station.subway.washington" = "Subway Station";
+"type.railway.station.subway.washington" = "Subway";
 
-"type.railway.station.subway.wuhan" = "Subway Station";
+"type.railway.station.subway.wuhan" = "Subway";
 
-"type.railway.station.subway.yerevan" = "Subway Station";
+"type.railway.station.subway.yerevan" = "Subway";
 
-"type.railway.station.subway.yokohama" = "Subway Station";
+"type.railway.station.subway.yokohama" = "Subway";
 
 "type.railway.subway" = "Subway Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3283,15 +3273,15 @@
 
 "type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
 "type.shop.cannabis" = "Крама канабіса";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Workshop";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
@@ -3299,7 +3289,7 @@
 
 "type.shop.carpet" = "Дываны";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Крама шакалада";
 
@@ -3309,11 +3299,11 @@
 
 "type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Candy Shop";
+"type.shop.confectionery" = "Sweets";
 
 "type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
 "type.shop.cosmetics" = "Касметыка";
 
@@ -3323,11 +3313,11 @@
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "Home Improvement Store";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "Модныя аксэсуары";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Рытуальныя паслугі";
 
 "type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "Газавая крама";
 
@@ -3365,7 +3355,7 @@
 
 "type.shop.houseware" = "Крама посуду";
 
-"type.shop.jewelry" = "Jewelry Store";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
@@ -3377,7 +3367,7 @@
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Cell Phone Store";
+"type.shop.mobile_phone" = "Cell Phones";
 
 "type.shop.money_lender" = "Ліхвяр";
 
@@ -3391,9 +3381,9 @@
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "Пункт самавывазу";
 
@@ -3407,13 +3397,13 @@
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
 "type.shop.second_hand" = "Крама сэканд-хэнд";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3435,7 +3425,7 @@
 
 "type.shop.video" = "Video Shop";
 
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.video_games" = "Video Games Shop";
 
 "type.shop.wine" = "Wine Shop";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Крама бытавой тэхнікі";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Крама мастацтваў";
 
 "type.shop.baby_goods" = "Дзіцячая крама";
@@ -3563,19 +3552,19 @@
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
@@ -3583,13 +3572,13 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "Кемпінг для аўтадамоў";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "Месца правядзення мерапрыемстваў";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index ff217c0f3a..37e0afac87 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Мое местоположение";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "По-късно";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "За RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Зареждане на отметки";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1073,7 +1073,7 @@
 
 "dialog_routing_change_start_carplay" = "Unable to build a route from your current location";
 
-"dialog_routing_change_end_carplay" = "Unable to find a route to your destination. Please choose another end point";
+"dialog_routing_change_end_carplay" = "Unable to build a route to your destination. Please choose another point";
 
 "dialog_routing_check_gps_carplay" = "No GPS signal. Please move to an open area";
 
@@ -1105,7 +1105,7 @@
 
 "speedcams_alert_title_carplay_2" = "Speed warnings";
 
-"download_map_carplay" = "Please download maps in the app on your mobile device";
+"download_map_carplay" = "Please download maps in Organic Maps app on your device";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Адрес/Блок";
-
-"type.addr_interpolation.even" = "Адрес/Блок";
-
-"type.addr_interpolation.odd" = "Адрес/Блок";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1285,7 +1279,7 @@
 
 "type.amenity" = "Amenity";
 
-"type.amenity.arts_centre" = "Arts Center";
+"type.amenity.arts_centre" = "Art Center";
 
 "type.amenity.atm" = "ATM";
 
@@ -1409,7 +1403,7 @@
 
 "type.amenity.parking.private" = "Частен паркинг";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "Подземен паркинг";
 
@@ -1435,23 +1429,23 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
-"type.amenity.post_box" = "Mailbox";
+"type.amenity.post_box" = "Post Box";
 
 "type.amenity.post_office" = "Post Office";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,9 +1524,9 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "Parking Tickets";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinary Doctor";
 
@@ -1552,13 +1546,13 @@
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "Barrier";
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Фотограф";
 
-"type.shop.camera" = "Магазин за фотоапарати";
-
 "type.craft.plumber" = "Водопроводчик";
 
 "type.craft.sawmill" = "Дъскорезница";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Мост";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2343,11 +2333,11 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
-"type.landuse.grass" = "Grass";
+"type.landuse.grass" = "Lawn";
 
 "type.landuse.greenfield" = "Greenfield";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2417,7 +2407,7 @@
 
 "type.leisure.picnic_table" = "Маса за пикник";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Комуникационна кула";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Слънчев генератор";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "Вятърна електроцентрала";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Level Crossing";
 
@@ -2799,225 +2789,225 @@
 
 "type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Subway Station";
+"type.railway.station.subway" = "Subway";
 
-"type.railway.station.subway.adana" = "Subway Station";
+"type.railway.station.subway.adana" = "Subway";
 
-"type.railway.station.subway.algiers" = "Subway Station";
+"type.railway.station.subway.algiers" = "Subway";
 
-"type.railway.station.subway.almaty" = "Subway Station";
+"type.railway.station.subway.almaty" = "Subway";
 
-"type.railway.station.subway.amsterdam" = "Subway Station";
+"type.railway.station.subway.amsterdam" = "Subway";
 
-"type.railway.station.subway.ankara" = "Subway Station";
+"type.railway.station.subway.ankara" = "Subway";
 
-"type.railway.station.subway.athens" = "Subway Station";
+"type.railway.station.subway.athens" = "Subway";
 
-"type.railway.station.subway.baku" = "Subway Station";
+"type.railway.station.subway.baku" = "Subway";
 
-"type.railway.station.subway.bangkok" = "Subway Station";
+"type.railway.station.subway.bangkok" = "Subway";
 
-"type.railway.station.subway.barcelona" = "Subway Station";
+"type.railway.station.subway.barcelona" = "Subway";
 
-"type.railway.station.subway.beijing" = "Subway Station";
+"type.railway.station.subway.beijing" = "Subway";
 
-"type.railway.station.subway.bengalore" = "Subway Station";
+"type.railway.station.subway.bengalore" = "Subway";
 
-"type.railway.station.subway.berlin" = "Subway Station";
+"type.railway.station.subway.berlin" = "Subway";
 
-"type.railway.station.subway.bilbao" = "Subway Station";
+"type.railway.station.subway.bilbao" = "Subway";
 
-"type.railway.station.subway.brasilia" = "Subway Station";
+"type.railway.station.subway.brasilia" = "Subway";
 
-"type.railway.station.subway.brescia" = "Subway Station";
+"type.railway.station.subway.brescia" = "Subway";
 
-"type.railway.station.subway.brussels" = "Subway Station";
+"type.railway.station.subway.brussels" = "Subway";
 
-"type.railway.station.subway.bucharest" = "Subway Station";
+"type.railway.station.subway.bucharest" = "Subway";
 
-"type.railway.station.subway.budapest" = "Subway Station";
+"type.railway.station.subway.budapest" = "Subway";
 
-"type.railway.station.subway.buenos_aires" = "Subway Station";
+"type.railway.station.subway.buenos_aires" = "Subway";
 
-"type.railway.station.subway.bursa" = "Subway Station";
+"type.railway.station.subway.bursa" = "Subway";
 
-"type.railway.station.subway.cairo" = "Subway Station";
+"type.railway.station.subway.cairo" = "Subway";
 
-"type.railway.station.subway.caracas" = "Subway Station";
+"type.railway.station.subway.caracas" = "Subway";
 
-"type.railway.station.subway.catania" = "Subway Station";
+"type.railway.station.subway.catania" = "Subway";
 
-"type.railway.station.subway.changchun" = "Subway Station";
+"type.railway.station.subway.changchun" = "Subway";
 
-"type.railway.station.subway.chengdu" = "Subway Station";
+"type.railway.station.subway.chengdu" = "Subway";
 
-"type.railway.station.subway.chicago" = "Subway Station";
+"type.railway.station.subway.chicago" = "Subway";
 
-"type.railway.station.subway.chongqing" = "Subway Station";
+"type.railway.station.subway.chongqing" = "Subway";
 
-"type.railway.station.subway.dalian" = "Subway Station";
+"type.railway.station.subway.dalian" = "Subway";
 
-"type.railway.station.subway.delhi" = "Subway Station";
+"type.railway.station.subway.delhi" = "Subway";
 
-"type.railway.station.subway.dnepro" = "Subway Station";
+"type.railway.station.subway.dnepro" = "Subway";
 
-"type.railway.station.subway.dubai" = "Subway Station";
+"type.railway.station.subway.dubai" = "Subway";
 
-"type.railway.station.subway.ekb" = "Subway Station";
+"type.railway.station.subway.ekb" = "Subway";
 
-"type.railway.station.subway.fukuoka" = "Subway Station";
+"type.railway.station.subway.fukuoka" = "Subway";
 
-"type.railway.station.subway.glasgow" = "Subway Station";
+"type.railway.station.subway.glasgow" = "Subway";
 
-"type.railway.station.subway.guangzhou" = "Subway Station";
+"type.railway.station.subway.guangzhou" = "Subway";
 
-"type.railway.station.subway.hamburg" = "Subway Station";
+"type.railway.station.subway.hamburg" = "Subway";
 
-"type.railway.station.subway.helsinki" = "Subway Station";
+"type.railway.station.subway.helsinki" = "Subway";
 
-"type.railway.station.subway.hiroshima" = "Subway Station";
+"type.railway.station.subway.hiroshima" = "Subway";
 
-"type.railway.station.subway.isfahan" = "Subway Station";
+"type.railway.station.subway.isfahan" = "Subway";
 
-"type.railway.station.subway.istanbul" = "Subway Station";
+"type.railway.station.subway.istanbul" = "Subway";
 
-"type.railway.station.subway.izmir" = "Subway Station";
+"type.railway.station.subway.izmir" = "Subway";
 
-"type.railway.station.subway.kazan" = "Subway Station";
+"type.railway.station.subway.kazan" = "Subway";
 
-"type.railway.station.subway.kharkiv" = "Subway Station";
+"type.railway.station.subway.kharkiv" = "Subway";
 
-"type.railway.station.subway.kiev" = "Subway Station";
+"type.railway.station.subway.kiev" = "Subway";
 
-"type.railway.station.subway.kobe" = "Subway Station";
+"type.railway.station.subway.kobe" = "Subway";
 
-"type.railway.station.subway.kolkata" = "Subway Station";
+"type.railway.station.subway.kolkata" = "Subway";
 
-"type.railway.station.subway.kunming" = "Subway Station";
+"type.railway.station.subway.kunming" = "Subway";
 
-"type.railway.station.subway.kyoto" = "Subway Station";
+"type.railway.station.subway.kyoto" = "Subway";
 
-"type.railway.station.subway.la" = "Subway Station";
+"type.railway.station.subway.la" = "Subway";
 
-"type.railway.station.subway.lausanne" = "Subway Station";
+"type.railway.station.subway.lausanne" = "Subway";
 
-"type.railway.station.subway.lille" = "Subway Station";
+"type.railway.station.subway.lille" = "Subway";
 
-"type.railway.station.subway.lima" = "Subway Station";
+"type.railway.station.subway.lima" = "Subway";
 
-"type.railway.station.subway.lisboa" = "Subway Station";
+"type.railway.station.subway.lisboa" = "Subway";
 
-"type.railway.station.subway.london" = "Subway Station";
+"type.railway.station.subway.london" = "Subway";
 
-"type.railway.station.subway.lyon" = "Subway Station";
+"type.railway.station.subway.lyon" = "Subway";
 
-"type.railway.station.subway.madrid" = "Subway Station";
+"type.railway.station.subway.madrid" = "Subway";
 
-"type.railway.station.subway.malaga" = "Subway Station";
+"type.railway.station.subway.malaga" = "Subway";
 
-"type.railway.station.subway.manila" = "Subway Station";
+"type.railway.station.subway.manila" = "Subway";
 
-"type.railway.station.subway.maracaibo" = "Subway Station";
+"type.railway.station.subway.maracaibo" = "Subway";
 
-"type.railway.station.subway.mashhad" = "Subway Station";
+"type.railway.station.subway.mashhad" = "Subway";
 
-"type.railway.station.subway.mecca" = "Subway Station";
+"type.railway.station.subway.mecca" = "Subway";
 
-"type.railway.station.subway.medellin" = "Subway Station";
+"type.railway.station.subway.medellin" = "Subway";
 
-"type.railway.station.subway.mexico" = "Subway Station";
+"type.railway.station.subway.mexico" = "Subway";
 
-"type.railway.station.subway.milan" = "Subway Station";
+"type.railway.station.subway.milan" = "Subway";
 
-"type.railway.station.subway.minsk" = "Subway Station";
+"type.railway.station.subway.minsk" = "Subway";
 
-"type.railway.station.subway.montreal" = "Subway Station";
+"type.railway.station.subway.montreal" = "Subway";
 
-"type.railway.station.subway.moscow" = "Subway Station";
+"type.railway.station.subway.moscow" = "Subway";
 
-"type.railway.station.subway.munchen" = "Subway Station";
+"type.railway.station.subway.munchen" = "Subway";
 
-"type.railway.station.subway.nagoya" = "Subway Station";
+"type.railway.station.subway.nagoya" = "Subway";
 
-"type.railway.station.subway.newyork" = "Subway Station";
+"type.railway.station.subway.newyork" = "Subway";
 
-"type.railway.station.subway.nnov" = "Subway Station";
+"type.railway.station.subway.nnov" = "Subway";
 
-"type.railway.station.subway.novosibirsk" = "Subway Station";
+"type.railway.station.subway.novosibirsk" = "Subway";
 
-"type.railway.station.subway.osaka" = "Subway Station";
+"type.railway.station.subway.osaka" = "Subway";
 
-"type.railway.station.subway.oslo" = "Subway Station";
+"type.railway.station.subway.oslo" = "Subway";
 
-"type.railway.station.subway.palma" = "Subway Station";
+"type.railway.station.subway.palma" = "Subway";
 
-"type.railway.station.subway.panama" = "Subway Station";
+"type.railway.station.subway.panama" = "Subway";
 
-"type.railway.station.subway.paris" = "Subway Station";
+"type.railway.station.subway.paris" = "Subway";
 
-"type.railway.station.subway.philadelphia" = "Subway Station";
+"type.railway.station.subway.philadelphia" = "Subway";
 
-"type.railway.station.subway.pyongyang" = "Subway Station";
+"type.railway.station.subway.pyongyang" = "Subway";
 
-"type.railway.station.subway.rennes" = "Subway Station";
+"type.railway.station.subway.rennes" = "Subway";
 
-"type.railway.station.subway.rio" = "Subway Station";
+"type.railway.station.subway.rio" = "Subway";
 
-"type.railway.station.subway.roma" = "Subway Station";
+"type.railway.station.subway.roma" = "Subway";
 
-"type.railway.station.subway.rotterdam" = "Subway Station";
+"type.railway.station.subway.rotterdam" = "Subway";
 
-"type.railway.station.subway.samara" = "Subway Station";
+"type.railway.station.subway.samara" = "Subway";
 
-"type.railway.station.subway.santiago" = "Subway Station";
+"type.railway.station.subway.santiago" = "Subway";
 
-"type.railway.station.subway.santo_domingo" = "Subway Station";
+"type.railway.station.subway.santo_domingo" = "Subway";
 
-"type.railway.station.subway.saopaulo" = "Subway Station";
+"type.railway.station.subway.saopaulo" = "Subway";
 
-"type.railway.station.subway.sapporo" = "Subway Station";
+"type.railway.station.subway.sapporo" = "Subway";
 
-"type.railway.station.subway.sendai" = "Subway Station";
+"type.railway.station.subway.sendai" = "Subway";
 
-"type.railway.station.subway.sf" = "Subway Station";
+"type.railway.station.subway.sf" = "Subway";
 
-"type.railway.station.subway.shanghai" = "Subway Station";
+"type.railway.station.subway.shanghai" = "Subway";
 
-"type.railway.station.subway.shiraz" = "Subway Station";
+"type.railway.station.subway.shiraz" = "Subway";
 
-"type.railway.station.subway.sofia" = "Subway Station";
+"type.railway.station.subway.sofia" = "Subway";
 
-"type.railway.station.subway.spb" = "Subway Station";
+"type.railway.station.subway.spb" = "Subway";
 
-"type.railway.station.subway.stockholm" = "Subway Station";
+"type.railway.station.subway.stockholm" = "Subway";
 
-"type.railway.station.subway.tabriz" = "Subway Station";
+"type.railway.station.subway.tabriz" = "Subway";
 
-"type.railway.station.subway.taipei" = "Subway Station";
+"type.railway.station.subway.taipei" = "Subway";
 
-"type.railway.station.subway.taoyuan" = "Subway Station";
+"type.railway.station.subway.taoyuan" = "Subway";
 
-"type.railway.station.subway.tashkent" = "Subway Station";
+"type.railway.station.subway.tashkent" = "Subway";
 
-"type.railway.station.subway.tbilisi" = "Subway Station";
+"type.railway.station.subway.tbilisi" = "Subway";
 
-"type.railway.station.subway.tianjin" = "Subway Station";
+"type.railway.station.subway.tianjin" = "Subway";
 
-"type.railway.station.subway.tokyo" = "Subway Station";
+"type.railway.station.subway.tokyo" = "Subway";
 
-"type.railway.station.subway.valencia" = "Subway Station";
+"type.railway.station.subway.valencia" = "Subway";
 
-"type.railway.station.subway.vienna" = "Subway Station";
+"type.railway.station.subway.vienna" = "Subway";
 
-"type.railway.station.subway.warszawa" = "Subway Station";
+"type.railway.station.subway.warszawa" = "Subway";
 
-"type.railway.station.subway.washington" = "Subway Station";
+"type.railway.station.subway.washington" = "Subway";
 
-"type.railway.station.subway.wuhan" = "Subway Station";
+"type.railway.station.subway.wuhan" = "Subway";
 
-"type.railway.station.subway.yerevan" = "Subway Station";
+"type.railway.station.subway.yerevan" = "Subway";
 
-"type.railway.station.subway.yokohama" = "Subway Station";
+"type.railway.station.subway.yokohama" = "Subway";
 
 "type.railway.subway" = "Subway Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3283,15 +3273,15 @@
 
 "type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
 "type.shop.cannabis" = "Магазин за канабис";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Workshop";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
@@ -3299,23 +3289,23 @@
 
 "type.shop.carpet" = "Килими";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Chocolate Shop";
 
 "type.shop.clothes" = "Clothes Shop";
 
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Store";
 
 "type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Candy Shop";
+"type.shop.confectionery" = "Sweets";
 
 "type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
-"type.shop.cosmetics" = "Cosmetics Shop";
+"type.shop.cosmetics" = "Cosmetics";
 
 "type.shop.curtain" = "Пердета";
 
@@ -3323,11 +3313,11 @@
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "Home Improvement Store";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "Модни аксесоари";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
 
 "type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "Магазин за газ";
 
@@ -3365,7 +3355,7 @@
 
 "type.shop.houseware" = "Магазин за домакински принадлежности";
 
-"type.shop.jewelry" = "Jewelry Store";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
@@ -3377,7 +3367,7 @@
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Cell Phone Store";
+"type.shop.mobile_phone" = "Cell Phones";
 
 "type.shop.money_lender" = "Money Lender";
 
@@ -3387,13 +3377,13 @@
 
 "type.shop.music" = "Record Store";
 
-"type.shop.musical_instrument" = "Musical Instrument Shop";
+"type.shop.musical_instrument" = "Musical Instruments";
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "Точка на вземане";
 
@@ -3407,13 +3397,13 @@
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
 "type.shop.second_hand" = "Магазин втора употреба";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3421,7 +3411,7 @@
 
 "type.shop.tattoo" = "Tattoo Parlour";
 
-"type.shop.tea" = "Tea Shop";
+"type.shop.tea" = "Tea Store";
 
 "type.shop.ticket" = "Ticket Shop";
 
@@ -3435,7 +3425,7 @@
 
 "type.shop.video" = "Video Shop";
 
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.video_games" = "Video Games Shop";
 
 "type.shop.wine" = "Wine Shop";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Магазин за техника";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Магазин за изкуства";
 
 "type.shop.baby_goods" = "Детски магазин";
@@ -3527,7 +3516,7 @@
 "type.sport.multi" = "Различни спортове";
 
 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
@@ -3563,19 +3552,19 @@
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
@@ -3583,13 +3572,13 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "RV Park";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3655,13 +3644,13 @@
 
 "type.waterway.riverbank" = "River";
 
-"type.waterway.stream" = "Stream";
+"type.waterway.stream" = "River";
 
-"type.waterway.stream.ephemeral" = "Ephemeral Stream";
+"type.waterway.stream.ephemeral" = "River";
 
-"type.waterway.stream.intermittent" = "Intermittent Stream";
+"type.waterway.stream.intermittent" = "River";
 
-"type.waterway.stream.tunnel" = "Stream";
+"type.waterway.stream.tunnel" = "River";
 
 "type.waterway.waterfall" = "Waterfall";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "Място за провеждане на събития";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 0b3ef7d68b..86386eb066 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "La meva posició";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Més tard";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/ca/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Ca:About";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adreça/Bloc";
-
-"type.addr_interpolation.even" = "Adreça/Bloc";
-
-"type.addr_interpolation.odd" = "Adreça/Bloc";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1285,7 +1279,7 @@
 
 "type.amenity" = "Amenity";
 
-"type.amenity.arts_centre" = "Arts Center";
+"type.amenity.arts_centre" = "Art Center";
 
 "type.amenity.atm" = "ATM";
 
@@ -1409,15 +1403,15 @@
 
 "type.amenity.parking.private" = "Private Parking";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "Underground Parking";
 
-"type.amenity.parking_entrance" = "Parking Entrance";
+"type.amenity.parking_entrance" = "Parking entrance";
 
-"type.amenity.parking_entrance.private" = "Parking Entrance";
+"type.amenity.parking_entrance.private" = "Parking entrance";
 
-"type.amenity.parking_entrance.permissive" = "Parking Entrance";
+"type.amenity.parking_entrance.permissive" = "Parking entrance";
 
 "type.amenity.parking_space" = "Parking Space";
 
@@ -1435,23 +1429,23 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
-"type.amenity.post_box" = "Mailbox";
+"type.amenity.post_box" = "Post Box";
 
 "type.amenity.post_office" = "Post Office";
 
@@ -1470,7 +1464,7 @@
 
 "type.amenity.recycling.container" = "Recycling Container";
 
-"type.recycling.batteries" = "Batteries";
+"type.recycling.batteries" = "Household Batteries";
 
 "type.recycling.clothes" = "Clothes";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,9 +1524,9 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "Parking Tickets";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinary Doctor";
 
@@ -1552,13 +1546,13 @@
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "Barrier";
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1660,7 +1652,7 @@
 
 "type.craft.carpenter" = "Carpenter";
 
-"type.craft.confectionery" = "Confectioner";
+"type.craft.confectionery" = "Confectionery";
 
 "type.craft.electrician" = "Electrician";
 
@@ -1671,7 +1663,7 @@
 "type.craft.handicraft" = "Handicraft";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "HVAC Shop";
+"type.craft.hvac" = "HVAC";
 
 "type.craft.key_cutter" = "Tall de claus";
 
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Photographer";
 
-"type.shop.camera" = "Botiga de càmeres";
-
 "type.craft.plumber" = "Plumber";
 
 "type.craft.sawmill" = "Sawmill";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -1885,19 +1875,19 @@
 
 "type.healthcare.physiotherapist" = "Physiotherapist";
 
-"type.healthcare.alternative" = "Alternative Medicine";
+"type.healthcare.alternative" = "Alternative medicine";
 
-"type.healthcare.audiologist" = "Audiologist";
+"type.healthcare.audiologist" = "Audiology";
 
-"type.healthcare.blood_donation" = "Blood Donation Center";
+"type.healthcare.blood_donation" = "Blood donation center";
 
-"type.healthcare.optometrist" = "Optometrist";
+"type.healthcare.optometrist" = "Optometry";
 
-"type.healthcare.podiatrist" = "Podiatrist";
+"type.healthcare.podiatrist" = "Podiatry";
 
-"type.healthcare.psychotherapist" = "Psychotherapist";
+"type.healthcare.psychotherapist" = "Psychotherapy";
 
-"type.healthcare.sample_collection" = "Sample Collection Centre";
+"type.healthcare.sample_collection" = "Sample collection";
 
 "type.healthcare.speech_therapist" = "Logopedics";
 
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Bridge";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2207,21 +2197,21 @@
 
 /********** Types: Historic **********/
 
-"type.historic" = "Historic Object";
+"type.historic" = "Historic object";
 
 "type.historic.archaeological_site" = "Archaeological Site";
 
-"type.historic.battlefield" = "Historic Battlefield";
+"type.historic.battlefield" = "Battlefield";
 
 "type.historic.boundary_stone" = "Boundary Stone";
 
 "type.historic.castle" = "Castle";
 
-"type.historic.castle.castrum" = "Roman Fort";
+"type.historic.castle.castrum" = "Roman fort";
 
-"type.historic.castle.defensive" = "Stronghold Castle";
+"type.historic.castle.defensive" = "Castle";
 
-"type.historic.castle.fortified_church" = "Fortified Church";
+"type.historic.castle.fortified_church" = "Fortified church";
 
 "type.historic.castle.fortress" = "Fortress";
 
@@ -2229,15 +2219,15 @@
 
 "type.historic.castle.kremlin" = "Kremlin";
 
-"type.historic.castle.manor" = "Manor House";
+"type.historic.castle.manor" = "Manor house";
 
 "type.historic.castle.palace" = "Palace";
 
-"type.historic.castle.shiro" = "Japanese Castle";
+"type.historic.castle.shiro" = "Japanese castle";
 
-"type.historic.castle.stately" = "Stately Castle";
+"type.historic.castle.stately" = "Castle";
 
-"type.historic.city_gate" = "City Gate";
+"type.historic.city_gate" = "City gate";
 
 "type.historic.citywalls" = "City Wall";
 
@@ -2247,9 +2237,9 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.cross" = "Memorial Cross";
+"type.historic.memorial.cross" = "Memorial cross";
 
-"type.historic.memorial.plaque" = "Commemorative Plaque";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
 "type.historic.memorial.sculpture" = "Sculpture";
 
@@ -2257,21 +2247,21 @@
 
 "type.historic.memorial.stolperstein" = "Stolperstein";
 
-"type.historic.memorial.war_memorial" = "War Memorial";
+"type.historic.memorial.war_memorial" = "War memorial";
 
 "type.historic.monument" = "Monument";
 
 "type.historic.pillory" = "Pillory";
 
-"type.historic.ruins" = "Historic Ruins";
+"type.historic.ruins" = "Ruins";
 
 "type.historic.ship" = "Ship";
 
 "type.historic.tomb" = "Tomb";
 
-"type.historic.wayside_cross" = "Wayside Cross";
+"type.historic.wayside_cross" = "Wayside cross";
 
-"type.historic.wayside_shrine" = "Wayside Shrine";
+"type.historic.wayside_shrine" = "Wayside shrine";
 
 "type.hwtag" = "hwtag";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2343,11 +2333,11 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
-"type.landuse.grass" = "Grass";
+"type.landuse.grass" = "Lawn";
 
 "type.landuse.greenfield" = "Greenfield";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2417,7 +2407,7 @@
 
 "type.leisure.picnic_table" = "Picnic Table";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Torre de comunicacions";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2511,13 +2501,13 @@
 
 "type.natural.beach" = "Beach";
 
-"type.natural.beach.sand" = "Sandy Beach";
+"type.natural.beach.sand" = "Sand Beach";
 
 "type.natural.beach.gravel" = "Gravel Beach";
 
 "type.natural.cape" = "Cape";
 
-"type.natural.cave_entrance" = "Cave Entrance";
+"type.natural.cave_entrance" = "Cave";
 
 "type.natural.cliff" = "Cliff";
 
@@ -2565,7 +2555,7 @@
 
 "type.natural.scrub" = "Scrub";
 
-"type.natural.spring" = "Natural Spring";
+"type.natural.spring" = "Spring";
 
 "type.natural.strait" = "Strait";
 
@@ -2577,7 +2567,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Waterbody";
 
 "type.natural.wetland" = "Wetland";
 
@@ -2643,7 +2633,7 @@
 
 "type.place.island" = "Island";
 
-"type.place.islet" = "Islet";
+"type.place.islet" = "Island";
 
 "type.place.isolated_dwelling" = "Isolated Dwelling";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Generador solar";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "Central eòlica";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Level Crossing";
 
@@ -2799,225 +2789,225 @@
 
 "type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Subway Station";
+"type.railway.station.subway" = "Subway";
 
-"type.railway.station.subway.adana" = "Subway Station";
+"type.railway.station.subway.adana" = "Subway";
 
-"type.railway.station.subway.algiers" = "Subway Station";
+"type.railway.station.subway.algiers" = "Subway";
 
-"type.railway.station.subway.almaty" = "Subway Station";
+"type.railway.station.subway.almaty" = "Subway";
 
-"type.railway.station.subway.amsterdam" = "Subway Station";
+"type.railway.station.subway.amsterdam" = "Subway";
 
-"type.railway.station.subway.ankara" = "Subway Station";
+"type.railway.station.subway.ankara" = "Subway";
 
-"type.railway.station.subway.athens" = "Subway Station";
+"type.railway.station.subway.athens" = "Subway";
 
-"type.railway.station.subway.baku" = "Subway Station";
+"type.railway.station.subway.baku" = "Subway";
 
-"type.railway.station.subway.bangkok" = "Subway Station";
+"type.railway.station.subway.bangkok" = "Subway";
 
-"type.railway.station.subway.barcelona" = "Subway Station";
+"type.railway.station.subway.barcelona" = "Subway";
 
-"type.railway.station.subway.beijing" = "Subway Station";
+"type.railway.station.subway.beijing" = "Subway";
 
-"type.railway.station.subway.bengalore" = "Subway Station";
+"type.railway.station.subway.bengalore" = "Subway";
 
-"type.railway.station.subway.berlin" = "Subway Station";
+"type.railway.station.subway.berlin" = "Subway";
 
-"type.railway.station.subway.bilbao" = "Subway Station";
+"type.railway.station.subway.bilbao" = "Subway";
 
-"type.railway.station.subway.brasilia" = "Subway Station";
+"type.railway.station.subway.brasilia" = "Subway";
 
-"type.railway.station.subway.brescia" = "Subway Station";
+"type.railway.station.subway.brescia" = "Subway";
 
-"type.railway.station.subway.brussels" = "Subway Station";
+"type.railway.station.subway.brussels" = "Subway";
 
-"type.railway.station.subway.bucharest" = "Subway Station";
+"type.railway.station.subway.bucharest" = "Subway";
 
-"type.railway.station.subway.budapest" = "Subway Station";
+"type.railway.station.subway.budapest" = "Subway";
 
-"type.railway.station.subway.buenos_aires" = "Subway Station";
+"type.railway.station.subway.buenos_aires" = "Subway";
 
-"type.railway.station.subway.bursa" = "Subway Station";
+"type.railway.station.subway.bursa" = "Subway";
 
-"type.railway.station.subway.cairo" = "Subway Station";
+"type.railway.station.subway.cairo" = "Subway";
 
-"type.railway.station.subway.caracas" = "Subway Station";
+"type.railway.station.subway.caracas" = "Subway";
 
-"type.railway.station.subway.catania" = "Subway Station";
+"type.railway.station.subway.catania" = "Subway";
 
-"type.railway.station.subway.changchun" = "Subway Station";
+"type.railway.station.subway.changchun" = "Subway";
 
-"type.railway.station.subway.chengdu" = "Subway Station";
+"type.railway.station.subway.chengdu" = "Subway";
 
-"type.railway.station.subway.chicago" = "Subway Station";
+"type.railway.station.subway.chicago" = "Subway";
 
-"type.railway.station.subway.chongqing" = "Subway Station";
+"type.railway.station.subway.chongqing" = "Subway";
 
-"type.railway.station.subway.dalian" = "Subway Station";
+"type.railway.station.subway.dalian" = "Subway";
 
-"type.railway.station.subway.delhi" = "Subway Station";
+"type.railway.station.subway.delhi" = "Subway";
 
-"type.railway.station.subway.dnepro" = "Subway Station";
+"type.railway.station.subway.dnepro" = "Subway";
 
-"type.railway.station.subway.dubai" = "Subway Station";
+"type.railway.station.subway.dubai" = "Subway";
 
-"type.railway.station.subway.ekb" = "Subway Station";
+"type.railway.station.subway.ekb" = "Subway";
 
-"type.railway.station.subway.fukuoka" = "Subway Station";
+"type.railway.station.subway.fukuoka" = "Subway";
 
-"type.railway.station.subway.glasgow" = "Subway Station";
+"type.railway.station.subway.glasgow" = "Subway";
 
-"type.railway.station.subway.guangzhou" = "Subway Station";
+"type.railway.station.subway.guangzhou" = "Subway";
 
-"type.railway.station.subway.hamburg" = "Subway Station";
+"type.railway.station.subway.hamburg" = "Subway";
 
-"type.railway.station.subway.helsinki" = "Subway Station";
+"type.railway.station.subway.helsinki" = "Subway";
 
-"type.railway.station.subway.hiroshima" = "Subway Station";
+"type.railway.station.subway.hiroshima" = "Subway";
 
-"type.railway.station.subway.isfahan" = "Subway Station";
+"type.railway.station.subway.isfahan" = "Subway";
 
-"type.railway.station.subway.istanbul" = "Subway Station";
+"type.railway.station.subway.istanbul" = "Subway";
 
-"type.railway.station.subway.izmir" = "Subway Station";
+"type.railway.station.subway.izmir" = "Subway";
 
-"type.railway.station.subway.kazan" = "Subway Station";
+"type.railway.station.subway.kazan" = "Subway";
 
-"type.railway.station.subway.kharkiv" = "Subway Station";
+"type.railway.station.subway.kharkiv" = "Subway";
 
-"type.railway.station.subway.kiev" = "Subway Station";
+"type.railway.station.subway.kiev" = "Subway";
 
-"type.railway.station.subway.kobe" = "Subway Station";
+"type.railway.station.subway.kobe" = "Subway";
 
-"type.railway.station.subway.kolkata" = "Subway Station";
+"type.railway.station.subway.kolkata" = "Subway";
 
-"type.railway.station.subway.kunming" = "Subway Station";
+"type.railway.station.subway.kunming" = "Subway";
 
-"type.railway.station.subway.kyoto" = "Subway Station";
+"type.railway.station.subway.kyoto" = "Subway";
 
-"type.railway.station.subway.la" = "Subway Station";
+"type.railway.station.subway.la" = "Subway";
 
-"type.railway.station.subway.lausanne" = "Subway Station";
+"type.railway.station.subway.lausanne" = "Subway";
 
-"type.railway.station.subway.lille" = "Subway Station";
+"type.railway.station.subway.lille" = "Subway";
 
-"type.railway.station.subway.lima" = "Subway Station";
+"type.railway.station.subway.lima" = "Subway";
 
-"type.railway.station.subway.lisboa" = "Subway Station";
+"type.railway.station.subway.lisboa" = "Subway";
 
-"type.railway.station.subway.london" = "Subway Station";
+"type.railway.station.subway.london" = "Subway";
 
-"type.railway.station.subway.lyon" = "Subway Station";
+"type.railway.station.subway.lyon" = "Subway";
 
-"type.railway.station.subway.madrid" = "Subway Station";
+"type.railway.station.subway.madrid" = "Subway";
 
-"type.railway.station.subway.malaga" = "Subway Station";
+"type.railway.station.subway.malaga" = "Subway";
 
-"type.railway.station.subway.manila" = "Subway Station";
+"type.railway.station.subway.manila" = "Subway";
 
-"type.railway.station.subway.maracaibo" = "Subway Station";
+"type.railway.station.subway.maracaibo" = "Subway";
 
-"type.railway.station.subway.mashhad" = "Subway Station";
+"type.railway.station.subway.mashhad" = "Subway";
 
-"type.railway.station.subway.mecca" = "Subway Station";
+"type.railway.station.subway.mecca" = "Subway";
 
-"type.railway.station.subway.medellin" = "Subway Station";
+"type.railway.station.subway.medellin" = "Subway";
 
-"type.railway.station.subway.mexico" = "Subway Station";
+"type.railway.station.subway.mexico" = "Subway";
 
-"type.railway.station.subway.milan" = "Subway Station";
+"type.railway.station.subway.milan" = "Subway";
 
-"type.railway.station.subway.minsk" = "Subway Station";
+"type.railway.station.subway.minsk" = "Subway";
 
-"type.railway.station.subway.montreal" = "Subway Station";
+"type.railway.station.subway.montreal" = "Subway";
 
-"type.railway.station.subway.moscow" = "Subway Station";
+"type.railway.station.subway.moscow" = "Subway";
 
-"type.railway.station.subway.munchen" = "Subway Station";
+"type.railway.station.subway.munchen" = "Subway";
 
-"type.railway.station.subway.nagoya" = "Subway Station";
+"type.railway.station.subway.nagoya" = "Subway";
 
-"type.railway.station.subway.newyork" = "Subway Station";
+"type.railway.station.subway.newyork" = "Subway";
 
-"type.railway.station.subway.nnov" = "Subway Station";
+"type.railway.station.subway.nnov" = "Subway";
 
-"type.railway.station.subway.novosibirsk" = "Subway Station";
+"type.railway.station.subway.novosibirsk" = "Subway";
 
-"type.railway.station.subway.osaka" = "Subway Station";
+"type.railway.station.subway.osaka" = "Subway";
 
-"type.railway.station.subway.oslo" = "Subway Station";
+"type.railway.station.subway.oslo" = "Subway";
 
-"type.railway.station.subway.palma" = "Subway Station";
+"type.railway.station.subway.palma" = "Subway";
 
-"type.railway.station.subway.panama" = "Subway Station";
+"type.railway.station.subway.panama" = "Subway";
 
-"type.railway.station.subway.paris" = "Subway Station";
+"type.railway.station.subway.paris" = "Subway";
 
-"type.railway.station.subway.philadelphia" = "Subway Station";
+"type.railway.station.subway.philadelphia" = "Subway";
 
-"type.railway.station.subway.pyongyang" = "Subway Station";
+"type.railway.station.subway.pyongyang" = "Subway";
 
-"type.railway.station.subway.rennes" = "Subway Station";
+"type.railway.station.subway.rennes" = "Subway";
 
-"type.railway.station.subway.rio" = "Subway Station";
+"type.railway.station.subway.rio" = "Subway";
 
-"type.railway.station.subway.roma" = "Subway Station";
+"type.railway.station.subway.roma" = "Subway";
 
-"type.railway.station.subway.rotterdam" = "Subway Station";
+"type.railway.station.subway.rotterdam" = "Subway";
 
-"type.railway.station.subway.samara" = "Subway Station";
+"type.railway.station.subway.samara" = "Subway";
 
-"type.railway.station.subway.santiago" = "Subway Station";
+"type.railway.station.subway.santiago" = "Subway";
 
-"type.railway.station.subway.santo_domingo" = "Subway Station";
+"type.railway.station.subway.santo_domingo" = "Subway";
 
-"type.railway.station.subway.saopaulo" = "Subway Station";
+"type.railway.station.subway.saopaulo" = "Subway";
 
-"type.railway.station.subway.sapporo" = "Subway Station";
+"type.railway.station.subway.sapporo" = "Subway";
 
-"type.railway.station.subway.sendai" = "Subway Station";
+"type.railway.station.subway.sendai" = "Subway";
 
-"type.railway.station.subway.sf" = "Subway Station";
+"type.railway.station.subway.sf" = "Subway";
 
-"type.railway.station.subway.shanghai" = "Subway Station";
+"type.railway.station.subway.shanghai" = "Subway";
 
-"type.railway.station.subway.shiraz" = "Subway Station";
+"type.railway.station.subway.shiraz" = "Subway";
 
-"type.railway.station.subway.sofia" = "Subway Station";
+"type.railway.station.subway.sofia" = "Subway";
 
-"type.railway.station.subway.spb" = "Subway Station";
+"type.railway.station.subway.spb" = "Subway";
 
-"type.railway.station.subway.stockholm" = "Subway Station";
+"type.railway.station.subway.stockholm" = "Subway";
 
-"type.railway.station.subway.tabriz" = "Subway Station";
+"type.railway.station.subway.tabriz" = "Subway";
 
-"type.railway.station.subway.taipei" = "Subway Station";
+"type.railway.station.subway.taipei" = "Subway";
 
-"type.railway.station.subway.taoyuan" = "Subway Station";
+"type.railway.station.subway.taoyuan" = "Subway";
 
-"type.railway.station.subway.tashkent" = "Subway Station";
+"type.railway.station.subway.tashkent" = "Subway";
 
-"type.railway.station.subway.tbilisi" = "Subway Station";
+"type.railway.station.subway.tbilisi" = "Subway";
 
-"type.railway.station.subway.tianjin" = "Subway Station";
+"type.railway.station.subway.tianjin" = "Subway";
 
-"type.railway.station.subway.tokyo" = "Subway Station";
+"type.railway.station.subway.tokyo" = "Subway";
 
-"type.railway.station.subway.valencia" = "Subway Station";
+"type.railway.station.subway.valencia" = "Subway";
 
-"type.railway.station.subway.vienna" = "Subway Station";
+"type.railway.station.subway.vienna" = "Subway";
 
-"type.railway.station.subway.warszawa" = "Subway Station";
+"type.railway.station.subway.warszawa" = "Subway";
 
-"type.railway.station.subway.washington" = "Subway Station";
+"type.railway.station.subway.washington" = "Subway";
 
-"type.railway.station.subway.wuhan" = "Subway Station";
+"type.railway.station.subway.wuhan" = "Subway";
 
-"type.railway.station.subway.yerevan" = "Subway Station";
+"type.railway.station.subway.yerevan" = "Subway";
 
-"type.railway.station.subway.yokohama" = "Subway Station";
+"type.railway.station.subway.yokohama" = "Subway";
 
 "type.railway.subway" = "Subway Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3283,15 +3273,15 @@
 
 "type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
 "type.shop.cannabis" = "Botiga de cànnabis";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Workshop";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
@@ -3299,35 +3289,35 @@
 
 "type.shop.carpet" = "Catifes";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Chocolate Shop";
 
 "type.shop.clothes" = "Clothes Shop";
 
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Store";
 
 "type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Candy Shop";
+"type.shop.confectionery" = "Sweets";
 
 "type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
-"type.shop.cosmetics" = "Cosmetics Shop";
+"type.shop.cosmetics" = "Cosmetics";
 
 "type.shop.curtain" = "Cortines";
 
-"type.shop.deli" = "Delicatessen";
+"type.shop.deli" = "Delicatessen Shop";
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "Home Improvement Store";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "Complements de moda";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
 
 "type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "Botiga de gas";
 
@@ -3351,7 +3341,7 @@
 
 "type.shop.greengrocer" = "Greengrocer";
 
-"type.shop.grocery" = "Grocery Store";
+"type.shop.grocery" = "Grocery";
 
 "type.shop.hairdresser" = "Hairdresser";
 
@@ -3363,9 +3353,9 @@
 
 "type.shop.hifi" = "Àudio HiFi";
 
-"type.shop.houseware" = "Home Improvement Store";
+"type.shop.houseware" = "Hardware Store";
 
-"type.shop.jewelry" = "Jewelry Store";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
@@ -3377,7 +3367,7 @@
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Cell Phone Store";
+"type.shop.mobile_phone" = "Cell Phones";
 
 "type.shop.money_lender" = "Money Lender";
 
@@ -3387,13 +3377,13 @@
 
 "type.shop.music" = "Record Store";
 
-"type.shop.musical_instrument" = "Musical Instrument Shop";
+"type.shop.musical_instrument" = "Musical Instruments";
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "Punt de recollida";
 
@@ -3407,13 +3397,13 @@
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
-"type.shop.second_hand" = "Second Hand Shop";
+"type.shop.second_hand" = "Second Hand";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3421,7 +3411,7 @@
 
 "type.shop.tattoo" = "Tattoo Parlour";
 
-"type.shop.tea" = "Tea Shop";
+"type.shop.tea" = "Tea Store";
 
 "type.shop.ticket" = "Ticket Shop";
 
@@ -3435,22 +3425,21 @@
 
 "type.shop.video" = "Video Shop";
 
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.video_games" = "Video Games Shop";
 
 "type.shop.wine" = "Wine Shop";
 
 "type.shop.agrarian" = "Botiga agrícola";
 
-"type.shop.antiques" = "Antiques Shop";
+"type.shop.antiques" = "Antiques";
 
 "type.shop.appliance" = "Botiga d'electrodomèstics";
 
-/* maybe change to Art Gallery for en-US when supported */
-"type.shop.art" = "Artwork Shop";
+"type.shop.art" = "Arts Shop";
 
-"type.shop.baby_goods" = "Baby Goods Shop";
+"type.shop.baby_goods" = "Baby Goods";
 
-"type.shop.bag" = "Bag Shop";
+"type.shop.bag" = "Bags Store";
 
 "type.shop.bed" = "Botiga de llits";
 
@@ -3458,37 +3447,37 @@
 
 "type.shop.charity" = "Charity Shop";
 
-"type.shop.cheese" = "Cheese Shop";
+"type.shop.cheese" = "Cheese Store";
 
-"type.shop.craft" = "Craft Supplies Store";
+"type.shop.craft" = "Arts and Crafts";
 
-"type.shop.dairy" = "Dairy Shop";
+"type.shop.dairy" = "Dairy Products";
 
-"type.shop.electrical" = "Electrical Supplies Store";
+"type.shop.electrical" = "Electrical Store";
 
 "type.shop.fishing" = "Fishing Store";
 
-"type.shop.interior_decoration" = "Interior Decorations Store";
+"type.shop.interior_decoration" = "Interior Decorations";
 
 "type.shop.lottery" = "Lottery Tickets";
 
-"type.shop.medical_supply" = "Medical Supplies Store";
+"type.shop.medical_supply" = "Medical Supplies";
 
-"type.shop.nutrition_supplements" = "Nutrition Supplement Store";
+"type.shop.nutrition_supplements" = "Nutrition Supplements";
 
-"type.shop.paint" = "Paint Shop";
+"type.shop.paint" = "Paints";
 
-"type.shop.perfumery" = "Perfume Shop";
+"type.shop.perfumery" = "Perfumery";
 
-"type.shop.sewing" = "Sewing Supplies Shop";
+"type.shop.sewing" = "Sewing Supplies";
 
 "type.shop.storage_rental" = "Storage Rental";
 
-"type.shop.tobacco" = "Smoke Shop";
+"type.shop.tobacco" = "Tobacco";
 
-"type.shop.trade" = "Trade Supplies";
+"type.shop.trade" = "Trades Supplies";
 
-"type.shop.watches" = "Watch Store";
+"type.shop.watches" = "Watches";
 
 "type.shop.wholesale" = "Wholesale Store";
 
@@ -3506,7 +3495,7 @@
 
 "type.sport.basketball" = "Basketball";
 
-"type.sport.beachvolleyball" = "Beach Volleyball";
+"type.sport.beachvolleyball" = "Beach volleyball";
 
 "type.sport.bowls" = "Bowls";
 
@@ -3527,7 +3516,7 @@
 "type.sport.multi" = "Various Sports";
 
 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
@@ -3539,7 +3528,7 @@
 
 "type.sport.swimming" = "Swimming";
 
-"type.sport.table_tennis" = "Table Tennis";
+"type.sport.table_tennis" = "Table tennis";
 
 "type.sport.tennis" = "Tennis Court";
 
@@ -3559,23 +3548,23 @@
 
 "type.sport.badminton" = "Badminton";
 
-"type.sport.pelota" = "Basque Pelota";
+"type.sport.pelota" = "Basque pelota";
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
@@ -3583,13 +3572,13 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "RV Park";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3655,13 +3644,13 @@
 
 "type.waterway.riverbank" = "River";
 
-"type.waterway.stream" = "Stream";
+"type.waterway.stream" = "River";
 
-"type.waterway.stream.ephemeral" = "Ephemeral Stream";
+"type.waterway.stream.ephemeral" = "River";
 
-"type.waterway.stream.intermittent" = "Intermittent Stream";
+"type.waterway.stream.intermittent" = "River";
 
-"type.waterway.stream.tunnel" = "Stream";
+"type.waterway.stream.tunnel" = "River";
 
 "type.waterway.waterfall" = "Waterfall";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "Events Venue";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index ecb88928bf..1ce7b448b4 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Moje poloha";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Později";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Pro RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Nahrávání záložek";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresa/blok";
-
-"type.addr_interpolation.even" = "Adresa/blok";
-
-"type.addr_interpolation.odd" = "Adresa/blok";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurace";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parkovací automat";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinář";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Stavba";
 
-"type.building.has_parts" = "Stavba";
-
-"type.building_part" = "Stavba";
-
 "type.building.garage" = "Garáž";
 
+"type.building.has_parts" = "Stavba";
+
 "type.building.train_station" = "Železniční stanice";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Obchod s fotoaparáty";
-
 "type.craft.plumber" = "Instalatér";
 
 "type.craft.sawmill" = "Pila";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Komunikační věž";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vodovodní kohoutek";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solární generátor";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Kadeřnictví";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Železářství";
 
 "type.shop.health_food" = "Prodejna zdravé výživy";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Obchod se spotřebiči";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Obchod s uměním";
 
 "type.shop.baby_goods" = "Dětský obchod";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Stavba";
+
 "type.amenity.events_venue" = "Místo konání akcí";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 44b6d730dd..93428bdaa8 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Min position";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Senere";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Til RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Indlæser Bogmærker";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresse/blok";
-
-"type.addr_interpolation.even" = "Adresse/blok";
-
-"type.addr_interpolation.odd" = "Adresse/blok";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parkeringsbilletmaskine";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Dyrlæge";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Bygning";
 
-"type.building.has_parts" = "Bygning";
-
-"type.building_part" = "Bygning";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Bygning";
+
 "type.building.train_station" = "Togstation";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Kamera butik";
-
 "type.craft.plumber" = "VVS-mand";
 
 "type.craft.sawmill" = "Savværk";
@@ -1757,7 +1747,7 @@
 
 "type.cuisine.fish" = "Fisk";
 
-"type.cuisine.fish_and_chips" = "Fish and Chips";
+"type.cuisine.fish_and_chips" = "Fish and chips";
 
 "type.cuisine.french" = "Fransk";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Kommunikationstårn";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vandhane";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solar generator";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Frisør";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Isenkræmmer";
 
 "type.shop.health_food" = "Helsekostbutik";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Hvidevarer butik";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Kunstbutik";
 
 "type.shop.baby_goods" = "Børnebutik";
@@ -3583,7 +3572,7 @@
 
 "type.tourism.attraction.specified" = "Attraktioner";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "Autocamperplads";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Bygning";
+
 "type.amenity.events_venue" = "Sted for arrangementer";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index b9d0fa50a7..843c29530b 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mein Standort";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Später";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1017,7 +1017,7 @@
 
 "avoid_tolls" = "Mautstraßen";
 
-"avoid_unpaved" = "Unbefestigte Straßen";
+"avoid_unpaved" = "Erdwege";
 
 "avoid_ferry" = "Fährstellen";
 
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/de/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/DE:Über_OSM";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresse/Block";
-
-"type.addr_interpolation.even" = "Adresse/Block";
-
-"type.addr_interpolation.odd" = "Adresse/Block";
-
 "type.aerialway" = "Seilbahn";
 
 "type.aerialway.cable_car" = "Pendelbahn";
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Gebäude";
 
-"type.building.has_parts" = "Gebäude";
-
-"type.building_part" = "Gebäude";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Gebäude";
+
 "type.building.train_station" = "Bahnhof";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Kamerageschäft";
-
 "type.craft.plumber" = "Installateur";
 
 "type.craft.sawmill" = "Sägewerk";
@@ -2327,7 +2317,7 @@
 
 "type.landuse.construction" = "Baustelle";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Bauernhof";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Friseur";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Baumarkt";
 
 "type.shop.health_food" = "Reformhaus";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Laden für Haushaltsgeräte";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Kunstgeschäft";
 
 "type.shop.baby_goods" = "Babybedarf";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Rodelbahn";
 
+"type.building_part" = "Gebäude";
+
 "type.amenity.events_venue" = "Veranstaltungszentrum";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 3fe6ed486f..45718f5e16 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Η θέση μου";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Αργότερα";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Για RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Φόρτωση αγαπημένων";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Διεύθυνση/Μπλοκ";
-
-"type.addr_interpolation.even" = "Διεύθυνση/Μπλοκ";
-
-"type.addr_interpolation.odd" = "Διεύθυνση/Μπλοκ";
-
 "type.aerialway" = "Τελεφερίκ";
 
 "type.aerialway.cable_car" = "Τελεφερίκ";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Εστιατόριο";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Εισιτήρια στάθμευσης";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Κτηνίατρος";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Κτίριο";
 
-"type.building.has_parts" = "Κτίριο";
-
-"type.building_part" = "Κτίριο";
-
 "type.building.garage" = "Γκαράζ";
 
+"type.building.has_parts" = "Κτίριο";
+
 "type.building.train_station" = "Σιδηροδρομικός σταθμός";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Φωτογράφος";
 
-"type.shop.camera" = "Κατάστημα φωτογραφικών μηχανών";
-
 "type.craft.plumber" = "Υδραυλικός";
 
 "type.craft.sawmill" = "Πριστήριο";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Πύργος Επικοινωνιών";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Βρύση νερού";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Ηλιακή γεννήτρια";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Κατάστημα οικιακών συσκευών";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Κατάστημα Τεχνών";
 
 "type.shop.baby_goods" = "Παιδικό κατάστημα";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Κτίριο";
+
 "type.amenity.events_venue" = "Κέντρο εκδηλώσεων";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 9610631366..dce83b5180 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -60,7 +60,7 @@
 "continue_download" = "Continue";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Add a New List";
+"add_new_set" = "Add New List";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bookmark Colour";
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV Facilities";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Loading Bookmarks";
@@ -227,7 +227,7 @@
 "pref_map_3d_buildings_title" = "3D buildings";
 
 /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */
-"pref_map_3d_buildings_disabled_summary" = "3D buildings are disabled in power saving mode";
+"pref_map_3d_buildings_disabled_summary" = "3D buildings are turned off in power saving mode";
 
 /* Settings «Route» category: «Tts enabled» title */
 "pref_tts_enable_title" = "Voice Instructions";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -316,10 +316,10 @@
 "report_a_bug" = "Report a bug";
 
 /* Alert text */
-"email_error_body" = "The email client has not been set up. Please configure it or contact us at %@";
+"email_error_body" = "The email client has not been set up. Please configure it or use any other way to contact us at %@";
 
 /* Alert title */
-"email_error_title" = "Error sending email";
+"email_error_title" = "Mail sending error";
 
 /* Settings item title */
 "pref_calibration_title" = "Compass calibration";
@@ -424,10 +424,10 @@
 "deep_orange" = "Deep Orange";
 
 /* gray color */
-"gray" = "Grey";
+"gray" = "Gray";
 
 /* blue gray color */
-"blue_gray" = "Blue Grey";
+"blue_gray" = "Blue Gray";
 
 
 /********** Routing dialogs strings **********/
@@ -440,7 +440,7 @@
 
 "dialog_routing_disclaimer_recommendations" = "— Suggested routes should only be understood as recommendations;";
 
-"dialog_routing_disclaimer_borders" = "— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.";
+"dialog_routing_disclaimer_borders" = "— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorized places.";
 
 "dialog_routing_disclaimer_beware" = "Please stay alert and safe on the roads!";
 
@@ -456,11 +456,11 @@
 
 "dialog_routing_download_files" = "Download required files";
 
-"dialog_routing_download_and_update_all" = "Download or update all maps along the projected path to calculate a route.";
+"dialog_routing_download_and_update_all" = "Download and update all map and routing information along the projected path to calculate route.";
 
 "dialog_routing_unable_locate_route" = "Unable to locate route";
 
-"dialog_routing_change_start_or_end" = "Please adjust your starting point or destination.";
+"dialog_routing_change_start_or_end" = "Please adjust your starting point or your destination.";
 
 "dialog_routing_change_start" = "Adjust starting point";
 
@@ -518,7 +518,7 @@
 
 "search_history_title" = "Search History";
 
-"search_history_text" = "View your recent searches.";
+"search_history_text" = "View recent searches.";
 
 "clear_search" = "Clear Search History";
 
@@ -536,9 +536,9 @@
 
 "p2p_to_here" = "Route to";
 
-"p2p_only_from_current" = "Navigation is only available from your current location.";
+"p2p_only_from_current" = "Navigation is available only from your current location.";
 
-"p2p_reroute_from_current" = "Do you want to plan a route from your current location?";
+"p2p_reroute_from_current" = "Do you want us to plan a route from your current location?";
 
 "editor_time_add" = "Add Schedule";
 
@@ -565,13 +565,13 @@
 
 "editor_add_select_location" = "Location";
 
-"editor_done_dialog_1" = "You’ve changed the world map! Don't keep it to yourself; tell your friends and edit it together.";
+"editor_done_dialog_1" = "You’ve changed the world map. Do not keep it to yourself! Tell your friends, and edit it together.";
 
 "share_with_friends" = "Share with friends";
 
 "editor_report_problem_send_button" = "Send";
 
-"autodownload" = "Auto-download maps";
+"autodownload" = "Auto-download";
 
 /* Place Page opening hours text */
 "closed_now" = "Closed now";
@@ -611,7 +611,7 @@
 
 "invalid_username_or_password" = "Invalid username or password.";
 
-"login" = "OpenStreetMap Login";
+"login" = "Log In";
 
 "forgot_password" = "Forgot your password?";
 
@@ -657,7 +657,7 @@
 
 "please_note" = "Please note";
 
-"downloader_delete_map_dialog" = "All of your map edits will be deleted with the map.";
+"downloader_delete_map_dialog" = "All of your map edits will be deleted together with the map.";
 
 "downloader_update_maps" = "Update Maps";
 
@@ -665,7 +665,7 @@
 
 "migration_download_error_dialog" = "Download error";
 
-"common_check_internet_connection_dialog" = "Please make sure your device is connected to the Internet.";
+"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the Internet.";
 
 "downloader_no_space_title" = "Not enough space";
 
@@ -695,7 +695,7 @@
 
 "message_invalid_feature_position" = "No object can be located here";
 
-"login_to_make_edits_visible" = "Log in to openstreetmap.org to publish your changes to the world.";
+"login_to_make_edits_visible" = "Log in to OpenStreetMap.org so other users can see the changes you have made.";
 
 /* Error dialog no space */
 "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
@@ -727,7 +727,7 @@
 
 "editor_detailed_description_hint" = "Detailed comment";
 
-"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in Organic Maps.";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in Organic Maps.";
 
 "editor_more_about_osm" = "More about OpenStreetMap";
 
@@ -735,13 +735,13 @@
 
 "downloader_no_downloaded_maps_title" = "You haven't downloaded any maps";
 
-"downloader_no_downloaded_maps_message" = "Download maps to search and navigate offline.";
+"downloader_no_downloaded_maps_message" = "Download maps to search for a location and use navigation offline.";
 
 /* Error title that appears after certain time without location. */
-"current_location_unknown_title" = "Continue detecting your location?";
+"current_location_unknown_title" = "Continue detecting your current location?";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "Current location is unknown. You may be in a building or tunnel.";
+"current_location_unknown_message" = "Current location is unknown. Maybe you are in a building or in a tunnel.";
 
 "current_location_unknown_continue_button" = "Continue";
 
@@ -749,7 +749,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occurred while determining your location. Check that your device is working properly and try again later.";
+"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later.";
 
 "location_services_disabled_header" = "Location services are disabled";
 
@@ -826,21 +826,21 @@
 "editor_share_to_all_dialog_title" = "Do you want to send it to all users?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any private or personal data.";
+"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any personal data.";
 
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and contact you if they have any questions.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and get in contact with you if they have any questions.";
 
 "navigation_stop_button" = "stop";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
-"recent_track_background_dialog_title" = "Disable recording of your recently travelled route?";
+"recent_track_background_dialog_title" = "Disable recording of your recently traveled route?";
 
 "off_recent_track_background_button" = "Disable";
 
 /* For sharing via SMS and so on */
 "sharing_call_action_look" = "Check out";
 
-"recent_track_background_dialog_message" = "Organic Maps uses your location in the background to record your recently travelled route.";
+"recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route.";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
 "about_description" = "Organic Maps is a fast and free offline maps app without ads and tracking. Maps are based on crowd-sourced OpenStreetMap.org data, so you can fix mapping errors and add features there yourself. Organic Maps is an open-source project created by enthusiasts in their spare time. Your feedback and support are much appreciated!";
@@ -867,7 +867,7 @@
 "mobile_data" = "Mobile Internet";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Mobile internet is required for map update notifications and uploading edits.";
+"mobile_data_description" = "Mobile internet is required for map update notifications and for displaying detailed information about places and bookmarks.";
 
 "mobile_data_option_never" = "Never Use";
 
@@ -875,7 +875,7 @@
 
 "traffic_update_maps_text" = "To display traffic data, maps must be updated.";
 
-"big_font" = "Increase size for map labels";
+"big_font" = "Increase font size on the map";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
@@ -887,7 +887,7 @@
 
 "off" = "Off";
 
-"transliteration_title" = "Transliteration into Latin alphabet";
+"transliteration_title" = "Transliteration into Latin";
 
 /* Subway exits for public transport marks on the map */
 "core_exit" = "Exit";
@@ -908,11 +908,11 @@
 
 "start_from_my_position" = "Start from";
 
-"profile_authorization_error" = "Oops, there was an error. Try signing in again.";
+"profile_authorization_error" = "Oops, there was an error. Try to sign in again.";
 
 "core_entrance" = "Entrance";
 
-"error_enter_correct_name" = "Please enter a correct name";
+"error_enter_correct_name" = "Please, enter a correct name";
 
 "bookmark_lists" = "Lists";
 
@@ -921,7 +921,7 @@
 
 "bookmark_lists_show_all" = "Show all";
 
-"bookmarks_create_new_group" = "Create a new list";
+"bookmarks_create_new_group" = "Create new list";
 
 "downloader_hide_screen" = "Hide Screen";
 
@@ -983,7 +983,7 @@
 
 "hide_from_map" = "Hide from map";
 
-"bookmark_list_description_hint" = "Enter a description (text or html)";
+"bookmark_list_description_hint" = "Type a description (text or html)";
 
 "tags_loading_error_subtitle" = "An error occurred while loading tags, please try again";
 
@@ -1003,13 +1003,13 @@
 
 "power_managment_title" = "Power saving mode";
 
-"power_managment_description" = "Try to reduce power usage at the expense of some functionality.";
+"power_managment_description" = "When automatic mode is selected the application starts to disable battery draining features depending on the current battery charge level";
 
 "power_managment_setting_never" = "Never";
 
-"power_managment_setting_auto" = "When battery is low";
+"power_managment_setting_auto" = "Automatic";
 
-"power_managment_setting_manual_max" = "Always";
+"power_managment_setting_manual_max" = "Maximum power saving";
 
 "driving_options_title" = "Routing options";
 
@@ -1025,7 +1025,7 @@
 
 "unable_to_calc_alert_title" = "Unable to calculate route";
 
-"unable_to_calc_alert_subtitle" = "A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.";
+"unable_to_calc_alert_subtitle" = "Unfortunately, we couldn't find a route, probably due to the options you have chosen. Please change the settings and try again.";
 
 "define_to_avoid_btn" = "Define roads to avoid";
 
@@ -1047,7 +1047,7 @@
 
 "pick_destination" = "Destination";
 
-"follow_my_position" = "Re-centre";
+"follow_my_position" = "Re-center";
 
 "search_results" = "Search results";
 
@@ -1073,7 +1073,7 @@
 
 "dialog_routing_change_start_carplay" = "Unable to build a route from your current location";
 
-"dialog_routing_change_end_carplay" = "Unable to find a route to your destination. Please choose another end point";
+"dialog_routing_change_end_carplay" = "Unable to build a route to your destination. Please choose another point";
 
 "dialog_routing_check_gps_carplay" = "No GPS signal. Please move to an open area";
 
@@ -1105,7 +1105,7 @@
 
 "speedcams_alert_title_carplay_2" = "Speed warnings";
 
-"download_map_carplay" = "Please download maps in the app on your mobile device";
+"download_map_carplay" = "Please download maps in Organic Maps app on your device";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -1160,7 +1160,7 @@
 
 "parkings" = "Parkings";
 
-"fuel_places" = "Petrol Stations";
+"fuel_places" = "Gas stations";
 
 "medicine" = "Medicine";
 
@@ -1174,11 +1174,11 @@
 
 "dialog_pedestrian_route_is_long_message" = "Please choose a start or end point closer to a metro station";
 
-"button_layer_isolines" = "Contour Lines";
+"button_layer_isolines" = "Terrain";
 
-"isolines_activation_error_dialog" = "Activating contour lines requires downloading map data for this area";
+"isolines_activation_error_dialog" = "To activate and use the topographic layer please update or download the map of the area";
 
-"isolines_location_error_dialog" = "Contour lines are not yet available in this area";
+"isolines_location_error_dialog" = "The topographic layer is not yet available in this area";
 
 "elevation_profile_diff_level" = "Difficulty level";
 
@@ -1207,7 +1207,7 @@
 "downloader_loading_ios" = "Downloading";
 
 /* Autoupdate dialog on start */
-"whats_new_auto_update_title" = "Update downloaded maps";
+"whats_new_auto_update_title" = "Update your downloaded maps";
 
 /* Autoupdate dialog on start */
 "whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Address/Block";
-
-"type.addr_interpolation.even" = "Address/Block";
-
-"type.addr_interpolation.odd" = "Address/Block";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1285,7 +1279,7 @@
 
 "type.amenity" = "Amenity";
 
-"type.amenity.arts_centre" = "Arts Centre";
+"type.amenity.arts_centre" = "Art Center";
 
 "type.amenity.atm" = "ATM";
 
@@ -1325,7 +1319,7 @@
 
 "type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
 
-"type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcar" = "Motorcar Charging Station";
 
 "type.amenity.childcare" = "Nursery";
 
@@ -1387,7 +1381,7 @@
 
 "type.amenity.library" = "Library";
 
-"type.amenity.loading_dock" = "Loading Bay";
+"type.amenity.loading_dock" = "Loading Dock";
 
 "type.amenity.marketplace" = "Marketplace";
 
@@ -1409,15 +1403,15 @@
 
 "type.amenity.parking.private" = "Private Parking";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "Underground Parking";
 
-"type.amenity.parking_entrance" = "Parking Entrance";
+"type.amenity.parking_entrance" = "Parking entrance";
 
-"type.amenity.parking_entrance.private" = "Parking Entrance";
+"type.amenity.parking_entrance.private" = "Parking entrance";
 
-"type.amenity.parking_entrance.permissive" = "Parking Entrance";
+"type.amenity.parking_entrance.permissive" = "Parking entrance";
 
 "type.amenity.parking_space" = "Parking Space";
 
@@ -1435,23 +1429,23 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
-"type.amenity.post_box" = "Postbox";
+"type.amenity.post_box" = "Post Box";
 
 "type.amenity.post_office" = "Post Office";
 
@@ -1464,13 +1458,13 @@
 
 /********** Types: Recycling **********/
 
-"type.amenity.recycling.centre" = "Recycling Centre";
+"type.amenity.recycling.centre" = "Recycling Center";
 
 "type.amenity.recycling" = "Recycling Container";
 
 "type.amenity.recycling.container" = "Recycling Container";
 
-"type.recycling.batteries" = "Batteries";
+"type.recycling.batteries" = "Household Batteries";
 
 "type.recycling.clothes" = "Clothes";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,9 +1524,9 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "Parking Tickets";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
 
@@ -1542,23 +1536,23 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinary Doctor";
 
-"type.amenity.waste_basket" = "Rubbish Bin";
+"type.amenity.waste_basket" = "Trash Bin";
 
 "type.amenity.waste_disposal" = "Dumpster";
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "Barrier";
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1660,7 +1652,7 @@
 
 "type.craft.carpenter" = "Carpenter";
 
-"type.craft.confectionery" = "Confectioner";
+"type.craft.confectionery" = "Confectionery";
 
 "type.craft.electrician" = "Electrician";
 
@@ -1671,7 +1663,7 @@
 "type.craft.handicraft" = "Handicraft";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "HVAC Shop";
+"type.craft.hvac" = "HVAC";
 
 "type.craft.key_cutter" = "Key Cutting";
 
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Photographer";
 
-"type.shop.camera" = "Camera Shop";
-
 "type.craft.plumber" = "Plumber";
 
 "type.craft.sawmill" = "Sawmill";
@@ -1747,7 +1737,7 @@
 
 "type.cuisine.diner" = "Diner";
 
-"type.cuisine.donut" = "Doughnut";
+"type.cuisine.donut" = "Donut";
 
 "type.cuisine.ethiopian" = "Ethiopian";
 
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -1841,7 +1831,7 @@
 
 "type.cuisine.sausage" = "Sausage";
 
-"type.cuisine.savory_pancakes" = "Savoury Pancakes";
+"type.cuisine.savory_pancakes" = "Savory Pancakes";
 
 "type.cuisine.seafood" = "Seafood";
 
@@ -1885,19 +1875,19 @@
 
 "type.healthcare.physiotherapist" = "Physiotherapist";
 
-"type.healthcare.alternative" = "Alternative Medicine";
+"type.healthcare.alternative" = "Alternative medicine";
 
-"type.healthcare.audiologist" = "Audiologist";
+"type.healthcare.audiologist" = "Audiology";
 
-"type.healthcare.blood_donation" = "Blood Donation Centre";
+"type.healthcare.blood_donation" = "Blood donation center";
 
-"type.healthcare.optometrist" = "Optometrist";
+"type.healthcare.optometrist" = "Optometry";
 
-"type.healthcare.podiatrist" = "Podiatrist";
+"type.healthcare.podiatrist" = "Podiatry";
 
-"type.healthcare.psychotherapist" = "Psychotherapist";
+"type.healthcare.psychotherapist" = "Psychotherapy";
 
-"type.healthcare.sample_collection" = "Sample Collection Centre";
+"type.healthcare.sample_collection" = "Sample collection";
 
 "type.healthcare.speech_therapist" = "Logopedics";
 
@@ -1916,7 +1906,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
 
-"type.highway.busway" = "Dedicated Bus Road";
+"type.highway.busway" = "Dedicated bus road";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Bridge";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2207,21 +2197,21 @@
 
 /********** Types: Historic **********/
 
-"type.historic" = "Historic Object";
+"type.historic" = "Historic object";
 
 "type.historic.archaeological_site" = "Archaeological Site";
 
-"type.historic.battlefield" = "Historic Battlefield";
+"type.historic.battlefield" = "Battlefield";
 
 "type.historic.boundary_stone" = "Boundary Stone";
 
 "type.historic.castle" = "Castle";
 
-"type.historic.castle.castrum" = "Roman Fort";
+"type.historic.castle.castrum" = "Roman fort";
 
-"type.historic.castle.defensive" = "Stronghold Castle";
+"type.historic.castle.defensive" = "Castle";
 
-"type.historic.castle.fortified_church" = "Fortified Church";
+"type.historic.castle.fortified_church" = "Fortified church";
 
 "type.historic.castle.fortress" = "Fortress";
 
@@ -2229,15 +2219,15 @@
 
 "type.historic.castle.kremlin" = "Kremlin";
 
-"type.historic.castle.manor" = "Manor House";
+"type.historic.castle.manor" = "Manor house";
 
 "type.historic.castle.palace" = "Palace";
 
-"type.historic.castle.shiro" = "Japanese Castle";
+"type.historic.castle.shiro" = "Japanese castle";
 
-"type.historic.castle.stately" = "Stately Castle";
+"type.historic.castle.stately" = "Castle";
 
-"type.historic.city_gate" = "City Gate";
+"type.historic.city_gate" = "City gate";
 
 "type.historic.citywalls" = "City Wall";
 
@@ -2247,9 +2237,9 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.cross" = "Memorial Cross";
+"type.historic.memorial.cross" = "Memorial cross";
 
-"type.historic.memorial.plaque" = "Commemorative Plaque";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
 "type.historic.memorial.sculpture" = "Sculpture";
 
@@ -2257,21 +2247,21 @@
 
 "type.historic.memorial.stolperstein" = "Stolperstein";
 
-"type.historic.memorial.war_memorial" = "War Memorial";
+"type.historic.memorial.war_memorial" = "War memorial";
 
 "type.historic.monument" = "Monument";
 
 "type.historic.pillory" = "Pillory";
 
-"type.historic.ruins" = "Historic Ruins";
+"type.historic.ruins" = "Ruins";
 
 "type.historic.ship" = "Ship";
 
 "type.historic.tomb" = "Tomb";
 
-"type.historic.wayside_cross" = "Wayside Cross";
+"type.historic.wayside_cross" = "Wayside cross";
 
-"type.historic.wayside_shrine" = "Wayside Shrine";
+"type.historic.wayside_shrine" = "Wayside shrine";
 
 "type.hwtag" = "hwtag";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2343,11 +2333,11 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
-"type.landuse.grass" = "Grass";
+"type.landuse.grass" = "Lawn";
 
 "type.landuse.greenfield" = "Greenfield";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2417,7 +2407,7 @@
 
 "type.leisure.picnic_table" = "Picnic Table";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2427,7 +2417,7 @@
 
 "type.leisure.slipway" = "Slipway";
 
-"type.leisure.sports_centre" = "Sports Centre";
+"type.leisure.sports_centre" = "Sports Center";
 
 "type.sport.climbing" = "Climbing Centre";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Communications Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2511,13 +2501,13 @@
 
 "type.natural.beach" = "Beach";
 
-"type.natural.beach.sand" = "Sandy Beach";
+"type.natural.beach.sand" = "Sand Beach";
 
 "type.natural.beach.gravel" = "Gravel Beach";
 
 "type.natural.cape" = "Cape";
 
-"type.natural.cave_entrance" = "Cave Entrance";
+"type.natural.cave_entrance" = "Cave";
 
 "type.natural.cliff" = "Cliff";
 
@@ -2565,7 +2555,7 @@
 
 "type.natural.scrub" = "Scrub";
 
-"type.natural.spring" = "Natural Spring";
+"type.natural.spring" = "Spring";
 
 "type.natural.strait" = "Strait";
 
@@ -2577,7 +2567,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Waterbody";
 
 "type.natural.wetland" = "Wetland";
 
@@ -2593,7 +2583,7 @@
 
 "type.office.estate_agent" = "Estate Agent";
 
-"type.office.government" = "Governmental Office";
+"type.office.government" = "Government Office";
 
 "type.office.insurance" = "Insurance Office";
 
@@ -2643,7 +2633,7 @@
 
 "type.place.island" = "Island";
 
-"type.place.islet" = "Islet";
+"type.place.islet" = "Island";
 
 "type.place.isolated_dwelling" = "Isolated Dwelling";
 
@@ -2671,13 +2661,13 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solar Generator";
 
 "type.power.generator.wind" = "Wind Generator";
 
-"type.power.generator.gas" = "Gas Turbine Power Plant";
+"type.power.generator.gas" = "Gas turbine Power Plant";
 
 "type.power.generator.hydro" = "Hydroelectric Power Plant";
 
@@ -2691,7 +2681,7 @@
 
 "type.power.plant.coal" = "Coal Power Plant";
 
-"type.power.plant.gas" = "Gas Turbine Power Plant";
+"type.power.plant.gas" = "Gas turbine Power Plant";
 
 "type.power.plant.hydro" = "Hydroelectric Power Plant";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "Wind Power Plant";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Level Crossing";
 
@@ -2799,225 +2789,225 @@
 
 "type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Metro Station";
+"type.railway.station.subway" = "Metro";
 
-"type.railway.station.subway.adana" = "Metro Station";
+"type.railway.station.subway.adana" = "Metro";
 
-"type.railway.station.subway.algiers" = "Metro Station";
+"type.railway.station.subway.algiers" = "Metro";
 
-"type.railway.station.subway.almaty" = "Metro Station";
+"type.railway.station.subway.almaty" = "Metro";
 
-"type.railway.station.subway.amsterdam" = "Metro Station";
+"type.railway.station.subway.amsterdam" = "Metro";
 
-"type.railway.station.subway.ankara" = "Metro Station";
+"type.railway.station.subway.ankara" = "Metro";
 
-"type.railway.station.subway.athens" = "Metro Station";
+"type.railway.station.subway.athens" = "Metro";
 
-"type.railway.station.subway.baku" = "Metro Station";
+"type.railway.station.subway.baku" = "Metro";
 
-"type.railway.station.subway.bangkok" = "Metro Station";
+"type.railway.station.subway.bangkok" = "Metro";
 
-"type.railway.station.subway.barcelona" = "Metro Station";
+"type.railway.station.subway.barcelona" = "Metro";
 
-"type.railway.station.subway.beijing" = "Metro Station";
+"type.railway.station.subway.beijing" = "Metro";
 
-"type.railway.station.subway.bengalore" = "Metro Station";
+"type.railway.station.subway.bengalore" = "Metro";
 
-"type.railway.station.subway.berlin" = "Metro Station";
+"type.railway.station.subway.berlin" = "Metro";
 
-"type.railway.station.subway.bilbao" = "Metro Station";
+"type.railway.station.subway.bilbao" = "Metro";
 
-"type.railway.station.subway.brasilia" = "Metro Station";
+"type.railway.station.subway.brasilia" = "Metro";
 
-"type.railway.station.subway.brescia" = "Metro Station";
+"type.railway.station.subway.brescia" = "Metro";
 
-"type.railway.station.subway.brussels" = "Metro Station";
+"type.railway.station.subway.brussels" = "Metro";
 
-"type.railway.station.subway.bucharest" = "Metro Station";
+"type.railway.station.subway.bucharest" = "Metro";
 
-"type.railway.station.subway.budapest" = "Metro Station";
+"type.railway.station.subway.budapest" = "Metro";
 
-"type.railway.station.subway.buenos_aires" = "Metro Station";
+"type.railway.station.subway.buenos_aires" = "Metro";
 
-"type.railway.station.subway.bursa" = "Metro Station";
+"type.railway.station.subway.bursa" = "Metro";
 
-"type.railway.station.subway.cairo" = "Metro Station";
+"type.railway.station.subway.cairo" = "Metro";
 
-"type.railway.station.subway.caracas" = "Metro Station";
+"type.railway.station.subway.caracas" = "Metro";
 
-"type.railway.station.subway.catania" = "Metro Station";
+"type.railway.station.subway.catania" = "Metro";
 
-"type.railway.station.subway.changchun" = "Metro Station";
+"type.railway.station.subway.changchun" = "Metro";
 
-"type.railway.station.subway.chengdu" = "Metro Station";
+"type.railway.station.subway.chengdu" = "Metro";
 
-"type.railway.station.subway.chicago" = "Metro Station";
+"type.railway.station.subway.chicago" = "Metro";
 
-"type.railway.station.subway.chongqing" = "Metro Station";
+"type.railway.station.subway.chongqing" = "Metro";
 
-"type.railway.station.subway.dalian" = "Metro Station";
+"type.railway.station.subway.dalian" = "Metro";
 
-"type.railway.station.subway.delhi" = "Metro Station";
+"type.railway.station.subway.delhi" = "Metro";
 
-"type.railway.station.subway.dnepro" = "Metro Station";
+"type.railway.station.subway.dnepro" = "Metro";
 
-"type.railway.station.subway.dubai" = "Metro Station";
+"type.railway.station.subway.dubai" = "Metro";
 
-"type.railway.station.subway.ekb" = "Metro Station";
+"type.railway.station.subway.ekb" = "Metro";
 
-"type.railway.station.subway.fukuoka" = "Metro Station";
+"type.railway.station.subway.fukuoka" = "Metro";
 
-"type.railway.station.subway.glasgow" = "Metro Station";
+"type.railway.station.subway.glasgow" = "Metro";
 
-"type.railway.station.subway.guangzhou" = "Metro Station";
+"type.railway.station.subway.guangzhou" = "Metro";
 
-"type.railway.station.subway.hamburg" = "Metro Station";
+"type.railway.station.subway.hamburg" = "Metro";
 
-"type.railway.station.subway.helsinki" = "Metro Station";
+"type.railway.station.subway.helsinki" = "Metro";
 
-"type.railway.station.subway.hiroshima" = "Metro Station";
+"type.railway.station.subway.hiroshima" = "Metro";
 
-"type.railway.station.subway.isfahan" = "Metro Station";
+"type.railway.station.subway.isfahan" = "Metro";
 
-"type.railway.station.subway.istanbul" = "Metro Station";
+"type.railway.station.subway.istanbul" = "Metro";
 
-"type.railway.station.subway.izmir" = "Metro Station";
+"type.railway.station.subway.izmir" = "Metro";
 
-"type.railway.station.subway.kazan" = "Metro Station";
+"type.railway.station.subway.kazan" = "Metro";
 
-"type.railway.station.subway.kharkiv" = "Metro Station";
+"type.railway.station.subway.kharkiv" = "Metro";
 
-"type.railway.station.subway.kiev" = "Metro Station";
+"type.railway.station.subway.kiev" = "Metro";
 
-"type.railway.station.subway.kobe" = "Metro Station";
+"type.railway.station.subway.kobe" = "Metro";
 
-"type.railway.station.subway.kolkata" = "Metro Station";
+"type.railway.station.subway.kolkata" = "Metro";
 
-"type.railway.station.subway.kunming" = "Metro Station";
+"type.railway.station.subway.kunming" = "Metro";
 
-"type.railway.station.subway.kyoto" = "Metro Station";
+"type.railway.station.subway.kyoto" = "Metro";
 
-"type.railway.station.subway.la" = "Metro Station";
+"type.railway.station.subway.la" = "Metro";
 
-"type.railway.station.subway.lausanne" = "Metro Station";
+"type.railway.station.subway.lausanne" = "Metro";
 
-"type.railway.station.subway.lille" = "Metro Station";
+"type.railway.station.subway.lille" = "Metro";
 
-"type.railway.station.subway.lima" = "Metro Station";
+"type.railway.station.subway.lima" = "Metro";
 
-"type.railway.station.subway.lisboa" = "Metro Station";
+"type.railway.station.subway.lisboa" = "Metro";
 
 "type.railway.station.subway.london" = "Underground Station";
 
-"type.railway.station.subway.lyon" = "Metro Station";
+"type.railway.station.subway.lyon" = "Metro";
 
-"type.railway.station.subway.madrid" = "Metro Station";
+"type.railway.station.subway.madrid" = "Metro";
 
-"type.railway.station.subway.malaga" = "Metro Station";
+"type.railway.station.subway.malaga" = "Metro";
 
-"type.railway.station.subway.manila" = "Metro Station";
+"type.railway.station.subway.manila" = "Metro";
 
-"type.railway.station.subway.maracaibo" = "Metro Station";
+"type.railway.station.subway.maracaibo" = "Metro";
 
-"type.railway.station.subway.mashhad" = "Metro Station";
+"type.railway.station.subway.mashhad" = "Metro";
 
-"type.railway.station.subway.mecca" = "Metro Station";
+"type.railway.station.subway.mecca" = "Metro";
 
-"type.railway.station.subway.medellin" = "Metro Station";
+"type.railway.station.subway.medellin" = "Metro";
 
-"type.railway.station.subway.mexico" = "Metro Station";
+"type.railway.station.subway.mexico" = "Metro";
 
-"type.railway.station.subway.milan" = "Metro Station";
+"type.railway.station.subway.milan" = "Metro";
 
-"type.railway.station.subway.minsk" = "Metro Station";
+"type.railway.station.subway.minsk" = "Metro";
 
-"type.railway.station.subway.montreal" = "Metro Station";
+"type.railway.station.subway.montreal" = "Metro";
 
-"type.railway.station.subway.moscow" = "Metro Station";
+"type.railway.station.subway.moscow" = "Metro";
 
-"type.railway.station.subway.munchen" = "Metro Station";
+"type.railway.station.subway.munchen" = "Metro";
 
-"type.railway.station.subway.nagoya" = "Metro Station";
+"type.railway.station.subway.nagoya" = "Metro";
 
-"type.railway.station.subway.newyork" = "Metro Station";
+"type.railway.station.subway.newyork" = "Metro";
 
-"type.railway.station.subway.nnov" = "Metro Station";
+"type.railway.station.subway.nnov" = "Metro";
 
-"type.railway.station.subway.novosibirsk" = "Metro Station";
+"type.railway.station.subway.novosibirsk" = "Metro";
 
-"type.railway.station.subway.osaka" = "Metro Station";
+"type.railway.station.subway.osaka" = "Metro";
 
-"type.railway.station.subway.oslo" = "Metro Station";
+"type.railway.station.subway.oslo" = "Metro";
 
-"type.railway.station.subway.palma" = "Metro Station";
+"type.railway.station.subway.palma" = "Metro";
 
-"type.railway.station.subway.panama" = "Metro Station";
+"type.railway.station.subway.panama" = "Metro";
 
-"type.railway.station.subway.paris" = "Metro Station";
+"type.railway.station.subway.paris" = "Metro";
 
-"type.railway.station.subway.philadelphia" = "Metro Station";
+"type.railway.station.subway.philadelphia" = "Metro";
 
-"type.railway.station.subway.pyongyang" = "Metro Station";
+"type.railway.station.subway.pyongyang" = "Metro";
 
-"type.railway.station.subway.rennes" = "Metro Station";
+"type.railway.station.subway.rennes" = "Metro";
 
-"type.railway.station.subway.rio" = "Metro Station";
+"type.railway.station.subway.rio" = "Metro";
 
-"type.railway.station.subway.roma" = "Metro Station";
+"type.railway.station.subway.roma" = "Metro";
 
-"type.railway.station.subway.rotterdam" = "Metro Station";
+"type.railway.station.subway.rotterdam" = "Metro";
 
-"type.railway.station.subway.samara" = "Metro Station";
+"type.railway.station.subway.samara" = "Metro";
 
-"type.railway.station.subway.santiago" = "Metro Station";
+"type.railway.station.subway.santiago" = "Metro";
 
-"type.railway.station.subway.santo_domingo" = "Metro Station";
+"type.railway.station.subway.santo_domingo" = "Metro";
 
-"type.railway.station.subway.saopaulo" = "Metro Station";
+"type.railway.station.subway.saopaulo" = "Metro";
 
-"type.railway.station.subway.sapporo" = "Metro Station";
+"type.railway.station.subway.sapporo" = "Metro";
 
-"type.railway.station.subway.sendai" = "Metro Station";
+"type.railway.station.subway.sendai" = "Metro";
 
-"type.railway.station.subway.sf" = "Metro Station";
+"type.railway.station.subway.sf" = "Metro";
 
-"type.railway.station.subway.shanghai" = "Metro Station";
+"type.railway.station.subway.shanghai" = "Metro";
 
-"type.railway.station.subway.shiraz" = "Metro Station";
+"type.railway.station.subway.shiraz" = "Metro";
 
-"type.railway.station.subway.sofia" = "Metro Station";
+"type.railway.station.subway.sofia" = "Metro";
 
-"type.railway.station.subway.spb" = "Metro Station";
+"type.railway.station.subway.spb" = "Metro";
 
-"type.railway.station.subway.stockholm" = "Metro Station";
+"type.railway.station.subway.stockholm" = "Metro";
 
-"type.railway.station.subway.tabriz" = "Metro Station";
+"type.railway.station.subway.tabriz" = "Metro";
 
-"type.railway.station.subway.taipei" = "Metro Station";
+"type.railway.station.subway.taipei" = "Metro";
 
-"type.railway.station.subway.taoyuan" = "Metro Station";
+"type.railway.station.subway.taoyuan" = "Metro";
 
-"type.railway.station.subway.tashkent" = "Metro Station";
+"type.railway.station.subway.tashkent" = "Metro";
 
-"type.railway.station.subway.tbilisi" = "Metro Station";
+"type.railway.station.subway.tbilisi" = "Metro";
 
-"type.railway.station.subway.tianjin" = "Metro Station";
+"type.railway.station.subway.tianjin" = "Metro";
 
-"type.railway.station.subway.tokyo" = "Metro Station";
+"type.railway.station.subway.tokyo" = "Metro";
 
-"type.railway.station.subway.valencia" = "Metro Station";
+"type.railway.station.subway.valencia" = "Metro";
 
-"type.railway.station.subway.vienna" = "Metro Station";
+"type.railway.station.subway.vienna" = "Metro";
 
-"type.railway.station.subway.warszawa" = "Metro Station";
+"type.railway.station.subway.warszawa" = "Metro";
 
-"type.railway.station.subway.washington" = "Metro Station";
+"type.railway.station.subway.washington" = "Metro";
 
-"type.railway.station.subway.wuhan" = "Metro Station";
+"type.railway.station.subway.wuhan" = "Metro";
 
-"type.railway.station.subway.yerevan" = "Metro Station";
+"type.railway.station.subway.yerevan" = "Metro";
 
-"type.railway.station.subway.yokohama" = "Metro Station";
+"type.railway.station.subway.yokohama" = "Metro";
 
 "type.railway.subway" = "Metro Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3281,53 +3271,53 @@
 
 "type.shop.bookmaker" = "Bookmaker";
 
-"type.shop.books" = "Bookshop";
+"type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
-"type.shop.cannabis" = "Cannabis Shop";
+"type.shop.cannabis" = "Cannabis Store";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Garage";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
-"type.shop.caravan" = "Caravan Dealership";
+"type.shop.caravan" = "RV Dealership";
 
-"type.shop.carpet" = "Carpet Shop";
+"type.shop.carpet" = "Carpets";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Chocolate Shop";
 
 "type.shop.clothes" = "Clothes Shop";
 
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Store";
 
-"type.shop.computer" = "Computer Shop";
+"type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Sweet Shop";
+"type.shop.confectionery" = "Sweets";
 
-"type.shop.convenience" = "Convenience Shop";
+"type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
-"type.shop.cosmetics" = "Cosmetics Shop";
+"type.shop.cosmetics" = "Cosmetics";
 
-"type.shop.curtain" = "Curtain Shop";
+"type.shop.curtain" = "Curtains";
 
-"type.shop.deli" = "Delicatessen";
+"type.shop.deli" = "Delicatessen Shop";
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "DIY Shop";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "Fashion Accessories";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
 
-"type.shop.furniture" = "Furniture Shop";
+"type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Centre";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "Gas Store";
 
@@ -3351,33 +3341,33 @@
 
 "type.shop.greengrocer" = "Greengrocer";
 
-"type.shop.grocery" = "Grocery Shop";
+"type.shop.grocery" = "Grocery";
 
 "type.shop.hairdresser" = "Hairdresser";
 
-"type.shop.hardware" = "Ironmongers";
+"type.shop.hardware" = "Hardware Store";
 
 "type.shop.health_food" = "Health Food Shop";
 
-"type.shop.herbalist" = "Herbalist";
+"type.shop.herbalist" = "Herbs Store";
 
-"type.shop.hifi" = "HiFi Audio Shop";
+"type.shop.hifi" = "HiFi Audio";
 
-"type.shop.houseware" = "Housewares Shop";
+"type.shop.houseware" = "Hardware Store";
 
-"type.shop.jewelry" = "Jewellery Shop";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
-"type.shop.kitchen" = "Kitchen Shop";
+"type.shop.kitchen" = "Kitchen Store";
 
-"type.shop.laundry" = "Launderette";
+"type.shop.laundry" = "Laundry";
 
-"type.shop.mall" = "Shopping Centre";
+"type.shop.mall" = "Mall";
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Mobile Phone Shop";
+"type.shop.mobile_phone" = "Mobile Phones";
 
 "type.shop.money_lender" = "Money Lender";
 
@@ -3385,15 +3375,15 @@
 
 "type.shop.motorcycle_repair" = "Motorcycle Repair";
 
-"type.shop.music" = "Record Shop";
+"type.shop.music" = "Record Store";
 
-"type.shop.musical_instrument" = "Musical Instrument Shop";
+"type.shop.musical_instrument" = "Musical Instruments";
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "Pickup Point";
 
@@ -3401,19 +3391,19 @@
 
 "type.shop.pawnbroker" = "Pawnbroker";
 
-"type.shop.pet" = "Pet Shop";
+"type.shop.pet" = "Pet Store";
 
 "type.shop.pet_grooming" = "Pet Grooming";
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
-"type.shop.second_hand" = "Second Hand Shop";
+"type.shop.second_hand" = "Second Hand";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3421,76 +3411,75 @@
 
 "type.shop.tattoo" = "Tattoo Parlour";
 
-"type.shop.tea" = "Tea Shop";
+"type.shop.tea" = "Tea Store";
 
 "type.shop.ticket" = "Ticket Shop";
 
-"type.shop.toys" = "Toy Shop";
+"type.shop.toys" = "Toy Store";
 
 "type.shop.travel_agency" = "Travel Agency";
 
 "type.shop.tyres" = "Tyre Shop";
 
-"type.shop.variety_store" = "Variety Shop";
+"type.shop.variety_store" = "Variety Store";
 
 "type.shop.video" = "Video Shop";
 
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.video_games" = "Video Games Shop";
 
 "type.shop.wine" = "Wine Shop";
 
 "type.shop.agrarian" = "Agricultural Shop";
 
-"type.shop.antiques" = "Antiques Shop";
+"type.shop.antiques" = "Antiques";
 
-"type.shop.appliance" = "Appliance Shop";
+"type.shop.appliance" = "Appliances Shop";
 
-/* maybe change to Art Gallery for en-US when supported */
-"type.shop.art" = "Artwork Shop";
+"type.shop.art" = "Arts Shop";
 
-"type.shop.baby_goods" = "Baby Goods Shop";
+"type.shop.baby_goods" = "Baby Goods";
 
-"type.shop.bag" = "Bag Shop";
+"type.shop.bag" = "Bags Store";
 
-"type.shop.bed" = "Bed Shop";
+"type.shop.bed" = "Beds Shop";
 
 "type.shop.boutique" = "Boutique";
 
 "type.shop.charity" = "Charity Shop";
 
-"type.shop.cheese" = "Cheese Shop";
+"type.shop.cheese" = "Cheese Store";
 
-"type.shop.craft" = "Arts and Crafts Shop";
+"type.shop.craft" = "Arts and Crafts";
 
-"type.shop.dairy" = "Dairy Shop";
+"type.shop.dairy" = "Dairy Products";
 
-"type.shop.electrical" = "Electrical Supplies Shop";
+"type.shop.electrical" = "Electrical Store";
 
-"type.shop.fishing" = "Fishing Shop";
+"type.shop.fishing" = "Fishing Store";
 
-"type.shop.interior_decoration" = "Interior Decorations Shop";
+"type.shop.interior_decoration" = "Interior Decorations";
 
 "type.shop.lottery" = "Lottery Tickets";
 
-"type.shop.medical_supply" = "Medical Supplies Shop";
+"type.shop.medical_supply" = "Medical Supplies";
 
-"type.shop.nutrition_supplements" = "Nutrition Supplement Shop";
+"type.shop.nutrition_supplements" = "Nutrition Supplements";
 
-"type.shop.paint" = "Paint Shop";
+"type.shop.paint" = "Paints";
 
-"type.shop.perfumery" = "Perfume Shop";
+"type.shop.perfumery" = "Perfumery";
 
-"type.shop.sewing" = "Sewing Supplies Shop";
+"type.shop.sewing" = "Sewing Supplies";
 
 "type.shop.storage_rental" = "Storage Rental";
 
-"type.shop.tobacco" = "Tobacco Shop";
+"type.shop.tobacco" = "Tobacco";
 
-"type.shop.trade" = "Trade Supplies";
+"type.shop.trade" = "Trades Supplies";
 
-"type.shop.watches" = "Watch Shop";
+"type.shop.watches" = "Watches";
 
-"type.shop.wholesale" = "Wholesale Shop";
+"type.shop.wholesale" = "Wholesale Store";
 
 "type.sport" = "Sport";
 
@@ -3506,7 +3495,7 @@
 
 "type.sport.basketball" = "Basketball";
 
-"type.sport.beachvolleyball" = "Beach Volleyball";
+"type.sport.beachvolleyball" = "Beach volleyball";
 
 "type.sport.bowls" = "Bowls";
 
@@ -3527,7 +3516,7 @@
 "type.sport.multi" = "Various Sports";
 
 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
@@ -3535,11 +3524,11 @@
 
 "type.sport.skiing" = "Skiing";
 
-"type.sport.soccer" = "Football";
+"type.sport.soccer" = "Soccer";
 
 "type.sport.swimming" = "Swimming";
 
-"type.sport.table_tennis" = "Table Tennis";
+"type.sport.table_tennis" = "Table tennis";
 
 "type.sport.tennis" = "Tennis Court";
 
@@ -3559,23 +3548,23 @@
 
 "type.sport.badminton" = "Badminton";
 
-"type.sport.pelota" = "Basque Pelota";
+"type.sport.pelota" = "Basque pelota";
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
@@ -3583,13 +3572,13 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campsite";
+"type.tourism.camp_site" = "Camping";
 
-"type.tourism.caravan_site" = "Caravan Park";
+"type.tourism.caravan_site" = "RV Park";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3655,13 +3644,13 @@
 
 "type.waterway.riverbank" = "River";
 
-"type.waterway.stream" = "Stream";
+"type.waterway.stream" = "River";
 
-"type.waterway.stream.ephemeral" = "Ephemeral Stream";
+"type.waterway.stream.ephemeral" = "River";
 
-"type.waterway.stream.intermittent" = "Intermittent Stream";
+"type.waterway.stream.intermittent" = "River";
 
-"type.waterway.stream.tunnel" = "Stream";
+"type.waterway.stream.tunnel" = "River";
 
 "type.waterway.waterfall" = "Waterfall";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "Events Venue";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 311fc0b0d8..eb28e250ec 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -60,7 +60,7 @@
 "continue_download" = "Continue";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Add a New List";
+"add_new_set" = "Add New List";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bookmark Color";
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV Facilities";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Loading Bookmarks";
@@ -227,7 +227,7 @@
 "pref_map_3d_buildings_title" = "3D buildings";
 
 /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */
-"pref_map_3d_buildings_disabled_summary" = "3D buildings are disabled in power saving mode";
+"pref_map_3d_buildings_disabled_summary" = "3D buildings are turned off in power saving mode";
 
 /* Settings «Route» category: «Tts enabled» title */
 "pref_tts_enable_title" = "Voice Instructions";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -316,10 +316,10 @@
 "report_a_bug" = "Report a bug";
 
 /* Alert text */
-"email_error_body" = "The email client has not been set up. Please configure it or contact us at %@";
+"email_error_body" = "The email client has not been set up. Please configure it or use any other way to contact us at %@";
 
 /* Alert title */
-"email_error_title" = "Error sending email";
+"email_error_title" = "Mail sending error";
 
 /* Settings item title */
 "pref_calibration_title" = "Compass calibration";
@@ -456,11 +456,11 @@
 
 "dialog_routing_download_files" = "Download required files";
 
-"dialog_routing_download_and_update_all" = "Download or update all maps along the projected path to calculate a route.";
+"dialog_routing_download_and_update_all" = "Download and update all map and routing information along the projected path to calculate route.";
 
 "dialog_routing_unable_locate_route" = "Unable to locate route";
 
-"dialog_routing_change_start_or_end" = "Please adjust your starting point or destination.";
+"dialog_routing_change_start_or_end" = "Please adjust your starting point or your destination.";
 
 "dialog_routing_change_start" = "Adjust starting point";
 
@@ -518,7 +518,7 @@
 
 "search_history_title" = "Search History";
 
-"search_history_text" = "View your recent searches.";
+"search_history_text" = "View recent searches.";
 
 "clear_search" = "Clear Search History";
 
@@ -536,9 +536,9 @@
 
 "p2p_to_here" = "Route to";
 
-"p2p_only_from_current" = "Navigation is only available from your current location.";
+"p2p_only_from_current" = "Navigation is available only from your current location.";
 
-"p2p_reroute_from_current" = "Do you want to plan a route from your current location?";
+"p2p_reroute_from_current" = "Do you want us to plan a route from your current location?";
 
 "editor_time_add" = "Add Schedule";
 
@@ -565,13 +565,13 @@
 
 "editor_add_select_location" = "Location";
 
-"editor_done_dialog_1" = "You’ve changed the world map! Don't keep it to yourself; tell your friends and edit it together.";
+"editor_done_dialog_1" = "You’ve changed the world map. Do not keep it to yourself! Tell your friends, and edit it together.";
 
 "share_with_friends" = "Share with friends";
 
 "editor_report_problem_send_button" = "Send";
 
-"autodownload" = "Auto-download maps";
+"autodownload" = "Auto-download";
 
 /* Place Page opening hours text */
 "closed_now" = "Closed now";
@@ -611,7 +611,7 @@
 
 "invalid_username_or_password" = "Invalid username or password.";
 
-"login" = "OpenStreetMap Login";
+"login" = "Log In";
 
 "forgot_password" = "Forgot your password?";
 
@@ -657,7 +657,7 @@
 
 "please_note" = "Please note";
 
-"downloader_delete_map_dialog" = "All of your map edits will be deleted with the map.";
+"downloader_delete_map_dialog" = "All of your map edits will be deleted together with the map.";
 
 "downloader_update_maps" = "Update Maps";
 
@@ -665,7 +665,7 @@
 
 "migration_download_error_dialog" = "Download error";
 
-"common_check_internet_connection_dialog" = "Please make sure your device is connected to the Internet.";
+"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the Internet.";
 
 "downloader_no_space_title" = "Not enough space";
 
@@ -695,7 +695,7 @@
 
 "message_invalid_feature_position" = "No object can be located here";
 
-"login_to_make_edits_visible" = "Log in to openstreetmap.org to publish your changes to the world.";
+"login_to_make_edits_visible" = "Log in to OpenStreetMap.org so other users can see the changes you have made.";
 
 /* Error dialog no space */
 "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
@@ -727,7 +727,7 @@
 
 "editor_detailed_description_hint" = "Detailed comment";
 
-"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in Organic Maps.";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in Organic Maps.";
 
 "editor_more_about_osm" = "More about OpenStreetMap";
 
@@ -735,13 +735,13 @@
 
 "downloader_no_downloaded_maps_title" = "You haven't downloaded any maps";
 
-"downloader_no_downloaded_maps_message" = "Download maps to search and navigate offline.";
+"downloader_no_downloaded_maps_message" = "Download maps to search for a location and use navigation offline.";
 
 /* Error title that appears after certain time without location. */
-"current_location_unknown_title" = "Continue detecting your location?";
+"current_location_unknown_title" = "Continue detecting your current location?";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "Current location is unknown. You may be in a building or tunnel.";
+"current_location_unknown_message" = "Current location is unknown. Maybe you are in a building or in a tunnel.";
 
 "current_location_unknown_continue_button" = "Continue";
 
@@ -749,7 +749,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occurred while determining your location. Check that your device is working properly and try again later.";
+"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later.";
 
 "location_services_disabled_header" = "Location services are disabled";
 
@@ -826,21 +826,21 @@
 "editor_share_to_all_dialog_title" = "Do you want to send it to all users?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any private or personal data.";
+"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any personal data.";
 
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and contact you if they have any questions.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and get in contact with you if they have any questions.";
 
 "navigation_stop_button" = "stop";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
-"recent_track_background_dialog_title" = "Disable recording of your recently travelled route?";
+"recent_track_background_dialog_title" = "Disable recording of your recently traveled route?";
 
 "off_recent_track_background_button" = "Disable";
 
 /* For sharing via SMS and so on */
 "sharing_call_action_look" = "Check out";
 
-"recent_track_background_dialog_message" = "Organic Maps uses your location in the background to record your recently travelled route.";
+"recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route.";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
 "about_description" = "Organic Maps is a fast and free offline maps app without ads and tracking. Maps are based on crowd-sourced OpenStreetMap.org data, so you can fix mapping errors and add features there yourself. Organic Maps is an open-source project created by enthusiasts in their spare time. Your feedback and support are much appreciated!";
@@ -867,7 +867,7 @@
 "mobile_data" = "Mobile Internet";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Mobile internet is required for map update notifications and uploading edits.";
+"mobile_data_description" = "Mobile internet is required for map update notifications and for displaying detailed information about places and bookmarks.";
 
 "mobile_data_option_never" = "Never Use";
 
@@ -875,7 +875,7 @@
 
 "traffic_update_maps_text" = "To display traffic data, maps must be updated.";
 
-"big_font" = "Increase size for map labels";
+"big_font" = "Increase font size on the map";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
@@ -887,7 +887,7 @@
 
 "off" = "Off";
 
-"transliteration_title" = "Transliteration into Latin alphabet";
+"transliteration_title" = "Transliteration into Latin";
 
 /* Subway exits for public transport marks on the map */
 "core_exit" = "Exit";
@@ -908,11 +908,11 @@
 
 "start_from_my_position" = "Start from";
 
-"profile_authorization_error" = "Oops, there was an error. Try signing in again.";
+"profile_authorization_error" = "Oops, there was an error. Try to sign in again.";
 
 "core_entrance" = "Entrance";
 
-"error_enter_correct_name" = "Please enter a correct name";
+"error_enter_correct_name" = "Please, enter a correct name";
 
 "bookmark_lists" = "Lists";
 
@@ -921,7 +921,7 @@
 
 "bookmark_lists_show_all" = "Show all";
 
-"bookmarks_create_new_group" = "Create a new list";
+"bookmarks_create_new_group" = "Create new list";
 
 "downloader_hide_screen" = "Hide Screen";
 
@@ -983,7 +983,7 @@
 
 "hide_from_map" = "Hide from map";
 
-"bookmark_list_description_hint" = "Enter a description (text or html)";
+"bookmark_list_description_hint" = "Type a description (text or html)";
 
 "tags_loading_error_subtitle" = "An error occurred while loading tags, please try again";
 
@@ -1003,13 +1003,13 @@
 
 "power_managment_title" = "Power saving mode";
 
-"power_managment_description" = "Try to reduce power usage at the expense of some functionality.";
+"power_managment_description" = "When automatic mode is selected the application starts to disable battery draining features depending on the current battery charge level";
 
 "power_managment_setting_never" = "Never";
 
-"power_managment_setting_auto" = "When battery is low";
+"power_managment_setting_auto" = "Automatic";
 
-"power_managment_setting_manual_max" = "Always";
+"power_managment_setting_manual_max" = "Maximum power saving";
 
 "driving_options_title" = "Routing options";
 
@@ -1025,7 +1025,7 @@
 
 "unable_to_calc_alert_title" = "Unable to calculate route";
 
-"unable_to_calc_alert_subtitle" = "A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.";
+"unable_to_calc_alert_subtitle" = "Unfortunately, we couldn't find a route, probably due to the options you have chosen. Please change the settings and try again.";
 
 "define_to_avoid_btn" = "Define roads to avoid";
 
@@ -1073,7 +1073,7 @@
 
 "dialog_routing_change_start_carplay" = "Unable to build a route from your current location";
 
-"dialog_routing_change_end_carplay" = "Unable to find a route to your destination. Please choose another end point";
+"dialog_routing_change_end_carplay" = "Unable to build a route to your destination. Please choose another point";
 
 "dialog_routing_check_gps_carplay" = "No GPS signal. Please move to an open area";
 
@@ -1105,7 +1105,7 @@
 
 "speedcams_alert_title_carplay_2" = "Speed warnings";
 
-"download_map_carplay" = "Please download maps in the app on your mobile device";
+"download_map_carplay" = "Please download maps in Organic Maps app on your device";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -1174,11 +1174,11 @@
 
 "dialog_pedestrian_route_is_long_message" = "Please choose a start or end point closer to a subway station";
 
-"button_layer_isolines" = "Contour Lines";
+"button_layer_isolines" = "Terrain";
 
-"isolines_activation_error_dialog" = "Activating contour lines requires downloading map data for this area";
+"isolines_activation_error_dialog" = "To activate and use the topographic layer please update or download the map of the area";
 
-"isolines_location_error_dialog" = "Contour lines are not yet available in this area";
+"isolines_location_error_dialog" = "The topographic layer is not yet available in this area";
 
 "elevation_profile_diff_level" = "Difficulty level";
 
@@ -1207,7 +1207,7 @@
 "downloader_loading_ios" = "Downloading";
 
 /* Autoupdate dialog on start */
-"whats_new_auto_update_title" = "Update downloaded maps";
+"whats_new_auto_update_title" = "Update your downloaded maps";
 
 /* Autoupdate dialog on start */
 "whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Address/Block";
-
-"type.addr_interpolation.even" = "Address/Block";
-
-"type.addr_interpolation.odd" = "Address/Block";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1285,7 +1279,7 @@
 
 "type.amenity" = "Amenity";
 
-"type.amenity.arts_centre" = "Arts Center";
+"type.amenity.arts_centre" = "Art Center";
 
 "type.amenity.atm" = "ATM";
 
@@ -1325,7 +1319,7 @@
 
 "type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
 
-"type.amenity.charging_station.motorcar" = "Car Charging Station";
+"type.amenity.charging_station.motorcar" = "Motorcar Charging Station";
 
 "type.amenity.childcare" = "Nursery";
 
@@ -1409,15 +1403,15 @@
 
 "type.amenity.parking.private" = "Private Parking";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "Underground Parking";
 
-"type.amenity.parking_entrance" = "Parking Entrance";
+"type.amenity.parking_entrance" = "Parking entrance";
 
-"type.amenity.parking_entrance.private" = "Parking Entrance";
+"type.amenity.parking_entrance.private" = "Parking entrance";
 
-"type.amenity.parking_entrance.permissive" = "Parking Entrance";
+"type.amenity.parking_entrance.permissive" = "Parking entrance";
 
 "type.amenity.parking_space" = "Parking Space";
 
@@ -1435,23 +1429,23 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
-"type.amenity.post_box" = "Mailbox";
+"type.amenity.post_box" = "Post Box";
 
 "type.amenity.post_office" = "Post Office";
 
@@ -1470,7 +1464,7 @@
 
 "type.amenity.recycling.container" = "Recycling Container";
 
-"type.recycling.batteries" = "Batteries";
+"type.recycling.batteries" = "Household Batteries";
 
 "type.recycling.clothes" = "Clothes";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,9 +1524,9 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "Parking Tickets";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinary Doctor";
 
@@ -1552,13 +1546,13 @@
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "Barrier";
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1660,7 +1652,7 @@
 
 "type.craft.carpenter" = "Carpenter";
 
-"type.craft.confectionery" = "Confectioner";
+"type.craft.confectionery" = "Confectionery";
 
 "type.craft.electrician" = "Electrician";
 
@@ -1671,7 +1663,7 @@
 "type.craft.handicraft" = "Handicraft";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "HVAC Shop";
+"type.craft.hvac" = "HVAC";
 
 "type.craft.key_cutter" = "Key Cutting";
 
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Photographer";
 
-"type.shop.camera" = "Camera Shop";
-
 "type.craft.plumber" = "Plumber";
 
 "type.craft.sawmill" = "Sawmill";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -1885,19 +1875,19 @@
 
 "type.healthcare.physiotherapist" = "Physiotherapist";
 
-"type.healthcare.alternative" = "Alternative Medicine";
+"type.healthcare.alternative" = "Alternative medicine";
 
-"type.healthcare.audiologist" = "Audiologist";
+"type.healthcare.audiologist" = "Audiology";
 
-"type.healthcare.blood_donation" = "Blood Donation Center";
+"type.healthcare.blood_donation" = "Blood donation center";
 
-"type.healthcare.optometrist" = "Optometrist";
+"type.healthcare.optometrist" = "Optometry";
 
-"type.healthcare.podiatrist" = "Podiatrist";
+"type.healthcare.podiatrist" = "Podiatry";
 
-"type.healthcare.psychotherapist" = "Psychotherapist";
+"type.healthcare.psychotherapist" = "Psychotherapy";
 
-"type.healthcare.sample_collection" = "Sample Collection Centre";
+"type.healthcare.sample_collection" = "Sample collection";
 
 "type.healthcare.speech_therapist" = "Logopedics";
 
@@ -1916,7 +1906,7 @@
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Tunnel";
 
-"type.highway.busway" = "Dedicated Bus Road";
+"type.highway.busway" = "Dedicated bus road";
 
 "type.highway.bus_stop" = "Bus Stop";
 
@@ -1938,7 +1928,7 @@
 
 "type.highway.footway.alpine_hiking" = "Path";
 
-"type.highway.footway.area" = "Pedestrian Area";
+"type.highway.footway.area" = "Pedestrian Zone";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pedestrian Bridge";
@@ -2014,7 +2004,7 @@
 
 "type.highway.pedestrian" = "Pedestrian Street";
 
-"type.highway.pedestrian.area" = "Pedestrian Area";
+"type.highway.pedestrian.area" = "Pedestrian Zone";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.pedestrian.bridge" = "Pedestrian Bridge";
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Bridge";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2207,21 +2197,21 @@
 
 /********** Types: Historic **********/
 
-"type.historic" = "Historic Object";
+"type.historic" = "Historic object";
 
 "type.historic.archaeological_site" = "Archaeological Site";
 
-"type.historic.battlefield" = "Historic Battlefield";
+"type.historic.battlefield" = "Battlefield";
 
 "type.historic.boundary_stone" = "Boundary Stone";
 
 "type.historic.castle" = "Castle";
 
-"type.historic.castle.castrum" = "Roman Fort";
+"type.historic.castle.castrum" = "Roman fort";
 
-"type.historic.castle.defensive" = "Stronghold Castle";
+"type.historic.castle.defensive" = "Castle";
 
-"type.historic.castle.fortified_church" = "Fortified Church";
+"type.historic.castle.fortified_church" = "Fortified church";
 
 "type.historic.castle.fortress" = "Fortress";
 
@@ -2229,15 +2219,15 @@
 
 "type.historic.castle.kremlin" = "Kremlin";
 
-"type.historic.castle.manor" = "Manor House";
+"type.historic.castle.manor" = "Manor house";
 
 "type.historic.castle.palace" = "Palace";
 
-"type.historic.castle.shiro" = "Japanese Castle";
+"type.historic.castle.shiro" = "Japanese castle";
 
-"type.historic.castle.stately" = "Stately Castle";
+"type.historic.castle.stately" = "Castle";
 
-"type.historic.city_gate" = "City Gate";
+"type.historic.city_gate" = "City gate";
 
 "type.historic.citywalls" = "City Wall";
 
@@ -2247,9 +2237,9 @@
 
 "type.historic.memorial" = "Memorial";
 
-"type.historic.memorial.cross" = "Memorial Cross";
+"type.historic.memorial.cross" = "Memorial cross";
 
-"type.historic.memorial.plaque" = "Commemorative Plaque";
+"type.historic.memorial.plaque" = "Commemorative plaque";
 
 "type.historic.memorial.sculpture" = "Sculpture";
 
@@ -2257,21 +2247,21 @@
 
 "type.historic.memorial.stolperstein" = "Stolperstein";
 
-"type.historic.memorial.war_memorial" = "War Memorial";
+"type.historic.memorial.war_memorial" = "War memorial";
 
 "type.historic.monument" = "Monument";
 
 "type.historic.pillory" = "Pillory";
 
-"type.historic.ruins" = "Historic Ruins";
+"type.historic.ruins" = "Ruins";
 
 "type.historic.ship" = "Ship";
 
 "type.historic.tomb" = "Tomb";
 
-"type.historic.wayside_cross" = "Wayside Cross";
+"type.historic.wayside_cross" = "Wayside cross";
 
-"type.historic.wayside_shrine" = "Wayside Shrine";
+"type.historic.wayside_shrine" = "Wayside shrine";
 
 "type.hwtag" = "hwtag";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2343,11 +2333,11 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
-"type.landuse.grass" = "Grass";
+"type.landuse.grass" = "Lawn";
 
 "type.landuse.greenfield" = "Greenfield";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2409,15 +2399,15 @@
 
 "type.leisure.park" = "Park";
 
-"type.leisure.park.no.access" = "Private Park";
+"type.leisure.park.no.access" = "Park";
 
 "type.leisure.park.permissive" = "Park";
 
-"type.leisure.park.private" = "Private Park";
+"type.leisure.park.private" = "Park";
 
 "type.leisure.picnic_table" = "Picnic Table";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Communications Tower";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2511,13 +2501,13 @@
 
 "type.natural.beach" = "Beach";
 
-"type.natural.beach.sand" = "Sandy Beach";
+"type.natural.beach.sand" = "Sand Beach";
 
 "type.natural.beach.gravel" = "Gravel Beach";
 
 "type.natural.cape" = "Cape";
 
-"type.natural.cave_entrance" = "Cave Entrance";
+"type.natural.cave_entrance" = "Cave";
 
 "type.natural.cliff" = "Cliff";
 
@@ -2565,7 +2555,7 @@
 
 "type.natural.scrub" = "Scrub";
 
-"type.natural.spring" = "Natural Spring";
+"type.natural.spring" = "Spring";
 
 "type.natural.strait" = "Strait";
 
@@ -2577,7 +2567,7 @@
 
 "type.natural.volcano" = "Volcano";
 
-"type.natural.water" = "Water";
+"type.natural.water" = "Waterbody";
 
 "type.natural.wetland" = "Wetland";
 
@@ -2643,7 +2633,7 @@
 
 "type.place.island" = "Island";
 
-"type.place.islet" = "Islet";
+"type.place.islet" = "Island";
 
 "type.place.isolated_dwelling" = "Isolated Dwelling";
 
@@ -2671,13 +2661,13 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solar Generator";
 
 "type.power.generator.wind" = "Wind Generator";
 
-"type.power.generator.gas" = "Gas Turbine Power Plant";
+"type.power.generator.gas" = "Gas turbine Power Plant";
 
 "type.power.generator.hydro" = "Hydroelectric Power Plant";
 
@@ -2691,7 +2681,7 @@
 
 "type.power.plant.coal" = "Coal Power Plant";
 
-"type.power.plant.gas" = "Gas Turbine Power Plant";
+"type.power.plant.gas" = "Gas turbine Power Plant";
 
 "type.power.plant.hydro" = "Hydroelectric Power Plant";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "Wind Power Plant";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Level Crossing";
 
@@ -2795,229 +2785,229 @@
 
 "type.railway.station" = "Train Station";
 
-"type.railway.station.light_rail" = "Light Rail Station";
+"type.railway.station.light_rail" = "Train Station";
 
-"type.railway.station.monorail" = "Monorail Station";
+"type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Subway Station";
+"type.railway.station.subway" = "Subway";
 
-"type.railway.station.subway.adana" = "Subway Station";
+"type.railway.station.subway.adana" = "Subway";
 
-"type.railway.station.subway.algiers" = "Subway Station";
+"type.railway.station.subway.algiers" = "Subway";
 
-"type.railway.station.subway.almaty" = "Subway Station";
+"type.railway.station.subway.almaty" = "Subway";
 
-"type.railway.station.subway.amsterdam" = "Subway Station";
+"type.railway.station.subway.amsterdam" = "Subway";
 
-"type.railway.station.subway.ankara" = "Subway Station";
+"type.railway.station.subway.ankara" = "Subway";
 
-"type.railway.station.subway.athens" = "Subway Station";
+"type.railway.station.subway.athens" = "Subway";
 
-"type.railway.station.subway.baku" = "Subway Station";
+"type.railway.station.subway.baku" = "Subway";
 
-"type.railway.station.subway.bangkok" = "Subway Station";
+"type.railway.station.subway.bangkok" = "Subway";
 
-"type.railway.station.subway.barcelona" = "Subway Station";
+"type.railway.station.subway.barcelona" = "Subway";
 
-"type.railway.station.subway.beijing" = "Subway Station";
+"type.railway.station.subway.beijing" = "Subway";
 
-"type.railway.station.subway.bengalore" = "Subway Station";
+"type.railway.station.subway.bengalore" = "Subway";
 
-"type.railway.station.subway.berlin" = "Subway Station";
+"type.railway.station.subway.berlin" = "Subway";
 
-"type.railway.station.subway.bilbao" = "Subway Station";
+"type.railway.station.subway.bilbao" = "Subway";
 
-"type.railway.station.subway.brasilia" = "Subway Station";
+"type.railway.station.subway.brasilia" = "Subway";
 
-"type.railway.station.subway.brescia" = "Subway Station";
+"type.railway.station.subway.brescia" = "Subway";
 
-"type.railway.station.subway.brussels" = "Subway Station";
+"type.railway.station.subway.brussels" = "Subway";
 
-"type.railway.station.subway.bucharest" = "Subway Station";
+"type.railway.station.subway.bucharest" = "Subway";
 
-"type.railway.station.subway.budapest" = "Subway Station";
+"type.railway.station.subway.budapest" = "Subway";
 
-"type.railway.station.subway.buenos_aires" = "Subway Station";
+"type.railway.station.subway.buenos_aires" = "Subway";
 
-"type.railway.station.subway.bursa" = "Subway Station";
+"type.railway.station.subway.bursa" = "Subway";
 
-"type.railway.station.subway.cairo" = "Subway Station";
+"type.railway.station.subway.cairo" = "Subway";
 
-"type.railway.station.subway.caracas" = "Subway Station";
+"type.railway.station.subway.caracas" = "Subway";
 
-"type.railway.station.subway.catania" = "Subway Station";
+"type.railway.station.subway.catania" = "Subway";
 
-"type.railway.station.subway.changchun" = "Subway Station";
+"type.railway.station.subway.changchun" = "Subway";
 
-"type.railway.station.subway.chengdu" = "Subway Station";
+"type.railway.station.subway.chengdu" = "Subway";
 
-"type.railway.station.subway.chicago" = "Subway Station";
+"type.railway.station.subway.chicago" = "Subway";
 
-"type.railway.station.subway.chongqing" = "Subway Station";
+"type.railway.station.subway.chongqing" = "Subway";
 
-"type.railway.station.subway.dalian" = "Subway Station";
+"type.railway.station.subway.dalian" = "Subway";
 
-"type.railway.station.subway.delhi" = "Subway Station";
+"type.railway.station.subway.delhi" = "Subway";
 
-"type.railway.station.subway.dnepro" = "Subway Station";
+"type.railway.station.subway.dnepro" = "Subway";
 
-"type.railway.station.subway.dubai" = "Subway Station";
+"type.railway.station.subway.dubai" = "Subway";
 
-"type.railway.station.subway.ekb" = "Subway Station";
+"type.railway.station.subway.ekb" = "Subway";
 
-"type.railway.station.subway.fukuoka" = "Subway Station";
+"type.railway.station.subway.fukuoka" = "Subway";
 
-"type.railway.station.subway.glasgow" = "Subway Station";
+"type.railway.station.subway.glasgow" = "Subway";
 
-"type.railway.station.subway.guangzhou" = "Subway Station";
+"type.railway.station.subway.guangzhou" = "Subway";
 
-"type.railway.station.subway.hamburg" = "Subway Station";
+"type.railway.station.subway.hamburg" = "Subway";
 
-"type.railway.station.subway.helsinki" = "Subway Station";
+"type.railway.station.subway.helsinki" = "Subway";
 
-"type.railway.station.subway.hiroshima" = "Subway Station";
+"type.railway.station.subway.hiroshima" = "Subway";
 
-"type.railway.station.subway.isfahan" = "Subway Station";
+"type.railway.station.subway.isfahan" = "Subway";
 
-"type.railway.station.subway.istanbul" = "Subway Station";
+"type.railway.station.subway.istanbul" = "Subway";
 
-"type.railway.station.subway.izmir" = "Subway Station";
+"type.railway.station.subway.izmir" = "Subway";
 
-"type.railway.station.subway.kazan" = "Subway Station";
+"type.railway.station.subway.kazan" = "Subway";
 
-"type.railway.station.subway.kharkiv" = "Subway Station";
+"type.railway.station.subway.kharkiv" = "Subway";
 
-"type.railway.station.subway.kiev" = "Subway Station";
+"type.railway.station.subway.kiev" = "Subway";
 
-"type.railway.station.subway.kobe" = "Subway Station";
+"type.railway.station.subway.kobe" = "Subway";
 
-"type.railway.station.subway.kolkata" = "Subway Station";
+"type.railway.station.subway.kolkata" = "Subway";
 
-"type.railway.station.subway.kunming" = "Subway Station";
+"type.railway.station.subway.kunming" = "Subway";
 
-"type.railway.station.subway.kyoto" = "Subway Station";
+"type.railway.station.subway.kyoto" = "Subway";
 
-"type.railway.station.subway.la" = "Subway Station";
+"type.railway.station.subway.la" = "Subway";
 
-"type.railway.station.subway.lausanne" = "Subway Station";
+"type.railway.station.subway.lausanne" = "Subway";
 
-"type.railway.station.subway.lille" = "Subway Station";
+"type.railway.station.subway.lille" = "Subway";
 
-"type.railway.station.subway.lima" = "Subway Station";
+"type.railway.station.subway.lima" = "Subway";
 
-"type.railway.station.subway.lisboa" = "Subway Station";
+"type.railway.station.subway.lisboa" = "Subway";
 
 "type.railway.station.subway.london" = "Underground Station";
 
-"type.railway.station.subway.lyon" = "Subway Station";
+"type.railway.station.subway.lyon" = "Subway";
 
-"type.railway.station.subway.madrid" = "Subway Station";
+"type.railway.station.subway.madrid" = "Subway";
 
-"type.railway.station.subway.malaga" = "Subway Station";
+"type.railway.station.subway.malaga" = "Subway";
 
-"type.railway.station.subway.manila" = "Subway Station";
+"type.railway.station.subway.manila" = "Subway";
 
-"type.railway.station.subway.maracaibo" = "Subway Station";
+"type.railway.station.subway.maracaibo" = "Subway";
 
-"type.railway.station.subway.mashhad" = "Subway Station";
+"type.railway.station.subway.mashhad" = "Subway";
 
-"type.railway.station.subway.mecca" = "Subway Station";
+"type.railway.station.subway.mecca" = "Subway";
 
-"type.railway.station.subway.medellin" = "Subway Station";
+"type.railway.station.subway.medellin" = "Subway";
 
-"type.railway.station.subway.mexico" = "Subway Station";
+"type.railway.station.subway.mexico" = "Subway";
 
-"type.railway.station.subway.milan" = "Subway Station";
+"type.railway.station.subway.milan" = "Subway";
 
-"type.railway.station.subway.minsk" = "Subway Station";
+"type.railway.station.subway.minsk" = "Subway";
 
-"type.railway.station.subway.montreal" = "Subway Station";
+"type.railway.station.subway.montreal" = "Subway";
 
-"type.railway.station.subway.moscow" = "Subway Station";
+"type.railway.station.subway.moscow" = "Subway";
 
-"type.railway.station.subway.munchen" = "Subway Station";
+"type.railway.station.subway.munchen" = "Subway";
 
-"type.railway.station.subway.nagoya" = "Subway Station";
+"type.railway.station.subway.nagoya" = "Subway";
 
-"type.railway.station.subway.newyork" = "Subway Station";
+"type.railway.station.subway.newyork" = "Subway";
 
-"type.railway.station.subway.nnov" = "Subway Station";
+"type.railway.station.subway.nnov" = "Subway";
 
-"type.railway.station.subway.novosibirsk" = "Subway Station";
+"type.railway.station.subway.novosibirsk" = "Subway";
 
-"type.railway.station.subway.osaka" = "Subway Station";
+"type.railway.station.subway.osaka" = "Subway";
 
-"type.railway.station.subway.oslo" = "Subway Station";
+"type.railway.station.subway.oslo" = "Subway";
 
-"type.railway.station.subway.palma" = "Subway Station";
+"type.railway.station.subway.palma" = "Subway";
 
-"type.railway.station.subway.panama" = "Subway Station";
+"type.railway.station.subway.panama" = "Subway";
 
-"type.railway.station.subway.paris" = "Subway Station";
+"type.railway.station.subway.paris" = "Subway";
 
-"type.railway.station.subway.philadelphia" = "Subway Station";
+"type.railway.station.subway.philadelphia" = "Subway";
 
-"type.railway.station.subway.pyongyang" = "Subway Station";
+"type.railway.station.subway.pyongyang" = "Subway";
 
-"type.railway.station.subway.rennes" = "Subway Station";
+"type.railway.station.subway.rennes" = "Subway";
 
-"type.railway.station.subway.rio" = "Subway Station";
+"type.railway.station.subway.rio" = "Subway";
 
-"type.railway.station.subway.roma" = "Subway Station";
+"type.railway.station.subway.roma" = "Subway";
 
-"type.railway.station.subway.rotterdam" = "Subway Station";
+"type.railway.station.subway.rotterdam" = "Subway";
 
-"type.railway.station.subway.samara" = "Subway Station";
+"type.railway.station.subway.samara" = "Subway";
 
-"type.railway.station.subway.santiago" = "Subway Station";
+"type.railway.station.subway.santiago" = "Subway";
 
-"type.railway.station.subway.santo_domingo" = "Subway Station";
+"type.railway.station.subway.santo_domingo" = "Subway";
 
-"type.railway.station.subway.saopaulo" = "Subway Station";
+"type.railway.station.subway.saopaulo" = "Subway";
 
-"type.railway.station.subway.sapporo" = "Subway Station";
+"type.railway.station.subway.sapporo" = "Subway";
 
-"type.railway.station.subway.sendai" = "Subway Station";
+"type.railway.station.subway.sendai" = "Subway";
 
-"type.railway.station.subway.sf" = "Subway Station";
+"type.railway.station.subway.sf" = "Subway";
 
-"type.railway.station.subway.shanghai" = "Subway Station";
+"type.railway.station.subway.shanghai" = "Subway";
 
-"type.railway.station.subway.shiraz" = "Subway Station";
+"type.railway.station.subway.shiraz" = "Subway";
 
-"type.railway.station.subway.sofia" = "Subway Station";
+"type.railway.station.subway.sofia" = "Subway";
 
-"type.railway.station.subway.spb" = "Subway Station";
+"type.railway.station.subway.spb" = "Subway";
 
-"type.railway.station.subway.stockholm" = "Subway Station";
+"type.railway.station.subway.stockholm" = "Subway";
 
-"type.railway.station.subway.tabriz" = "Subway Station";
+"type.railway.station.subway.tabriz" = "Subway";
 
-"type.railway.station.subway.taipei" = "Subway Station";
+"type.railway.station.subway.taipei" = "Subway";
 
-"type.railway.station.subway.taoyuan" = "Subway Station";
+"type.railway.station.subway.taoyuan" = "Subway";
 
-"type.railway.station.subway.tashkent" = "Subway Station";
+"type.railway.station.subway.tashkent" = "Subway";
 
-"type.railway.station.subway.tbilisi" = "Subway Station";
+"type.railway.station.subway.tbilisi" = "Subway";
 
-"type.railway.station.subway.tianjin" = "Subway Station";
+"type.railway.station.subway.tianjin" = "Subway";
 
-"type.railway.station.subway.tokyo" = "Subway Station";
+"type.railway.station.subway.tokyo" = "Subway";
 
-"type.railway.station.subway.valencia" = "Subway Station";
+"type.railway.station.subway.valencia" = "Subway";
 
-"type.railway.station.subway.vienna" = "Subway Station";
+"type.railway.station.subway.vienna" = "Subway";
 
-"type.railway.station.subway.warszawa" = "Subway Station";
+"type.railway.station.subway.warszawa" = "Subway";
 
-"type.railway.station.subway.washington" = "Subway Station";
+"type.railway.station.subway.washington" = "Subway";
 
-"type.railway.station.subway.wuhan" = "Subway Station";
+"type.railway.station.subway.wuhan" = "Subway";
 
-"type.railway.station.subway.yerevan" = "Subway Station";
+"type.railway.station.subway.yerevan" = "Subway";
 
-"type.railway.station.subway.yokohama" = "Subway Station";
+"type.railway.station.subway.yokohama" = "Subway";
 
 "type.railway.subway" = "Subway Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3283,51 +3273,51 @@
 
 "type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
-"type.shop.cannabis" = "Cannabis Shop";
+"type.shop.cannabis" = "Cannabis Store";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Workshop";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
 "type.shop.caravan" = "RV Dealership";
 
-"type.shop.carpet" = "Carpet Shop";
+"type.shop.carpet" = "Carpets";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Chocolate Shop";
 
 "type.shop.clothes" = "Clothes Shop";
 
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Store";
 
 "type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Candy Shop";
+"type.shop.confectionery" = "Sweets";
 
 "type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
-"type.shop.cosmetics" = "Cosmetics Shop";
+"type.shop.cosmetics" = "Cosmetics";
 
-"type.shop.curtain" = "Curtain Shop";
+"type.shop.curtain" = "Curtains";
 
-"type.shop.deli" = "Delicatessen";
+"type.shop.deli" = "Delicatessen Shop";
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "Home Improvement Store";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "Fashion Accessories";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
 
 "type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "Gas Store";
 
@@ -3351,7 +3341,7 @@
 
 "type.shop.greengrocer" = "Greengrocer";
 
-"type.shop.grocery" = "Grocery Store";
+"type.shop.grocery" = "Grocery";
 
 "type.shop.hairdresser" = "Hairdresser";
 
@@ -3359,13 +3349,13 @@
 
 "type.shop.health_food" = "Health Food Shop";
 
-"type.shop.herbalist" = "Herbalist";
+"type.shop.herbalist" = "Herbs Store";
 
-"type.shop.hifi" = "HiFi Audio Shop";
+"type.shop.hifi" = "HiFi Audio";
 
-"type.shop.houseware" = "Housewares Store";
+"type.shop.houseware" = "Houseware";
 
-"type.shop.jewelry" = "Jewelry Store";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
@@ -3377,7 +3367,7 @@
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Cell Phone Store";
+"type.shop.mobile_phone" = "Cell Phones";
 
 "type.shop.money_lender" = "Money Lender";
 
@@ -3387,17 +3377,17 @@
 
 "type.shop.music" = "Record Store";
 
-"type.shop.musical_instrument" = "Musical Instrument Shop";
+"type.shop.musical_instrument" = "Musical Instruments";
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "Pickup Point";
 
-"type.shop.pastry" = "Pastry Shop";
+"type.shop.pastry" = "Pastry";
 
 "type.shop.pawnbroker" = "Pawnbroker";
 
@@ -3407,13 +3397,13 @@
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
-"type.shop.second_hand" = "Second Hand Shop";
+"type.shop.second_hand" = "Second Hand";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3421,7 +3411,7 @@
 
 "type.shop.tattoo" = "Tattoo Parlour";
 
-"type.shop.tea" = "Tea Shop";
+"type.shop.tea" = "Tea Store";
 
 "type.shop.ticket" = "Ticket Shop";
 
@@ -3435,60 +3425,59 @@
 
 "type.shop.video" = "Video Shop";
 
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.video_games" = "Video Games Shop";
 
 "type.shop.wine" = "Wine Shop";
 
 "type.shop.agrarian" = "Agricultural Shop";
 
-"type.shop.antiques" = "Antiques Shop";
+"type.shop.antiques" = "Antiques";
 
-"type.shop.appliance" = "Appliance Shop";
+"type.shop.appliance" = "Appliances Shop";
 
-/* maybe change to Art Gallery for en-US when supported */
-"type.shop.art" = "Artwork Shop";
+"type.shop.art" = "Arts Shop";
 
-"type.shop.baby_goods" = "Baby Goods Shop";
+"type.shop.baby_goods" = "Baby Goods";
 
-"type.shop.bag" = "Bag Shop";
+"type.shop.bag" = "Bags Store";
 
-"type.shop.bed" = "Bed Shop";
+"type.shop.bed" = "Beds Shop";
 
 "type.shop.boutique" = "Boutique";
 
 "type.shop.charity" = "Charity Shop";
 
-"type.shop.cheese" = "Cheese Shop";
+"type.shop.cheese" = "Cheese Store";
 
-"type.shop.craft" = "Craft Supplies Store";
+"type.shop.craft" = "Arts and Crafts";
 
-"type.shop.dairy" = "Dairy Shop";
+"type.shop.dairy" = "Dairy Products";
 
-"type.shop.electrical" = "Electrical Supplies Store";
+"type.shop.electrical" = "Electrical Store";
 
 "type.shop.fishing" = "Fishing Store";
 
-"type.shop.interior_decoration" = "Interior Decorations Store";
+"type.shop.interior_decoration" = "Interior Decorations";
 
 "type.shop.lottery" = "Lottery Tickets";
 
-"type.shop.medical_supply" = "Medical Supplies Store";
+"type.shop.medical_supply" = "Medical Supplies";
 
-"type.shop.nutrition_supplements" = "Nutrition Supplement Store";
+"type.shop.nutrition_supplements" = "Nutrition Supplements";
 
-"type.shop.paint" = "Paint Shop";
+"type.shop.paint" = "Paints";
 
-"type.shop.perfumery" = "Perfume Shop";
+"type.shop.perfumery" = "Perfumery";
 
-"type.shop.sewing" = "Sewing Supplies Shop";
+"type.shop.sewing" = "Sewing Supplies";
 
 "type.shop.storage_rental" = "Storage Rental";
 
-"type.shop.tobacco" = "Smoke Shop";
+"type.shop.tobacco" = "Tobacco";
 
-"type.shop.trade" = "Trade Supplies";
+"type.shop.trade" = "Trades Supplies";
 
-"type.shop.watches" = "Watch Store";
+"type.shop.watches" = "Watches";
 
 "type.shop.wholesale" = "Wholesale Store";
 
@@ -3506,7 +3495,7 @@
 
 "type.sport.basketball" = "Basketball";
 
-"type.sport.beachvolleyball" = "Beach Volleyball";
+"type.sport.beachvolleyball" = "Beach volleyball";
 
 "type.sport.bowls" = "Bowls";
 
@@ -3527,7 +3516,7 @@
 "type.sport.multi" = "Various Sports";
 
 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "Shooting";
 
@@ -3539,7 +3528,7 @@
 
 "type.sport.swimming" = "Swimming";
 
-"type.sport.table_tennis" = "Table Tennis";
+"type.sport.table_tennis" = "Table tennis";
 
 "type.sport.tennis" = "Tennis Court";
 
@@ -3559,37 +3548,37 @@
 
 "type.sport.badminton" = "Badminton";
 
-"type.sport.pelota" = "Basque Pelota";
+"type.sport.pelota" = "Basque pelota";
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
-"type.tourism.attraction.animal" = "Animal Enclosure";
+"type.tourism.attraction.animal" = "Animal enclosure";
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "RV Park";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3655,13 +3644,13 @@
 
 "type.waterway.riverbank" = "River";
 
-"type.waterway.stream" = "Stream";
+"type.waterway.stream" = "River";
 
-"type.waterway.stream.ephemeral" = "Ephemeral Stream";
+"type.waterway.stream.ephemeral" = "River";
 
-"type.waterway.stream.intermittent" = "Intermittent Stream";
+"type.waterway.stream.intermittent" = "River";
 
-"type.waterway.stream.tunnel" = "Stream";
+"type.waterway.stream.tunnel" = "River";
 
 "type.waterway.waterfall" = "Waterfall";
 
@@ -3689,20 +3678,22 @@
 
 "type.piste_type.downhill" = "Downhill Ski Run";
 
-"type.piste_type.downhill.advanced" = "Advanced Downhill Ski Run";
+"type.piste_type.downhill.advanced" = "Downhill Ski Run";
 
-"type.piste_type.downhill.easy" = "Easy Downhill Ski Run";
+"type.piste_type.downhill.easy" = "Downhill Ski Run";
 
-"type.piste_type.downhill.expert" = "Expert Downhill Ski Run";
+"type.piste_type.downhill.expert" = "Downhill Ski Run";
 
 "type.piste_type.downhill.freeride" = "Downhill Ski Run";
 
-"type.piste_type.downhill.intermediate" = "Intermediate Downhill Ski Run";
+"type.piste_type.downhill.intermediate" = "Downhill Ski Run";
 
-"type.piste_type.downhill.novice" = "Novice Downhill Ski Run";
+"type.piste_type.downhill.novice" = "Downhill Ski Run";
 
 "type.piste_type.nordic" = "Nordic Ski Trail";
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "Events Venue";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index eaed8530d6..a075ddee2c 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mi posición";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Luego";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/es/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Dirección/Bloque";
-
-"type.addr_interpolation.even" = "Dirección/Bloque";
-
-"type.addr_interpolation.odd" = "Dirección/Bloque";
-
 "type.aerialway" = "Transporte aéreo";
 
 "type.aerialway.cable_car" = "Teleférico";
@@ -1564,7 +1558,7 @@
 
 "type.barrier.chain" = "Cadena";
 
-"type.barrier.city_wall" = "City Wall";
+"type.barrier.city_wall" = "Muro de la ciudad";
 
 "type.barrier.cycle_barrier" = "Barrera para bicicletas";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Edificio";
 
-"type.building.has_parts" = "Edificio";
-
-"type.building_part" = "Edificio";
-
 "type.building.garage" = "Garaje";
 
+"type.building.has_parts" = "Edificio";
+
 "type.building.train_station" = "Estación de tren";
 
 "type.building.warehouse" = "Almacén";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotógrafo";
 
-"type.shop.camera" = "Tienda de cámaras";
-
 "type.craft.plumber" = "Fontanero";
 
 "type.craft.sawmill" = "Serrería";
@@ -1943,15 +1933,15 @@
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Puente";
 
-"type.highway.footway.demanding_alpine_hiking" = "Path";
+"type.highway.footway.demanding_alpine_hiking" = "Camino";
 
-"type.highway.footway.demanding_mountain_hiking" = "Path";
+"type.highway.footway.demanding_mountain_hiking" = "Camino";
 
-"type.highway.footway.difficult_alpine_hiking" = "Path";
+"type.highway.footway.difficult_alpine_hiking" = "Camino";
 
 "type.highway.footway.hiking" = "Sendero";
 
-"type.highway.footway.mountain_hiking" = "Path";
+"type.highway.footway.mountain_hiking" = "Camino";
 
 "type.highway.footway.permissive" = "Camino";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Peluquería";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Ferretería";
 
 "type.shop.health_food" = "Tienda de comida saludable";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Tienda de electrodomésticos";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Tienda de arte";
 
 "type.shop.baby_goods" = "Tienda de niños";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Pista para trineos";
 
+"type.building_part" = "Edificio";
+
 "type.amenity.events_venue" = "Lugar para eventos";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 9038ecaf6c..5bb73269d8 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mi posición";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Luego";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/es/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Dirección/Bloque";
-
-"type.addr_interpolation.even" = "Dirección/Bloque";
-
-"type.addr_interpolation.odd" = "Dirección/Bloque";
-
 "type.aerialway" = "Transporte aéreo";
 
 "type.aerialway.cable_car" = "Teleférico";
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Edificio";
 
-"type.building.has_parts" = "Edificio";
-
-"type.building_part" = "Edificio";
-
 "type.building.garage" = "Garaje";
 
+"type.building.has_parts" = "Edificio";
+
 "type.building.train_station" = "Estación de tren";
 
 "type.building.warehouse" = "Almacén";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotógrafo";
 
-"type.shop.camera" = "Tienda de cámaras";
-
 "type.craft.plumber" = "Fontanero";
 
 "type.craft.sawmill" = "Serrería";
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Peluquería";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Ferretería";
 
 "type.shop.health_food" = "Tienda de comida saludable";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Tienda de electrodomésticos";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Tienda de arte";
 
 "type.shop.baby_goods" = "Tienda de niños";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Pista para trineos";
 
+"type.building_part" = "Edificio";
+
 "type.amenity.events_venue" = "Lugar para eventos";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 2b8b736571..0353032135 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Minu asukoht";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Hiljem";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Aadress/plokk";
-
-"type.addr_interpolation.even" = "Aadress/plokk";
-
-"type.addr_interpolation.odd" = "Aadress/plokk";
-
 "type.aerialway" = "Õhutee";
 
 "type.aerialway.cable_car" = "Tramm";
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Hoone";
 
-"type.building.has_parts" = "Hoone";
-
-"type.building_part" = "Hoone";
-
 "type.building.garage" = "Garaaž";
 
+"type.building.has_parts" = "Hoone";
+
 "type.building.train_station" = "Rongijaam";
 
 "type.building.warehouse" = "Ladu";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograaf";
 
-"type.shop.camera" = "Kaamerapood";
-
 "type.craft.plumber" = "Santehnik";
 
 "type.craft.sawmill" = "Saeveski";
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Tehnikapood";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Kunstipood";
 
 "type.shop.baby_goods" = "Lastekaubad";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Kelgurada";
 
+"type.building_part" = "Hoone";
+
 "type.amenity.events_venue" = "Ürituste toimumiskoht";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 8473369c46..0f3cb08dc0 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -10,10 +10,10 @@
 "cancel" = "Utzi";
 
 /* Button which interrupts country download */
-"cancel_download" = "Utzi deskarga";
+"cancel_download" = "Utzi deskargatzea";
 
 /* Button which deletes downloaded country */
-"delete" = "Ezabatu";
+"delete" = "Kendu";
 
 "download_maps" = "Deskargatu mapak";
 
@@ -21,7 +21,7 @@
 "downloading" = "Deskargatzen…";
 
 /* Choose measurement on first launch alert - choose metric system button */
-"kilometres" = "Kilometro";
+"kilometres" = "Kilometroak";
 
 /* Leave Review dialog - Review button */
 "leave_a_review" = "Idatzi iritzia";
@@ -30,9 +30,9 @@
 "miles" = "Milia";
 
 /* A text for current gps location point/arrow selected on the map */
-"core_my_position" = "Nire kokapena";
+"core_my_position" = "Nire posizioa";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Geroago";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -42,15 +42,15 @@
 "use_cellular_data" = "Bai";
 
 /* View and button titles for accessibility */
-"zoom_to_country" = "Erakutsi mapan";
+"zoom_to_country" = "Mapan erakutsi";
 
 /* Button text for the button at the center of the screen when the country is not downloaded and the size should not be shown */
 "country_status_download_without_size" = "Deskargatu mapa";
 
 /* Message to display at the center of the screen when the country download has failed */
-"country_status_download_failed" = "Deskargak huts egin du";
+"country_status_download_failed" = "Errore bat deskargatzean";
 
-"about_menu_title" = "Organic Maps-i buruz";
+"about_menu_title" = "Organic Maps buruz";
 
 "close" = "Itxi";
 
@@ -60,16 +60,16 @@
 "continue_download" = "Jarraitu";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Gehitu zerrenda berri bat";
+"add_new_set" = "Gehitu talde berri bat";
 
 /* Bookmark Color dialog title */
-"bookmark_color" = "Markagailuaren kolorea";
+"bookmark_color" = "Markatzailearen kolorea";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
-"bookmark_set_name" = "Markagailuen zerrendaren izena";
+"bookmark_set_name" = "Markatzaile taldearen izena";
 
 /* "Bookmark Lists" dialog title */
-"bookmark_sets" = "Markagailuen zerrenda";
+"bookmark_sets" = "Markagailu taldeak";
 
 /* "Bookmarks" dialog title, please also edit it in iphone/plist.txt */
 "bookmarks" = "Markagailuak";
@@ -78,13 +78,13 @@
 "core_my_places" = "Nire tokiak";
 
 /* Editor title above street and house number */
-"address" = "Helbidea";
+"address" = "Norabidea";
 
 /* Settings button in system menu */
 "settings" = "Ezarpenak";
 
 /* Measurement units title in settings activity */
-"measurement_units" = "Neurketa unitateak";
+"measurement_units" = "Neurketa-unitateak";
 
 
 /********** Search categories **********/
@@ -93,13 +93,13 @@
 "eat" = "Non jan";
 
 /* Search category for grocery stores; any changes should be duplicated in categories.txt @food! */
-"food" = "Janari-denda";
+"food" = "Janariak";
 
 /* Search category for public transport; any changes should be duplicated in categories.txt @transport! */
 "transport" = "Garraioa";
 
 /* Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! */
-"fuel" = "Gasolindegia";
+"fuel" = "Erregai-geltokia";
 
 /* Search category for parking lots; any changes should be duplicated in categories.txt @parking! */
 "parking" = "Aparkalekua";
@@ -120,7 +120,7 @@
 "atm" = "Kutxazain automatikoa";
 
 /* Search category for nightclubs/bars; any changes should be duplicated in categories.txt @nightlife! */
-"nightlife" = "Gaueko giroa";
+"nightlife" = "Gaueko bizitza";
 
 /* Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! */
 "children" = "Familiako jarduerak";
@@ -135,7 +135,7 @@
 "hospital" = "Ospitalea";
 
 /* Search category for toilets; any changes should be duplicated in categories.txt @toilet! */
-"toilet" = "Komuna";
+"toilet" = "Komunak";
 
 /* Search category for post offices; any changes should be duplicated in categories.txt @post! */
 "post" = "Posta bulegoa";
@@ -155,16 +155,16 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Karabanak";
 
-"share_bookmarks_email_body" = "Kaixo!\nNire markagailuak Organic Maps aplikazioan erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin!";
+"share_bookmarks_email_body" = "Kaixo!\nNire markatzaileak Mapak organikoak aplikaziotik erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz\n\nGozatu bidaiatzen Organic Maps-ekin!";
 
 /* message title of loading file */
-"load_kmz_title" = "Markagailuak kargatzen";
+"load_kmz_title" = "Markatzaileak kargatzen";
 
 /* Kmz file successful loading */
-"load_kmz_successful" = "Markagailuak behar bezala kargatu dira! Mapan edo markagailuak kudeatzeko pantailan aurki ditzakezu.";
+"load_kmz_successful" = "Gogokoak behar bezala kargatu dira! Mapan edo kudeatu gogokoak pantailan aurki ditzakezu.";
 
 /* Kml file loading failed */
-"load_kmz_failed" = "Ezin izan dira markagailuak kargatu. Fitxategia hondatuta edo akastuna izan daiteke.";
+"load_kmz_failed" = "Ezin izan da gogokoak kargatu. Fitxategia hondatuta edo akastuna izan daiteke.";
 
 /* resource for context menu */
 "edit" = "Editatu";
@@ -173,16 +173,16 @@
 "unknown_current_position" = "Zure kokapena ez da oraindik zehaztu";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Begiratu nire markagailua Organic Maps mapan!";
+"bookmark_share_email_subject" = "Begiratu nire markatzailea Map organikoak mapan!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Ikusi nire uneko kokapena Organic Maps mapan!";
+"my_position_share_email_subject" = "Ikusi nire uneko kokapena mapan Organic Maps-en!";
 
 /* Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. */
 "share" = "Partekatu";
 
 /* Share by email button text, also used in editor and About. */
-"email" = "Posta elektronikoa";
+"email" = "Email";
 
 /* place preview title */
 "info" = "Informazioa";
@@ -197,7 +197,7 @@
 "data_version" = "OpenStreetMap datuak: %@";
 
 /* Title for tracks category in bookmarks manager */
-"tracks_title" = "Arrastoak";
+"tracks_title" = "Ibilbideak";
 
 /* Length of track in cell that describes route */
 "length" = "Luzera";
@@ -227,7 +227,7 @@
 "pref_map_3d_buildings_title" = "3D eraikinak";
 
 /* A message in Settings/Preferences explaining why is it not possible to enable 3D buildings when max power saving mode is enabled */
-"pref_map_3d_buildings_disabled_summary" = "3D eraikinak desgaituta daude energia aurrezteko moduan";
+"pref_map_3d_buildings_disabled_summary" = "3D eraikinak itzalita daude energia aurrezteko moduan";
 
 /* Settings «Route» category: «Tts enabled» title */
 "pref_tts_enable_title" = "Ahots argibideak";
@@ -239,13 +239,13 @@
 "pref_tts_other_section_title" = "Beste batzuk";
 
 /* Settings «Map» category: «Record track» title */
-"pref_track_record_title" = "Azken arrastoa";
+"pref_track_record_title" = "Azken bidaia";
 
 "pref_map_auto_zoom" = "Zoom automatikoa";
 
 "duration_disabled" = "Desaktibatuta";
 
-"duration_1_hour" = "ordu 1";
+"duration_1_hour" = "1 ordu";
 
 "duration_2_hours" = "2 ordu";
 
@@ -253,9 +253,9 @@
 
 "duration_12_hours" = "12 ordu";
 
-"duration_1_day" = "egun 1";
+"duration_1_day" = "1 egun";
 
-"recent_track_help_text" = "Denbora tarte jakin batean egindako arrastoa erregistratu eta mapan ikusteko aukera ematen du. Kontuan izan funtzio hau aktibatzea bateriaren kontsumoa handitzen dela. Ibilbide-erregistroa automatikoki kenduko da mapatik denbora-tarte hori igaro ondoren.";
+"recent_track_help_text" = "Denbora tarte jakin batean egindako ibilbidea erregistratu eta mapan ikusteko aukera ematen du. Kontuan izan funtzio hau aktibatzea bateriaren kontsumoa handitzen dela. Ibilbide-erregistroa automatikoki kenduko da mapatik denbora-tarte hori igaro ondoren.";
 
 "placepage_distance" = "Distantzia";
 
@@ -265,7 +265,7 @@
 "website" = "Webgunea";
 
 /* Text in About menu, opens Organic Maps news website */
-"news" = "Albisteak";
+"news" = "News";
 
 /* Text in menu */
 "github" = "GitHub";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -301,19 +301,19 @@
 "help" = "Laguntza";
 
 /* Button in the main Help dialog */
-"faq" = "Ohiko galderak";
+"faq" = "Maiz galderak";
 
 /* Button in the main menu */
 "donate" = "Dohaintza eman";
 
 /* Button in the main Help dialog */
-"how_to_support_us" = "Proiektuari laguntza eman";
+"how_to_support_us" = "Proiektuari laguntza ematea";
 
 /* Button in the main Help dialog */
-"copyright" = "Egile eskubideak";
+"copyright" = "Copyright";
 
 /* Text in menu + Button in the main Help dialog */
-"report_a_bug" = "Errore baten berri eman";
+"report_a_bug" = "Errore bat dago";
 
 /* Alert text */
 "email_error_body" = "Posta elektronikoko bezeroa ez da konfiguratu. Mesedez, konfigura ezazu edo erabili beste moduren bat gurekin harremanetan jartzeko %@ helbidean";
@@ -322,16 +322,16 @@
 "email_error_title" = "Errore bat mezua bidaltzean";
 
 /* Settings item title */
-"pref_calibration_title" = "Iparrorratzaren kalibrazioa";
+"pref_calibration_title" = "Konpas kalibrazioa";
 
 /* Update all button text */
 "downloader_update_all_button" = "Eguneratu guztiak";
 
 /* Downloaded maps list header */
-"downloader_downloaded_subtitle" = "Deskargatuta";
+"downloader_downloaded_subtitle" = "Alta";
 
 /* Downloaded maps category */
-"downloader_available_maps" = "Eskuragarria";
+"downloader_available_maps" = "Eskuragarri";
 
 /* Country queued for download */
 "downloader_queued" = "Ilaran";
@@ -348,16 +348,16 @@
 "downloader_search_results" = "Aurkituta";
 
 /* Status of outdated country in the list */
-"downloader_status_outdated" = "Eguneratu";
+"downloader_status_outdated" = "Eguneratzeko";
 
 /* Status of failed country in the list */
-"downloader_status_failed" = "Huts eginda";
+"downloader_status_failed" = "Porrota";
 
 /* Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode */
-"downloader_delete_map_while_routing_dialog" = "Mapa ezabatzeko, gelditu nabigazioa.";
+"downloader_delete_map_while_routing_dialog" = "Mapa kentzeko, utzi nabigazioa.";
 
 /* PointsInDifferentMWM */
-"routing_failed_cross_mwm_building" = "Eskualde bakarreko mapa batean guztiz bilduta dauden arrastoak soilik sor daitezke.";
+"routing_failed_cross_mwm_building" = "Eskualde bakarreko mapa batean guztiz bilduta dauden ibilbideak soilik sor daitezke.";
 
 /* Context menu item for downloader. */
 "downloader_download_map" = "Deskargatu mapa";
@@ -366,16 +366,16 @@
 "downloader_retry" = "Saiatu berriro";
 
 /* Item in context menu. */
-"downloader_delete_map" = "Ezabatu mapa";
+"downloader_delete_map" = "Mapa ezabatu";
 
 /* Text for routing error dialog */
-"routing_download_maps_along" = "Deskargatu zure arrastoaren mapa guztiak";
+"routing_download_maps_along" = "Deskargatu zure ibilbidearen mapa guztiak";
 
 /* Text for routing error dialog */
-"routing_requires_all_map" = "Arrasto bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatzea eta eguneratzea.";
+"routing_requires_all_map" = "Ibilbide bat sortzeko beharrezkoa da helmugako kokapenaren mapa guztiak deskargatu eta eguneratzea.";
 
 /* bookmark button text */
-"bookmark" = "Markagailua";
+"bookmark" = "Markatzailea";
 
 "save" = "Gorde";
 
@@ -412,13 +412,13 @@
 "light_blue" = "Urdin argia";
 
 /* cyan color */
-"cyan" = "Ziana";
+"cyan" = "Zian";
 
 /* teal color */
 "teal" = "Berde urdinxka";
 
 /* lime color */
-"lime" = "Lima";
+"lime" = "Karea";
 
 /* deep orange color */
 "deep_orange" = "Laranja iluna";
@@ -432,13 +432,13 @@
 
 /********** Routing dialogs strings **********/
 
-"dialog_routing_disclaimer_title" = "Arrastoa jarraitzean, kontuan izan:";
+"dialog_routing_disclaimer_title" = "Ibilbidea jarraitzean, kontuan izan:";
 
-"dialog_routing_disclaimer_priority" = "— Bidearen egoera, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;";
+"dialog_routing_disclaimer_priority" = "— Ibilbideen baldintzek, zirkulazio arauek eta bide seinaleek lehentasuna dute beti nabigazio-iradokizunen gainetik;";
 
-"dialog_routing_disclaimer_precision" = "— Mapa zehazgabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;";
+"dialog_routing_disclaimer_precision" = "— Mapa zehaztugabea izan daiteke eta helmugara iristeko biderik onena ez den ibilbide bat iradoki dezake;";
 
-"dialog_routing_disclaimer_recommendations" = "— Iradokitako ibilbideak gomendio gisa soilik hartu behar dira;";
+"dialog_routing_disclaimer_recommendations" = "— Iradokitako ibilbideak gomendio gisa soilik ulertu behar dira;";
 
 "dialog_routing_disclaimer_borders" = "— Kontuz ibili muga-eremuak dituzten ibilbideetan: gure aplikazioak sortutako ibilbideek batzuetan herrialdeen mugak zeharkatu ditzakete baimendu gabeko tokietan;";
 
@@ -448,15 +448,15 @@
 
 "dialog_routing_error_location_not_found" = "Ezin da ibilbidea sortu. Ezin izan dira uneko GPS koordenatuak identifikatu.";
 
-"dialog_routing_location_turn_wifi" = "Egiaztatu GPS seinalea. WiFi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da.";
+"dialog_routing_location_turn_wifi" = "Egiaztatu GPS seinalea. Wi-Fi konexioa aktibatuz gero, zure kokapenaren zehaztasuna hobetuko da.";
 
 "dialog_routing_location_turn_on" = "Aktibatu kokapen zerbitzuak";
 
-"dialog_routing_location_unknown_turn_on" = "Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.";
+"dialog_routing_location_unknown_turn_on" = "Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak ibilbidea kalkulatzeko.";
 
 "dialog_routing_download_files" = "Deskargatu beharrezko fitxategiak";
 
-"dialog_routing_download_and_update_all" = "Deskargatu eta eguneratu mapa eta ibilbideen informazio guztia aurreikusitako ibilbidearekin batera arrastoa kalkulatzeko.";
+"dialog_routing_download_and_update_all" = "Deskargatu eta eguneratu mapa eta ibilbideen informazio guztia aurreikusitako ibilbidearekin batera ibilbidea kalkulatzeko.";
 
 "dialog_routing_unable_locate_route" = "Ezin da ibilbiderik aurkitu";
 
@@ -466,17 +466,17 @@
 
 "dialog_routing_start_not_determined" = "Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.";
 
-"dialog_routing_select_closer_start" = "Hautatu errepide batetik gertuko abiapuntua.";
+"dialog_routing_select_closer_start" = "Hautatu errepide batetik gertu abiapuntua.";
 
-"dialog_routing_change_end" = "Zehaztu helmuga";
+"dialog_routing_change_end" = "Helmuga ezarri";
 
 "dialog_routing_end_not_determined" = "Ibilbidea ez da sortu. Ezin izan da helmuga aurkitu.";
 
 "dialog_routing_select_closer_end" = "Hautatu helmuga puntu bat errepide batetik gertu.";
 
-"dialog_routing_change_intermediate" = "Ezin izan da tarteko puntua kokatu.";
+"dialog_routing_change_intermediate" = "Ezin izan da tarteko geralekua kokatu.";
 
-"dialog_routing_intermediate_not_determined" = "Mesedez, zehaztu tarteko puntua.";
+"dialog_routing_intermediate_not_determined" = "Mesedez, egokitu tarteko geldialdia.";
 
 "dialog_routing_system_error" = "Sistemaren errorea";
 
@@ -503,24 +503,24 @@
 "routing_planning_error" = "Ibilbidea planifikatzeko errorea";
 
 /* Arrive routing message in navigation view */
-"routing_arrive" = "Iristeko unea: %s";
+"routing_arrive" = "Iritsiera: %s";
 
 /* Text for routing::RouterResultCode::FileTooOld dialog. */
 "dialog_routing_download_and_update_maps" = "Deskargatu eta eguneratu proiektatutako bideko mapa guztiak ibilbidea kalkulatzeko.";
 
 "categories" = "Kategoriak";
 
-"history" = "Historiala";
+"history" = "Grabatu";
 
 "search_not_found" = "Barkatu, ez dut ezer aurkitu.";
 
-"search_not_found_query" = "Saiatu bilaketa-irizpideak aldatzen.";
+"search_not_found_query" = "Mesedez, saiatu beste kontsulta bat.";
 
-"search_history_title" = "Bilaketa historia";
+"search_history_title" = "Bilaketa-historia";
 
 "search_history_text" = "Ikusi azken bilaketak.";
 
-"clear_search" = "Garbitu bilaketa historia";
+"clear_search" = "Ezabatu bilaketa-historia";
 
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
@@ -553,7 +553,7 @@
 
 "editor_time_add_closed" = "Gehitu ixteko ordutegia";
 
-"editor_time_title" = "Irekitzeko ordutegia";
+"editor_time_title" = "Ordutegiak";
 
 "editor_time_advanced" = "Modu aurreratua";
 
@@ -561,7 +561,7 @@
 
 "editor_hours_closed" = "Ixteko orduak";
 
-"editor_example_values" = "Adibide balioak";
+"editor_example_values" = "Adibide-balioak";
 
 "editor_add_select_location" = "Kokapena";
 
@@ -583,21 +583,21 @@
 
 "day_off_today" = "Gaur atseden eguna";
 
-"day_off" = "Itxita";
+"day_off" = "Egun librea";
 
 "today" = "Gaur";
 
 "opens_tomorrow_at" = "Bihar %@ean irekiko da";
 
-"opens_dayoftheweek_at" = "%1$@ean %2$@etan irekiko da";
+"opens_dayoftheweek_at" = "%1$@ean %2$@ean irekiko da";
 
-"opens_at" = "%@etan irekiko da";
+"opens_at" = "%@ean irekiko da";
 
-"opens_in" = "%@ barru irekiko da";
+"opens_in" = "%@ barru irekitzen da";
 
-"closes_at" = "%@etan itxiko da";
+"closes_at" = "%@ean itxiko da";
 
-"closes_in" = "%@ barru itxiko da";
+"closes_in" = "%@ barru ixten da";
 
 "closed" = "Itxita";
 
@@ -605,15 +605,15 @@
 
 "no_osm_account" = "Ez al duzu OpenStreetMap konturik?";
 
-"register_at_openstreetmap" = "Eman izena OpenStreetMap-en";
+"register_at_openstreetmap" = "Eman izena OpenStreetMap";
 
 "password_8_chars_min" = "Pasahitza (gutxienez 8 karaktere)";
 
-"invalid_username_or_password" = "Erabiltzaile izena edo pasahitza baliogabea.";
+"invalid_username_or_password" = "Erabiltzaile-izena edo pasahitza okerra.";
 
 "login" = "Saioa hasi";
 
-"forgot_password" = "Pasahitza ahaztu duzu?";
+"forgot_password" = "Pasahitza ahaztu al duzu?";
 
 "osm_account" = "OSM kontua";
 
@@ -631,16 +631,16 @@
 "add_language" = "Gehitu hizkuntza bat";
 
 /* Editable House Number text field (in address block). */
-"house_number" = "Etxeko zenbakia";
+"house_number" = "Etxe zenbakia";
 
 "details" = "Xehetasunak";
 
 /* Text field to enter non-existing street name, below list of known streets around */
 "add_street" = "Gehitu kale bat";
 
-"choose_language" = "Aukeratu hizkuntza bat";
+"choose_language" = "Hizkuntza bat aukeratu";
 
-"choose_street" = "Aukeratu kale bat";
+"choose_street" = "Kale bat aukeratu";
 
 "postal_code" = "Posta kodea";
 
@@ -659,15 +659,15 @@
 
 "downloader_delete_map_dialog" = "Maparen aldaketa guztiak maparekin batera ezabatuko dira.";
 
-"downloader_update_maps" = "Eguneratu mapak";
+"downloader_update_maps" = "Mapak deskargatu automatikoki";
 
-"downloader_search_field_hint" = "Bilatu mapa";
+"downloader_search_field_hint" = "Bilatu mapan";
 
-"migration_download_error_dialog" = "Deskargaren errorea";
+"migration_download_error_dialog" = "Deskargatzeko errorea";
 
 "common_check_internet_connection_dialog" = "Mesedez, egiaztatu ezarpenak eta ziurtatu zure gailua Internetera konektatuta dagoela.";
 
-"downloader_no_space_title" = "Leku nahikorik ez";
+"downloader_no_space_title" = "Leku nahikoa ez";
 
 "downloader_no_space_message" = "Ezabatu beharrezkoak ez diren datuak";
 
@@ -677,13 +677,13 @@
 
 "editor_add_select_category" = "Hautatu kategoria";
 
-"editor_add_select_category_popular_subtitle" = "Ospetsua";
+"editor_add_select_category_popular_subtitle" = "Herrikoia";
 
 "editor_add_select_category_all_subtitle" = "Kategoria guztiak";
 
-"editor_edit_place_title" = "Editatzen";
+"editor_edit_place_title" = "Editatu";
 
-"editor_add_place_title" = "Gehitzen";
+"editor_add_place_title" = "Gehitu";
 
 "editor_edit_place_name_hint" = "Tokiaren izena";
 
@@ -695,7 +695,7 @@
 
 "message_invalid_feature_position" = "Hemen ezin da objekturik jarri";
 
-"login_to_make_edits_visible" = "Hasi saioa OpenStreetMapen beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.";
+"login_to_make_edits_visible" = "Hasi saioa beste erabiltzaileek zuk egindako aldaketak ikus ditzaten.";
 
 /* Error dialog no space */
 "migration_no_space_message" = "Leku gehiago behar duzu deskargatzeko. Ezabatu beharrezkoak ez diren datuak.";
@@ -707,18 +707,18 @@
 
 "download_over_mobile_header" = "Deskargatu sare mugikorreko konexioarekin?";
 
-"download_over_mobile_message" = "Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.";
+"download_over_mobile_message" = "Oso garestia izan daiteke plan batzuekin edo datu-ibiltaritzarekin.";
 
-"error_enter_correct_house_number" = "Sartu etxeko zenbaki baliozkoa";
+"error_enter_correct_house_number" = "Sartu etxe-zenbaki zuzena";
 
 "editor_storey_number" = "Solairu kopurua (gehienez %d)";
 
 /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */
-"error_enter_correct_storey_number" = "Solairu kopurua ez da %d-tik gorakoa izan behar";
+"error_enter_correct_storey_number" = "Landare kopurua ez da %detik gorakoa izan behar";
 
 "editor_zip_code" = "Posta kodea";
 
-"error_enter_correct_zip_code" = "Sartu baliozko posta-kodea";
+"error_enter_correct_zip_code" = "Mesedez, idatzi posta-kode zuzena";
 
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "Toki ezezaguna";
@@ -741,7 +741,7 @@
 "current_location_unknown_title" = "Zure uneko kokapena detektatzen jarraitu nahi duzu?";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "Uneko kokapena ezezaguna da. Agian eraikin batean edo tunel batean zaudelako.";
+"current_location_unknown_message" = "Uneko kokapena ezezaguna da. Eraikin batean edo tunel batean egon daiteke.";
 
 "current_location_unknown_continue_button" = "Jarraitu";
 
@@ -751,7 +751,7 @@
 
 "current_location_unknown_error_message" = "Errore bat gertatu da zure kokapena bilatzean. Egiaztatu gailua behar bezala dabilela eta saiatu berriro geroago.";
 
-"location_services_disabled_header" = "Kokapen zerbitzuak desaktibatuta daude";
+"location_services_disabled_header" = "Kokapenaren identifikazioa desaktibatuta dago";
 
 "location_services_disabled_message" = "Aktibatu geokokapenerako sarbidea gailuaren ezarpenetan";
 
@@ -768,10 +768,10 @@
 
 "kilometers_per_hour" = "km/h";
 
-"mile" = "mi";
+"mile" = "ni";
 
 /* A unit of measure */
-"foot" = "oin";
+"foot" = "oina";
 
 "miles_per_hour" = "mph";
 
@@ -781,19 +781,19 @@
 
 "placepage_place_description" = "Deskribapena";
 
-"placepage_more_button" = "Gehiago";
+"placepage_more_button" = "Gainera";
 
 "book_button" = "Erreserba";
 
-"placepage_call_button" = "Deitu";
+"placepage_call_button" = "Deitzeko";
 
-"placepage_edit_bookmark_button" = "Editatu markagailua";
+"placepage_edit_bookmark_button" = "Editatu laster-marka";
 
-"placepage_bookmark_name_hint" = "Markagailuaren izena";
+"placepage_bookmark_name_hint" = "Laster-markaren izena";
 
 "placepage_personal_notes_hint" = "Ohar pertsonalak";
 
-"placepage_delete_bookmark_button" = "Ezabatu markagailua";
+"placepage_delete_bookmark_button" = "Ezabatu laster-marka";
 
 "editor_edits_sent_message" = "Iradokitako aldaketak bidali dira";
 
@@ -805,20 +805,20 @@
 
 "editor_remove_place_message" = "Gehitutako tokia ezabatu?";
 
-"editor_remove_place_button" = "Ezabatu";
+"editor_remove_place_button" = "Kendu";
 
 "editor_place_doesnt_exist" = "Tokia ez da existitzen";
 
-"text_more_button" = "…gehiago";
+"text_more_button" = "…gehi";
 
 /* Phone number error message */
-"error_enter_correct_phone" = "Idatzi baliozko telefono zenbaki bat";
+"error_enter_correct_phone" = "Mesedez, idatzi telefono-zenbaki zuzena";
 
-"error_enter_correct_web" = "Sartu baliozko web helbide bat";
+"error_enter_correct_web" = "Mesedez, sartu baliozko web-helbide bat";
 
 "error_enter_correct_email" = "Sartu baliozko posta elektroniko bat";
 
-"refresh" = "Eguneratu";
+"refresh" = "Eguneratzeko";
 
 "placepage_add_place_button" = "Gehitu toki bat mapan";
 
@@ -835,7 +835,7 @@
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
 "recent_track_background_dialog_title" = "Bidaiatutako azken ibilbidearen grabaketa desaktibatu nahi duzu?";
 
-"off_recent_track_background_button" = "Desgaitu";
+"off_recent_track_background_button" = "Desgaitzeko";
 
 /* For sharing via SMS and so on */
 "sharing_call_action_look" = "Egiaztatu";
@@ -843,22 +843,22 @@
 "recent_track_background_dialog_message" = "Organic Maps-ek zure geokokapena erabiltzen du atzeko planoan egindako azken ibilbidea erregistratzeko.";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
-"about_description" = "Organic Maps lineaz kanpoko mapa aplikazio doako eta irekia da. Iragarkirik ez. Ez dago jarraipenik. Mapan errore bat ikusten baduzu, konpondu OpenStreetMap-en. Proiektua zaleek sortu dute haien aisialdian, beraz, zure iritzia eta laguntza behar dugu.";
+"about_description" = "Organic Maps lineaz kanpoko mapa aplikazio doako eta irekia da. Iragarkirik ez. Ez dago jarraipenik. Mapan errore bat ikusten baduzu, konpondu OpenStreetMap-en. Proiektua zaleek sortu dute gure aisialdian, beraz, zure iritzia eta laguntza behar dugu.";
 
-"general_settings" = "Ezarpen orokorrak";
+"general_settings" = "Doikuntza orokorrak";
 
 /* For the first routing */
-"accept" = "Onartu";
+"accept" = "Onartzeko";
 
 /* For the first routing */
-"decline" = "Ukatu";
+"decline" = "Gainbehera";
 
 /* A noun - a button name used to show search results in list form */
-"search_in_table" = "Zerrenda";
+"search_in_table" = "Prest";
 
 "mobile_data_dialog" = "Internet mugikorra erabili informazio zehatza bistaratzeko?";
 
-"mobile_data_option_always" = "Erabili beti";
+"mobile_data_option_always" = "Beti erabili";
 
 "mobile_data_option_today" = "Gaur bakarrik";
 
@@ -869,13 +869,13 @@
 /* NOTE to translators: please synchronize your translation with the English one. */
 "mobile_data_description" = "Internet mugikorra behar da tokiei buruzko informazio zehatza bistaratzeko, hala nola argazkiak, prezioak eta iritziak.";
 
-"mobile_data_option_never" = "Ez erabili inoiz";
+"mobile_data_option_never" = "Inoiz erabili";
 
-"mobile_data_option_ask" = "Galdetu beti";
+"mobile_data_option_ask" = "Beti galdetu";
 
 "traffic_update_maps_text" = "Trafiko datuak bistaratzeko, mapak eguneratu behar dira.";
 
-"big_font" = "Handitu letra tamaina mapan";
+"big_font" = "Handitu letra-tamaina mapan";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Trafiko datuak bistaratzeko, aplikazioa eguneratu behar duzu.";
@@ -883,47 +883,47 @@
 /* "traffic" as in "road congestion" */
 "traffic_data_unavailable" = "Trafiko datuak ez daude eskuragarri";
 
-"on" = "Martxan";
+"on" = "Ekin.";
 
-"off" = "Itzalita";
+"off" = "Itzali";
 
 "transliteration_title" = "Latinezko transliterazioa";
 
 /* Subway exits for public transport marks on the map */
-"core_exit" = "Irten";
+"core_exit" = "Irteera";
 
-"routing_add_start_point" = "Gehitu abiapuntu bat ibilbide bat antolatzeko";
+"routing_add_start_point" = "Bilatu ibilbide-planaren iturria";
 
-"routing_add_finish_point" = "Gehitu helmuga bat ibilbide bat antolatzeko";
+"routing_add_finish_point" = "Bilatu ibilbide-planaren helmuga";
 
-"planning_route_manage_route" = "Kudeatu ibilbidea";
+"planning_route_manage_route" = "Ibilbidea kudeatu";
 
-"button_plan" = "Planifikatu";
+"button_plan" = "Planifikatzeko";
 
 "placepage_remove_stop" = "Kendu";
 
 "planning_route_remove_title" = "Arrastatu hona kentzeko";
 
-"placepage_add_stop" = "Gehitu geldiunea";
+"placepage_add_stop" = "Gehitu stop";
 
-"start_from_my_position" = "Hasi hemendik";
+"start_from_my_position" = "Hasi";
 
-"profile_authorization_error" = "Errore bat gertatu da. Saiatu berriro saioa hasten.";
+"profile_authorization_error" = "Errore bat gertatu da. Mesedez, saiatu berriro saioa hasten.";
 
 "core_entrance" = "Sarrera";
 
-"error_enter_correct_name" = "Mesedez, idatzi baliozko izen bat";
+"error_enter_correct_name" = "Mesedez, idatzi izen zuzena";
 
 "bookmark_lists" = "Zerrendak";
 
 /* Do not display all bookmark lists on the map */
 "bookmark_lists_hide_all" = "Ezkutatu guztiak";
 
-"bookmark_lists_show_all" = "Erakutsi guztiak";
+"bookmark_lists_show_all" = "Erakutsi dena";
 
 "bookmarks_create_new_group" = "Sortu zerrenda berria";
 
-"downloader_hide_screen" = "Ezkutatu pantaila";
+"downloader_hide_screen" = "Pantaila ezkutatu";
 
 "downloader_percent" = "%s (%s/%s)";
 
@@ -937,7 +937,7 @@
 
 "bookmarks_error_message_share_empty" = "Ezin da partekatu zerrenda hutsik";
 
-"bookmarks_error_message_empty_list_name" = "Idatzi zerrendaren izena";
+"bookmarks_error_message_empty_list_name" = "Mesedez, idatzi zerrendaren izena";
 
 "bookmarks_error_title_list_name_already_taken" = "Izen hau dagoeneko hartua da";
 
@@ -959,7 +959,7 @@
 
 "restore" = "Berreskuratu";
 
-"privacy_policy" = "Pribatutasun politika";
+"privacy_policy" = "Pribatutasun-politika";
 
 "terms_of_use" = "Erabilera baldintzak";
 
@@ -967,19 +967,19 @@
 
 "button_layer_subway" = "Metroa";
 
-"layers_title" = "Mapako geruzak";
+"layers_title" = "Mapa geruzak";
 
 "subway_data_unavailable" = "Metroaren mapa ez dago erabilgarri";
 
 "title_error_downloading_bookmarks" = "Akats bat gertatu da";
 
-"popular_place" = "Ospetsua";
+"popular_place" = "Popular";
 
-"export_file" = "Esportatu fitxategia";
+"export_file" = "Esportatu fitxategi gisa";
 
-"list_settings" = "Zerrendaren ezarpenak";
+"list_settings" = "Zerrenda konfiguratu";
 
-"delete_list" = "Ezabatu zerrenda";
+"delete_list" = "Zerrenda ezabatu";
 
 "hide_from_map" = "Ezkutatu mapan";
 
@@ -991,7 +991,7 @@
 
 "speedcams_alert_title" = "Abiadura kamerak";
 
-"speedcam_option_auto" = "Automatikoa";
+"speedcam_option_auto" = "Kotxea";
 
 "speedcam_option_always" = "Beti";
 
@@ -999,7 +999,7 @@
 
 "place_description_title" = "Tokiaren deskribapena";
 
-"speedcams_notice_message" = "Automatikoa - abiadura-kamerei buruz ohartarazten du abiadura muga gainditzeko arriskua badago\nBeti - beti abisatu kamerei buruz\nInoiz - inoiz ez abisatu kamerei buruz";
+"speedcams_notice_message" = "Auto - abiadura-kamerei buruz ohartarazten du abiadura muga gainditzeko arriskua badago\nBeti - beti erne kamerei buruz\nInoiz - inoiz ez abisatu kamerari buruz";
 
 "power_managment_title" = "Energia aurrezteko modua";
 
@@ -1009,9 +1009,9 @@
 
 "power_managment_setting_auto" = "Automatikoa";
 
-"power_managment_setting_manual_max" = "Energia aurrezpen handiena";
+"power_managment_setting_manual_max" = "Energia-aurrezpen handiena";
 
-"driving_options_title" = "Bideratzeko aukerak";
+"driving_options_title" = "Birbidali ezarpenak";
 
 "driving_options_subheader" = "Ibilbide guztietan saihestu";
 
@@ -1023,15 +1023,15 @@
 
 "avoid_motorways" = "Autobideak";
 
-"unable_to_calc_alert_title" = "Ezin da ibilbidea proposatu";
+"unable_to_calc_alert_title" = "Ezin da ibilbiderik eraiki";
 
-"unable_to_calc_alert_subtitle" = "Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik proposatu. Aldatu ezarpenak eta saiatu berriro";
+"unable_to_calc_alert_subtitle" = "Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik egin. Aldatu ezarpenak eta saiatu berriro";
 
-"define_to_avoid_btn" = "Zehaztu saihestu beharreko bideak";
+"define_to_avoid_btn" = "Pertsonalizatu saihesbidearen ibilbidea";
 
-"change_driving_options_btn" = "Bideratze aukerak gaituta";
+"change_driving_options_btn" = "Birbidaltze ezarpena aktibatuta dago";
 
-"toll_road" = "Ordainpeko errepidea";
+"toll_road" = "Bidesaria";
 
 "unpaved_road" = "Asfaltatu gabeko errepidea";
 
@@ -1043,13 +1043,13 @@
 
 "avoid_ferry_crossing_placepage" = "Ferryak saihestu";
 
-"trip_start" = "Goazen";
+"trip_start" = "Zoaz";
 
-"pick_destination" = "Helmuga";
+"pick_destination" = "Helburua";
 
-"follow_my_position" = "Berriz zentratu";
+"follow_my_position" = "Zentroa";
 
-"search_results" = "Bilaketa emaitzak";
+"search_results" = "Bilaketa-emaitzak";
 
 "then_turn" = "Gero";
 
@@ -1062,10 +1062,10 @@
 "no" = "Ez";
 
 /* E.g. "WiFi:Yes" */
-"yes_available" = "bai";
+"yes_available" = "Bai";
 
 /* E.g. "WiFi:No" */
-"no_available" = "ez";
+"no_available" = "Ez";
 
 "trip_finished" = "Iritsi zara!";
 
@@ -1073,7 +1073,7 @@
 
 "dialog_routing_change_start_carplay" = "Ezin da ibilbidea eraiki uneko kokapenetik";
 
-"dialog_routing_change_end_carplay" = "Ezin da sortu helmugarako ibilbidea. Aukeratu beste bat";
+"dialog_routing_change_end_carplay" = "Ezin da sortu amaiera punturako ibilbidea. aukeratu beste bat";
 
 "dialog_routing_check_gps_carplay" = "Ez dago GPS seinalerik. Joan eremu ireki batera";
 
@@ -1083,11 +1083,11 @@
 
 "dialog_routing_system_error_carplay" = "Akats bat gertatu da. Berrabiarazi aplikazioa";
 
-"dialog_routing_rebuild_from_current_location_carplay" = "Ibilbidea zure uneko kokapenetik birkalkulatuko da";
+"dialog_routing_rebuild_from_current_location_carplay" = "Ibilbidea zure uneko kokapenetik berregin egingo da";
 
-"dialog_routing_rebuild_for_vehicle_carplay" = "Ibilbidea auto modura aldatuko da";
+"dialog_routing_rebuild_for_vehicle_carplay" = "Ibilbidea autoz aldatuko da";
 
-"ok" = "Ados";
+"ok" = "Ok";
 
 "avoid_unpaved_carplay_1" = "Lurrezko biderik ez";
 
@@ -1097,29 +1097,29 @@
 
 "avoid_ferry_carplay_2" = "Ferryrik ez";
 
-"avoid_tolls_carplay_1" = "Bidesaririk ez";
+"avoid_tolls_carplay_1" = "Bidesaria ez";
 
-"avoid_tolls_carplay_2" = "Bidesaririk ez";
+"avoid_tolls_carplay_2" = "Bidesaria ez";
 
-"speedcams_alert_title_carplay_1" = "Abiadura kamerak.";
+"speedcams_alert_title_carplay_1" = "Abiadura kamera.";
 
-"speedcams_alert_title_carplay_2" = "Abiadura alertak.";
+"speedcams_alert_title_carplay_2" = "Abiadura alerta.";
 
 "download_map_carplay" = "Deskargatu mapak zure gailuko Organic Maps aplikazioan";
 
-"carplay_roundabout_exit" = "%s irteera";
+"carplay_roundabout_exit" = "%s desbideratzea";
 
 /* max. 10 symbols, both iOS and Android */
-"sort" = "Ordenatu…";
+"sort" = "Agindu…";
 
 /* iOS */
 "sort_default" = "Ordenatu lehenespenez";
 
-"sort_type" = "Ordenatu motaren arabera";
+"sort_type" = "Motaren arabera ordenatu";
 
 "sort_distance" = "Ordenatu distantziaren arabera";
 
-"sort_date" = "Ordenatu dataren arabera";
+"sort_date" = "Dataren arabera ordenatzeko";
 
 "week_ago_sorttype" = "Duela aste bat";
 
@@ -1136,7 +1136,7 @@
 
 /********** Bookmark types used for sorting **********/
 
-"food_places" = "Janariak";
+"food_places" = "Janari";
 
 "tourist_places" = "Toki interesgarriak";
 
@@ -1144,7 +1144,7 @@
 
 "parks" = "Parkeak";
 
-"swim_places" = "Igerilekua";
+"swim_places" = "Igeriketa";
 
 "mountains" = "Mendiak";
 
@@ -1158,25 +1158,25 @@
 
 "shops" = "Dendak";
 
-"parkings" = "Aparkalekuak";
+"parkings" = "Aparkaleku";
 
-"fuel_places" = "Gasolindegiak";
+"fuel_places" = "Erregai-geltokia";
 
 "medicine" = "Medikuntza";
 
 "search_in_the_list" = "Bilatu zerrendan";
 
-"religious_places" = "Erlijio guneak";
+"religious_places" = "Erlijio-guneak";
 
-"transit_not_found" = "Metroko nabigazioa oraindik ez dago erabilgarri eskualde honetan";
+"transit_not_found" = "Metro-nabigazioa oraindik ez dago erabilgarri eskualde honetan";
 
-"dialog_pedestrian_route_is_long_header" = "Ez da aurkitu metroko ibilbiderik";
+"dialog_pedestrian_route_is_long_header" = "Ez da aurkitu metroko ibilbidea";
 
 "dialog_pedestrian_route_is_long_message" = "Aukeratu metrotik hurbilen dagoen ibilbidearen hasiera edo amaiera puntua";
 
-"button_layer_isolines" = "Sestra kurbak";
+"button_layer_isolines" = "Altuerak";
 
-"isolines_activation_error_dialog" = "Sestra kurbak erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa";
+"isolines_activation_error_dialog" = "Erliebe-altuera erabiltzeko, eguneratu edo deskargatu nahi duzun eremuko mapa";
 
 "isolines_location_error_dialog" = "Erliebearen altitudea oraindik ez dago eskuragarri eskualde honetan";
 
@@ -1186,11 +1186,11 @@
 
 "elevation_profile_diff_level_moderate" = "Moderatua";
 
-"elevation_profile_diff_level_hard" = "Zaila";
+"elevation_profile_diff_level_hard" = "Gogorra";
 
-"elevation_profile_ascent" = "Maldan gora";
+"elevation_profile_ascent" = "Igoera";
 
-"elevation_profile_descent" = "Maldan behera";
+"elevation_profile_descent" = "Gainbehera";
 
 "elevation_profile_minaltitude" = "Gutxieneko altuera";
 
@@ -1198,13 +1198,13 @@
 
 "elevation_profile_difficulty" = "Zailtasuna";
 
-"elevation_profile_time" = "Denbora:";
+"elevation_profile_time" = "Hutsunea:";
 
-"isolines_toast_zooms_1_10" = "Handitu mapa sestra kurbak ikusteko";
+"isolines_toast_zooms_1_10" = "Handitu mapa isolineak ikusteko";
 
-"downloader_updating_ios" = "Eguneratzen";
+"downloader_updating_ios" = "Eguneratu";
 
-"downloader_loading_ios" = "Deskargatzen";
+"downloader_loading_ios" = "Kargatzen";
 
 /* Autoupdate dialog on start */
 "whats_new_auto_update_title" = "Eguneratu deskargatutako mapak";
@@ -1219,16 +1219,16 @@
 "whats_new_auto_update_button_later" = "Eguneratu geroago eskuz";
 
 /* Delete track button on track edit screen */
-"placepage_delete_track_button" = "Ezabatu arrastoa";
+"placepage_delete_track_button" = "Ibilbide garbia";
 
 /* Placeholder for track name input on track edit screen */
-"placepage_track_name_hint" = "Arrastoaren izena";
+"placepage_track_name_hint" = "Bide-izena";
 
 /* move track or bookmark from the list button text */
 "move" = "Mugitu";
 
 /* edit track screen title */
-"track_title" = "Arrastoa";
+"track_title" = "Ibilbidea";
 
 /* Telegram group url for the "?" About page */
 "telegram_url" = "https://t.me/OrganicMapsApp";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/eu/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Helbidea/Blokea";
-
-"type.addr_interpolation.even" = "Helbidea/Blokea";
-
-"type.addr_interpolation.odd" = "Helbidea/Blokea";
-
 "type.aerialway" = "Aire Garraioa";
 
 "type.aerialway.cable_car" = "Teleferikoa";
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Paketeen aldagela";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Albaitaritzako klinika";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Eraikin";
 
-"type.building.has_parts" = "Eraikin";
-
-"type.building_part" = "Eraikin";
-
 "type.building.garage" = "Garajea";
 
+"type.building.has_parts" = "Eraikin";
+
 "type.building.train_station" = "Tren geltokian";
 
 "type.building.warehouse" = "Denda";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Argazkilaria";
 
-"type.shop.camera" = "Kamera Denda";
-
 "type.craft.plumber" = "Iturgina";
 
 "type.craft.sawmill" = "Zerrategi";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Komunikazio Dorrea";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Ura hartzea";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Eguzki-sorgailua";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Etxetresna elektrikoen denda";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Arte Denda";
 
 "type.shop.baby_goods" = "Haurrentzako denda";
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Eraikin";
+
 "type.amenity.events_venue" = "Ekitaldien Lekua";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
index 92e7ad0662..3deeb6a9a9 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
       <key>other</key>
-      <string>%d markagailu</string>
+      <string>%d laster-marka</string>
     </dict>
   </dict>
 
@@ -34,10 +34,8 @@
       <string>NSStringPluralRuleType</string>
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
-      <key>one</key>
-      <string>fitxategi %d aurkitu da. Elkarrizketaren ondoren ikusiko duzu.</string>
       <key>other</key>
-      <string>%d fitxategi aurkitu dira. Elkarrizketaren ondoren ikusiko dituzu.</string>
+      <string>%d files were found. You can see them after conversion.</string>
     </dict>
   </dict>
 
@@ -51,10 +49,8 @@
       <string>NSStringPluralRuleType</string>
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
-      <key>one</key>
-      <string>objektu %d</string>
       <key>other</key>
-      <string>%d objektu</string>
+      <string>%d objects</string>
     </dict>
   </dict>
 
@@ -68,10 +64,8 @@
       <string>NSStringPluralRuleType</string>
       <key>NSStringFormatValueTypeKey</key>
       <string>d</string>
-      <key>one</key>
-      <string>arrasto %d</string>
       <key>other</key>
-      <string>%d arrasto</string>
+      <string>%d tracks</string>
     </dict>
   </dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index bfdef599bb..ce6d97c5f9 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "مکان من";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "بعداً";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV برای";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "در حال بارگیری نشانه‌ها";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -456,7 +456,7 @@
 
 "dialog_routing_download_files" = "دانلود فایل‌های مورد نیاز";
 
-"dialog_routing_download_and_update_all" = "Download or update all maps along the projected path to calculate a route.";
+"dialog_routing_download_and_update_all" = "Download and update all map and routing information along the projected path to calculate route.";
 
 "dialog_routing_unable_locate_route" = "ناتوان در تعیین مسیر";
 
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "آدرس/بلاک";
-
-"type.addr_interpolation.even" = "آدرس/بلاک";
-
-"type.addr_interpolation.odd" = "آدرس/بلاک";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "غذا";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "پارکو متر";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "دامپزشکی";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "ساختمان";
 
-"type.building.has_parts" = "ساختمان";
-
-"type.building_part" = "ساختمان";
-
 "type.building.garage" = "گاراژ";
 
+"type.building.has_parts" = "ساختمان";
+
 "type.building.train_station" = "ایستگاه قطار";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "عکاس";
 
-"type.shop.camera" = "فروشگاه دوربین";
-
 "type.craft.plumber" = "لوله کش";
 
 "type.craft.sawmill" = "کارخانه چوب‌بری";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "برج ارتباطات";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "شیراب";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "ژنراتور خورشیدی";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "فروشگاه لوازم خانگی";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ";
 
 "type.shop.baby_goods" = "ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ";
@@ -3563,7 +3552,7 @@
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
 "type.tourism.apartment" = "اپارتمان";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "ساختما";
+
 "type.amenity.events_venue" = "محل برگزاری رویدادها";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 3df39beaee..5f2140acf0 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Sijaintini";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Myöhemmin";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV tilat";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Ladataan kirjanmerkkejä";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Osoite/lohko";
-
-"type.addr_interpolation.even" = "Osoite/lohko";
-
-"type.addr_interpolation.odd" = "Osoite/lohko";
-
 "type.aerialway" = "Köysirata";
 
 "type.aerialway.cable_car" = "Kabiinihissi";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Ravintola";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Rakennus";
 
-"type.building.has_parts" = "Rakennus";
-
-"type.building_part" = "Rakennus";
-
 "type.building.garage" = "Autotalli";
 
+"type.building.has_parts" = "Rakennus";
+
 "type.building.train_station" = "Rautatieasema";
 
 "type.building.warehouse" = "Varasto";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Valokuvaaja";
 
-"type.shop.camera" = "Kamerakauppa";
-
 "type.craft.plumber" = "Putkimies";
 
 "type.craft.sawmill" = "Saha";
@@ -1757,7 +1747,7 @@
 
 "type.cuisine.fish" = "Kala";
 
-"type.cuisine.fish_and_chips" = "Fish and Chips";
+"type.cuisine.fish_and_chips" = "Fish & chips";
 
 "type.cuisine.french" = "Ranskalainen keittiö";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Viestintätorni";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vesihana";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Aurinkogeneraattori";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Kampaamo";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Rautakauppa";
 
 "type.shop.health_food" = "Terveysruokakauppa";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Kodinkoneet kauppa";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Taidekauppa";
 
 "type.shop.baby_goods" = "Lasten kauppa";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Kelkkarata";
 
+"type.building_part" = "Rakennus";
+
 "type.amenity.events_venue" = "Tapahtumapaikka";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 538958fe8f..ecdb68209b 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Ma position";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Plus tard";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/fr/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresse/Bloc";
-
-"type.addr_interpolation.even" = "Adresse/Bloc";
-
-"type.addr_interpolation.odd" = "Adresse/Bloc";
-
 "type.aerialway" = "Transport par câble aérien";
 
 "type.aerialway.cable_car" = "Téléphérique";
@@ -1435,11 +1429,11 @@
 
 "type.amenity.place_of_worship" = "Lieu de culte";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Église";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
@@ -1447,7 +1441,7 @@
 
 "type.amenity.place_of_worship.shinto" = "Sanctuaire";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Consigne automatique pour colis";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Docteur vétérinaire";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Bâtiment";
 
-"type.building.has_parts" = "Bâtiment";
-
-"type.building_part" = "Bâtiment";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Bâtiment";
+
 "type.building.train_station" = "Gare";
 
 "type.building.warehouse" = "Entrepôt";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Photographe";
 
-"type.shop.camera" = "Boutique d'appareils photo";
-
 "type.craft.plumber" = "Plombier";
 
 "type.craft.sawmill" = "Scierie";
@@ -1757,7 +1747,7 @@
 
 "type.cuisine.fish" = "Poisson";
 
-"type.cuisine.fish_and_chips" = "Fish and Chips";
+"type.cuisine.fish_and_chips" = "Fish and chips";
 
 "type.cuisine.french" = "Cuisine française";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Générateur solaire";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Trajet de ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Magasin d'électroménager";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Boutique d'art";
 
 "type.shop.baby_goods" = "Magasin de puériculture";
@@ -3583,7 +3572,7 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "Aire de camping-car";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Barrage";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Piste de luge";
 
+"type.building_part" = "Bâtiment";
+
 "type.amenity.events_venue" = "Lieu des événements";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index dfd45f2666..cf4067ce75 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "מיקומי";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "מאוחר יותר";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "םינאוורק רובע";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "טוען רשימות אתרים";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -518,7 +518,7 @@
 
 "search_history_title" = "Search History";
 
-"search_history_text" = "View your recent searches.";
+"search_history_text" = "View recent searches.";
 
 "clear_search" = "Clear Search History";
 
@@ -536,9 +536,9 @@
 
 "p2p_to_here" = "Route to";
 
-"p2p_only_from_current" = "Navigation is only available from your current location.";
+"p2p_only_from_current" = "Navigation is available only from your current location.";
 
-"p2p_reroute_from_current" = "Do you want to plan a route from your current location?";
+"p2p_reroute_from_current" = "Do you want us to plan a route from your current location?";
 
 "editor_time_add" = "Add Schedule";
 
@@ -565,13 +565,13 @@
 
 "editor_add_select_location" = "Location";
 
-"editor_done_dialog_1" = "You’ve changed the world map! Don't keep it to yourself; tell your friends and edit it together.";
+"editor_done_dialog_1" = "You’ve changed the world map. Do not keep it to yourself! Tell your friends, and edit it together.";
 
 "share_with_friends" = "Share with friends";
 
 "editor_report_problem_send_button" = "Send";
 
-"autodownload" = "Auto-download maps";
+"autodownload" = "Auto-download";
 
 /* Place Page opening hours text */
 "closed_now" = "Closed now";
@@ -611,7 +611,7 @@
 
 "invalid_username_or_password" = "Invalid username or password.";
 
-"login" = "OpenStreetMap Login";
+"login" = "Log In";
 
 "forgot_password" = "Forgot your password?";
 
@@ -657,7 +657,7 @@
 
 "please_note" = "Please note";
 
-"downloader_delete_map_dialog" = "All of your map edits will be deleted with the map.";
+"downloader_delete_map_dialog" = "All of your map edits will be deleted together with the map.";
 
 "downloader_update_maps" = "Update Maps";
 
@@ -665,7 +665,7 @@
 
 "migration_download_error_dialog" = "Download error";
 
-"common_check_internet_connection_dialog" = "Please make sure your device is connected to the Internet.";
+"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the Internet.";
 
 "downloader_no_space_title" = "Not enough space";
 
@@ -695,7 +695,7 @@
 
 "message_invalid_feature_position" = "No object can be located here";
 
-"login_to_make_edits_visible" = "Log in to openstreetmap.org to publish your changes to the world.";
+"login_to_make_edits_visible" = "Log in to OpenStreetMap.org so other users can see the changes you have made.";
 
 /* Error dialog no space */
 "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
@@ -727,7 +727,7 @@
 
 "editor_detailed_description_hint" = "Detailed comment";
 
-"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in Organic Maps.";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in Organic Maps.";
 
 "editor_more_about_osm" = "More about OpenStreetMap";
 
@@ -735,13 +735,13 @@
 
 "downloader_no_downloaded_maps_title" = "You haven't downloaded any maps";
 
-"downloader_no_downloaded_maps_message" = "Download maps to search and navigate offline.";
+"downloader_no_downloaded_maps_message" = "Download maps to search for a location and use navigation offline.";
 
 /* Error title that appears after certain time without location. */
-"current_location_unknown_title" = "Continue detecting your location?";
+"current_location_unknown_title" = "Continue detecting your current location?";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "Current location is unknown. You may be in a building or tunnel.";
+"current_location_unknown_message" = "Current location is unknown. Maybe you are in a building or in a tunnel.";
 
 "current_location_unknown_continue_button" = "Continue";
 
@@ -749,7 +749,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occurred while determining your location. Check that your device is working properly and try again later.";
+"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later.";
 
 "location_services_disabled_header" = "זיהוי המיקום אינו מופעל";
 
@@ -826,21 +826,21 @@
 "editor_share_to_all_dialog_title" = "Do you want to send it to all users?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any private or personal data.";
+"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any personal data.";
 
 "editor_share_to_all_dialog_message_2" = ".ןהשלכ תולאש םהל שי םא רשק ךתיא ורציו םייונישה תא וקדבי OpenStreetMap יכרוע";
 
 "navigation_stop_button" = "stop";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
-"recent_track_background_dialog_title" = "Disable recording of your recently travelled route?";
+"recent_track_background_dialog_title" = "Disable recording of your recently traveled route?";
 
 "off_recent_track_background_button" = "Disable";
 
 /* For sharing via SMS and so on */
 "sharing_call_action_look" = "Check out";
 
-"recent_track_background_dialog_message" = "Organic Maps uses your location in the background to record your recently travelled route.";
+"recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route.";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
 "about_description" = "Organic Maps היא אפליקציית מפות לא מקוונות בחינם ובקוד פתוח. ללא פרסומות. אין מעקב. אם אתה רואה שגיאה במפה, אנא תקן אותה ב-OpenStreetMap. הפרויקט נוצר על ידי חובבים בזמננו הפנוי, אז אנו זקוקים למשוב ולתמיכה שלכם.";
@@ -867,7 +867,7 @@
 "mobile_data" = "Mobile Internet";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Mobile internet is required for map update notifications and uploading edits.";
+"mobile_data_description" = "Mobile internet is required for map update notifications and for displaying detailed information about places and bookmarks.";
 
 "mobile_data_option_never" = "Never Use";
 
@@ -875,7 +875,7 @@
 
 "traffic_update_maps_text" = "To display traffic data, maps must be updated.";
 
-"big_font" = "Increase size for map labels";
+"big_font" = "Increase font size on the map";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
@@ -908,11 +908,11 @@
 
 "start_from_my_position" = "Start from";
 
-"profile_authorization_error" = "Oops, there was an error. Try signing in again.";
+"profile_authorization_error" = "Oops, there was an error. Try to sign in again.";
 
 "core_entrance" = "Entrance";
 
-"error_enter_correct_name" = "Please enter a correct name";
+"error_enter_correct_name" = "Please, enter a correct name";
 
 "bookmark_lists" = "Lists";
 
@@ -921,7 +921,7 @@
 
 "bookmark_lists_show_all" = "Show all";
 
-"bookmarks_create_new_group" = "Create a new list";
+"bookmarks_create_new_group" = "Create new list";
 
 "downloader_hide_screen" = "Hide Screen";
 
@@ -983,7 +983,7 @@
 
 "hide_from_map" = "Hide from map";
 
-"bookmark_list_description_hint" = "Enter a description (text or html)";
+"bookmark_list_description_hint" = "Type a description (text or html)";
 
 "tags_loading_error_subtitle" = "An error occurred while loading tags, please try again";
 
@@ -1003,13 +1003,13 @@
 
 "power_managment_title" = "Power saving mode";
 
-"power_managment_description" = "Try to reduce power usage at the expense of some functionality.";
+"power_managment_description" = "When automatic mode is selected the application starts to disable battery draining features depending on the current battery charge level";
 
 "power_managment_setting_never" = "Never";
 
-"power_managment_setting_auto" = "When battery is low";
+"power_managment_setting_auto" = "Automatic";
 
-"power_managment_setting_manual_max" = "Always";
+"power_managment_setting_manual_max" = "Maximum power saving";
 
 "driving_options_title" = "Routing options";
 
@@ -1025,7 +1025,7 @@
 
 "unable_to_calc_alert_title" = "Unable to calculate route";
 
-"unable_to_calc_alert_subtitle" = "A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.";
+"unable_to_calc_alert_subtitle" = "Unfortunately, we couldn't find a route, probably due to the options you have chosen. Please change the settings and try again.";
 
 "define_to_avoid_btn" = "Define roads to avoid";
 
@@ -1073,7 +1073,7 @@
 
 "dialog_routing_change_start_carplay" = "Unable to build a route from your current location";
 
-"dialog_routing_change_end_carplay" = "Unable to find a route to your destination. Please choose another end point";
+"dialog_routing_change_end_carplay" = "Unable to build a route to your destination. Please choose another point";
 
 "dialog_routing_check_gps_carplay" = "No GPS signal. Please move to an open area";
 
@@ -1105,7 +1105,7 @@
 
 "speedcams_alert_title_carplay_2" = "Speed warnings";
 
-"download_map_carplay" = "Please download maps in the app on your mobile device";
+"download_map_carplay" = "Please download maps in Organic Maps app on your device";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -1174,11 +1174,11 @@
 
 "dialog_pedestrian_route_is_long_message" = "Please choose a start or end point closer to a subway station";
 
-"button_layer_isolines" = "Contour Lines";
+"button_layer_isolines" = "Terrain";
 
-"isolines_activation_error_dialog" = "Activating contour lines requires downloading map data for this area";
+"isolines_activation_error_dialog" = "To activate and use the topographic layer please update or download the map of the area";
 
-"isolines_location_error_dialog" = "Contour lines are not yet available in this area";
+"isolines_location_error_dialog" = "The topographic layer is not yet available in this area";
 
 "elevation_profile_diff_level" = "Difficulty level";
 
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "כתובת/חסימה";
-
-"type.addr_interpolation.even" = "כתובת/חסימה";
-
-"type.addr_interpolation.odd" = "כתובת/חסימה";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1285,7 +1279,7 @@
 
 "type.amenity" = "Amenity";
 
-"type.amenity.arts_centre" = "Arts Center";
+"type.amenity.arts_centre" = "Art Center";
 
 "type.amenity.atm" = "ATM";
 
@@ -1409,7 +1403,7 @@
 
 "type.amenity.parking.private" = "תיטרפ הינח";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "תיעקרק - תת הינח";
 
@@ -1435,23 +1429,23 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
-"type.amenity.post_box" = "Mailbox";
+"type.amenity.post_box" = "Post Box";
 
 "type.amenity.post_office" = "Post Office";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,9 +1524,9 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "Parking Tickets";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinary Doctor";
 
@@ -1552,13 +1546,13 @@
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "Barrier";
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "צלם";
 
-"type.shop.camera" = "חנות מצלמות";
-
 "type.craft.plumber" = "שרברב";
 
 "type.craft.sawmill" = "מנסרה";
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "לְגַשֵׁר";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2343,11 +2333,11 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
-"type.landuse.grass" = "Grass";
+"type.landuse.grass" = "Lawn";
 
 "type.landuse.greenfield" = "Greenfield";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2417,7 +2407,7 @@
 
 "type.leisure.picnic_table" = "קינקיפ ןחלוש";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "מגדל תקשורת";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "גנרטור סולארי";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "תחנת כוח רוח";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Level Crossing";
 
@@ -2799,225 +2789,225 @@
 
 "type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Subway Station";
+"type.railway.station.subway" = "Subway";
 
-"type.railway.station.subway.adana" = "Subway Station";
+"type.railway.station.subway.adana" = "Subway";
 
-"type.railway.station.subway.algiers" = "Subway Station";
+"type.railway.station.subway.algiers" = "Subway";
 
-"type.railway.station.subway.almaty" = "Subway Station";
+"type.railway.station.subway.almaty" = "Subway";
 
-"type.railway.station.subway.amsterdam" = "Subway Station";
+"type.railway.station.subway.amsterdam" = "Subway";
 
-"type.railway.station.subway.ankara" = "Subway Station";
+"type.railway.station.subway.ankara" = "Subway";
 
-"type.railway.station.subway.athens" = "Subway Station";
+"type.railway.station.subway.athens" = "Subway";
 
-"type.railway.station.subway.baku" = "Subway Station";
+"type.railway.station.subway.baku" = "Subway";
 
-"type.railway.station.subway.bangkok" = "Subway Station";
+"type.railway.station.subway.bangkok" = "Subway";
 
-"type.railway.station.subway.barcelona" = "Subway Station";
+"type.railway.station.subway.barcelona" = "Subway";
 
-"type.railway.station.subway.beijing" = "Subway Station";
+"type.railway.station.subway.beijing" = "Subway";
 
-"type.railway.station.subway.bengalore" = "Subway Station";
+"type.railway.station.subway.bengalore" = "Subway";
 
-"type.railway.station.subway.berlin" = "Subway Station";
+"type.railway.station.subway.berlin" = "Subway";
 
-"type.railway.station.subway.bilbao" = "Subway Station";
+"type.railway.station.subway.bilbao" = "Subway";
 
-"type.railway.station.subway.brasilia" = "Subway Station";
+"type.railway.station.subway.brasilia" = "Subway";
 
-"type.railway.station.subway.brescia" = "Subway Station";
+"type.railway.station.subway.brescia" = "Subway";
 
-"type.railway.station.subway.brussels" = "Subway Station";
+"type.railway.station.subway.brussels" = "Subway";
 
-"type.railway.station.subway.bucharest" = "Subway Station";
+"type.railway.station.subway.bucharest" = "Subway";
 
-"type.railway.station.subway.budapest" = "Subway Station";
+"type.railway.station.subway.budapest" = "Subway";
 
-"type.railway.station.subway.buenos_aires" = "Subway Station";
+"type.railway.station.subway.buenos_aires" = "Subway";
 
-"type.railway.station.subway.bursa" = "Subway Station";
+"type.railway.station.subway.bursa" = "Subway";
 
-"type.railway.station.subway.cairo" = "Subway Station";
+"type.railway.station.subway.cairo" = "Subway";
 
-"type.railway.station.subway.caracas" = "Subway Station";
+"type.railway.station.subway.caracas" = "Subway";
 
-"type.railway.station.subway.catania" = "Subway Station";
+"type.railway.station.subway.catania" = "Subway";
 
-"type.railway.station.subway.changchun" = "Subway Station";
+"type.railway.station.subway.changchun" = "Subway";
 
-"type.railway.station.subway.chengdu" = "Subway Station";
+"type.railway.station.subway.chengdu" = "Subway";
 
-"type.railway.station.subway.chicago" = "Subway Station";
+"type.railway.station.subway.chicago" = "Subway";
 
-"type.railway.station.subway.chongqing" = "Subway Station";
+"type.railway.station.subway.chongqing" = "Subway";
 
-"type.railway.station.subway.dalian" = "Subway Station";
+"type.railway.station.subway.dalian" = "Subway";
 
-"type.railway.station.subway.delhi" = "Subway Station";
+"type.railway.station.subway.delhi" = "Subway";
 
-"type.railway.station.subway.dnepro" = "Subway Station";
+"type.railway.station.subway.dnepro" = "Subway";
 
-"type.railway.station.subway.dubai" = "Subway Station";
+"type.railway.station.subway.dubai" = "Subway";
 
-"type.railway.station.subway.ekb" = "Subway Station";
+"type.railway.station.subway.ekb" = "Subway";
 
-"type.railway.station.subway.fukuoka" = "Subway Station";
+"type.railway.station.subway.fukuoka" = "Subway";
 
-"type.railway.station.subway.glasgow" = "Subway Station";
+"type.railway.station.subway.glasgow" = "Subway";
 
-"type.railway.station.subway.guangzhou" = "Subway Station";
+"type.railway.station.subway.guangzhou" = "Subway";
 
-"type.railway.station.subway.hamburg" = "Subway Station";
+"type.railway.station.subway.hamburg" = "Subway";
 
-"type.railway.station.subway.helsinki" = "Subway Station";
+"type.railway.station.subway.helsinki" = "Subway";
 
-"type.railway.station.subway.hiroshima" = "Subway Station";
+"type.railway.station.subway.hiroshima" = "Subway";
 
-"type.railway.station.subway.isfahan" = "Subway Station";
+"type.railway.station.subway.isfahan" = "Subway";
 
-"type.railway.station.subway.istanbul" = "Subway Station";
+"type.railway.station.subway.istanbul" = "Subway";
 
-"type.railway.station.subway.izmir" = "Subway Station";
+"type.railway.station.subway.izmir" = "Subway";
 
-"type.railway.station.subway.kazan" = "Subway Station";
+"type.railway.station.subway.kazan" = "Subway";
 
-"type.railway.station.subway.kharkiv" = "Subway Station";
+"type.railway.station.subway.kharkiv" = "Subway";
 
-"type.railway.station.subway.kiev" = "Subway Station";
+"type.railway.station.subway.kiev" = "Subway";
 
-"type.railway.station.subway.kobe" = "Subway Station";
+"type.railway.station.subway.kobe" = "Subway";
 
-"type.railway.station.subway.kolkata" = "Subway Station";
+"type.railway.station.subway.kolkata" = "Subway";
 
-"type.railway.station.subway.kunming" = "Subway Station";
+"type.railway.station.subway.kunming" = "Subway";
 
-"type.railway.station.subway.kyoto" = "Subway Station";
+"type.railway.station.subway.kyoto" = "Subway";
 
-"type.railway.station.subway.la" = "Subway Station";
+"type.railway.station.subway.la" = "Subway";
 
-"type.railway.station.subway.lausanne" = "Subway Station";
+"type.railway.station.subway.lausanne" = "Subway";
 
-"type.railway.station.subway.lille" = "Subway Station";
+"type.railway.station.subway.lille" = "Subway";
 
-"type.railway.station.subway.lima" = "Subway Station";
+"type.railway.station.subway.lima" = "Subway";
 
-"type.railway.station.subway.lisboa" = "Subway Station";
+"type.railway.station.subway.lisboa" = "Subway";
 
-"type.railway.station.subway.london" = "Subway Station";
+"type.railway.station.subway.london" = "Subway";
 
-"type.railway.station.subway.lyon" = "Subway Station";
+"type.railway.station.subway.lyon" = "Subway";
 
-"type.railway.station.subway.madrid" = "Subway Station";
+"type.railway.station.subway.madrid" = "Subway";
 
-"type.railway.station.subway.malaga" = "Subway Station";
+"type.railway.station.subway.malaga" = "Subway";
 
-"type.railway.station.subway.manila" = "Subway Station";
+"type.railway.station.subway.manila" = "Subway";
 
-"type.railway.station.subway.maracaibo" = "Subway Station";
+"type.railway.station.subway.maracaibo" = "Subway";
 
-"type.railway.station.subway.mashhad" = "Subway Station";
+"type.railway.station.subway.mashhad" = "Subway";
 
-"type.railway.station.subway.mecca" = "Subway Station";
+"type.railway.station.subway.mecca" = "Subway";
 
-"type.railway.station.subway.medellin" = "Subway Station";
+"type.railway.station.subway.medellin" = "Subway";
 
-"type.railway.station.subway.mexico" = "Subway Station";
+"type.railway.station.subway.mexico" = "Subway";
 
-"type.railway.station.subway.milan" = "Subway Station";
+"type.railway.station.subway.milan" = "Subway";
 
-"type.railway.station.subway.minsk" = "Subway Station";
+"type.railway.station.subway.minsk" = "Subway";
 
-"type.railway.station.subway.montreal" = "Subway Station";
+"type.railway.station.subway.montreal" = "Subway";
 
-"type.railway.station.subway.moscow" = "Subway Station";
+"type.railway.station.subway.moscow" = "Subway";
 
-"type.railway.station.subway.munchen" = "Subway Station";
+"type.railway.station.subway.munchen" = "Subway";
 
-"type.railway.station.subway.nagoya" = "Subway Station";
+"type.railway.station.subway.nagoya" = "Subway";
 
-"type.railway.station.subway.newyork" = "Subway Station";
+"type.railway.station.subway.newyork" = "Subway";
 
-"type.railway.station.subway.nnov" = "Subway Station";
+"type.railway.station.subway.nnov" = "Subway";
 
-"type.railway.station.subway.novosibirsk" = "Subway Station";
+"type.railway.station.subway.novosibirsk" = "Subway";
 
-"type.railway.station.subway.osaka" = "Subway Station";
+"type.railway.station.subway.osaka" = "Subway";
 
-"type.railway.station.subway.oslo" = "Subway Station";
+"type.railway.station.subway.oslo" = "Subway";
 
-"type.railway.station.subway.palma" = "Subway Station";
+"type.railway.station.subway.palma" = "Subway";
 
-"type.railway.station.subway.panama" = "Subway Station";
+"type.railway.station.subway.panama" = "Subway";
 
-"type.railway.station.subway.paris" = "Subway Station";
+"type.railway.station.subway.paris" = "Subway";
 
-"type.railway.station.subway.philadelphia" = "Subway Station";
+"type.railway.station.subway.philadelphia" = "Subway";
 
-"type.railway.station.subway.pyongyang" = "Subway Station";
+"type.railway.station.subway.pyongyang" = "Subway";
 
-"type.railway.station.subway.rennes" = "Subway Station";
+"type.railway.station.subway.rennes" = "Subway";
 
-"type.railway.station.subway.rio" = "Subway Station";
+"type.railway.station.subway.rio" = "Subway";
 
-"type.railway.station.subway.roma" = "Subway Station";
+"type.railway.station.subway.roma" = "Subway";
 
-"type.railway.station.subway.rotterdam" = "Subway Station";
+"type.railway.station.subway.rotterdam" = "Subway";
 
-"type.railway.station.subway.samara" = "Subway Station";
+"type.railway.station.subway.samara" = "Subway";
 
-"type.railway.station.subway.santiago" = "Subway Station";
+"type.railway.station.subway.santiago" = "Subway";
 
-"type.railway.station.subway.santo_domingo" = "Subway Station";
+"type.railway.station.subway.santo_domingo" = "Subway";
 
-"type.railway.station.subway.saopaulo" = "Subway Station";
+"type.railway.station.subway.saopaulo" = "Subway";
 
-"type.railway.station.subway.sapporo" = "Subway Station";
+"type.railway.station.subway.sapporo" = "Subway";
 
-"type.railway.station.subway.sendai" = "Subway Station";
+"type.railway.station.subway.sendai" = "Subway";
 
-"type.railway.station.subway.sf" = "Subway Station";
+"type.railway.station.subway.sf" = "Subway";
 
-"type.railway.station.subway.shanghai" = "Subway Station";
+"type.railway.station.subway.shanghai" = "Subway";
 
-"type.railway.station.subway.shiraz" = "Subway Station";
+"type.railway.station.subway.shiraz" = "Subway";
 
-"type.railway.station.subway.sofia" = "Subway Station";
+"type.railway.station.subway.sofia" = "Subway";
 
-"type.railway.station.subway.spb" = "Subway Station";
+"type.railway.station.subway.spb" = "Subway";
 
-"type.railway.station.subway.stockholm" = "Subway Station";
+"type.railway.station.subway.stockholm" = "Subway";
 
-"type.railway.station.subway.tabriz" = "Subway Station";
+"type.railway.station.subway.tabriz" = "Subway";
 
-"type.railway.station.subway.taipei" = "Subway Station";
+"type.railway.station.subway.taipei" = "Subway";
 
-"type.railway.station.subway.taoyuan" = "Subway Station";
+"type.railway.station.subway.taoyuan" = "Subway";
 
-"type.railway.station.subway.tashkent" = "Subway Station";
+"type.railway.station.subway.tashkent" = "Subway";
 
-"type.railway.station.subway.tbilisi" = "Subway Station";
+"type.railway.station.subway.tbilisi" = "Subway";
 
-"type.railway.station.subway.tianjin" = "Subway Station";
+"type.railway.station.subway.tianjin" = "Subway";
 
-"type.railway.station.subway.tokyo" = "Subway Station";
+"type.railway.station.subway.tokyo" = "Subway";
 
-"type.railway.station.subway.valencia" = "Subway Station";
+"type.railway.station.subway.valencia" = "Subway";
 
-"type.railway.station.subway.vienna" = "Subway Station";
+"type.railway.station.subway.vienna" = "Subway";
 
-"type.railway.station.subway.warszawa" = "Subway Station";
+"type.railway.station.subway.warszawa" = "Subway";
 
-"type.railway.station.subway.washington" = "Subway Station";
+"type.railway.station.subway.washington" = "Subway";
 
-"type.railway.station.subway.wuhan" = "Subway Station";
+"type.railway.station.subway.wuhan" = "Subway";
 
-"type.railway.station.subway.yerevan" = "Subway Station";
+"type.railway.station.subway.yerevan" = "Subway";
 
-"type.railway.station.subway.yokohama" = "Subway Station";
+"type.railway.station.subway.yokohama" = "Subway";
 
 "type.railway.subway" = "Subway Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3283,15 +3273,15 @@
 
 "type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
 "type.shop.cannabis" = "חנות קנאביס";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Workshop";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
@@ -3299,23 +3289,23 @@
 
 "type.shop.carpet" = "שטיחים";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Chocolate Shop";
 
 "type.shop.clothes" = "Clothes Shop";
 
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Store";
 
 "type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Candy Shop";
+"type.shop.confectionery" = "Sweets";
 
 "type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
-"type.shop.cosmetics" = "Cosmetics Shop";
+"type.shop.cosmetics" = "Cosmetics";
 
 "type.shop.curtain" = "וילונות";
 
@@ -3323,11 +3313,11 @@
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "Home Improvement Store";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "אביזרי אופנה";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
 
 "type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "חנות דלק";
 
@@ -3365,7 +3355,7 @@
 
 "type.shop.houseware" = "תיב ילכל תונח";
 
-"type.shop.jewelry" = "Jewelry Store";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
@@ -3377,7 +3367,7 @@
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Cell Phone Store";
+"type.shop.mobile_phone" = "Cell Phones";
 
 "type.shop.money_lender" = "Money Lender";
 
@@ -3387,13 +3377,13 @@
 
 "type.shop.music" = "Record Store";
 
-"type.shop.musical_instrument" = "Musical Instrument Shop";
+"type.shop.musical_instrument" = "Musical Instruments";
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "נקודת איסוף";
 
@@ -3407,13 +3397,13 @@
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
 "type.shop.second_hand" = "היינש די תונח";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3421,7 +3411,7 @@
 
 "type.shop.tattoo" = "Tattoo Parlour";
 
-"type.shop.tea" = "Tea Shop";
+"type.shop.tea" = "Tea Store";
 
 "type.shop.ticket" = "Ticket Shop";
 
@@ -3435,7 +3425,7 @@
 
 "type.shop.video" = "Video Shop";
 
-"type.shop.video_games" = "Video Game Shop";
+"type.shop.video_games" = "Video Games Shop";
 
 "type.shop.wine" = "Wine Shop";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "חנות מוצרי חשמל";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "תויונמוא תונח";
 
 "type.shop.baby_goods" = "םידליל תונח";
@@ -3527,7 +3516,7 @@
 "type.sport.multi" = "ענפי ספורט שונים";
 
 /* Used to tag a scuba diving site. */
-"type.sport.scuba_diving" = "Scuba Diving Site";
+"type.sport.scuba_diving" = "Scuba diving site";
 
 "type.sport.shooting" = "ירי ספורטיבי";
 
@@ -3563,19 +3552,19 @@
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
@@ -3583,13 +3572,13 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "RV Park";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3655,13 +3644,13 @@
 
 "type.waterway.riverbank" = "River";
 
-"type.waterway.stream" = "Stream";
+"type.waterway.stream" = "River";
 
-"type.waterway.stream.ephemeral" = "Ephemeral Stream";
+"type.waterway.stream.ephemeral" = "River";
 
-"type.waterway.stream.intermittent" = "Intermittent Stream";
+"type.waterway.stream.intermittent" = "River";
 
-"type.waterway.stream.tunnel" = "Stream";
+"type.waterway.stream.tunnel" = "River";
 
 "type.waterway.waterfall" = "Waterfall";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "מקום אירועים";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index a2f178e9f0..ac4c4c9c23 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Saját helyzet";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Később";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -50,7 +50,7 @@
 /* Message to display at the center of the screen when the country download has failed */
 "country_status_download_failed" = "Letöltése sikertelen";
 
-"about_menu_title" = "Az Organic Mapsről";
+"about_menu_title" = "A Organic Maps programról";
 
 "close" = "Bezár";
 
@@ -93,10 +93,10 @@
 "eat" = "Hol lehet enni valamit";
 
 /* Search category for grocery stores; any changes should be duplicated in categories.txt @food! */
-"food" = "Élelmiszerek";
+"food" = "Termékek";
 
 /* Search category for public transport; any changes should be duplicated in categories.txt @transport! */
-"transport" = "Tömegközlekedés";
+"transport" = "Közlekedés";
 
 /* Search category for fuel stations; any changes should be duplicated in categories.txt @fuel! */
 "fuel" = "Benzinkút";
@@ -111,7 +111,7 @@
 "hotel" = "Szálloda";
 
 /* Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @tourism! */
-"tourism" = "Látnivalók";
+"tourism" = "Látnivaló";
 
 /* Search category for entertainment; any changes should be duplicated in categories.txt @entertainment! */
 "entertainment" = "Szórakozás";
@@ -123,7 +123,7 @@
 "nightlife" = "Éjjeli élet";
 
 /* Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @children! */
-"children" = "Családi kiruccanás";
+"children" = "Pihenés a gyerekekkel";
 
 /* Search category for banks; any changes should be duplicated in categories.txt @bank! */
 "bank" = "Bank";
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV számára";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Könyvjelzők letöltése";
@@ -265,7 +265,7 @@
 "website" = "Honlap";
 
 /* Text in About menu, opens Organic Maps news website */
-"news" = "Újdonságok";
+"news" = "Hírek";
 
 /* Text in menu */
 "github" = "GitHub";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -301,7 +301,7 @@
 "help" = "Segítség";
 
 /* Button in the main Help dialog */
-"faq" = "Gyakran Ismételt Kérdések";
+"faq" = "Kérdések és válaszok";
 
 /* Button in the main menu */
 "donate" = "Adományozni";
@@ -377,7 +377,7 @@
 /* bookmark button text */
 "bookmark" = "könyvjelző";
 
-"save" = "Mentés";
+"save" = "Simpan";
 
 "create" = "létrehoz";
 
@@ -532,9 +532,9 @@
 
 "p2p_start" = "Indítás";
 
-"p2p_from_here" = "Kiindulópont";
+"p2p_from_here" = "Innen";
 
-"p2p_to_here" = "Célpont";
+"p2p_to_here" = "Ide";
 
 "p2p_only_from_current" = "A navigáció csak a jelenlegi helyzetéből érhető el.";
 
@@ -867,7 +867,7 @@
 "mobile_data" = "Mobil Internet";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.";
+"mobile_data_description" = "Mobil internetre van szükség helyszínekre vonatkozó részletes információ, mint például fotók, árak és szemlék megjelenítéséhez.";
 
 "mobile_data_option_never" = "Soha se használja";
 
@@ -906,7 +906,7 @@
 
 "placepage_add_stop" = "Hozzáad megállót";
 
-"start_from_my_position" = "Kiindulás innen:";
+"start_from_my_position" = "Elkezdi innen:";
 
 "profile_authorization_error" = "Hoppá, volt egy hiba. Próbáljon meg újra bejelentkezni.";
 
@@ -914,7 +914,7 @@
 
 "error_enter_correct_name" = "Kérjük adja meg a helyes nevet";
 
-"bookmark_lists" = "Listák";
+"bookmark_lists" = "List";
 
 /* Do not display all bookmark lists on the map */
 "bookmark_lists_hide_all" = "Összes elrejtése";
@@ -981,7 +981,7 @@
 
 "delete_list" = "Törölni a listát";
 
-"hide_from_map" = "Elrejtés a térképről";
+"hide_from_map" = "Lefedés a térképen";
 
 "bookmark_list_description_hint" = "Leírás hozzáadása (szöveg vagy html)";
 
@@ -991,7 +991,7 @@
 
 "speedcams_alert_title" = "Sebességmérő kamerák";
 
-"speedcam_option_auto" = "Automatikus";
+"speedcam_option_auto" = "Autó";
 
 "speedcam_option_always" = "Mindig";
 
@@ -999,7 +999,7 @@
 
 "place_description_title" = "A hely ismertetése";
 
-"speedcams_notice_message" = "Automatikus - Figyelmeztetés a sebesség kamerákról, ha van kockázat a sebesség korlátozás megsértéséről\nMindig - Mindig figyelmeztet a kamerákról\nSoha - Soha ne figyelmezet a kamerákról";
+"speedcams_notice_message" = "Autó - Figyelmeztetés a sebesség kamerákról, ha van kockázat a sebesség korlátozás megsértéséről\nMindig - Mindig figyelmeztet a kamerákról\nSoha - Soha ne figyelmezet a kamerákról";
 
 "power_managment_title" = "Energiatakarékos mód";
 
@@ -1174,7 +1174,7 @@
 
 "dialog_pedestrian_route_is_long_message" = "Válasszon indulási vagy végpontot közelebb a metróállomáshoz";
 
-"button_layer_isolines" = "Domborzat";
+"button_layer_isolines" = "Terep";
 
 "isolines_activation_error_dialog" = "A topográfiai réteg aktiválásához és használatához kérjük frissítse vagy töltse le az adott terület térképét";
 
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/hu/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Hu:Névjegy";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Cím/blokk";
-
-"type.addr_interpolation.even" = "Cím/blokk";
-
-"type.addr_interpolation.odd" = "Cím/blokk";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Étterem";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parkolóautomata";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Állatorvos";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Épület";
 
-"type.building.has_parts" = "Épület";
-
-"type.building_part" = "Épület";
-
 "type.building.garage" = "Garázs";
 
+"type.building.has_parts" = "Épület";
+
 "type.building.train_station" = "Vonatmegálló";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fényképész";
 
-"type.shop.camera" = "Fényképezőgép bolt";
-
 "type.craft.plumber" = "Vízvezeték-szerelő";
 
 "type.craft.sawmill" = "Fűrészmalom";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Kommunikációs torony";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vízcsap";
 
@@ -2587,7 +2577,7 @@
 
 "type.noexit" = "Dead End";
 
-"type.office" = "Iroda";
+"type.office" = "Hivatal";
 
 "type.office.company" = "Vállalati iroda";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Napelemes generátor";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Készülék bolt";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Művészeti Bolt";
 
 "type.shop.baby_goods" = "Bababolt";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Épület";
+
 "type.amenity.events_venue" = "Rendezvények helyszíne";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index e387fe6ec0..46f6f216a1 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Posisi Saya";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Nanti";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Untuk RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Memuat Penanda";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/id/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Alamat/Blokir";
-
-"type.addr_interpolation.even" = "Alamat/Blokir";
-
-"type.addr_interpolation.odd" = "Alamat/Blokir";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restoran";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Mesin pembayaran tiket parkir";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Dokter Hewan";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Gedung";
 
-"type.building.has_parts" = "Gedung";
-
-"type.building_part" = "Gedung";
-
 "type.building.garage" = "Garasi";
 
+"type.building.has_parts" = "Gedung";
+
 "type.building.train_station" = "Rel kereta api";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Juru foto";
 
-"type.shop.camera" = "Toko Kamera";
-
 "type.craft.plumber" = "Tukang pipa";
 
 "type.craft.sawmill" = "Penggergajian kayu";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Menara Komunikasi";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Keran Air";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Pembangkit surya";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Penata rambut";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Toko perangkat keras";
 
 "type.shop.health_food" = "Toko Makanan Kesehatan";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Toko peralatan";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Toko Seni";
 
 "type.shop.baby_goods" = "Toko anak-anak";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Gedung";
+
 "type.amenity.events_venue" = "Tempat acara";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 627db8527c..f4f4f476ff 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "La mia posizione";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Più tardi";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Indirizzo/Blocco";
-
-"type.addr_interpolation.even" = "Indirizzo/Blocco";
-
-"type.addr_interpolation.odd" = "Indirizzo/Blocco";
-
 "type.aerialway" = "Impianto a fune";
 
 "type.aerialway.cable_car" = "Teleferica";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Umido";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Ristorante";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Punto di ritiro";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinario";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Edificio";
 
-"type.building.has_parts" = "Edificio";
-
-"type.building_part" = "Edificio";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Edificio";
+
 "type.building.train_station" = "Stazione ferroviaria";
 
 "type.building.warehouse" = "Magazzino";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotografo";
 
-"type.shop.camera" = "Negozio di macchine fotografiche";
-
 "type.craft.plumber" = "Idraulico";
 
 "type.craft.sawmill" = "Segheria";
@@ -1757,7 +1747,7 @@
 
 "type.cuisine.fish" = "Pesce";
 
-"type.cuisine.fish_and_chips" = "Fish and Chips";
+"type.cuisine.fish_and_chips" = "Fish and chips";
 
 "type.cuisine.french" = "Cucina francese";
 
@@ -2413,7 +2403,7 @@
 
 "type.leisure.park.permissive" = "Parco";
 
-"type.leisure.park.private" = "Parco";
+"type.leisure.park.private" = "Parco privato";
 
 "type.leisure.picnic_table" = "Tavolo da picnic";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Parrucchiera";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Ferramenta";
 
 "type.shop.health_food" = "Negozio di alimenti naturali";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Negozio di elettrodomestici";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Negozio d'arte";
 
 "type.shop.baby_goods" = "Negozio per neonati";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Pista per slitte";
 
+"type.building_part" = "Edificio";
+
 "type.amenity.events_venue" = "Sede degli eventi";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 5f98caf9fa..4eaf6bfd20 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "現在地";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "次の機会に";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV用";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "ブックマークの読み込み中";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "アドレス/ブロック";
-
-"type.addr_interpolation.even" = "アドレス/ブロック";
-
-"type.addr_interpolation.odd" = "アドレス/ブロック";
-
 "type.aerialway" = "索道";
 
 "type.aerialway.cable_car" = "ロープウェイ";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "レストラン";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "駐車券支払機";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "獣医";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "建物";
 
-"type.building.has_parts" = "建物";
-
-"type.building_part" = "建物";
-
 "type.building.garage" = "車庫";
 
+"type.building.has_parts" = "建物";
+
 "type.building.train_station" = "鉄道駅";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "写真家";
 
-"type.shop.camera" = "カメラショップ";
-
 "type.craft.plumber" = "配管工";
 
 "type.craft.sawmill" = "製材所";
@@ -2327,7 +2317,7 @@
 
 "type.landuse.construction" = "建設工事中";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "農地";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "家電店";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "アートショップ";
 
 "type.shop.baby_goods" = "キッズストア";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "建物";
+
 "type.amenity.events_venue" = "イベント会場";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 6c0b2670cc..c3893dee73 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "나의 위치";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "나중에";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "RV용";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "즐겨찾기 로드";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "주소/블록";
-
-"type.addr_interpolation.even" = "주소/블록";
-
-"type.addr_interpolation.odd" = "주소/블록";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "레스토랑";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "주차티켓판매기";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "동물병원";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "건물";
 
-"type.building.has_parts" = "건물";
-
-"type.building_part" = "건물";
-
 "type.building.garage" = "차고";
 
+"type.building.has_parts" = "건물";
+
 "type.building.train_station" = "기차역";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "사진작가";
 
-"type.shop.camera" = "카메라 샵";
-
 "type.craft.plumber" = "배관공";
 
 "type.craft.sawmill" = "제재소";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "커뮤니케이션 타워";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "수도꼭지";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "태양열 발전기";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "이발사";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "철물점";
 
 "type.shop.health_food" = "\"건강식품 가게\"";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "가전제품 매장";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "아트샵";
 
 "type.shop.baby_goods" = "어린이 가게";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "건물";
+
 "type.amenity.events_venue" = "행사장";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index d9c267a986..61a5e4b256 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "माझे स्थान";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "नंतर";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -828,7 +828,7 @@
 /* Dialog before publishing the modifications to the public map. */
 "editor_share_to_all_dialog_message_1" = "आपण कोणतीही वैयक्तिक माहिती प्रविष्ट केला नाही याची खात्री करा.";
 
-"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and contact you if they have any questions.";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and get in contact with you if they have any questions.";
 
 "navigation_stop_button" = "थांबा";
 
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/mr/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "पत्ता/ब्लॉक";
-
-"type.addr_interpolation.even" = "पत्ता/ब्लॉक";
-
-"type.addr_interpolation.odd" = "पत्ता/ब्लॉक";
-
 "type.aerialway" = "हवाई मार्ग";
 
 "type.aerialway.cable_car" = "हवाई मार्ग";
@@ -1413,11 +1407,11 @@
 
 "type.amenity.parking.underground" = "Underground Parking";
 
-"type.amenity.parking_entrance" = "Parking Entrance";
+"type.amenity.parking_entrance" = "Parking entrance";
 
-"type.amenity.parking_entrance.private" = "Parking Entrance";
+"type.amenity.parking_entrance.private" = "Parking entrance";
 
-"type.amenity.parking_entrance.permissive" = "Parking Entrance";
+"type.amenity.parking_entrance.permissive" = "Parking entrance";
 
 "type.amenity.parking_space" = "पार्किंगची जागा";
 
@@ -1552,7 +1546,7 @@
 
 "type.amenity.waste_transfer_station" = "कचरा हस्तांतरण केंद्र";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "अडथळा";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "इमारत";
 
-"type.building.has_parts" = "इमारत";
-
-"type.building_part" = "इमारत";
-
 "type.building.garage" = "गराज";
 
+"type.building.has_parts" = "इमारत";
+
 "type.building.train_station" = "रेल्वे स्थानक";
 
 "type.building.warehouse" = "वखार";
@@ -1671,7 +1663,7 @@
 "type.craft.handicraft" = "हस्तकला";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "HVAC Shop";
+"type.craft.hvac" = "HVAC";
 
 "type.craft.key_cutter" = "की कटिंग";
 
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "छायाचित्रकार";
 
-"type.shop.camera" = "कॅमेरा शॉप";
-
 "type.craft.plumber" = "नळकामगार";
 
 "type.craft.sawmill" = "सुमेल";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "नूडल्स";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "रेल्वे ओलांडणी";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "हवाई रज्जुमार्ग";
 
@@ -3313,13 +3303,13 @@
 
 "type.shop.convenience" = "सुविधा दुकान";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
 "type.shop.cosmetics" = "सौंदर्य(कॉस्मेटिक)";
 
 "type.shop.curtain" = "पडदे";
 
-"type.shop.deli" = "Delicatessen";
+"type.shop.deli" = "Delicatessen Shop";
 
 "type.shop.department_store" = "विभागीय भांडार";
 
@@ -3351,11 +3341,11 @@
 
 "type.shop.greengrocer" = "भाजीवाला";
 
-"type.shop.grocery" = "Grocery Store";
+"type.shop.grocery" = "Grocery";
 
 "type.shop.hairdresser" = "न्हावी";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "हार्डवेअर दुकान";
 
 "type.shop.health_food" = "Health Food Shop";
 
@@ -3409,7 +3399,7 @@
 
 "type.shop.seafood" = "मासळी उपहारगृह";
 
-"type.shop.second_hand" = "Second Hand Shop";
+"type.shop.second_hand" = "Second Hand";
 
 "type.shop.shoes" = "चपलाचे दूकान";
 
@@ -3441,16 +3431,15 @@
 
 "type.shop.agrarian" = "शेतीचे दुकान";
 
-"type.shop.antiques" = "Antiques Shop";
+"type.shop.antiques" = "Antiques";
 
 "type.shop.appliance" = "उपकरणांचे दुकान";
 
-/* maybe change to Art Gallery for en-US when supported */
-"type.shop.art" = "Artwork Shop";
+"type.shop.art" = "Arts Shop";
 
-"type.shop.baby_goods" = "Baby Goods Shop";
+"type.shop.baby_goods" = "Baby Goods";
 
-"type.shop.bag" = "Bag Shop";
+"type.shop.bag" = "Bags Store";
 
 "type.shop.bed" = "पलंगाचे दुकान";
 
@@ -3458,37 +3447,37 @@
 
 "type.shop.charity" = "Charity Shop";
 
-"type.shop.cheese" = "Cheese Shop";
+"type.shop.cheese" = "Cheese Store";
 
-"type.shop.craft" = "Craft Supplies Store";
+"type.shop.craft" = "Arts and Crafts";
 
-"type.shop.dairy" = "Dairy Shop";
+"type.shop.dairy" = "Dairy Products";
 
-"type.shop.electrical" = "Electrical Supplies Store";
+"type.shop.electrical" = "Electrical Store";
 
 "type.shop.fishing" = "Fishing Store";
 
-"type.shop.interior_decoration" = "Interior Decorations Store";
+"type.shop.interior_decoration" = "Interior Decorations";
 
 "type.shop.lottery" = "Lottery Tickets";
 
-"type.shop.medical_supply" = "Medical Supplies Store";
+"type.shop.medical_supply" = "Medical Supplies";
 
-"type.shop.nutrition_supplements" = "Nutrition Supplement Store";
+"type.shop.nutrition_supplements" = "Nutrition Supplements";
 
-"type.shop.paint" = "Paint Shop";
+"type.shop.paint" = "Paints";
 
-"type.shop.perfumery" = "Perfume Shop";
+"type.shop.perfumery" = "Perfumery";
 
-"type.shop.sewing" = "Sewing Supplies Shop";
+"type.shop.sewing" = "Sewing Supplies";
 
 "type.shop.storage_rental" = "Storage Rental";
 
-"type.shop.tobacco" = "Smoke Shop";
+"type.shop.tobacco" = "Tobacco";
 
-"type.shop.trade" = "Trade Supplies";
+"type.shop.trade" = "Trades Supplies";
 
-"type.shop.watches" = "Watch Store";
+"type.shop.watches" = "Watches";
 
 "type.shop.wholesale" = "Wholesale Store";
 
@@ -3559,11 +3548,11 @@
 
 "type.sport.badminton" = "Badminton";
 
-"type.sport.pelota" = "Basque Pelota";
+"type.sport.pelota" = "Basque pelota";
 
 "type.tourism" = "पर्यटन";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
 "type.tourism.apartment" = "सदनिका";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "इमारत";
+
 "type.amenity.events_venue" = "कार्यक्रमाचे ठिकाण";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 5b5191e9af..989d150142 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Min posisjon";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Senere";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresse/blokk";
-
-"type.addr_interpolation.even" = "Adresse/blokk";
-
-"type.addr_interpolation.odd" = "Adresse/blokk";
-
 "type.aerialway" = "Taubane";
 
 "type.aerialway.cable_car" = "Pendeltaubane";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parkeringsautomat";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinær";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Bygning";
 
-"type.building.has_parts" = "Bygning";
-
-"type.building_part" = "Bygning";
-
 "type.building.garage" = "Garasje";
 
+"type.building.has_parts" = "Bygning";
+
 "type.building.train_station" = "Togstasjon";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Kamerabutikk";
-
 "type.craft.plumber" = "Rørlegger";
 
 "type.craft.sawmill" = "Sagbruk";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Kommunikasjonstårn";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vannkran";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solenergi generator";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Frisør";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Jernvareforretning";
 
 "type.shop.health_food" = "Helsekostbutikk";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Hvitevarebutikk";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Kunstbutikk";
 
 "type.shop.baby_goods" = "Barnebutikk";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Bygning";
+
 "type.amenity.events_venue" = "Arrangementssted";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 806a48255e..936bddbd50 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Mijn locatie";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/nl/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adres/blok";
-
-"type.addr_interpolation.even" = "Adres/blok";
-
-"type.addr_interpolation.odd" = "Adres/blok";
-
 "type.aerialway" = "Kabelbaan";
 
 "type.aerialway.cable_car" = "Cabinelift";
@@ -1423,9 +1417,9 @@
 
 "type.amenity.parking_space.permissive" = "Parkeerplek";
 
-"type.amenity.parking_space.private" = "Parkeerplek";
+"type.amenity.parking_space.private" = "Privé parkeerplek";
 
-"type.amenity.parking_space.underground" = "Parkeerplek";
+"type.amenity.parking_space.underground" = "Ondergrondse parkeerplek";
 
 "type.amenity.parking_space.disabled" = "Invalide parkeerplaats";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Gebouw";
 
-"type.building.has_parts" = "Gebouw";
-
-"type.building_part" = "Gebouw";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Gebouw";
+
 "type.building.train_station" = "Treinstation";
 
 "type.building.warehouse" = "Magazijn";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograaf";
 
-"type.shop.camera" = "Camerawinkel";
-
 "type.craft.plumber" = "Loodgieter";
 
 "type.craft.sawmill" = "Zagerij";
@@ -1757,7 +1747,7 @@
 
 "type.cuisine.fish" = "Vis";
 
-"type.cuisine.fish_and_chips" = "Fish and Chips";
+"type.cuisine.fish_and_chips" = "Fish and chips";
 
 "type.cuisine.french" = "Frans";
 
@@ -2369,7 +2359,7 @@
 
 "type.landuse.recreation_ground" = "Recreatiezone";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Woonwijk";
 
@@ -2409,11 +2399,11 @@
 
 "type.leisure.park" = "Park";
 
-"type.leisure.park.no.access" = "Park";
+"type.leisure.park.no.access" = "Ontoegankelijk park";
 
 "type.leisure.park.permissive" = "Park";
 
-"type.leisure.park.private" = "Park";
+"type.leisure.park.private" = "Privé park";
 
 "type.leisure.picnic_table" = "Picknicktafel";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Electriciteit";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Zonne-generator";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Rangeerterrein tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Veerboot";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Apparaten winkel";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Kunstwinkel";
 
 "type.shop.baby_goods" = "Babyspullenwinkel";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sleebaan";
 
+"type.building_part" = "Gebouw";
+
 "type.amenity.events_venue" = "Evenementenlocatie";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index f6ea6c0864..20e8ae6ab2 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Moje położenie";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Później";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/pl/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Pl:Wstęp";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adres/Blok";
-
-"type.addr_interpolation.even" = "Adres/Blok";
-
-"type.addr_interpolation.odd" = "Adres/Blok";
-
 "type.aerialway" = "Transport linowy";
 
 "type.aerialway.cable_car" = "Kolej linowa";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restauracja";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parkometr";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Weterynarz";
 
@@ -1636,14 +1630,12 @@
 
 "type.building" = "Budynek";
 
-"type.building.address" = "Budynek";
-
-"type.building.has_parts" = "Budynek";
-
-"type.building_part" = "Budynek";
+"type.building.address" = "Adres";
 
 "type.building.garage" = "Garaż";
 
+"type.building.has_parts" = "Część budynku";
+
 "type.building.train_station" = "Dworzec kolejowy";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Studio fotograficzne";
 
-"type.shop.camera" = "Sklep z aparatami";
-
 "type.craft.plumber" = "Hydraulik";
 
 "type.craft.sawmill" = "Tartak";
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Generator słoneczny";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Sklep AGD";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Sklep artystyczny";
 
 "type.shop.baby_goods" = "Sklep dla dzieci";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Część budynku";
+
 "type.amenity.events_venue" = "Miejsce wydarzeń";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 2405747a94..7757eb2315 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Minha posição";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Mais tarde";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/pt-BR/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Endereço/Bloco";
-
-"type.addr_interpolation.even" = "Endereço/Bloco";
-
-"type.addr_interpolation.odd" = "Endereço/Bloco";
-
 "type.aerialway" = "Transporte aéreo";
 
 "type.aerialway.cable_car" = "Teleférico";
@@ -1423,9 +1417,9 @@
 
 "type.amenity.parking_space.permissive" = "Lugar de estacionamento";
 
-"type.amenity.parking_space.private" = "Lugar de estacionamento";
+"type.amenity.parking_space.private" = "Lugar de estacionamento privado";
 
-"type.amenity.parking_space.underground" = "Lugar de estacionamento";
+"type.amenity.parking_space.underground" = "Lugar de estacionamento subterrâneo";
 
 "type.amenity.parking_space.disabled" = "Estacionamento para deficientes";
 
@@ -1564,7 +1558,7 @@
 
 "type.barrier.chain" = "Chain";
 
-"type.barrier.city_wall" = "City Wall";
+"type.barrier.city_wall" = "Muralha";
 
 "type.barrier.cycle_barrier" = "Barreira de bicicletas";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Edifício";
 
-"type.building.has_parts" = "Edifício";
-
-"type.building_part" = "Edifício";
-
 "type.building.garage" = "Garagem";
 
+"type.building.has_parts" = "Edifício";
+
 "type.building.train_station" = "Estação de trem";
 
 "type.building.warehouse" = "Armazém";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotógrafo";
 
-"type.shop.camera" = "Loja de câmeras";
-
 "type.craft.plumber" = "Encanador";
 
 "type.craft.sawmill" = "Serraria";
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Loja de eletrodomésticos";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Loja de artes";
 
 "type.shop.baby_goods" = "Loja infantil";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Pista para trenós";
 
+"type.building_part" = "Parte de edifício";
+
 "type.amenity.events_venue" = "Local do evento";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index c53e095601..07ac00c6a0 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "A minha posição";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Mais tarde";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Endereço/Bloco";
-
-"type.addr_interpolation.even" = "Endereço/Bloco";
-
-"type.addr_interpolation.odd" = "Endereço/Bloco";
-
 "type.aerialway" = "Transporte aéreo";
 
 "type.aerialway.cable_car" = "Teleférico";
@@ -1423,9 +1417,9 @@
 
 "type.amenity.parking_space.permissive" = "Lugar de estacionamento";
 
-"type.amenity.parking_space.private" = "Lugar de estacionamento";
+"type.amenity.parking_space.private" = "Lugar de estacionamento privado";
 
-"type.amenity.parking_space.underground" = "Lugar de estacionamento";
+"type.amenity.parking_space.underground" = "Lugar de estacionamento subterrâneo";
 
 "type.amenity.parking_space.disabled" = "Estacionamento para deficientes";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurante";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Máquina venda de bilhetes de estacionamento";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Cacifo";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinário";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Edifício";
 
-"type.building.has_parts" = "Edifício";
-
-"type.building_part" = "Edifício";
-
 "type.building.garage" = "Garagem";
 
+"type.building.has_parts" = "Edifício";
+
 "type.building.train_station" = "Estação de comboios";
 
 "type.building.warehouse" = "Armazém";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotógrafo";
 
-"type.shop.camera" = "Loja de câmeras";
-
 "type.craft.plumber" = "Picheleiro";
 
 "type.craft.sawmill" = "Serraria";
@@ -2327,7 +2317,7 @@
 
 "type.landuse.construction" = "Construção";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Quinta";
 
@@ -2413,7 +2403,7 @@
 
 "type.leisure.park.permissive" = "Parque urbano";
 
-"type.leisure.park.private" = "Parque urbano";
+"type.leisure.park.private" = "Parque urbano privado";
 
 "type.leisure.picnic_table" = "Mesa de piqueniques";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Loja de eletrodomésticos";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Loja de artes";
 
 "type.shop.baby_goods" = "Loja infantil";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Pista para trenós";
 
+"type.building_part" = "Parte de edifício";
+
 "type.amenity.events_venue" = "Local dos eventos";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 68b07223c4..04661ca6a9 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Poziția mea";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Mai târziu";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresă/Bloc";
-
-"type.addr_interpolation.even" = "Adresă/Bloc";
-
-"type.addr_interpolation.odd" = "Adresă/Bloc";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parcomat";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Cabinet veterinar";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Clădire";
 
-"type.building.has_parts" = "Clădire";
-
-"type.building_part" = "Clădire";
-
 "type.building.garage" = "Garaj";
 
+"type.building.has_parts" = "Clădire";
+
 "type.building.train_station" = "Feroviar";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Magazin de aparate foto";
-
 "type.craft.plumber" = "Instalator";
 
 "type.craft.sawmill" = "Fabrica de cherestea";
@@ -1757,7 +1747,7 @@
 
 "type.cuisine.fish" = "Pește";
 
-"type.cuisine.fish_and_chips" = "Fish and Chips";
+"type.cuisine.fish_and_chips" = "Restaurant fish and chips";
 
 "type.cuisine.french" = "Bucătărie francez";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Turnul de comunicații";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Robinet cu apă";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Generator solar";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Magazin de electrocasnice";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Magazin de arte";
 
 "type.shop.baby_goods" = "Magazin pentru copii";
@@ -3583,7 +3572,7 @@
 
 "type.tourism.attraction.specified" = "Punct de atracție";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "Teren pentru campare";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Clădire";
+
 "type.amenity.events_venue" = "Locul de desfășurare a evenimentelor";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 0737d00d11..4a75689e9a 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Мое местоположение";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Не сейчас";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Адрес/Блок";
-
-"type.addr_interpolation.even" = "Адрес/Блок";
-
-"type.addr_interpolation.odd" = "Адрес/Блок";
-
 "type.aerialway" = "Канатная дорога";
 
 "type.aerialway.cable_car" = "Канатная дорога";
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Здание";
 
-"type.building.has_parts" = "Здание";
-
-"type.building_part" = "Здание";
-
 "type.building.garage" = "Гараж";
 
+"type.building.has_parts" = "Здание";
+
 "type.building.train_station" = "Ж/д вокзал";
 
 "type.building.warehouse" = "Склад";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Фотограф";
 
-"type.shop.camera" = "Магазин фотоаппаратов";
-
 "type.craft.plumber" = "Сантехник";
 
 "type.craft.sawmill" = "Лесопилка";
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Магазин бытовой техники";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Художественный магазин";
 
 "type.shop.baby_goods" = "Детский магазин";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Трасса для саней";
 
+"type.building_part" = "Здание";
+
 "type.amenity.events_venue" = "Место проведения мероприятий";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 3a5c71e15b..699d07a030 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Moja poloha";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Neskôr";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Pre RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Načítavanie záložiek";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adresa/blok";
-
-"type.addr_interpolation.even" = "Adresa/blok";
-
-"type.addr_interpolation.odd" = "Adresa/blok";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Reštaurácia";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Automat na výdaj parkovacích lístkov";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinár";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Budova";
 
-"type.building.has_parts" = "Budova";
-
-"type.building_part" = "Budova";
-
 "type.building.garage" = "Garáž";
 
+"type.building.has_parts" = "Budova";
+
 "type.building.train_station" = "Železničná stanica";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Obchod s fotoaparátmi";
-
 "type.craft.plumber" = "Klampiarstvo";
 
 "type.craft.sawmill" = "Píla";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Komunikačná veža";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vodovodný kohútik";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solárny generátor";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Kaderníctvo";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Železiarstvo";
 
 "type.shop.health_food" = "Obchod so zdravou výživou";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Obchod so spotrebičmi";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Obchod s umením";
 
 "type.shop.baby_goods" = "Obchod pre deti";
@@ -3583,7 +3572,7 @@
 
 "type.tourism.attraction.specified" = "Atrakcia";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "Kemp pre karavany";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Budova";
+
 "type.amenity.events_venue" = "Miesto konania podujatí";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 5183354ace..d2fec49c8a 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Min position";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Senare";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "För husbil";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Läser in bokmärken";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/sv/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adress/Block";
-
-"type.addr_interpolation.even" = "Adress/Block";
-
-"type.addr_interpolation.odd" = "Adress/Block";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurang";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Parkeringsautomat";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinär";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Byggnad";
 
-"type.building.has_parts" = "Byggnad";
-
-"type.building_part" = "Byggnad";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Byggnad";
+
 "type.building.train_station" = "Tågstation";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotograf";
 
-"type.shop.camera" = "Kameraaffär";
-
 "type.craft.plumber" = "Vvs-montör";
 
 "type.craft.sawmill" = "Sågverk";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Kommunikationstorn";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vattenkran";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Solgenerator";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Vitvarubutik";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Konstaffär";
 
 "type.shop.baby_goods" = "Barnbutik";
@@ -3583,7 +3572,7 @@
 
 "type.tourism.attraction.specified" = "Attraktion";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "Husvagnsplats";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Byggnad";
+
 "type.amenity.events_venue" = "Evenemangslokal";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 2ad97f2af7..89f066ad50 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "My Position";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Later";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -60,7 +60,7 @@
 "continue_download" = "Continue";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Add a New List";
+"add_new_set" = "Add New List";
 
 /* Bookmark Color dialog title */
 "bookmark_color" = "Bookmark Color";
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Kwa RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Loading Bookmarks";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -316,10 +316,10 @@
 "report_a_bug" = "Report a bug";
 
 /* Alert text */
-"email_error_body" = "The email client has not been set up. Please configure it or contact us at %@";
+"email_error_body" = "The email client has not been set up. Please configure it or use any other way to contact us at %@";
 
 /* Alert title */
-"email_error_title" = "Error sending email";
+"email_error_title" = "Mail sending error";
 
 /* Settings item title */
 "pref_calibration_title" = "Compass calibration";
@@ -456,11 +456,11 @@
 
 "dialog_routing_download_files" = "Download required files";
 
-"dialog_routing_download_and_update_all" = "Download or update all maps along the projected path to calculate a route.";
+"dialog_routing_download_and_update_all" = "Download and update all map and routing information along the projected path to calculate route.";
 
 "dialog_routing_unable_locate_route" = "Unable to locate route";
 
-"dialog_routing_change_start_or_end" = "Please adjust your starting point or destination.";
+"dialog_routing_change_start_or_end" = "Please adjust your starting point or your destination.";
 
 "dialog_routing_change_start" = "Adjust starting point";
 
@@ -518,7 +518,7 @@
 
 "search_history_title" = "Search History";
 
-"search_history_text" = "View your recent searches.";
+"search_history_text" = "View recent searches.";
 
 "clear_search" = "Clear Search History";
 
@@ -536,9 +536,9 @@
 
 "p2p_to_here" = "Route to";
 
-"p2p_only_from_current" = "Navigation is only available from your current location.";
+"p2p_only_from_current" = "Navigation is available only from your current location.";
 
-"p2p_reroute_from_current" = "Do you want to plan a route from your current location?";
+"p2p_reroute_from_current" = "Do you want us to plan a route from your current location?";
 
 "editor_time_add" = "Add Schedule";
 
@@ -565,13 +565,13 @@
 
 "editor_add_select_location" = "Location";
 
-"editor_done_dialog_1" = "You’ve changed the world map! Don't keep it to yourself; tell your friends and edit it together.";
+"editor_done_dialog_1" = "You’ve changed the world map. Do not keep it to yourself! Tell your friends, and edit it together.";
 
 "share_with_friends" = "Share with friends";
 
 "editor_report_problem_send_button" = "Send";
 
-"autodownload" = "Auto-download maps";
+"autodownload" = "Auto-download";
 
 /* Place Page opening hours text */
 "closed_now" = "Closed now";
@@ -611,7 +611,7 @@
 
 "invalid_username_or_password" = "Invalid username or password.";
 
-"login" = "OpenStreetMap Login";
+"login" = "Log In";
 
 "forgot_password" = "Forgot your password?";
 
@@ -657,7 +657,7 @@
 
 "please_note" = "Please note";
 
-"downloader_delete_map_dialog" = "All of your map edits will be deleted with the map.";
+"downloader_delete_map_dialog" = "All of your map edits will be deleted together with the map.";
 
 "downloader_update_maps" = "Update Maps";
 
@@ -665,7 +665,7 @@
 
 "migration_download_error_dialog" = "Download error";
 
-"common_check_internet_connection_dialog" = "Please make sure your device is connected to the Internet.";
+"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the Internet.";
 
 "downloader_no_space_title" = "Not enough space";
 
@@ -695,7 +695,7 @@
 
 "message_invalid_feature_position" = "No object can be located here";
 
-"login_to_make_edits_visible" = "Log in to openstreetmap.org to publish your changes to the world.";
+"login_to_make_edits_visible" = "Log in to OpenStreetMap.org so other users can see the changes you have made.";
 
 /* Error dialog no space */
 "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
@@ -727,7 +727,7 @@
 
 "editor_detailed_description_hint" = "Detailed comment";
 
-"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in Organic Maps.";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in Organic Maps.";
 
 "editor_more_about_osm" = "More about OpenStreetMap";
 
@@ -735,13 +735,13 @@
 
 "downloader_no_downloaded_maps_title" = "You haven't downloaded any maps";
 
-"downloader_no_downloaded_maps_message" = "Download maps to search and navigate offline.";
+"downloader_no_downloaded_maps_message" = "Download maps to search for a location and use navigation offline.";
 
 /* Error title that appears after certain time without location. */
-"current_location_unknown_title" = "Continue detecting your location?";
+"current_location_unknown_title" = "Continue detecting your current location?";
 
 /* Error that appears after certain time without location. */
-"current_location_unknown_message" = "Current location is unknown. You may be in a building or tunnel.";
+"current_location_unknown_message" = "Current location is unknown. Maybe you are in a building or in a tunnel.";
 
 "current_location_unknown_continue_button" = "Continue";
 
@@ -749,7 +749,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occurred while determining your location. Check that your device is working properly and try again later.";
+"current_location_unknown_error_message" = "An error occurred while searching for your location. Check that your device is working properly and try again later.";
 
 "location_services_disabled_header" = "Location services are disabled";
 
@@ -826,21 +826,21 @@
 "editor_share_to_all_dialog_title" = "Do you want to send it to all users?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any private or personal data.";
+"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any personal data.";
 
 "editor_share_to_all_dialog_message_2" = "Wahariri wa OpenStreetMap watakagua mabadiliko na kuwasiliana nawe ikiwa wana maswali yoyote.";
 
 "navigation_stop_button" = "stop";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
-"recent_track_background_dialog_title" = "Disable recording of your recently travelled route?";
+"recent_track_background_dialog_title" = "Disable recording of your recently traveled route?";
 
 "off_recent_track_background_button" = "Disable";
 
 /* For sharing via SMS and so on */
 "sharing_call_action_look" = "Check out";
 
-"recent_track_background_dialog_message" = "Organic Maps uses your location in the background to record your recently travelled route.";
+"recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route.";
 
 /* Text under the version number in the Help dialog. TODO: Synchronize other translations with English. */
 "about_description" = "Organic Maps ni programu huria na ya chanzo huria ya ramani za nje ya mtandao. Hakuna matangazo. Hakuna ufuatiliaji. Ukiona hitilafu kwenye ramani, tafadhali irekebishe katika OpenStreetMap. Mradi huu umeundwa na wapendaji katika wakati wetu wa bure, kwa hivyo tunahitaji maoni na usaidizi wako.";
@@ -867,7 +867,7 @@
 "mobile_data" = "Mobile Internet";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Mobile internet is required for map update notifications and uploading edits.";
+"mobile_data_description" = "Mobile internet is required for map update notifications and for displaying detailed information about places and bookmarks.";
 
 "mobile_data_option_never" = "Never Use";
 
@@ -875,7 +875,7 @@
 
 "traffic_update_maps_text" = "To display traffic data, maps must be updated.";
 
-"big_font" = "Increase size for map labels";
+"big_font" = "Increase font size on the map";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Anwani/Zuia";
-
-"type.addr_interpolation.even" = "Anwani/Zuia";
-
-"type.addr_interpolation.odd" = "Anwani/Zuia";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1409,7 +1403,7 @@
 
 "type.amenity.parking.private" = "Maegesho ya Kibinafsi";
 
-"type.amenity.parking.park_and_ride" = "Park And Ride Parking";
+"type.amenity.parking.park_and_ride" = "Parking";
 
 "type.amenity.parking.underground" = "Maegesho ya chini ya ardhi";
 
@@ -1435,23 +1429,23 @@
 
 "type.amenity.place_of_worship" = "Place of Worship";
 
-"type.amenity.place_of_worship.buddhist" = "Buddhist Temple";
+"type.amenity.place_of_worship.buddhist" = "Temple";
 
 "type.amenity.place_of_worship.christian" = "Church";
 
-"type.amenity.place_of_worship.hindu" = "Hindu Temple";
+"type.amenity.place_of_worship.hindu" = "Temple";
 
 "type.amenity.place_of_worship.jewish" = "Synagogue";
 
 "type.amenity.place_of_worship.muslim" = "Mosque";
 
-"type.amenity.place_of_worship.shinto" = "Shinto Shrine";
+"type.amenity.place_of_worship.shinto" = "Shrine";
 
-"type.amenity.place_of_worship.taoist" = "Taoist Temple";
+"type.amenity.place_of_worship.taoist" = "Temple";
 
 "type.amenity.police" = "Police";
 
-"type.amenity.post_box" = "Mailbox";
+"type.amenity.post_box" = "Post Box";
 
 "type.amenity.post_office" = "Ofisi ya posta";
 
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Restaurant";
 
@@ -1530,9 +1524,9 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
-"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
+"type.amenity.vending_machine.parking_tickets" = "Parking Tickets";
 
 "type.amenity.vending_machine.public_transport_tickets" = "Mashine ya kuuzia tiketi za usafiri wa umma";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Veterinary Doctor";
 
@@ -1552,13 +1546,13 @@
 
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 
-"type.amenity.water_point" = "Water Tank Refill Point";
+"type.amenity.water_point" = "RV Water Point";
 
 "type.barrier" = "Barrier";
 
 "type.barrier.block" = "Block";
 
-"type.barrier.bollard" = "Bollard";
+"type.barrier.bollard" = "Pillar";
 
 "type.barrier.border_control" = "Border Control";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Building";
 
-"type.building.has_parts" = "Building";
-
-"type.building_part" = "Building";
-
 "type.building.garage" = "Garage";
 
+"type.building.has_parts" = "Building";
+
 "type.building.train_station" = "Train Station";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Mpiga picha";
 
-"type.shop.camera" = "Duka la Kamera";
-
 "type.craft.plumber" = "Fundi bomba";
 
 "type.craft.sawmill" = "Sumel";
@@ -1815,7 +1805,7 @@
 
 "type.cuisine.noodles" = "Noodles";
 
-"type.cuisine.oriental" = "East Asian";
+"type.cuisine.oriental" = "Far Eastern";
 
 "type.cuisine.pancake" = "Pancake";
 
@@ -2040,9 +2030,9 @@
 
 "type.highway.raceway" = "Racetrack";
 
-"type.highway.residential" = "Residential Street";
+"type.highway.residential" = "Street";
 
-"type.highway.residential.area" = "Residential Street";
+"type.highway.residential.area" = "Street";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.residential.bridge" = "Daraja";
@@ -2184,7 +2174,7 @@
 
 "type.area_highway.primary" = "Primary Road";
 
-"type.area_highway.residential" = "Residential Street";
+"type.area_highway.residential" = "Street";
 
 "type.area_highway.secondary" = "Secondary Road";
 
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2343,7 +2333,7 @@
 
 "type.landuse.forest.deciduous" = "Deciduous Forest";
 
-"type.landuse.forest.mixed" = "Mixed-Leaf Forest";
+"type.landuse.forest.mixed" = "Mixed Forest";
 
 "type.landuse.garages" = "Garages";
 
@@ -2369,13 +2359,13 @@
 
 "type.landuse.recreation_ground" = "Recreation Ground";
 
-"type.landuse.reservoir" = "Reservoir";
+"type.landuse.reservoir" = "Water";
 
 "type.landuse.residential" = "Residential Area";
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2417,7 +2407,7 @@
 
 "type.leisure.picnic_table" = "Jedwali la Picnic";
 
-"type.leisure.pitch" = "Sport Pitch";
+"type.leisure.pitch" = "Sports Ground";
 
 "type.leisure.playground" = "Playground";
 
@@ -2453,7 +2443,7 @@
 
 "type.man_made.cairn" = "Cairn";
 
-"type.man_made.chimney" = "Chimney";
+"type.man_made.chimney" = "Factory Chimney";
 
 "type.man_made.cutline" = "Cutline";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Mnara wa Mawasiliano";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Water Tap";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Jenereta ya jua";
 
@@ -2699,7 +2689,7 @@
 
 "type.power.plant.wind" = "Kiwanda cha nguvu cha upepo";
 
-"type.power.pole" = "Power Pole";
+"type.power.pole" = "Power Tower";
 
 "type.power.station" = "Power Station";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -2741,7 +2731,7 @@
 
 "type.railway.funicular.tunnel" = "Funicular Tunnel";
 
-"type.railway.halt" = "Rail Halt";
+"type.railway.halt" = "Train Station";
 
 "type.railway.level_crossing" = "Tambuka Reli";
 
@@ -2799,225 +2789,225 @@
 
 "type.railway.station.monorail" = "Train Station";
 
-"type.railway.station.subway" = "Subway Station";
+"type.railway.station.subway" = "Subway";
 
-"type.railway.station.subway.adana" = "Subway Station";
+"type.railway.station.subway.adana" = "Subway";
 
-"type.railway.station.subway.algiers" = "Subway Station";
+"type.railway.station.subway.algiers" = "Subway";
 
-"type.railway.station.subway.almaty" = "Subway Station";
+"type.railway.station.subway.almaty" = "Subway";
 
-"type.railway.station.subway.amsterdam" = "Subway Station";
+"type.railway.station.subway.amsterdam" = "Subway";
 
-"type.railway.station.subway.ankara" = "Subway Station";
+"type.railway.station.subway.ankara" = "Subway";
 
-"type.railway.station.subway.athens" = "Subway Station";
+"type.railway.station.subway.athens" = "Subway";
 
-"type.railway.station.subway.baku" = "Subway Station";
+"type.railway.station.subway.baku" = "Subway";
 
-"type.railway.station.subway.bangkok" = "Subway Station";
+"type.railway.station.subway.bangkok" = "Subway";
 
-"type.railway.station.subway.barcelona" = "Subway Station";
+"type.railway.station.subway.barcelona" = "Subway";
 
-"type.railway.station.subway.beijing" = "Subway Station";
+"type.railway.station.subway.beijing" = "Subway";
 
-"type.railway.station.subway.bengalore" = "Subway Station";
+"type.railway.station.subway.bengalore" = "Subway";
 
-"type.railway.station.subway.berlin" = "Subway Station";
+"type.railway.station.subway.berlin" = "Subway";
 
-"type.railway.station.subway.bilbao" = "Subway Station";
+"type.railway.station.subway.bilbao" = "Subway";
 
-"type.railway.station.subway.brasilia" = "Subway Station";
+"type.railway.station.subway.brasilia" = "Subway";
 
-"type.railway.station.subway.brescia" = "Subway Station";
+"type.railway.station.subway.brescia" = "Subway";
 
-"type.railway.station.subway.brussels" = "Subway Station";
+"type.railway.station.subway.brussels" = "Subway";
 
-"type.railway.station.subway.bucharest" = "Subway Station";
+"type.railway.station.subway.bucharest" = "Subway";
 
-"type.railway.station.subway.budapest" = "Subway Station";
+"type.railway.station.subway.budapest" = "Subway";
 
-"type.railway.station.subway.buenos_aires" = "Subway Station";
+"type.railway.station.subway.buenos_aires" = "Subway";
 
-"type.railway.station.subway.bursa" = "Subway Station";
+"type.railway.station.subway.bursa" = "Subway";
 
-"type.railway.station.subway.cairo" = "Subway Station";
+"type.railway.station.subway.cairo" = "Subway";
 
-"type.railway.station.subway.caracas" = "Subway Station";
+"type.railway.station.subway.caracas" = "Subway";
 
-"type.railway.station.subway.catania" = "Subway Station";
+"type.railway.station.subway.catania" = "Subway";
 
-"type.railway.station.subway.changchun" = "Subway Station";
+"type.railway.station.subway.changchun" = "Subway";
 
-"type.railway.station.subway.chengdu" = "Subway Station";
+"type.railway.station.subway.chengdu" = "Subway";
 
-"type.railway.station.subway.chicago" = "Subway Station";
+"type.railway.station.subway.chicago" = "Subway";
 
-"type.railway.station.subway.chongqing" = "Subway Station";
+"type.railway.station.subway.chongqing" = "Subway";
 
-"type.railway.station.subway.dalian" = "Subway Station";
+"type.railway.station.subway.dalian" = "Subway";
 
-"type.railway.station.subway.delhi" = "Subway Station";
+"type.railway.station.subway.delhi" = "Subway";
 
-"type.railway.station.subway.dnepro" = "Subway Station";
+"type.railway.station.subway.dnepro" = "Subway";
 
-"type.railway.station.subway.dubai" = "Subway Station";
+"type.railway.station.subway.dubai" = "Subway";
 
-"type.railway.station.subway.ekb" = "Subway Station";
+"type.railway.station.subway.ekb" = "Subway";
 
-"type.railway.station.subway.fukuoka" = "Subway Station";
+"type.railway.station.subway.fukuoka" = "Subway";
 
-"type.railway.station.subway.glasgow" = "Subway Station";
+"type.railway.station.subway.glasgow" = "Subway";
 
-"type.railway.station.subway.guangzhou" = "Subway Station";
+"type.railway.station.subway.guangzhou" = "Subway";
 
-"type.railway.station.subway.hamburg" = "Subway Station";
+"type.railway.station.subway.hamburg" = "Subway";
 
-"type.railway.station.subway.helsinki" = "Subway Station";
+"type.railway.station.subway.helsinki" = "Subway";
 
-"type.railway.station.subway.hiroshima" = "Subway Station";
+"type.railway.station.subway.hiroshima" = "Subway";
 
-"type.railway.station.subway.isfahan" = "Subway Station";
+"type.railway.station.subway.isfahan" = "Subway";
 
-"type.railway.station.subway.istanbul" = "Subway Station";
+"type.railway.station.subway.istanbul" = "Subway";
 
-"type.railway.station.subway.izmir" = "Subway Station";
+"type.railway.station.subway.izmir" = "Subway";
 
-"type.railway.station.subway.kazan" = "Subway Station";
+"type.railway.station.subway.kazan" = "Subway";
 
-"type.railway.station.subway.kharkiv" = "Subway Station";
+"type.railway.station.subway.kharkiv" = "Subway";
 
-"type.railway.station.subway.kiev" = "Subway Station";
+"type.railway.station.subway.kiev" = "Subway";
 
-"type.railway.station.subway.kobe" = "Subway Station";
+"type.railway.station.subway.kobe" = "Subway";
 
-"type.railway.station.subway.kolkata" = "Subway Station";
+"type.railway.station.subway.kolkata" = "Subway";
 
-"type.railway.station.subway.kunming" = "Subway Station";
+"type.railway.station.subway.kunming" = "Subway";
 
-"type.railway.station.subway.kyoto" = "Subway Station";
+"type.railway.station.subway.kyoto" = "Subway";
 
-"type.railway.station.subway.la" = "Subway Station";
+"type.railway.station.subway.la" = "Subway";
 
-"type.railway.station.subway.lausanne" = "Subway Station";
+"type.railway.station.subway.lausanne" = "Subway";
 
-"type.railway.station.subway.lille" = "Subway Station";
+"type.railway.station.subway.lille" = "Subway";
 
-"type.railway.station.subway.lima" = "Subway Station";
+"type.railway.station.subway.lima" = "Subway";
 
-"type.railway.station.subway.lisboa" = "Subway Station";
+"type.railway.station.subway.lisboa" = "Subway";
 
-"type.railway.station.subway.london" = "Subway Station";
+"type.railway.station.subway.london" = "Subway";
 
-"type.railway.station.subway.lyon" = "Subway Station";
+"type.railway.station.subway.lyon" = "Subway";
 
-"type.railway.station.subway.madrid" = "Subway Station";
+"type.railway.station.subway.madrid" = "Subway";
 
-"type.railway.station.subway.malaga" = "Subway Station";
+"type.railway.station.subway.malaga" = "Subway";
 
-"type.railway.station.subway.manila" = "Subway Station";
+"type.railway.station.subway.manila" = "Subway";
 
-"type.railway.station.subway.maracaibo" = "Subway Station";
+"type.railway.station.subway.maracaibo" = "Subway";
 
-"type.railway.station.subway.mashhad" = "Subway Station";
+"type.railway.station.subway.mashhad" = "Subway";
 
-"type.railway.station.subway.mecca" = "Subway Station";
+"type.railway.station.subway.mecca" = "Subway";
 
-"type.railway.station.subway.medellin" = "Subway Station";
+"type.railway.station.subway.medellin" = "Subway";
 
-"type.railway.station.subway.mexico" = "Subway Station";
+"type.railway.station.subway.mexico" = "Subway";
 
-"type.railway.station.subway.milan" = "Subway Station";
+"type.railway.station.subway.milan" = "Subway";
 
-"type.railway.station.subway.minsk" = "Subway Station";
+"type.railway.station.subway.minsk" = "Subway";
 
-"type.railway.station.subway.montreal" = "Subway Station";
+"type.railway.station.subway.montreal" = "Subway";
 
-"type.railway.station.subway.moscow" = "Subway Station";
+"type.railway.station.subway.moscow" = "Subway";
 
-"type.railway.station.subway.munchen" = "Subway Station";
+"type.railway.station.subway.munchen" = "Subway";
 
-"type.railway.station.subway.nagoya" = "Subway Station";
+"type.railway.station.subway.nagoya" = "Subway";
 
-"type.railway.station.subway.newyork" = "Subway Station";
+"type.railway.station.subway.newyork" = "Subway";
 
-"type.railway.station.subway.nnov" = "Subway Station";
+"type.railway.station.subway.nnov" = "Subway";
 
-"type.railway.station.subway.novosibirsk" = "Subway Station";
+"type.railway.station.subway.novosibirsk" = "Subway";
 
-"type.railway.station.subway.osaka" = "Subway Station";
+"type.railway.station.subway.osaka" = "Subway";
 
-"type.railway.station.subway.oslo" = "Subway Station";
+"type.railway.station.subway.oslo" = "Subway";
 
-"type.railway.station.subway.palma" = "Subway Station";
+"type.railway.station.subway.palma" = "Subway";
 
-"type.railway.station.subway.panama" = "Subway Station";
+"type.railway.station.subway.panama" = "Subway";
 
-"type.railway.station.subway.paris" = "Subway Station";
+"type.railway.station.subway.paris" = "Subway";
 
-"type.railway.station.subway.philadelphia" = "Subway Station";
+"type.railway.station.subway.philadelphia" = "Subway";
 
-"type.railway.station.subway.pyongyang" = "Subway Station";
+"type.railway.station.subway.pyongyang" = "Subway";
 
-"type.railway.station.subway.rennes" = "Subway Station";
+"type.railway.station.subway.rennes" = "Subway";
 
-"type.railway.station.subway.rio" = "Subway Station";
+"type.railway.station.subway.rio" = "Subway";
 
-"type.railway.station.subway.roma" = "Subway Station";
+"type.railway.station.subway.roma" = "Subway";
 
-"type.railway.station.subway.rotterdam" = "Subway Station";
+"type.railway.station.subway.rotterdam" = "Subway";
 
-"type.railway.station.subway.samara" = "Subway Station";
+"type.railway.station.subway.samara" = "Subway";
 
-"type.railway.station.subway.santiago" = "Subway Station";
+"type.railway.station.subway.santiago" = "Subway";
 
-"type.railway.station.subway.santo_domingo" = "Subway Station";
+"type.railway.station.subway.santo_domingo" = "Subway";
 
-"type.railway.station.subway.saopaulo" = "Subway Station";
+"type.railway.station.subway.saopaulo" = "Subway";
 
-"type.railway.station.subway.sapporo" = "Subway Station";
+"type.railway.station.subway.sapporo" = "Subway";
 
-"type.railway.station.subway.sendai" = "Subway Station";
+"type.railway.station.subway.sendai" = "Subway";
 
-"type.railway.station.subway.sf" = "Subway Station";
+"type.railway.station.subway.sf" = "Subway";
 
-"type.railway.station.subway.shanghai" = "Subway Station";
+"type.railway.station.subway.shanghai" = "Subway";
 
-"type.railway.station.subway.shiraz" = "Subway Station";
+"type.railway.station.subway.shiraz" = "Subway";
 
-"type.railway.station.subway.sofia" = "Subway Station";
+"type.railway.station.subway.sofia" = "Subway";
 
-"type.railway.station.subway.spb" = "Subway Station";
+"type.railway.station.subway.spb" = "Subway";
 
-"type.railway.station.subway.stockholm" = "Subway Station";
+"type.railway.station.subway.stockholm" = "Subway";
 
-"type.railway.station.subway.tabriz" = "Subway Station";
+"type.railway.station.subway.tabriz" = "Subway";
 
-"type.railway.station.subway.taipei" = "Subway Station";
+"type.railway.station.subway.taipei" = "Subway";
 
-"type.railway.station.subway.taoyuan" = "Subway Station";
+"type.railway.station.subway.taoyuan" = "Subway";
 
-"type.railway.station.subway.tashkent" = "Subway Station";
+"type.railway.station.subway.tashkent" = "Subway";
 
-"type.railway.station.subway.tbilisi" = "Subway Station";
+"type.railway.station.subway.tbilisi" = "Subway";
 
-"type.railway.station.subway.tianjin" = "Subway Station";
+"type.railway.station.subway.tianjin" = "Subway";
 
-"type.railway.station.subway.tokyo" = "Subway Station";
+"type.railway.station.subway.tokyo" = "Subway";
 
-"type.railway.station.subway.valencia" = "Subway Station";
+"type.railway.station.subway.valencia" = "Subway";
 
-"type.railway.station.subway.vienna" = "Subway Station";
+"type.railway.station.subway.vienna" = "Subway";
 
-"type.railway.station.subway.warszawa" = "Subway Station";
+"type.railway.station.subway.warszawa" = "Subway";
 
-"type.railway.station.subway.washington" = "Subway Station";
+"type.railway.station.subway.washington" = "Subway";
 
-"type.railway.station.subway.wuhan" = "Subway Station";
+"type.railway.station.subway.wuhan" = "Subway";
 
-"type.railway.station.subway.yerevan" = "Subway Station";
+"type.railway.station.subway.yerevan" = "Subway";
 
-"type.railway.station.subway.yokohama" = "Subway Station";
+"type.railway.station.subway.yokohama" = "Subway";
 
 "type.railway.subway" = "Subway Line";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3267,7 +3257,7 @@
 
 "type.shop" = "Shop";
 
-"type.shop.alcohol" = "Liquor Shop";
+"type.shop.alcohol" = "Liquor Store";
 
 "type.shop.bakery" = "Bakery";
 
@@ -3283,15 +3273,15 @@
 
 "type.shop.books" = "Bookstore";
 
-"type.shop.butcher" = "Butcher";
+"type.shop.butcher" = "Butcher’s";
 
 "type.shop.cannabis" = "Duka la Bangi";
 
 "type.shop.car" = "Car Dealership";
 
-"type.shop.car_parts" = "Car Parts Shop";
+"type.shop.car_parts" = "Car Parts";
 
-"type.shop.car_repair" = "Car Repair Workshop";
+"type.shop.car_repair" = "Car Repair Shop";
 
 "type.shop.car_repair.tyres" = "Tyre Repair";
 
@@ -3299,23 +3289,23 @@
 
 "type.shop.carpet" = "Mazulia";
 
-"type.shop.chemist" = "Chemist";
+"type.shop.chemist" = "Chemist Shop";
 
 "type.shop.chocolate" = "Chocolate Shop";
 
 "type.shop.clothes" = "Clothes Shop";
 
-"type.shop.coffee" = "Coffee Shop";
+"type.shop.coffee" = "Coffee Store";
 
 "type.shop.computer" = "Computer Store";
 
-"type.shop.confectionery" = "Candy Shop";
+"type.shop.confectionery" = "Sweets";
 
 "type.shop.convenience" = "Convenience Store";
 
-"type.shop.copyshop" = "Copyshop";
+"type.shop.copyshop" = "Copy Shop";
 
-"type.shop.cosmetics" = "Cosmetics Shop";
+"type.shop.cosmetics" = "Cosmetics";
 
 "type.shop.curtain" = "Mapazia";
 
@@ -3323,11 +3313,11 @@
 
 "type.shop.department_store" = "Department Store";
 
-"type.shop.doityourself" = "Home Improvement Store";
+"type.shop.doityourself" = "Hardware Store";
 
-"type.shop.dry_cleaning" = "Dry Cleaner";
+"type.shop.dry_cleaning" = "Dry Cleaning";
 
-"type.shop.electronics" = "Electronics Shop";
+"type.shop.electronics" = "Electronics";
 
 "type.shop.erotic" = "Erotic Shop";
 
@@ -3337,13 +3327,13 @@
 
 "type.shop.fashion_accessories" = "Vifaa vya Mtindo";
 
-"type.shop.florist" = "Florist";
+"type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
 
 "type.shop.furniture" = "Furniture Store";
 
-"type.shop.garden_centre" = "Garden Center";
+"type.shop.garden_centre" = "Garden Store";
 
 "type.shop.gas" = "Duka la gesi";
 
@@ -3365,7 +3355,7 @@
 
 "type.shop.houseware" = "Duka la Vifaa vya Nyumbani";
 
-"type.shop.jewelry" = "Jewelry Store";
+"type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
@@ -3377,7 +3367,7 @@
 
 "type.shop.massage" = "Massage Salon";
 
-"type.shop.mobile_phone" = "Cell Phone Store";
+"type.shop.mobile_phone" = "Cell Phones";
 
 "type.shop.money_lender" = "Money Lender";
 
@@ -3387,13 +3377,13 @@
 
 "type.shop.music" = "Record Store";
 
-"type.shop.musical_instrument" = "Musical Instrument Shop";
+"type.shop.musical_instrument" = "Musical Instruments";
 
 "type.shop.newsagent" = "Newspaper Stand";
 
-"type.shop.optician" = "Optician";
+"type.shop.optician" = "Optician’s";
 
-"type.shop.outdoor" = "Outdoor Equipment Shop";
+"type.shop.outdoor" = "Outdoor Equipment";
 
 "type.shop.outpost" = "Sehemu ya kuchukua";
 
@@ -3407,13 +3397,13 @@
 
 "type.shop.photo" = "Photo Shop";
 
-"type.shop.seafood" = "Fishmonger";
+"type.shop.seafood" = "Seafood Shop";
 
 "type.shop.second_hand" = "Duka la Mitumba";
 
-"type.shop.shoes" = "Shoe Shop";
+"type.shop.shoes" = "Shoe Store";
 
-"type.shop.sports" = "Sports Shop";
+"type.shop.sports" = "Sports Goods";
 
 "type.shop.stationery" = "Stationery Shop";
 
@@ -3421,7 +3411,7 @@
 
 "type.shop.tattoo" = "Tattoo Parlour";
 
-"type.shop.tea" = "Tea Shop";
+"type.shop.tea" = "Tea Store";
 
 "type.shop.ticket" = "Ticket Shop";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Duka la vifaa";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Duka la Sanaa";
 
 "type.shop.baby_goods" = "Duka la watoto";
@@ -3563,19 +3552,19 @@
 
 "type.tourism" = "Tourism";
 
-"type.tourism.alpine_hut" = "Alpine Lodging";
+"type.tourism.alpine_hut" = "Mountains Lodging";
 
-"type.tourism.apartment" = "Holiday Apartment";
+"type.tourism.apartment" = "Apartments";
 
 "type.tourism.artwork" = "Artwork";
 
-"type.tourism.artwork.architecture" = "Architectural Artwork";
+"type.tourism.artwork.architecture" = "Artwork";
 
-"type.tourism.artwork.painting" = "Painting";
+"type.tourism.artwork.painting" = "Artwork";
 
-"type.tourism.artwork.sculpture" = "Sculpture";
+"type.tourism.artwork.sculpture" = "Artwork";
 
-"type.tourism.artwork.statue" = "Statue";
+"type.tourism.artwork.statue" = "Artwork";
 
 "type.tourism.attraction" = "Attraction";
 
@@ -3583,13 +3572,13 @@
 
 "type.tourism.attraction.specified" = "Attraction";
 
-"type.tourism.camp_site" = "Campground";
+"type.tourism.camp_site" = "Camping";
 
 "type.tourism.caravan_site" = "RV Park";
 
 "type.tourism.chalet" = "Chalet";
 
-"type.tourism.gallery" = "Art Gallery";
+"type.tourism.gallery" = "Gallery";
 
 "type.tourism.guest_house" = "Guest House";
 
@@ -3633,7 +3622,7 @@
 
 "type.waterway.canal" = "Canal";
 
-"type.waterway.canal.tunnel" = "Canal Tunnel";
+"type.waterway.canal.tunnel" = "Canal";
 
 "type.waterway.dam" = "Dam";
 
@@ -3655,13 +3644,13 @@
 
 "type.waterway.riverbank" = "River";
 
-"type.waterway.stream" = "Stream";
+"type.waterway.stream" = "River";
 
-"type.waterway.stream.ephemeral" = "Ephemeral Stream";
+"type.waterway.stream.ephemeral" = "River";
 
-"type.waterway.stream.intermittent" = "Intermittent Stream";
+"type.waterway.stream.intermittent" = "River";
 
-"type.waterway.stream.tunnel" = "Stream";
+"type.waterway.stream.tunnel" = "River";
 
 "type.waterway.waterfall" = "Waterfall";
 
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Building";
+
 "type.amenity.events_venue" = "Ukumbi wa Matukio";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index a63f3d7a5e..fd35fd6926 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "ตำแหน่งของฉัน";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "ภายหลัง";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "สำหรับ RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "กำลังโหลดบุ๊กมาร์ก";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "ที่อยู่/บล็อค";
-
-"type.addr_interpolation.even" = "ที่อยู่/บล็อค";
-
-"type.addr_interpolation.odd" = "ที่อยู่/บล็อค";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "ร้านอาหาร";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "เครื่องชำระค่าที่จอดรถอัตโนมัติ";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "สัตวแพทย์";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "อาคาร";
 
-"type.building.has_parts" = "อาคาร";
-
-"type.building_part" = "อาคาร";
-
 "type.building.garage" = "อาคารจอดรถ";
 
+"type.building.has_parts" = "อาคาร";
+
 "type.building.train_station" = "สถานีรถไฟ";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "ช่างภาพ";
 
-"type.shop.camera" = "ร้านกล้อง";
-
 "type.craft.plumber" = "ช่างประปา";
 
 "type.craft.sawmill" = "ซูเมล";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "หอสื่อสาร";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "ก๊อกน้ำ";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "เครื่องกำเนิดพลังงานแสงอาทิตย์";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "ร้านเครื่องใช้ไฟฟ้า";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "ร้านศิลปะ";
 
 "type.shop.baby_goods" = "ร้านขายของสำหรับเด็ก";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "อาคาร";
+
 "type.amenity.events_venue" = "สถานที่จัดงาน";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index bbf845828a..183e776888 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Konumum";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Daha sonra";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Adres/Blok";
-
-"type.addr_interpolation.even" = "Adres/Blok";
-
-"type.addr_interpolation.odd" = "Adres/Blok";
-
 "type.aerialway" = "Teleferik";
 
 "type.aerialway.cable_car" = "Teleferik";
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Otopark Fişi";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Bina";
 
-"type.building.has_parts" = "Bina";
-
-"type.building_part" = "Bina";
-
 "type.building.garage" = "Garaj";
 
+"type.building.has_parts" = "Bina";
+
 "type.building.train_station" = "Tren İstasyonu";
 
 "type.building.warehouse" = "Depo";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Fotoğraf Stüdyosu";
 
-"type.shop.camera" = "Kamera Dükkanı";
-
 "type.craft.plumber" = "Tesisatçı";
 
 "type.craft.sawmill" = "Kereste Fabrikası";
@@ -2327,7 +2317,7 @@
 
 "type.landuse.construction" = "Yapı";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Çiftlik";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Beyaz eşya dükkanı";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Sanat Mağazası";
 
 "type.shop.baby_goods" = "Çocuk mağazası";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Kızak Pisti";
 
+"type.building_part" = "Bina";
+
 "type.amenity.events_venue" = "Etkinlik mekanı";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 57cd31c3c1..112277fcdf 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Моє місцезнаходження";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Не зараз";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Для автобудинків";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Завантаження мiток";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1237,7 +1237,7 @@
 "instagram_url" = "https://www.instagram.com/organicmaps.app";
 
 /* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
-"translated_om_site_url" = "https://organicmaps.app/uk/";
+"translated_om_site_url" = "https://organicmaps.app/";
 
 /* Link to OSM wiki for Editor, Profile and About pages */
 "osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Uk:Про_проект";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Адреса/блок";
-
-"type.addr_interpolation.even" = "Адреса/блок";
-
-"type.addr_interpolation.odd" = "Адреса/блок";
-
 "type.aerialway" = "Канатна дорога";
 
 "type.aerialway.cable_car" = "Канатна дорога";
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Будівля";
 
-"type.building.has_parts" = "Будівля";
-
-"type.building_part" = "Будівля";
-
 "type.building.garage" = "Гараж";
 
+"type.building.has_parts" = "Будівля";
+
 "type.building.train_station" = "Залізничний вокзал";
 
 "type.building.warehouse" = "Склад";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Фотограф";
 
-"type.shop.camera" = "Магазин фотоапаратів";
-
 "type.craft.plumber" = "Сантехнік";
 
 "type.craft.sawmill" = "Лісопильня";
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Магазин побутової техніки";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Магазин мистецтв";
 
 "type.shop.baby_goods" = "Дитячий магазин";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Траса для санок";
 
+"type.building_part" = "Будівля";
+
 "type.amenity.events_venue" = "Місце проведення подій";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 05a0ad43bb..6d17d8765d 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "Vị trí của Tôi";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "Để sau";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "Đối với RV";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Tải Điểm đánh dấu";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "Địa chỉ/Khối";
-
-"type.addr_interpolation.even" = "Địa chỉ/Khối";
-
-"type.addr_interpolation.odd" = "Địa chỉ/Khối";
-
 "type.aerialway" = "Aerialway";
 
 "type.aerialway.cable_car" = "Cable Car";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "Quán ăn";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "Máy trả tiền vé đậu xe";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "Bác sĩ Thú y";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "Tòa nhà";
 
-"type.building.has_parts" = "Tòa nhà";
-
-"type.building_part" = "Tòa nhà";
-
 "type.building.garage" = "Gara";
 
+"type.building.has_parts" = "Tòa nhà";
+
 "type.building.train_station" = "Đường tàu hỏa";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "Thợ chụp ảnh";
 
-"type.shop.camera" = "Cửa hàng máy ảnh";
-
 "type.craft.plumber" = "Thợ đường ống";
 
 "type.craft.sawmill" = "Sumel";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "Tháp truyền thông";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "Vòi nước";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "Máy phát điện năng lượng mặt trời";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3355,7 +3345,7 @@
 
 "type.shop.hairdresser" = "Tiệm làm tóc";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Cửa hàng phần cứng";
 
 "type.shop.health_food" = "Cửa hàng thực phẩm sức khỏe";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "Cửa hàng đồ gia dụng";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "Cửa hàng nghệ thuật";
 
 "type.shop.baby_goods" = "Cửa hàng trẻ em";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "Tòa nhà";
+
 "type.amenity.events_venue" = "Địa điểm tổ chức sự kiện";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 5b1e6ec74a..1eb5c7e558 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "我的位置";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "稍后";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -155,7 +155,7 @@
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @rv! */
 "rv" = "房车用";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in Organic Maps. If you don't have it installed you can download it here: https://omaps.app/get?kmz\n\nEnjoy travelling with Organic Maps!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from Organic Maps app. Please open them if you have Organic Maps installed. Or, if you don't, download the app for your iOS or Android device by following this link: https://omaps.app/get?kmz\n\nEnjoy traveling with Organic Maps!";
 
 /* message title of loading file */
 "load_kmz_title" = "加载书签";
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "地址/区块";
-
-"type.addr_interpolation.even" = "地址/区块";
-
-"type.addr_interpolation.odd" = "地址/区块";
-
 "type.aerialway" = "缆车要素";
 
 "type.aerialway.cable_car" = "缆车";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "餐馆";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "停车缴费机";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "兽医";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "建筑物";
 
-"type.building.has_parts" = "建筑物";
-
-"type.building_part" = "建筑物";
-
 "type.building.garage" = "独立1车库";
 
+"type.building.has_parts" = "建筑物";
+
 "type.building.train_station" = "火车站建筑";
 
 "type.building.warehouse" = "仓库";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "摄影棚";
 
-"type.shop.camera" = "相机店";
-
 "type.craft.plumber" = "管道工";
 
 "type.craft.sawmill" = "锯木厂";
@@ -2327,7 +2317,7 @@
 
 "type.landuse.construction" = "建设区域";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "农田";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "零售用地";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "家电店";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "艺术商店";
 
 "type.shop.baby_goods" = "儿童商店";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "建筑部分";
+
 "type.amenity.events_venue" = "活动场所";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index e45e4a0f52..21eb7f9f69 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -32,7 +32,7 @@
 /* A text for current gps location point/arrow selected on the map */
 "core_my_position" = "我的位置";
 
-/* Update maps later button text */
+/* Update maps later/Buy pro version later button text */
 "later" = "稍後";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
@@ -274,7 +274,7 @@
 "telegram" = "Telegram";
 
 /* Text in menu */
-"matrix" = "[Matrix]";
+"matrix" = "[matrix]";
 
 /* Text in menu */
 "mastodon" = "Mastodon";
@@ -1245,12 +1245,6 @@
 
 /********** Types **********/
 
-"type.addr_interpolation" = "地址/區塊";
-
-"type.addr_interpolation.even" = "地址/區塊";
-
-"type.addr_interpolation.odd" = "地址/區塊";
-
 "type.aerialway" = "纜車要素";
 
 "type.aerialway.cable_car" = "纜車";
@@ -1494,7 +1488,7 @@
 
 "type.recycling.green_waste" = "Green/Organic Waste";
 
-"type.recycling.cartons" = "Cartons";
+"type.recycling.cartons" = "Beverage Cartons";
 
 "type.amenity.restaurant" = "餐廳";
 
@@ -1530,7 +1524,7 @@
 
 "type.amenity.vending_machine.food" = "Food Dispenser";
 
-"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
+"type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
 "type.amenity.vending_machine.parking_tickets" = "違規停車罰單繳費機";
 
@@ -1542,7 +1536,7 @@
 
 "type.amenity.parcel_locker" = "Parcel Locker";
 
-"type.amenity.vending_machine.fuel" = "Fuel Pump";
+"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
 
 "type.amenity.veterinary" = "獸醫";
 
@@ -1638,12 +1632,10 @@
 
 "type.building.address" = "建築物";
 
-"type.building.has_parts" = "建築物";
-
-"type.building_part" = "建築物";
-
 "type.building.garage" = "車庫";
 
+"type.building.has_parts" = "建築物";
+
 "type.building.train_station" = "鐵道";
 
 "type.building.warehouse" = "Warehouse";
@@ -1683,8 +1675,6 @@
 
 "type.craft.photographer" = "攝影師";
 
-"type.shop.camera" = "相機店";
-
 "type.craft.plumber" = "水管工人";
 
 "type.craft.sawmill" = "鋸木廠";
@@ -2325,9 +2315,9 @@
 
 "type.landuse.commercial" = "Commercial Area";
 
-"type.landuse.construction" = "Construction Area";
+"type.landuse.construction" = "Construction";
 
-"type.landuse.education" = "Educational Facility";
+"type.landuse.education" = "Educational Facilities";
 
 "type.landuse.farm" = "Farm";
 
@@ -2375,7 +2365,7 @@
 
 "type.landuse.retail" = "Retail Area";
 
-"type.landuse.salt_pond" = "Salt Pond";
+"type.landuse.salt_pond" = "Pond";
 
 "type.landuse.village_green" = "Land";
 
@@ -2481,7 +2471,7 @@
 
 "type.man_made.tower.communication" = "通訊塔";
 
-"type.man_made.wastewater_plant" = "Wastewater Treatment Plant";
+"type.man_made.wastewater_plant" = "Wastewater treatment plant";
 
 "type.man_made.water_tap" = "水龍頭";
 
@@ -2671,7 +2661,7 @@
 
 "type.power" = "Power";
 
-"type.power.generator" = "Power Generator";
+"type.power.generator" = "Generator";
 
 "type.power.generator.solar" = "太陽能發電機";
 
@@ -2733,7 +2723,7 @@
 
 "type.railway.crossing" = "Railway Crossing";
 
-"type.railway.disused" = "Disused Railway";
+"type.railway.disused" = "Disused railway";
 
 "type.railway.funicular" = "Funicular";
 
@@ -3259,7 +3249,7 @@
 
 "type.railway.yard.tunnel" = "Railway Yard Tunnel";
 
-"type.route" = "Route";
+"type.route" = "route";
 
 "type.route.ferry" = "Ferry";
 
@@ -3445,7 +3435,6 @@
 
 "type.shop.appliance" = "家電店";
 
-/* maybe change to Art Gallery for en-US when supported */
 "type.shop.art" = "藝術商店";
 
 "type.shop.baby_goods" = "兒童商店";
@@ -3705,4 +3694,6 @@
 
 "type.piste_type.sled" = "Sledding Piste";
 
+"type.building_part" = "建築物";
+
 "type.amenity.events_venue" = "活動場所";
diff --git a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
index d5bb3603b6..d5e6814232 100644
--- a/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
+++ b/iphone/Maps/UI/Editor/AdditionalNames/MWMEditorAdditionalNamesTableViewController.mm
@@ -1,8 +1,6 @@
 #import "MWMEditorAdditionalNamesTableViewController.h"
 #import "MWMTableViewCell.h"
 
-#import <CoreApi/StringUtils.h>
-
 @interface MWMEditorAdditionalNamesTableViewController ()
 
 @property (weak, nonatomic) id<MWMEditorAdditionalNamesProtocol> delegate;
@@ -36,7 +34,7 @@ additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
 - (void)viewWillAppear:(BOOL)animated
 {
   [super viewWillAppear:animated];
-  auto const getIndex = [](std::string_view lang) { return StringUtf8Multilang::GetLangIndex(lang); };
+  auto const getIndex = [](std::string const & lang) { return StringUtf8Multilang::GetLangIndex(lang); };
   StringUtf8Multilang::Languages const & supportedLanguages = StringUtf8Multilang::GetSupportedLanguages();
   m_languages.clear();
 
@@ -67,9 +65,9 @@ additionalSkipLanguageCodes:(std::vector<NSInteger>)additionalSkipLanguageCodes
 {
   MWMTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"ListCellIdentifier"];
   NSInteger const index = indexPath.row;
-  StringUtf8Multilang::Lang const & lang = m_languages[index];
-  cell.textLabel.text = ToNSString(lang.m_name);
-  cell.detailTextLabel.text = ToNSString(lang.m_code);
+  StringUtf8Multilang::Lang const & language = m_languages[index];
+  cell.textLabel.text = @(language.m_name.c_str());
+  cell.detailTextLabel.text = @(language.m_code.c_str());
   cell.accessoryType = UITableViewCellAccessoryNone;
   return cell;
 }
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 4d37ba17c1..55a20bd0f0 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -525,7 +525,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
       osm::LocalizedName const & name = localizedNames[indexPath.row];
       [tCell configWithDelegate:self
                        langCode:name.m_code
-                       langName:ToNSString(name.m_langName)
+                       langName:@(name.m_langName)
                            name:@(name.m_name.c_str())
                    errorMessage:L(@"error_enter_correct_name")
                         isValid:isValid
@@ -546,7 +546,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
 
       [tCell configWithDelegate:self
                        langCode:langCode
-                       langName:ToNSString(StringUtf8Multilang::GetLangNameByCode(langCode))
+                       langName:@(StringUtf8Multilang::GetLangNameByCode(langCode))
                            name:@(name.c_str())
                    errorMessage:L(@"error_enter_correct_name")
                         isValid:isValid
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
index 0120536276..a94cddb255 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -141,13 +141,13 @@ class PlacePageInfoViewController: UIViewController {
       }
     }
     
-    if placePageInfoData.wikipedia != nil {
+    if let wikipedia = placePageInfoData.wikipedia {
       wikipediaView = createInfoItem(L("read_in_wikipedia"), icon: UIImage(named: "ic_placepage_wiki"), style: .link) { [weak self] in
         self?.delegate?.didPressWikipedia()
       }
     }
     
-    if placePageInfoData.wikimediaCommons != nil {
+    if let wikimediaCommons = placePageInfoData.wikimediaCommons {
       wikimediaCommonsView = createInfoItem(L("wikimedia_commons"), icon: UIImage(named: "ic_placepage_wikimedia_commons"), style: .link) { [weak self] in
         self?.delegate?.didPressWikimediaCommons()
       }
diff --git a/iphone/metadata/ar-SA/release_notes.txt b/iphone/metadata/ar-SA/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/ar-SA/release_notes.txt
+++ b/iphone/metadata/ar-SA/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/ca/release_notes.txt b/iphone/metadata/ca/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/ca/release_notes.txt
+++ b/iphone/metadata/ca/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/cs/release_notes.txt b/iphone/metadata/cs/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/cs/release_notes.txt
+++ b/iphone/metadata/cs/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/da/release_notes.txt b/iphone/metadata/da/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/da/release_notes.txt
+++ b/iphone/metadata/da/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/de-DE/release_notes.txt b/iphone/metadata/de-DE/release_notes.txt
index da6eea0b27..62a98a8707 100644
--- a/iphone/metadata/de-DE/release_notes.txt
+++ b/iphone/metadata/de-DE/release_notes.txt
@@ -1,15 +1,24 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• Neue OSM Kartendaten vom 29. März
+• Links zum OSM Wiki werden in der richtigen Sprache geöffnet
+• Bergauf und Bergab Symbole wurden durch eindeutigere Pfeile ersetzt
+• KML Lesezeichen mit Pfaddaten werden korrekt importiert
+• Die 3D Darstellung von Gebäuden wird im Energiesparmodus ausgeschaltet
+• [editor] Orte mit den Tags "music" und "musical_instruments können bearbeitet werden
+• Nähgeschäfte und  and Kurzwarengeschäfte sind mit der Suche auffindbar
+• Zwischen Supermarkt und kleineren Lebensmittelläden wird unterschieden
 
-Follow our news at omaps.org/news
+Aussehen
+• Neue Geschäftstypen: landwirtschaftliche Produkte, Weiße Ware (Kühlschränke, Waschmaschinen...), Bettengeschäft, Click&Collect, Gas, Schlüsseldienst Schlosser, Teppichladen, Motorradwerkstatt, Haustierpflege, Hi-Fi, Badezimmereinrichtung, Gardinengeschäft, Modeaccessoires (Bekleidungszubehör) Cannabis, Kräuterladen
+• Neu hinzugefügte Objekte: Geldtransfer, Fahrradladestationen, Kraftwerk
+• Beschriftungen für Hauptstädte mit einem Sternsymbol wurden obligatorisch gemacht
+• Die Farben von Parks, Wäldern und Buschland sind jetzt unterschiedlich
+• Symbole für Standorte an denen Metall verarbeitet wird wurden hinzugefügt
+• Verbesserte Darstellung von: Lifts, Seilbahnen, Stromleitungen, Zäunen
+• Barcelonas U-Bahn Sichtbarkeit wurde verringert
+• Höhenlinen werden nicht mehr über Gebäude, Straßen etc. gezeichnet
+
+Übersetzung:
+• Verbesserung der deutschen, türkischen, belarussischen und ungarischen Übersetzung
+• Verbesserung der arabischen TTS Ausgabe
+
+Bleib auf dem aktuellsten Stand unter: omaps.app/news
diff --git a/iphone/metadata/el/release_notes.txt b/iphone/metadata/el/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/el/release_notes.txt
+++ b/iphone/metadata/el/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/en-AU/release_notes.txt b/iphone/metadata/en-AU/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/en-AU/release_notes.txt
+++ b/iphone/metadata/en-AU/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/en-CA/release_notes.txt b/iphone/metadata/en-CA/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/en-CA/release_notes.txt
+++ b/iphone/metadata/en-CA/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/en-GB/release_notes.txt b/iphone/metadata/en-GB/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/en-GB/release_notes.txt
+++ b/iphone/metadata/en-GB/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/en-US/release_notes.txt b/iphone/metadata/en-US/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/en-US/release_notes.txt
+++ b/iphone/metadata/en-US/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/es-ES/release_notes.txt b/iphone/metadata/es-ES/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/es-ES/release_notes.txt
+++ b/iphone/metadata/es-ES/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/es-MX/release_notes.txt b/iphone/metadata/es-MX/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/es-MX/release_notes.txt
+++ b/iphone/metadata/es-MX/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/fi/release_notes.txt b/iphone/metadata/fi/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/fi/release_notes.txt
+++ b/iphone/metadata/fi/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/fr-CA/release_notes.txt b/iphone/metadata/fr-CA/release_notes.txt
index da6eea0b27..afc11b3552 100644
--- a/iphone/metadata/fr-CA/release_notes.txt
+++ b/iphone/metadata/fr-CA/release_notes.txt
@@ -1,15 +1,25 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• Nouvelles données OpenStreetMap du 29 Mars
+• Ajout de liens localisés pour la page wiki OpenStreetMap
+• Remplacement des icônes de montée et de descente par des flèches plus claires
+• Importation correcte des signets KML avec les données de la trace
+• Désactivation des préférences pour les bâtiments en 3D si l'économie d'énergie est activée
+• Les magasins de musique et d'instruments de musique peuvent être ajoutés à l'aide de l'éditeur
+• Les magasins de couture et les merceries peuvent être recherchés et ont une meilleure icône
+• La recherche d'un "supermarché" n'aboutit plus à des supérettes.
 
-Follow our news at omaps.org/news
+Styles
+
+• Nouveaux types de magasins : agricole, appareils électroménagers, literie, point de retrait, gaz, reproduction de clés, serrurier, tapis, réparation de motos, toilettage pour animaux, hi-fi, ameublement de salle de bain, rideaux, accessoires de mode, cannabis, herboristerie
+• Ajout du transfert d'argent, des stations de recharge de vélos, des centrales électriques
+• Légendes optionnelles pour la plupart des icônes de POI
+• Différenciation des couleurs des parcs, des forêts et des broussailles
+• Ajout d'icônes de construction en métal
+• Amélioration des voies aériennes, des téléphériques, des lignes électriques, des clôtures
+• Réduction de la visibilité du métro de Barcelone
+• Correction des courbes de niveaux dessinées sur les bâtiments, les routes, etc
+• Correction du rendu des éléments de type multiple (par exemple, certaines légendes de POI s'affichaient trop tôt)
+
+Traductions
+
+• Amélioration des traductions en allemand, turc, biélorusse et hongrois
+• Amélioration des instructions TTS en arabe
diff --git a/iphone/metadata/fr-FR/release_notes.txt b/iphone/metadata/fr-FR/release_notes.txt
index 67b75ed297..afc11b3552 100644
--- a/iphone/metadata/fr-FR/release_notes.txt
+++ b/iphone/metadata/fr-FR/release_notes.txt
@@ -1,14 +1,25 @@
-• Nouvelles données Openstreetmap du 3 Mai
-• Recherche d'adresses améliorée
-• Rendu de la couche métro plus rapide
-• Correction des codes postaux incorrects à Paris
-• Correction des liens Wikipédia manquants
-• Amélioration du routage
-• Traductions anglaises, allemandes, et brésiliennes améliorées
-• Ajout du guidage vocal pour le basque, marathi, norvégien et l'espagnol (Mexique)
-• Ajout de nouveau type de boutiques (magasin d'appareils photo, magasin de décoration d'intérieur, magasin d'antiquités et d'arts et fromagerie)
-• Mise à jour de l'icône des portes et l'icône du métro de Lyon
-• Correction de l'affichage des noms des routes sur la carte aux États-Unis
-• Amélioration de l'affichage des cours d'eau sur la carte
+• Nouvelles données OpenStreetMap du 29 Mars
+• Ajout de liens localisés pour la page wiki OpenStreetMap
+• Remplacement des icônes de montée et de descente par des flèches plus claires
+• Importation correcte des signets KML avec les données de la trace
+• Désactivation des préférences pour les bâtiments en 3D si l'économie d'énergie est activée
+• Les magasins de musique et d'instruments de musique peuvent être ajoutés à l'aide de l'éditeur
+• Les magasins de couture et les merceries peuvent être recherchés et ont une meilleure icône
+• La recherche d'un "supermarché" n'aboutit plus à des supérettes.
 
-Suivez nos actualités sur : omaps.org/fr/news
+Styles
+
+• Nouveaux types de magasins : agricole, appareils électroménagers, literie, point de retrait, gaz, reproduction de clés, serrurier, tapis, réparation de motos, toilettage pour animaux, hi-fi, ameublement de salle de bain, rideaux, accessoires de mode, cannabis, herboristerie
+• Ajout du transfert d'argent, des stations de recharge de vélos, des centrales électriques
+• Légendes optionnelles pour la plupart des icônes de POI
+• Différenciation des couleurs des parcs, des forêts et des broussailles
+• Ajout d'icônes de construction en métal
+• Amélioration des voies aériennes, des téléphériques, des lignes électriques, des clôtures
+• Réduction de la visibilité du métro de Barcelone
+• Correction des courbes de niveaux dessinées sur les bâtiments, les routes, etc
+• Correction du rendu des éléments de type multiple (par exemple, certaines légendes de POI s'affichaient trop tôt)
+
+Traductions
+
+• Amélioration des traductions en allemand, turc, biélorusse et hongrois
+• Amélioration des instructions TTS en arabe
diff --git a/iphone/metadata/he/release_notes.txt b/iphone/metadata/he/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/he/release_notes.txt
+++ b/iphone/metadata/he/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/hi/release_notes.txt b/iphone/metadata/hi/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/hi/release_notes.txt
+++ b/iphone/metadata/hi/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/hr/release_notes.txt b/iphone/metadata/hr/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/hr/release_notes.txt
+++ b/iphone/metadata/hr/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/hu/release_notes.txt b/iphone/metadata/hu/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/hu/release_notes.txt
+++ b/iphone/metadata/hu/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/id/release_notes.txt b/iphone/metadata/id/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/id/release_notes.txt
+++ b/iphone/metadata/id/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/it/release_notes.txt b/iphone/metadata/it/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/it/release_notes.txt
+++ b/iphone/metadata/it/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/ja/release_notes.txt b/iphone/metadata/ja/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/ja/release_notes.txt
+++ b/iphone/metadata/ja/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/ko/release_notes.txt b/iphone/metadata/ko/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/ko/release_notes.txt
+++ b/iphone/metadata/ko/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/ms/release_notes.txt b/iphone/metadata/ms/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/ms/release_notes.txt
+++ b/iphone/metadata/ms/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/nl-NL/release_notes.txt b/iphone/metadata/nl-NL/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/nl-NL/release_notes.txt
+++ b/iphone/metadata/nl-NL/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/no/release_notes.txt b/iphone/metadata/no/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/no/release_notes.txt
+++ b/iphone/metadata/no/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/pl/release_notes.txt b/iphone/metadata/pl/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/pl/release_notes.txt
+++ b/iphone/metadata/pl/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/pt-BR/release_notes.txt b/iphone/metadata/pt-BR/release_notes.txt
index 12297af96a..ee3603ac74 100644
--- a/iphone/metadata/pt-BR/release_notes.txt
+++ b/iphone/metadata/pt-BR/release_notes.txt
@@ -1,15 +1,25 @@
-• Novos dados OSM de 3 de maio
-• A busca oferece suporte a endereços interpolados
-• Renderização mais rápida da camada de metrô
-• Correção de CEPs incorretos em Paris
-• Correção de links ausentes da Wikipédia
-• Correção de roteamento de carros nas rotatórias
-• Melhoria de traduções para alemão, inglês e português (Brasil)
-• Ativação de TTS para basco, espanhol (México), marata, norueguês e português (Brasil)
-• Adição de loja de antiguidades, arte, câmeras, decoração de interiores e queijos
-• Alteração de ícone de portão
-• Atualização do ícone do metrô de Lyon
-• Correção de placas de identificação de estradas dos EUA
-• Correção na exibição de corpos d'água
+• Novos dados OSM de 29 de março
+• Adição de links localizados para a página da Wiki OSM
+• Substituição de ícones de subida e descida para setas melhores definidas
+• Importação correta de favoritos KML com dados de trilha
+• Desativação de edifícios 3D nas Configurações, se a economia de energia estiver ativada
+• O editor agora permite adicionar lojas de música e instrumentos musicais
+• As lojas de costura e de miudezas são pesquisáveis e têm um ícone melhor
+• Procurar um "supermercado" não resulta mais em lojas de conveniência
 
-Acompanhe nossas novidades em omaps.org/new
+Estilos
+• Novos tipos de loja: agrícola, acessórios de moda, cama, cannabis, chaveiro, cortina, eletrodomésticos, ervas, gás, móveis de banheiro, oficinas de motos, pet-shops, recolha de encomendas, serralheiro, som hi-fi e tapetes
+• Adição de estações de carregamento de bicicleta, transferência de dinheiro e usinas de energia
+• Legendas opcionais para a maioria dos ícones de pontos de interesse
+• Distinção das cores de arbustos, florestas e parques
+• Adição de ícones de construção de metal
+• Melhoria em caminhos aéreos, teleféricos, linhas de energia e cercas
+• Redução da visibilidade do metrô de Barcelona
+• Correção de isolinhas que eram desenhadas por cima de edifícios, estradas etc.
+• Correção da renderização de elementos multi-tipos (ex. algumas legendas de pontos de interesse eram mostradas muito cedo)
+
+Traduções:
+• Melhoria nas traduções de alemão, bielorrusso, húngaro e turco
+• Melhoria nas instruções TTS de árabe
+
+Acompanhe nossas novidades em omaps.app/news
diff --git a/iphone/metadata/pt-PT/release_notes.txt b/iphone/metadata/pt-PT/release_notes.txt
index 75e3869119..9a3e75c568 100644
--- a/iphone/metadata/pt-PT/release_notes.txt
+++ b/iphone/metadata/pt-PT/release_notes.txt
@@ -1,15 +1,25 @@
-• Novos dados OSM de 3 de maio
-• A busca oferece suporte à moradas interpoladas
-• Renderização mais rápida da camada de metro
-• Correção de códigos postais incorretos em Paris
-• Correção de links ausentes da Wikipédia
-• Correção de roteamento de carros nas rotundas
-• Melhoria de traduções para alemão, inglês e português (Brasil)
-• Ativação de TTS para basco, espanhol (México), marata, norueguês e português (Brasil)
-• Adição de loja de antiguidades, arte, câmeras, decoração de interiores e queijos
-• Alteração de ícone de portão
-• Atualização do ícone do metro de Lyon
-• Correção de placas de identificação de estradas dos EUA
-• Correção na exibição de corpos d'água
+• Novos dados OSM de 29 de março
+• Adição de links localizados para a página da Wiki OSM
+• Substituição de ícones de subida e descida para setas melhores definidas
+• Importação correta de favoritos KML com dados de trilha
+• Desativação de edifícios 3D nas Configurações, se a poupança de energia estiver ativada
+• O editor agora permite adicionar lojas de música e instrumentos musicais
+• As lojas de costura e de miudezas são pesquisáveis e têm um ícone melhor
+• Procurar um "supermercado" não resulta mais em lojas de conveniência
 
-Acompanhe nossas novidades em omaps.org/new
+Estilos
+• Novos tipos de loja: agrícola, acessórios de moda, cama, canábis, chaveiro, cortina, eletrodomésticos, ervas, gás, levantamento de encomendas, móveis de casa de banho, oficinas de motos, pet-shops, serralheiro, som hi-fi e tapetes
+• Adição de estações de carregamento de bicicleta, transferência de dinheiro e usinas de energia
+• Legendas opcionais para a maioria dos ícones de pontos de interesse
+• Distinção das cores de arbustos, florestas e parques
+• Adição de ícones de construção de metal
+• Melhoria em caminhos aéreos, teleféricos, linhas de energia e cercas
+• Redução da visibilidade do metro de Barcelona
+• Correção de isolinhas que eram desenhadas por cima de edifícios, estradas etc.
+• Correção da renderização de elementos multi-tipos (ex. algumas legendas de pontos de interesse eram mostradas muito cedo)
+
+Traduções:
+• Melhoria nas traduções de alemão, bielorrusso, húngaro e turco
+• Melhoria nas instruções TTS de árabe
+
+Acompanhe nossas novidades em omaps.app/news
diff --git a/iphone/metadata/ro/release_notes.txt b/iphone/metadata/ro/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/ro/release_notes.txt
+++ b/iphone/metadata/ro/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/ru/release_notes.txt b/iphone/metadata/ru/release_notes.txt
index 64143045ac..6a613cf61f 100644
--- a/iphone/metadata/ru/release_notes.txt
+++ b/iphone/metadata/ru/release_notes.txt
@@ -1,15 +1,26 @@
-• Новые картографические данные OpenStreetMap за 3 мая
-• Реализован поиск чередующихся четных/нечетных номеров домов
-• Слой метро рисуется быстрее
-• Исправлены неправильные почтовые индексы в Париже
-• Появились некоторые отсутствующие ранее ссылки на Википедию
-• Исправлены автомаршруты через перекрестки с круговым движением
-• Улучшены переводы на английский, немецкий и бразильский языки
-• Включены голосовые инструкции для баскского, маратхи, норвежского, португальского (Бразилия), испанского (Мексика) языков
-• Добавлены магазины камер, интерьер-декора, антиквариата, искусства и сыра
-• Изменена иконка ворот
-• Изменена иконка метро Лиона
-• Исправлены иконки некоторых дорог между штатами
-• Исправлен приоритет водных зон
+• Новые данные OpenStreetMap по состоянию на 29 марта
+• Навигационные указания теперь правильно отображаются на iPad
+• Заменены иконки подъемов и спусков на более понятные стрелки
+• Исправлен импорт треков из некоторых KML файлов
+• 3D здания в настройках отключаются, если включено энергосбережение
+• Магазины музыки и музыкальных инструментов могут быть добавлены с помощью редактора
+• Швейные и галантерейные магазины доступны для поиска и имеют более понятную иконку
+• Поиск супермаркета больше не показывает универсамы
+• Добавлены локализованные ссылки для вики-страницы OpenStreetMap
 
-Следите за нашими новостями на omaps.org/ru/news
+Стили
+• Новые типы магазинов: аграрный, бытовая техника, кровать, аванпост, газ, кусачки, слесарь, ковер, ремонт мотоциклов, уход за животными, hi-fi, мебель для ванной, шторы, модные аксессуары, конопля, травник
+• Добавлены перевод денег, станции зарядки велосипедов, электростанция
+• Сделаны необязательными подписи для большинства иконок POI
+• Сделаны разными цвета парка, леса и кустарника
+• Добавлены иконки металлических конструкций
+• Улучшены воздушные пути, канатные дороги, линии электропередач, заборы
+• Уменьшена видимость метро Барселоны
+• Исправлены изолинии, которые рисуются над зданиями, дорогами и т.д.
+• Исправлена визуализация объектов нескольких типов (например, некоторые подписи POI отображались слишком рано)
+
+Переводы:
+• Улучшены немецкий, турецкий, белорусский, венгерский переводы
+• Улучшены арабские TTS-инструкции
+
+Следите за нашими новостями на omaps.app/ru/news
diff --git a/iphone/metadata/sk/release_notes.txt b/iphone/metadata/sk/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/sk/release_notes.txt
+++ b/iphone/metadata/sk/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/sv/release_notes.txt b/iphone/metadata/sv/release_notes.txt
index da6eea0b27..4e53b6af01 100644
--- a/iphone/metadata/sv/release_notes.txt
+++ b/iphone/metadata/sv/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Följ våra nyheter på omaps.app/news
diff --git a/iphone/metadata/th/release_notes.txt b/iphone/metadata/th/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/th/release_notes.txt
+++ b/iphone/metadata/th/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/tr/release_notes.txt b/iphone/metadata/tr/release_notes.txt
index 326d3d766d..e3a4a46602 100644
--- a/iphone/metadata/tr/release_notes.txt
+++ b/iphone/metadata/tr/release_notes.txt
@@ -1,11 +1,22 @@
-• 3 Mayıs tarihine ait yeni OpenStreetMap verileri
-• addr:interpolation adresleri artık aranabilir
-• Metro katmanı artık daha hızlı açılıyor
-• Eksik Vikipedi bağlantıları düzeltildi
-• Döner kavşaklardan geçen araç rotalarında bazı düzeltmeler yapıldı
-• Bazı cihazlarda ağ üzerinden konum algılama düzeltildi
-• Geçit simgesi değiştirildi
-• Fotoğraf makinesi mağazası, iç dekorasyon, antika, sanat, peynirci kategorileri eklendi
-• Su alanlarının önceliği düzeltildi
+Mutlu, Sağlıklı ve Huzur Dolu bir Ramazan dileriz.
 
-Gelişmelerimizi omaps.org/tr/news adresinden takip edebilirsiniz
+• 29 Mart tarihine ait yeni OpenStreetMap harita verileri
+• OpenStreetMap wiki bağlantıları artık Türkçe sayfalara yönlendiriyor
+• Yokuş yukarı ve aşağı simgeleri daha net oklarla değiştirildi
+• KML yer işaretleri artık yol kaydı verileriyle doğru bir şekilde içe aktarılıyor
+• Güç tasarrufu modundayken artık 3D yapılar devre dışı bırakılıyor
+• Müzik ve enstrüman kategorileri editör aracılığıyla haritaya eklenebilir
+• Dikiş dükkanları ve tuhafiyeler artık aranabilir
+• Süpermarket ve marketler birbirinden ayrıldı
+• Türkçe çeviriler iyileştirildi
+
+Stiller
+• Anahtarcı, çilingir, halıcı, motosiklet tamircisi, evcil hayvan bakımı, banyo mobilyası, perdeci, moda aksesuarları ve aktar gibi birçok yeni mağaza türleri eklendi
+• Para transferi, bisiklet şarj istasyonu ve enerji santrali kategorileri eklendi
+• Yıldız simgesi olan başkentler için başlık zorunlu hale getirildi
+• Park, orman ve çalılık renkleri artık farklı
+• Metal konstrüksiyon simgeleri eklendi
+• Hava yolları, teleferikler, elektrik hatları ve çitler iyileştirildi
+• Bina, yol vb. nesnelerin üzerinden geçen eş yükselti çizgileri (izohipsler) düzeltildi
+
+Gelişmelerimizi omaps.app/tr/news adresinden takip edebilirsiniz
diff --git a/iphone/metadata/uk/release_notes.txt b/iphone/metadata/uk/release_notes.txt
index 8f5cf2ea2a..79e2b6a3cb 100644
--- a/iphone/metadata/uk/release_notes.txt
+++ b/iphone/metadata/uk/release_notes.txt
@@ -1,15 +1,26 @@
-• Нові дані OSM станом на 3 травня
-• Пошук тепер знаходить парні та непарні інтерполовані адреси
-• Пришвидшення малювання схеми метро
-• Виправлення поштових індексів у Парижі
-• Виправлення зниклих посилань до Wikipedia
-• Виправлена навігації через кільце
-• Покращено англійський, німецький та бразильский переклади
-• Додані голосові підказки баскською, норвезькою, португальською (Бразія), іспанською (Мексика) та мовою маратхі
-• Додані магазини фототехніки, декору, антикваріату, мистецтва та сиру
-• Нова іконка воріт
-• Нові іконки станцій метро у Ліоні
-• Виправлення щитів доріг у США
-• Виправлення пріорітету водяних резервуарів
+• Нові дані OpenStreetMap станом на 29 березня
+• Навігаційні вказівки тепер правильно відображаються на iPad
+• Замінено іконки підйомів і спусків на більш зрозумілі стрілки
+• Виправлено імпорт треків із деяких KML файлів
+• 3D будівлі в налаштуваннях відключаються, якщо ввімкнено енергозбереження
+• Магазини музики та музичних інструментів можуть бути додані за допомогою редактора
+• Швейні та галантерейні магазини доступні для пошуку і мають більш зрозумілу іконку
+• Пошук супермаркету більше не показує універсами
+• Додано локалізовані посилання для вікі-сторінки OpenStreetMap
 
-Слідкуйте за нашими новинами на omaps.org/news
+Стилі
+• Нові типи магазинів: аграрний, побутова техніка, ліжко, аванпост, газ, кусачки, слюсар, килим, ремонт мотоциклів, догляд за тваринами, hi-fi, меблі для ванної, штори, модні аксесуари, коноплі, травник
+• Додано переказ грошей, станції зарядки велосипедів, електростанцію
+• Зроблено необов'язковими підписи для більшості іконок POI
+• Зроблено різними кольори парку, лісу та чагарнику
+• Додано іконки металевих конструкцій
+• Покращено повітряні шляхи, канатні дороги, лінії електропередач, паркани
+• Зменшено видимість метро Барселони
+• Виправлено ізолінії, які малюються над будівлями, дорогами і т.д.
+• Виправлено візуалізацію об'єктів кількох типів (наприклад, деякі підписи POI відображалися занадто рано)
+
+Переклади:
+• Покращено німецький, турецький, білоруський, угорський переклади
+• Покращено арабські TTS-інструкції
+
+Слідкуйте за нашими новинами на omaps.app/ru/news
diff --git a/iphone/metadata/vi/release_notes.txt b/iphone/metadata/vi/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/vi/release_notes.txt
+++ b/iphone/metadata/vi/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/zh-Hans/description.txt b/iphone/metadata/zh-Hans/description.txt
index 135472cec6..5cd7ce06c1 100644
--- a/iphone/metadata/zh-Hans/description.txt
+++ b/iphone/metadata/zh-Hans/description.txt
@@ -1,52 +1,39 @@
-•详细的离线地图，其中包含其他地图上不存在的地方
+• Detailed offline maps with places that don't exist on other maps
+• Cycling routes, hiking trails, and walking paths
+• Contour lines, elevation profiles, peaks, and slopes
+• Turn-by-turn walking, cycling, and car navigation with voice guidance
+• Fast offline search
+• Bookmark everything you need, import and share KML/KMZ (GPX is planned)
+• Dark mode to protect your eyes
+• … and many other features!
 
-•自行车路线、远足小径和步行道
+Organic Maps is pure and organic, made with love:
 
-•轮廓线、海拔剖面、山峰和斜坡
+• Respects your privacy
+• Saves your battery
+• No unexpected mobile data charges
 
-•带语音引导的逐向步行、骑自行车和汽车导航
+Organic Maps is free from trackers and other bad stuff:
 
-•快速离线搜索
+• No ads
+• No tracking
+• No data collection
+• No phoning home
+• No annoying registration
+• No mandatory tutorials
+• No noisy email spam
+• No push notifications
+• No crapware
+• No pesticides
 
-•将您需要的所有内容添加为书签，导入并共享KML/KMZ（计划GPX）
+At Organic Maps, we believe that privacy is a fundamental human right:
 
-•深色模式来保护你的眼睛
+• Organic Maps is an indie community-driven project
+• The code is open-sourced
+• The maps data is taken from OpenStreetMap, also community-driven project
+• We protect your privacy from Big Tech’s prying eyes
+• Stay safe no matter wherever you are
 
-• ...和许多其他功能！
+Reject surveillance, embrace your freedom, and support the community.
 
-有机地图是纯有机的，用爱制作：
-
-• 尊重您的隐私
-
-•节省您的电池
-
-•没有意外的移动数据费用
-
-有机地图没有跟踪器和其他坏东西：
-
-•无广告
-
-•没有跟踪
-
-•没有数据收集
-
-•不打电话回家
-
-•没有烦人的注册
-
-•没有强制性教程
-
-•没有噪音的电子邮件垃圾邮件
-
-•无推送通知
-
-•没有垃圾软件
-•无杀虫剂
-在有机地图，我们认为隐私是一项基本人权：
-•有机地图是一个独立社区驱动的项目
-•代码是开源的
-•地图数据取自OpenStreetMap，也是社区驱动的项目
-•我们保护您的隐私免受大科技公司的窥探
-•无论你身在何处，都要保持安全
-拒绝监视，拥抱你的自由，并支持社区。
-试试有机地图！
+Give Organic Maps a try!
diff --git a/iphone/metadata/zh-Hans/release_notes.txt b/iphone/metadata/zh-Hans/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/zh-Hans/release_notes.txt
+++ b/iphone/metadata/zh-Hans/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/iphone/metadata/zh-Hant/release_notes.txt b/iphone/metadata/zh-Hant/release_notes.txt
index da6eea0b27..fa3634c17b 100644
--- a/iphone/metadata/zh-Hant/release_notes.txt
+++ b/iphone/metadata/zh-Hant/release_notes.txt
@@ -1,15 +1,26 @@
-• New OpenStreetMap data as of May 3
-• Implemented search for interpolated odd/even house numbers
-• Faster rendering of subway layer
-• Fixed wrong postcodes in Paris
-• Fixed missing Wikipedia links
-• Fixed car routing via roundabouts
-• Improved English, German, and Brazil translations
-• Enabled TTS for Basque, Marathi, Norwegian, Portuguese (Brazil), Spanish (México)
-• Added camera shop, interior_decoration, antiques, art, cheese shop
-• Changed gate icon
-• Changed the Lyon subway icon
-• Fixed US road shields
-• Fixed priority of water areas
+• New OpenStreetMap data as of March 29
+• Navigation directions are now correctly displayed on iPad
+• Replaced uphill and downhill icons with more clear arrows
+• Correctly import KML bookmarks with track data
+• Disable 3D buildings preference if power saving is enabled
+• Music and music instruments shops can be added using Editor
+• Sewing shops and haberdasheries are searchable and have a better icon
+• Searching for a "supermarket" doesn't result in convenience stores anymore
+• Add localized links for the OSM wiki page
 
-Follow our news at omaps.org/news
+Styles
+• New shop types: agrarian, appliance, bed, outpost, gas, key cutter, locksmith, carpet, motorcycle repair, pet grooming, hi-fi, bathroom furnishing, curtain, fashion accessories, cannabis, herbalist
+• Added money transfer, bicycle charging stations, power plant
+• Made captions optional for most of POI icons
+• Made park, forest, and scrub colors different
+• Added metal construction icons
+• Improved aerial ways, cable cars, power lines, fences
+• Reduce Barcelona subway visibility
+• Fixed isolines that are drawn over buildings, roads, etc.
+• Fixed rendering of multiple-type features (e.g. some POI captions were displayed too early)
+
+Translations:
+• Improved German, Turkish, Belarusian, Hungarian translations
+• Improved Arabic TTS instructions
+
+Follow our news at omaps.app/news
diff --git a/kml/serdes.cpp b/kml/serdes.cpp
index 370920d338..8bb1b944a2 100644
--- a/kml/serdes.cpp
+++ b/kml/serdes.cpp
@@ -19,13 +19,13 @@ namespace kml
 {
 namespace
 {
-std::string_view constexpr kPlacemark = "Placemark";
-std::string_view constexpr kStyle = "Style";
-std::string_view constexpr kDocument = "Document";
-std::string_view constexpr kStyleMap = "StyleMap";
-std::string_view constexpr kStyleUrl = "styleUrl";
-std::string_view constexpr kPair = "Pair";
-std::string_view constexpr kExtendedData = "ExtendedData";
+std::string_view const kPlacemark = "Placemark";
+std::string_view const kStyle = "Style";
+std::string_view const kDocument = "Document";
+std::string_view const kStyleMap = "StyleMap";
+std::string_view const kStyleUrl = "styleUrl";
+std::string_view const kPair = "Pair";
+std::string_view const kExtendedData = "ExtendedData";
 std::string const kCompilation = "mwm:compilation";
 
 std::string_view const kCoordinates = "coordinates";
@@ -180,28 +180,8 @@ uint32_t ToRGBA(Channel red, Channel green, Channel blue, Channel alpha)
          static_cast<uint8_t>(blue) << 8 | static_cast<uint8_t>(alpha);
 }
 
-void SaveStringWithCDATA(KmlWriter::WriterWrapper & writer, std::string s)
+void SaveStringWithCDATA(KmlWriter::WriterWrapper & writer, std::string const & s)
 {
-  if (s.empty())
-    return;
-
-  // Expat loads XML 1.0 only. Sometimes users copy and paste bookmark descriptions or even names from the web.
-  // Rarely, in these copy-pasted texts, there are invalid XML1.0 symbols.
-  // See https://en.wikipedia.org/wiki/Valid_characters_in_XML
-  // A robust solution requires parsing invalid XML on loading (then users can restore "bad" XML files), see
-  // https://github.com/organicmaps/organicmaps/issues/3837
-  // When a robust solution is implemented, this workaround can be removed for better performance/battery.
-  //
-  // This solution is a simple ASCII-range check that does not check symbols from other unicode ranges
-  // (they will require a more complex and slower approach of converting UTF-8 string to unicode first).
-  // It should be enough for many cases, according to user reports and wrong characters in their data.
-  s.erase(std::remove_if(s.begin(), s.end(), [](unsigned char c)
-  {
-    if (c >= 0x20 || c == 0x09 || c == 0x0a || c == 0x0d)
-      return false;
-    return true;
-  }), s.end());
-
   if (s.empty())
     return;
 
@@ -258,9 +238,8 @@ void SaveLocalizableString(KmlWriter::WriterWrapper & writer, LocalizableString
   writer << offsetStr << "</mwm:" << tagName << ">\n";
 }
 
-template <class StringViewLike>
 void SaveStringsArray(KmlWriter::WriterWrapper & writer,
-                      std::vector<StringViewLike> const & stringsArray,
+                      std::vector<std::string> const & stringsArray,
                       std::string const & tagName, std::string const & offsetStr)
 {
   if (stringsArray.empty())
@@ -270,14 +249,7 @@ void SaveStringsArray(KmlWriter::WriterWrapper & writer,
   for (auto const & s : stringsArray)
   {
     writer << offsetStr << kIndent2 << "<mwm:value>";
-    // Constants from our code do not need any additional checks or escaping.
-    if constexpr (std::is_same_v<StringViewLike, std::string_view>)
-    {
-      ASSERT_EQUAL(s.find_first_of("<&"), std::string_view::npos, ("Use std::string overload for", s));
-      writer << s;
-    }
-    else
-      SaveStringWithCDATA(writer, s);
+    SaveStringWithCDATA(writer, s);
     writer << "</mwm:value>\n";
   }
   writer << offsetStr << "</mwm:" << tagName << ">\n";
@@ -370,12 +342,14 @@ void SaveCategoryExtendedData(KmlWriter::WriterWrapper & writer, CategoryData co
 
   SaveStringsArray(writer, categoryData.m_toponyms, "toponyms", indent);
 
-  std::vector<std::string_view> languageCodes;
+  std::vector<std::string> languageCodes;
   languageCodes.reserve(categoryData.m_languageCodes.size());
   for (auto const & lang : categoryData.m_languageCodes)
-    if (auto const str = StringUtf8Multilang::GetLangByCode(lang); !str.empty())
-      languageCodes.push_back(str);
-
+  {
+    std::string str = StringUtf8Multilang::GetLangByCode(lang);
+    if (!str.empty())
+      languageCodes.push_back(std::move(str));
+  }
   SaveStringsArray(writer, languageCodes, "languageCodes", indent);
 
   SaveStringsMap(writer, categoryData.m_properties, "properties", indent);
@@ -501,7 +475,7 @@ void SaveBookmarkData(KmlWriter::WriterWrapper & writer, BookmarkData const & bo
 {
   writer << kIndent2 << "<Placemark>\n";
   writer << kIndent4 << "<name>";
-  auto const defaultLang = StringUtf8Multilang::GetLangByCode(kDefaultLangCode);
+  std::string const defaultLang = StringUtf8Multilang::GetLangByCode(kDefaultLangCode);
   SaveStringWithCDATA(writer, GetPreferredBookmarkName(bookmarkData, defaultLang));
   writer << "</name>\n";
 
@@ -680,7 +654,7 @@ bool ParsePointWithAltitude(std::string_view s, char const * delim,
 }
 }  // namespace
 
-KmlWriter::WriterWrapper & KmlWriter::WriterWrapper::operator<<(std::string_view str)
+KmlWriter::WriterWrapper & KmlWriter::WriterWrapper::operator<<(std::string const & str)
 {
   m_writer.Write(str.data(), str.length());
   return *this;
diff --git a/kml/serdes.hpp b/kml/serdes.hpp
index 0c8b7f2aea..54aa82ced5 100644
--- a/kml/serdes.hpp
+++ b/kml/serdes.hpp
@@ -25,7 +25,7 @@ public:
     explicit WriterWrapper(Writer & writer)
       : m_writer(writer)
     {}
-    WriterWrapper & operator<<(std::string_view str);
+    WriterWrapper & operator<<(std::string const & str);
   private:
     Writer & m_writer;
   };
diff --git a/kml/type_utils.cpp b/kml/type_utils.cpp
index be6979190e..c0ec27253e 100644
--- a/kml/type_utils.cpp
+++ b/kml/type_utils.cpp
@@ -67,7 +67,7 @@ std::string GetLocalizedFeatureType(std::vector<uint32_t> const & types)
   return platform::GetLocalizedTypeName(c.GetReadableObjectName(type));
 }
 
-std::string GetPreferredBookmarkName(BookmarkData const & bmData, std::string_view languageOrig)
+std::string GetPreferredBookmarkName(BookmarkData const & bmData, std::string const & languageOrig)
 {
   auto const languageNorm = languages::Normalize(languageOrig);
   std::string name = GetPreferredBookmarkStr(bmData.m_customName, languageNorm);
diff --git a/kml/type_utils.hpp b/kml/type_utils.hpp
index d5d1e70108..2b20d94236 100644
--- a/kml/type_utils.hpp
+++ b/kml/type_utils.hpp
@@ -102,7 +102,7 @@ template <class T> bool IsEqual(std::vector<T> const & lhs, std::vector<T> const
 }
 
 struct BookmarkData;
-std::string GetPreferredBookmarkName(BookmarkData const & bmData, std::string_view languageOrig);
+std::string GetPreferredBookmarkName(BookmarkData const & bmData, std::string const & languageOrig);
 std::string GetPreferredBookmarkStr(LocalizableString const & name, std::string const & languageNorm);
 std::string GetPreferredBookmarkStr(LocalizableString const & name, feature::RegionData const & regionData,
                                     std::string const & languageNorm);
diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt
index 2bd9dc7c6a..d291a9d01f 100644
--- a/map/CMakeLists.txt
+++ b/map/CMakeLists.txt
@@ -12,6 +12,7 @@ set(SRC
   bookmark_manager.cpp
   bookmark_manager.hpp
   bookmarks_search_params.hpp
+  caching_address_getter.hpp
   chart_generator.cpp
   chart_generator.hpp
   elevation_info.cpp
diff --git a/map/caching_address_getter.hpp b/map/caching_address_getter.hpp
new file mode 100644
index 0000000000..b85ef33b72
--- /dev/null
+++ b/map/caching_address_getter.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "search/reverse_geocoder.hpp"
+
+// TODO: get rid of this class when version 8.6 will not be supported.
+// TODO: because of fast algorithm and new mwm section which were implemented for 9.0.
+// Note: this class is NOT thread-safe.
+class CachingAddressGetter
+{
+public:
+  search::ReverseGeocoder::Address GetAddressAtPoint(DataSource const & dataSource,
+                                                     m2::PointD const & pt,
+                                                     double distanceThresholdMeters) const
+  {
+    if (pt.EqualDxDy(m_cache.m_point, kMwmPointAccuracy))
+      return m_cache.m_address;
+
+    m_cache.m_point = pt;
+    m_cache.m_address = {};
+
+    search::ReverseGeocoder const coder(dataSource);
+    coder.GetNearbyAddress(pt, distanceThresholdMeters, m_cache.m_address);
+
+    return m_cache.m_address;
+  }
+private:
+  struct Cache
+  {
+    m2::PointD m_point;
+    search::ReverseGeocoder::Address m_address;
+  };
+
+  mutable Cache m_cache;
+};
diff --git a/map/extrapolation_benchmark/extrapolation_benchmark.cpp b/map/extrapolation_benchmark/extrapolation_benchmark.cpp
index 3120f83642..834362d713 100644
--- a/map/extrapolation_benchmark/extrapolation_benchmark.cpp
+++ b/map/extrapolation_benchmark/extrapolation_benchmark.cpp
@@ -158,7 +158,7 @@ bool Parse(string const & pathToCsv, Tracks & tracks)
         return false;
       track.emplace_back(static_cast<double>(timestamp), lat, lon);
     }
-    tracks.push_back(std::move(track));
+    tracks.push_back(move(track));
   }
   csvStream.close();
   return true;
diff --git a/map/framework.cpp b/map/framework.cpp
index c00b5d602a..f502865e31 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -589,13 +589,10 @@ void Framework::FillTrackInfo(Track const & track, m2::PointD const & trackPoint
   info.SetMercator(trackPoint);
 }
 
-search::ReverseGeocoder::Address Framework::GetAddressAtPoint(m2::PointD const & pt) const
+search::ReverseGeocoder::Address Framework::GetAddressAtPoint(m2::PointD const & pt,
+                                                              double distanceThresholdMeters) const
 {
-  search::ReverseGeocoder const coder(m_featuresFetcher.GetDataSource());
-  search::ReverseGeocoder::Address addr;
-  /// @todo Call exact address manually here?
-  coder.GetNearbyAddress(pt, 0.5 /* maxDistanceM */, addr);
-  return addr;
+  return m_addressGetter.GetAddressAtPoint(m_featuresFetcher.GetDataSource(), pt, distanceThresholdMeters);
 }
 
 void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info) const
diff --git a/map/framework.hpp b/map/framework.hpp
index 7d2b82788c..8c090156c5 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -3,6 +3,7 @@
 #include "map/api_mark_point.hpp"
 #include "map/bookmark.hpp"
 #include "map/bookmark_manager.hpp"
+#include "map/caching_address_getter.hpp"
 #include "map/features_fetcher.hpp"
 #include "map/isolines_manager.hpp"
 #include "map/mwm_url.hpp"
@@ -599,7 +600,8 @@ private:
   void FillDescription(FeatureType & ft, place_page::Info & info) const;
 
 public:
-  search::ReverseGeocoder::Address GetAddressAtPoint(m2::PointD const & pt) const;
+  search::ReverseGeocoder::Address GetAddressAtPoint(m2::PointD const & pt,
+                                                     double distanceThresholdMeters = 0.5) const;
 
   /// Get "best for the user" feature at given point even if it's invisible on the screen.
   /// Ignores coastlines and prefers buildings over other area features.
@@ -714,6 +716,7 @@ public:
                   std::string const & note);
 
 private:
+  CachingAddressGetter m_addressGetter;
   settings::UsageStats m_usageStats;
 
 public:
diff --git a/map/gps_track.cpp b/map/gps_track.cpp
index dcba7a21a4..76a7d2b4d9 100644
--- a/map/gps_track.cpp
+++ b/map/gps_track.cpp
@@ -41,7 +41,7 @@ GpsTrack::GpsTrack(string const & filePath, size_t maxItemCount, hours duration,
   , m_duration(duration)
   , m_needClear(false)
   , m_needSendSnapshop(false)
-  , m_filter(std::move(filter))
+  , m_filter(move(filter))
   , m_threadExit(false)
   , m_threadWakeup(false)
 {
@@ -327,7 +327,7 @@ void GpsTrack::NotifyCallback(pair<size_t, size_t> const & addedIds, pair<size_t
     if (toAdd.empty())
       return; // nothing to send
 
-    m_callback(std::move(toAdd), make_pair(kInvalidId, kInvalidId));
+    m_callback(move(toAdd), make_pair(kInvalidId, kInvalidId));
   }
   else
   {
@@ -348,6 +348,6 @@ void GpsTrack::NotifyCallback(pair<size_t, size_t> const & addedIds, pair<size_t
     if (toAdd.empty() && evictedIds.first == kInvalidId)
       return; // nothing to send
 
-    m_callback(std::move(toAdd), evictedIds);
+    m_callback(move(toAdd), evictedIds);
   }
 }
diff --git a/map/map_tests/countries_names_tests.cpp b/map/map_tests/countries_names_tests.cpp
index 8ab2ac2fe5..a0cb710f0b 100644
--- a/map/map_tests/countries_names_tests.cpp
+++ b/map/map_tests/countries_names_tests.cpp
@@ -38,7 +38,7 @@ UNIT_TEST(CountriesNamesTest)
 
   auto & value = *handle.GetValue();
   TEST(value.HasSearchIndex(), ());
-  search::MwmContext const mwmContext(std::move(handle));
+  search::MwmContext const mwmContext(move(handle));
   base::Cancellable const cancellable;
   search::CategoriesCache cache(ftypes::IsLocalityChecker::Instance(), cancellable);
 
diff --git a/map/map_tests/gps_track_test.cpp b/map/map_tests/gps_track_test.cpp
index 9129d4155c..9cbd3befab 100644
--- a/map/map_tests/gps_track_test.cpp
+++ b/map/map_tests/gps_track_test.cpp
@@ -50,7 +50,7 @@ public:
   void OnUpdate(vector<pair<size_t, location::GpsTrackInfo>> && toAdd,
                 pair<size_t, size_t> const & toRemove)
   {
-    m_toAdd = std::move(toAdd);
+    m_toAdd = move(toAdd);
     m_toRemove = toRemove;
 
     lock_guard<mutex> lg(m_mutex);
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 932b15a012..37755e81d9 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -178,7 +178,7 @@ vector<RouteMarkData> DeserializeRoutePoints(string const & data)
       if (point.m_position.EqualDxDy(m2::PointD::Zero(), mercator::kPointEqualityEps))
         continue;
 
-      result.push_back(std::move(point));
+      result.push_back(move(point));
     }
 
     if (result.size() < 2)
@@ -298,7 +298,7 @@ drape_ptr<df::Subroute> CreateDrapeSubroute(vector<RouteSegment> const & segment
 }  // namespace
 
 RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
-  : m_callbacks(std::move(callbacks))
+  : m_callbacks(move(callbacks))
   , m_delegate(delegate)
   , m_extrapolator(
         [this](location::GpsInfo const & gpsInfo) { this->OnExtrapolatedLocationUpdate(gpsInfo); })
@@ -523,7 +523,7 @@ void RoutingManager::SetRouterImpl(RouterType type)
                                          m_routingSession, dataSource);
 
   m_routingSession.SetRoutingSettings(GetRoutingSettings(vehicleType));
-  m_routingSession.SetRouter(std::move(router), std::move(regionsFinder));
+  m_routingSession.SetRouter(move(router), move(regionsFinder));
   m_currentRouterType = type;
 }
 
@@ -613,7 +613,7 @@ void RoutingManager::CreateRoadWarningMarks(RoadWarningsCollection && roadWarnin
   if (roadWarnings.empty())
     return;
 
-  GetPlatform().RunTask(Platform::Thread::Gui, [this, roadWarnings = std::move(roadWarnings)]()
+  GetPlatform().RunTask(Platform::Thread::Gui, [this, roadWarnings = move(roadWarnings)]()
   {
     auto es = m_bmManager->GetEditSession();
     for (auto const & typeInfo : roadWarnings)
@@ -723,7 +723,7 @@ bool RoutingManager::InsertRoute(Route const & route)
 
   if (isTransitRoute)
   {
-    GetPlatform().RunTask(Platform::Thread::Gui, [transitRouteDisplay = std::move(transitRouteDisplay)]()
+    GetPlatform().RunTask(Platform::Thread::Gui, [transitRouteDisplay = move(transitRouteDisplay)]()
     {
       transitRouteDisplay->CreateTransitMarks();
     });
@@ -731,7 +731,7 @@ bool RoutingManager::InsertRoute(Route const & route)
 
   bool const hasWarnings = !roadWarnings.empty();
   if (hasWarnings && m_currentRouterType == RouterType::Vehicle)
-    CreateRoadWarningMarks(std::move(roadWarnings));
+    CreateRoadWarningMarks(move(roadWarnings));
 
   return hasWarnings;
 }
@@ -834,7 +834,7 @@ void RoutingManager::AddRoutePoint(RouteMarkData && markData)
   }
 
   markData.m_isVisible = !markData.m_isMyPosition;
-  routePoints.AddRoutePoint(std::move(markData));
+  routePoints.AddRoutePoint(move(markData));
   ReorderIntermediatePoints();
 }
 
@@ -1013,7 +1013,7 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
   for (auto const & point : routePoints)
     points.push_back(point.m_position);
 
-  m_routingSession.BuildRoute(Checkpoints(std::move(points)), timeoutSec);
+  m_routingSession.BuildRoute(Checkpoints(move(points)), timeoutSec);
 }
 
 void RoutingManager::SetUserCurrentPosition(m2::PointD const & position)
@@ -1116,9 +1116,9 @@ void RoutingManager::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine, bool is3dAl
   m_drapeEngine.SafeCall(&df::DrapeEngine::RequestSymbolsSize, symbols,
                          [this, is3dAllowed](map<string, m2::PointF> && sizes)
   {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, is3dAllowed, sizes = std::move(sizes)]() mutable
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, is3dAllowed, sizes = move(sizes)]() mutable
     {
-      m_transitSymbolSizes = std::move(sizes);
+      m_transitSymbolSizes = move(sizes);
 
       // In case of the engine reinitialization recover route.
       if (IsRoutingActive())
@@ -1301,7 +1301,7 @@ void RoutingManager::CancelRoutePointsTransaction(uint32_t transactionId)
   editSession.ClearGroup(UserMark::Type::ROUTING);
   RoutePointsLayout routePoints(*m_bmManager);
   for (auto & markData : routeMarks)
-    routePoints.AddRoutePoint(std::move(markData));
+    routePoints.AddRoutePoint(move(markData));
 }
 
 bool RoutingManager::HasSavedRoutePoints() const
@@ -1346,7 +1346,7 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
     }
 
     GetPlatform().RunTask(Platform::Thread::Gui,
-                          [this, handler, points = std::move(points)]() mutable
+                          [this, handler, points = move(points)]() mutable
     {
       ASSERT(m_bmManager != nullptr, ());
       // If we have found my position, we use my position as start point.
@@ -1361,11 +1361,11 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
           startPt.m_pointType = RouteMarkType::Start;
           startPt.m_isMyPosition = true;
           startPt.m_position = myPosMark.GetPivot();
-          AddRoutePoint(std::move(startPt));
+          AddRoutePoint(move(startPt));
         }
         else
         {
-          AddRoutePoint(std::move(p));
+          AddRoutePoint(move(p));
         }
       }
 
@@ -1389,7 +1389,7 @@ void RoutingManager::SaveRoutePoints()
     return;
   }
 
-  GetPlatform().RunTask(Platform::Thread::File, [points = std::move(points)]()
+  GetPlatform().RunTask(Platform::Thread::File, [points = move(points)]()
   {
     try
     {
diff --git a/map/transit/transit_reader.cpp b/map/transit/transit_reader.cpp
index 480071ca19..e46019fbcd 100644
--- a/map/transit/transit_reader.cpp
+++ b/map/transit/transit_reader.cpp
@@ -50,7 +50,7 @@ void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId,
   else
   {
     m_loadSubset = true;
-    m_transitInfo = std::move(transitInfo);
+    m_transitInfo = move(transitInfo);
   }
   m_success = false;
 }
@@ -191,7 +191,7 @@ void ReadTransitTask::Reset()
 
 unique_ptr<TransitDisplayInfo> && ReadTransitTask::GetTransitInfo()
 {
-  return std::move(m_transitInfo);
+  return move(m_transitInfo);
 }
 
 void ReadTransitTask::FillLinesAndRoutes(::transit::experimental::TransitData const & transitData)
@@ -462,8 +462,8 @@ bool TransitReadManager::GetTransitDisplayInfo(TransitDisplayInfos & transitDisp
   {
     auto const & mwmId = mwmTransitPair.first;
     auto task = make_unique<ReadTransitTask>(m_dataSource, m_readFeaturesFn);
-    task->Init(groupId, mwmId, std::move(mwmTransitPair.second));
-    transitTasks[mwmId] = std::move(task);
+    task->Init(groupId, mwmId, move(mwmTransitPair.second));
+    transitTasks[mwmId] = move(task);
   }
 
   lock.lock();
diff --git a/openlr/candidate_paths_getter.cpp b/openlr/candidate_paths_getter.cpp
index 7e1cf3d728..55b6ca3bed 100644
--- a/openlr/candidate_paths_getter.cpp
+++ b/openlr/candidate_paths_getter.cpp
@@ -254,7 +254,7 @@ void CandidatePathsGetter::GetBestCandidatePaths(
     if (!isLastPoint)
       reverse(begin(edges), end(edges));
 
-    candidates.emplace_back(std::move(edges));
+    candidates.emplace_back(move(edges));
   }
 }
 
diff --git a/openlr/openlr_decoder.cpp b/openlr/openlr_decoder.cpp
index 65dcd59ac8..fdda6dcdd4 100644
--- a/openlr/openlr_decoder.cpp
+++ b/openlr/openlr_decoder.cpp
@@ -221,7 +221,7 @@ class SegmentsDecoderV2
 {
 public:
   SegmentsDecoderV2(DataSource & dataSource, unique_ptr<CarModelFactory> cmf)
-    : m_dataSource(dataSource), m_graph(dataSource, std::move(cmf)), m_infoGetter(dataSource)
+    : m_dataSource(dataSource), m_graph(dataSource, move(cmf)), m_infoGetter(dataSource)
   {
   }
 
@@ -310,7 +310,7 @@ class SegmentsDecoderV3
 {
 public:
   SegmentsDecoderV3(DataSource & dataSource, unique_ptr<CarModelFactory> carModelFactory)
-      : m_dataSource(dataSource), m_graph(dataSource, std::move(carModelFactory)), m_infoGetter(dataSource)
+      : m_dataSource(dataSource), m_graph(dataSource, move(carModelFactory)), m_infoGetter(dataSource)
   {
   }
 
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
index c81be4ba86..8f4f4cc24d 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
@@ -152,10 +152,8 @@ public:
     {
       if (ft.GetGeomType() != feature::GeomType::Line)
         return;
-
-      /// @todo Transported (railway=rail) are also present here :)
       auto const roadClass = ftypes::GetHighwayClass(feature::TypesHolder(ft));
-      if (roadClass == ftypes::HighwayClass::Undefined ||
+      if (roadClass == ftypes::HighwayClass::Error ||
           roadClass == ftypes::HighwayClass::Pedestrian)
       {
         return;
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
index 9020535baa..4a2adeef9a 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
@@ -102,8 +102,8 @@ TrafficMode::TrafficMode(std::string const & dataFileName, DataSource const & da
                          QObject * parent)
   : QAbstractTableModel(parent)
   , m_dataSource(dataSource)
-  , m_drawerDelegate(std::move(drawerDelegate))
-  , m_pointsDelegate(std::move(pointsDelegate))
+  , m_drawerDelegate(move(drawerDelegate))
+  , m_pointsDelegate(move(pointsDelegate))
 {
   // TODO(mgsergio): Collect stat how many segments of each kind were parsed.
   pugi::xml_document doc;
diff --git a/openlr/score_candidate_paths_getter.cpp b/openlr/score_candidate_paths_getter.cpp
index 92985a3413..29e80c7180 100644
--- a/openlr/score_candidate_paths_getter.cpp
+++ b/openlr/score_candidate_paths_getter.cpp
@@ -176,7 +176,7 @@ void ScoreCandidatePathsGetter::GetAllSuitablePaths(ScoreEdgeVec const & startLi
 
     if (u->m_distanceM + currentEdgeLen >= bearDistM)
     {
-      allPaths.emplace_back(std::move(u));
+      allPaths.emplace_back(move(u));
       continue;
     }
 
@@ -281,7 +281,7 @@ void ScoreCandidatePathsGetter::GetBestCandidatePaths(vector<shared_ptr<Link>> c
     if (!isLastPoint)
       reverse(edges.begin(), edges.end());
 
-    candidates.emplace_back(path.GetScore(), std::move(edges));
+    candidates.emplace_back(path.GetScore(), move(edges));
   }
 }
 
diff --git a/openlr/score_paths_connector.cpp b/openlr/score_paths_connector.cpp
index 5cd76f7e3b..187aa4344c 100644
--- a/openlr/score_paths_connector.cpp
+++ b/openlr/score_paths_connector.cpp
@@ -46,8 +46,6 @@ public:
     }
     else
     {
-      CHECK(hwClass != ftypes::HighwayClass::Undefined, (edge));
-
       m_minHwClass = static_cast<ftypes::HighwayClass>(
           min(base::Underlying(m_minHwClass), base::Underlying(hwClass)));
       m_maxHwClass = static_cast<ftypes::HighwayClass>(
@@ -179,7 +177,7 @@ bool ScorePathsConnector::FindBestPath(vector<LocationReferencePoint> const & po
 
         auto const score = pathLenScore + GetScoreForUniformity(path) +
                            fromCandidates[fromInd].m_score + toCandidates[toInd].m_score;
-        result.emplace_back(score, std::move(path));
+        result.emplace_back(score, move(path));
       }
     }
 
diff --git a/packaging/app.organicmaps.desktop.metainfo.xml b/packaging/app.organicmaps.desktop.metainfo.xml
index c748e082a8..cd59daf85e 100644
--- a/packaging/app.organicmaps.desktop.metainfo.xml
+++ b/packaging/app.organicmaps.desktop.metainfo.xml
@@ -113,32 +113,6 @@
   </screenshots>
 
   <releases>
-   <release version="2023.05.08-7" date="2023-05-08">
-     <description>
-       <p>Highlights:</p>
-         <ul>
-           <li>New OpenStreetMap data as of May 3</li>
-           <li>Fixed OpenGL issues on some devices</li>
-           <li>Search supports addr:interpolation addresses</li>
-           <li>Faster rendering of subway layer</li>
-           <li>Fixed wrong postcodes in Paris</li>
-           <li>Fixed missing Wikipedia links</li>
-           <li>Fixed car routing via roundabouts</li>
-         </ul>
-       <p>Map Styles:</p>
-         <ul>
-           <li>Changed gate icon</li>
-           <li>Changed Lyon subway icon</li>
-           <li>Fixed US road shields</li>
-           <li>Fixed priority of water areas</li>
-           <li>Added camera shop, interior_decoration, antiques, art, cheese shop</li>
-         </ul>
-       <p>Translations:</p>
-         <ul>
-           <li>Improved English, German, Brazilian Portuguese translations</li>
-         </ul>
-     </description>
-   </release>
    <release version="2023.04.02-7" date="2023-04-02">
      <description>
        <p>Highlights:</p>
diff --git a/platform/http_client_curl.cpp b/platform/http_client_curl.cpp
index b135c79c0f..b01280fe5f 100644
--- a/platform/http_client_curl.cpp
+++ b/platform/http_client_curl.cpp
@@ -268,7 +268,7 @@ bool HttpClient::RunHttpRequest()
       }
     }
   }
-  m_headers.emplace("Set-Cookie", NormalizeServerCookies(std::move(serverCookies)));
+  m_headers.emplace("Set-Cookie", NormalizeServerCookies(move(serverCookies)));
 
   if (m_urlReceived.empty())
   {
@@ -295,8 +295,8 @@ bool HttpClient::RunHttpRequest()
 
     m_errorCode = redirect.ErrorCode();
     m_urlReceived = redirect.UrlReceived();
-    m_headers = std::move(redirect.m_headers);
-    m_serverResponse = std::move(redirect.m_serverResponse);
+    m_headers = move(redirect.m_headers);
+    m_serverResponse = move(redirect.m_serverResponse);
   }
 
   for (auto const & header : headers)
diff --git a/platform/languages.hpp b/platform/languages.hpp
index 7d579ffcd3..bd73c588e8 100644
--- a/platform/languages.hpp
+++ b/platform/languages.hpp
@@ -6,50 +6,49 @@
 
 // The list of languages which can be used by TTS.
 // It shall be included in Android (jni) and iOS parts to get the languages list.
-// TODO: Now it is used only on iOS.
-// Manual sync with android/res/values/strings-tts.xml is needed.
 
-namespace routing::turns::sound
+namespace routing
 {
-std::array<std::pair<std::string, std::string>, 38> const kLanguageList =
+namespace turns
+{
+namespace sound
+{
+std::array<std::pair<std::string, std::string>, 33> const kLanguageList =
 {{
   {"en", "English"},
-  {"id", "Bahasa Indonesia"},
+  {"ru", "Русский"},
+  {"be", "Беларуская"},
   {"ca", "Català"},
+  {"cs", "Čeština"},
   {"da", "Dansk"},
   {"de", "Deutsch"},
   {"es", "Español"},
-  {"es-MX", "Español (México)"},
-  {"eu", "Euskara"},
   {"fr", "Français"},
   {"hr", "Hrvatski"},
+  {"id", "Indonesia"},
   {"it", "Italiano"},
   {"sw", "Kiswahili"},
   {"hu", "Magyar"},
   {"nl", "Nederlands"},
-  {"nb", "Norsk Bokmål"},
   {"pl", "Polski"},
   {"pt", "Português"},
-  {"pt-BR", "Português (Brasil)"},
   {"ro", "Română"},
   {"sk", "Slovenčina"},
   {"fi", "Suomi"},
   {"sv", "Svenska"},
   {"vi", "Tiếng Việt"},
   {"tr", "Türkçe"},
-  {"cs", "Čeština"},
   {"el", "Ελληνικά"},
-  {"be", "Беларуская"},
-  {"ru", "Русский"},
   {"uk", "Українська"},
   {"ar", "العربية"},
   {"fa", "فارسی"},
-  {"mr", "मराठी"},
   {"hi", "हिंदी"},
-  {"th", "ไทย"},
-  {"zh-Hans", "中文简体"},
-  {"zh-Hant", "中文繁體"},
   {"ja", "日本語"},
   {"ko", "한국어"},
+  {"th", "ภาษาไทย"},
+  {"zh-Hant", "中文繁體"},
+  {"zh-Hans", "中文简体"},
 }};
-}  // namespace routing::turns::sound
+}  // namespace sound
+}  // namespace turns
+}  // namespace routing
diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp
index a86fcdf93b..205798c279 100644
--- a/platform/preferred_languages.cpp
+++ b/platform/preferred_languages.cpp
@@ -152,9 +152,9 @@ std::string GetCurrentOrig()
     return arr[0];
 }
 
-std::string Normalize(std::string_view lang)
+std::string Normalize(std::string const & lang)
 {
-  return std::string{lang.substr(0, lang.find_first_of("-_ "))};
+  return lang.substr(0, lang.find_first_of("-_ "));
 }
 
 std::string GetCurrentNorm()
diff --git a/platform/preferred_languages.hpp b/platform/preferred_languages.hpp
index 2288eeda9d..4d3dc222e6 100644
--- a/platform/preferred_languages.hpp
+++ b/platform/preferred_languages.hpp
@@ -19,6 +19,6 @@ std::string GetCurrentTwine();
 /// Returned languages are normalized to our supported languages in the core, see
 /// string_utf8_multilang.cpp and should not be used with any sub-locales like zh-Hans/zh-Hant. Some
 /// langs like Danish (da) are not supported in the core too, but used as a locale.
-std::string Normalize(std::string_view lang);
+std::string Normalize(std::string const & lang);
 std::string GetCurrentNorm();
 }  // namespace languages
diff --git a/platform/string_storage_base.cpp b/platform/string_storage_base.cpp
index b8e9c793db..edd6fc1466 100644
--- a/platform/string_storage_base.cpp
+++ b/platform/string_storage_base.cpp
@@ -10,33 +10,35 @@
 
 #include <istream>
 
-namespace platform
-{
+using namespace std;
+
 namespace
 {
-constexpr char kKeyValueDelimChar = '=';
+constexpr char kDelimChar = '=';
 }  // namespace
 
-StringStorageBase::StringStorageBase(std::string const & path) : m_path(path)
+namespace platform
+{
+StringStorageBase::StringStorageBase(string const & path) : m_path(path)
 {
   try
   {
     LOG(LINFO, ("Settings path:", m_path));
-    ReaderStreamBuf buffer(std::make_unique<FileReader>(m_path));
-    std::istream stream(&buffer);
+    ReaderStreamBuf buffer(make_unique<FileReader>(m_path));
+    istream stream(&buffer);
 
-    std::string line;
+    string line;
     while (getline(stream, line))
     {
       if (line.empty())
         continue;
 
-      size_t const delimPos = line.find(kKeyValueDelimChar);
-      if (delimPos == std::string::npos)
+      size_t const delimPos = line.find(kDelimChar);
+      if (delimPos == string::npos)
         continue;
 
-      std::string const key = line.substr(0, delimPos);
-      std::string const value = line.substr(delimPos + 1);
+      string const key = line.substr(0, delimPos);
+      string const value = line.substr(delimPos + 1);
       if (!key.empty() && !value.empty())
         m_values[key] = value;
     }
@@ -54,8 +56,8 @@ void StringStorageBase::Save() const
     FileWriter file(m_path);
     for (auto const & value : m_values)
     {
-      std::string line(value.first);
-      line += kKeyValueDelimChar;
+      string line(value.first);
+      line += kDelimChar;
       line += value.second;
       line += '\n';
       file.Write(line.data(), line.size());
@@ -70,14 +72,14 @@ void StringStorageBase::Save() const
 
 void StringStorageBase::Clear()
 {
-  std::lock_guard guard(m_mutex);
+  lock_guard<mutex> guard(m_mutex);
   m_values.clear();
   Save();
 }
 
-bool StringStorageBase::GetValue(std::string const & key, std::string & outValue) const
+bool StringStorageBase::GetValue(string const & key, string & outValue) const
 {
-  std::lock_guard guard(m_mutex);
+  lock_guard<mutex> guard(m_mutex);
 
   auto const found = m_values.find(key);
   if (found == m_values.end())
@@ -87,19 +89,19 @@ bool StringStorageBase::GetValue(std::string const & key, std::string & outValue
   return true;
 }
 
-void StringStorageBase::SetValue(std::string const & key, std::string && value)
+void StringStorageBase::SetValue(string const & key, string && value)
 {
-  std::lock_guard guard(m_mutex);
+  lock_guard<mutex> guard(m_mutex);
 
-  m_values[key] = std::move(value);
+  m_values[key] = move(value);
   Save();
 }
 
 void StringStorageBase::Update(std::map<std::string, std::string> const & values)
 {
-  std::lock_guard guard(m_mutex);
+  lock_guard<mutex> guard(m_mutex);
 
-  for (const auto & pair : values)
+  for (const auto & pair: values)
   {
     if (pair.second.empty())
       m_values.erase(pair.first);
@@ -110,9 +112,9 @@ void StringStorageBase::Update(std::map<std::string, std::string> const & values
   Save();
 }
 
-void StringStorageBase::DeleteKeyAndValue(std::string const & key)
+void StringStorageBase::DeleteKeyAndValue(string const & key)
 {
-  std::lock_guard guard(m_mutex);
+  lock_guard<mutex> guard(m_mutex);
 
   auto const found = m_values.find(key);
   if (found != m_values.end())
diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp
index aa7f19fcc3..c4f4776ead 100644
--- a/qt/editor_dialog.cpp
+++ b/qt/editor_dialog.cpp
@@ -56,11 +56,10 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
     int namesRow = 0;
     for (auto const & ln : emo.GetNamesDataSource().names)
     {
-      namesGrid->addWidget(new QLabel(QString::fromUtf8(ln.m_lang.data(), ln.m_lang.size())), namesRow, 0);
+      namesGrid->addWidget(new QLabel(ln.m_lang), namesRow, 0);
       QLineEdit * lineEditName = new QLineEdit(QString::fromStdString(ln.m_name));
       lineEditName->setReadOnly(!emo.IsNameEditable());
-      std::string_view const code = StringUtf8Multilang::GetLangByCode(ln.m_code);
-      lineEditName->setObjectName(QString::fromUtf8(code.data(), code.size()));
+      lineEditName->setObjectName(StringUtf8Multilang::GetLangByCode(ln.m_code));
       namesGrid->addWidget(lineEditName, namesRow++, 1);
     }
 
@@ -172,8 +171,7 @@ void EditorDialog::OnSave()
     for (int8_t langCode = StringUtf8Multilang::kDefaultCode;
          langCode < StringUtf8Multilang::kMaxSupportedLanguages; ++langCode)
     {
-      std::string_view const lang = StringUtf8Multilang::GetLangByCode(langCode);
-      QLineEdit * le = findChild<QLineEdit *>(QString::fromUtf8(lang.data(), lang.size()));
+      QLineEdit * le = findChild<QLineEdit *>(StringUtf8Multilang::GetLangByCode(langCode));
       if (!le)
         continue;
 
diff --git a/qt/main.cpp b/qt/main.cpp
index adefaa32c1..12e2fbc98b 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -214,21 +214,17 @@ int main(int argc, char * argv[])
     fmt.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
     fmt.setSwapInterval(1);
     fmt.setDepthBufferSize(16);
-
-    // This is a workaround for some systems,
-    // including MacOs and older Linux distros, which rely on X.org and Mesa.
-    // Where somehow the driver itself doesn't
+#if defined(OMIM_OS_LINUX)
+    // This is a workaround for older distros, which rely on X.org and Mesa,
+    // where somehow the Mesa driver itself doesn't
     // make all the otherwise supported GLSL versions available by default
     // and such requests are somehow disregarded at later stages of execution.
     // This setting here will be potentially overwritten and overruled anyway,
     // and only needed to ensure that we have the needed GLSL compiler available
     // later when we need it.
-    if (app.platformName() == QString("xcb") ||
-        app.platformName() == QString("cocoa"))
-    {
-      fmt.setProfile(QSurfaceFormat::CoreProfile);
+    if (app.platformName() == QString("xcb"))
       fmt.setVersion(3, 2);
-    }
+#endif
 #ifdef ENABLE_OPENGL_DIAGNOSTICS
     fmt.setOption(QSurfaceFormat::DebugContext);
 #endif
diff --git a/routing/absent_regions_finder.cpp b/routing/absent_regions_finder.cpp
index 24bdc1d50e..8fda02b7a2 100644
--- a/routing/absent_regions_finder.cpp
+++ b/routing/absent_regions_finder.cpp
@@ -33,7 +33,7 @@ void AbsentRegionsFinder::GenerateAbsentRegions(Checkpoints const & checkpoints,
 
   // iOS can't reuse threads. So we need to recreate the thread.
   m_routerThread = std::make_unique<threads::Thread>();
-  m_routerThread->Create(std::move(router));
+  m_routerThread->Create(move(router));
 }
 
 void AbsentRegionsFinder::GetAbsentRegions(std::set<std::string> & regions)
diff --git a/routing/base/followed_polyline.cpp b/routing/base/followed_polyline.cpp
index 691fc53012..1849257e82 100644
--- a/routing/base/followed_polyline.cpp
+++ b/routing/base/followed_polyline.cpp
@@ -185,7 +185,7 @@ Iter FollowedPolyline::UpdateProjection(m2::RectD const & posRect)
 void FollowedPolyline::SetFakeSegmentIndexes(vector<size_t> && fakeSegmentIndexes)
 {
   ASSERT(is_sorted(fakeSegmentIndexes.cbegin(), fakeSegmentIndexes.cend()), ());
-  m_fakeSegmentIndexes = std::move(fakeSegmentIndexes);
+  m_fakeSegmentIndexes = move(fakeSegmentIndexes);
 }
 
 double FollowedPolyline::GetDistFromCurPointToRoutePointMerc() const
diff --git a/routing/car_directions.cpp b/routing/car_directions.cpp
index aebbd08c06..01fa53b397 100644
--- a/routing/car_directions.cpp
+++ b/routing/car_directions.cpp
@@ -15,7 +15,7 @@ using namespace turns;
 using namespace ftypes;
 
 CarDirectionsEngine::CarDirectionsEngine(MwmDataSource & dataSource, shared_ptr<NumMwmIds> numMwmIds)
-  : DirectionsEngine(dataSource, std::move(numMwmIds))
+  : DirectionsEngine(dataSource, move(numMwmIds))
 {
 }
 
@@ -478,7 +478,7 @@ void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingS
 
   if (turnCandidates.size() == 1)
   {
-    //ASSERT_EQUAL(turnCandidates.front().m_segment, firstOutgoingSeg, ());
+    ASSERT(turnCandidates.front().m_segment == firstOutgoingSeg, ());
 
     if (IsGoStraightOrSlightTurn(intermediateDirection))
       return;
diff --git a/routing/directions_engine.cpp b/routing/directions_engine.cpp
index d94beaac15..ed97b54820 100644
--- a/routing/directions_engine.cpp
+++ b/routing/directions_engine.cpp
@@ -78,7 +78,8 @@ void DirectionsEngine::LoadPathAttributes(FeatureID const & featureId,
   LoadLanes(pathSegment, *ft, isForward);
 
   pathSegment.m_highwayClass = GetHighwayClass(types);
-  ASSERT(pathSegment.m_highwayClass != HighwayClass::Undefined, (featureId));
+  ASSERT_NOT_EQUAL(pathSegment.m_highwayClass, HighwayClass::Error, ());
+  ASSERT_NOT_EQUAL(pathSegment.m_highwayClass, HighwayClass::Undefined, ());
 
   pathSegment.m_isLink = m_linkChecker(types);
   pathSegment.m_onRoundabout = m_roundAboutChecker(types);
@@ -88,8 +89,7 @@ void DirectionsEngine::LoadPathAttributes(FeatureID const & featureId,
   pathSegment.m_roadNameInfo.m_junction_ref = ft->GetMetadata(feature::Metadata::FMD_JUNCTION_REF);
   pathSegment.m_roadNameInfo.m_destination_ref = ft->GetMetadata(feature::Metadata::FMD_DESTINATION_REF);
   pathSegment.m_roadNameInfo.m_destination = ft->GetMetadata(feature::Metadata::FMD_DESTINATION);
-  /// @todo Should make some better parsing here (@see further use in GetFullRoadName).
-  pathSegment.m_roadNameInfo.m_ref = ft->GetRef();
+  pathSegment.m_roadNameInfo.m_ref = ft->GetRoadNumber();
   pathSegment.m_roadNameInfo.m_name = ft->GetName(StringUtf8Multilang::kDefaultCode);
 }
 
@@ -119,7 +119,8 @@ void DirectionsEngine::GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT con
     feature::TypesHolder types(*ft);
 
     auto const highwayClass = GetHighwayClass(types);
-    ASSERT(highwayClass != HighwayClass::Undefined, (edge.PrintLatLon()));
+    ASSERT_NOT_EQUAL(highwayClass, HighwayClass::Error, (edge.PrintLatLon()));
+    ASSERT_NOT_EQUAL(highwayClass, HighwayClass::Undefined, (edge.PrintLatLon()));
 
     double angle = 0;
 
@@ -209,8 +210,8 @@ void DirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
     // |prevSegments| contains segments which corresponds to road edges between joints. In case of a
     // fake edge a fake segment is created.
     CHECK_EQUAL(prevSegments.size() + 1, prevJunctions.size(), ());
-    pathSegment.m_path = std::move(prevJunctions);
-    pathSegment.m_segments = std::move(prevSegments);
+    pathSegment.m_path = move(prevJunctions);
+    pathSegment.m_segments = move(prevSegments);
 
     LoadPathAttributes(segmentRange.GetFeature(), pathSegment, inEdge.IsForward());
 
@@ -220,11 +221,11 @@ void DirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
       /// Entry already exists, when start-end points are on the same fake segments.
 
       //bool const isEmpty = adjacentEdges.m_outgoingTurns.candidates.empty();
-      //CHECK(m_adjacentEdges.emplace(segmentRange, std::move(adjacentEdges)).second || isEmpty, ());
-      m_adjacentEdges.emplace(segmentRange, std::move(adjacentEdges));
+      //CHECK(m_adjacentEdges.emplace(segmentRange, move(adjacentEdges)).second || isEmpty, ());
+      m_adjacentEdges.emplace(segmentRange, move(adjacentEdges));
     }
 
-    m_pathSegments.push_back(std::move(pathSegment));
+    m_pathSegments.push_back(move(pathSegment));
 
     prevJunctions.clear();
     prevSegments.clear();
@@ -320,6 +321,8 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou
 
   RoutingEngineResult result(routeEdges, m_adjacentEdges, m_pathSegments);
 
+  LOG(LDEBUG, ("Shortest path length:", result.GetPathLength()));
+
   routeSegments.reserve(routeEdges.size());
 
   RoutingSettings const vehicleSettings = GetRoutingSettings(m_vehicleType);
@@ -327,7 +330,7 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou
   auto const & loadedSegments = result.GetSegments(); // the same as m_pathSegments
 
   // First point of first loadedSegment is ignored. This is the reason for:
-  //ASSERT_EQUAL(loadedSegments.front().m_path.back(), loadedSegments.front().m_path.front(), ());
+  ASSERT_EQUAL(loadedSegments.front().m_path.back(), loadedSegments.front().m_path.front(), ());
 
   size_t skipTurnSegments = 0;
   for (size_t idxLoadedSegment = 0; idxLoadedSegment < loadedSegments.size(); ++idxLoadedSegment)
@@ -362,8 +365,8 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou
     routeSegments.emplace_back(loadedSegment.m_segments.back(), turnItem, loadedSegment.m_path.back(), rni);
   }
 
-  //ASSERT_EQUAL(routeSegments.front().GetJunction(), result.GetStartPoint(), ());
-  //ASSERT_EQUAL(routeSegments.back().GetJunction(), result.GetEndPoint(), ());
+  ASSERT_EQUAL(routeSegments.front().GetJunction(), result.GetStartPoint(), ());
+  ASSERT_EQUAL(routeSegments.back().GetJunction(), result.GetEndPoint(), ());
 
   FixupTurns(routeSegments);
 }
diff --git a/routing/geometry.cpp b/routing/geometry.cpp
index 090f0e8b44..5ed34b1c84 100644
--- a/routing/geometry.cpp
+++ b/routing/geometry.cpp
@@ -235,7 +235,7 @@ void RoadGeometry::Load(VehicleModelInterface const & vehicleModel, FeatureType
       /// - Remove assert, but update A* algo heuristic somehow;
       /// - Reconsider ferry defaults;
       /// - Make _very big_ bicycle/pedestrian maxspeed;
-      ASSERT_LESS_OR_EQUAL(speed, vehicleModel.GetMaxWeightSpeed(), (roadLenKm, durationH, fID));
+      ASSERT_LESS_OR_EQUAL(speed, vehicleModel.GetMaxWeightSpeed(), (roadLenKm, durationH));
       m_forwardSpeed = m_backwardSpeed = SpeedKMpH(speed);
     }
   }
@@ -281,7 +281,7 @@ double RoadGeometry::GetRoadLengthM() const
 
 // Geometry ----------------------------------------------------------------------------------------
 Geometry::Geometry(unique_ptr<GeometryLoader> loader, size_t roadsCacheSize)
-  : m_loader(std::move(loader))
+  : m_loader(move(loader))
 {
   CHECK(m_loader, ());
 
diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp
index 22b27ea85b..e82c14db4e 100644
--- a/routing/index_graph.cpp
+++ b/routing/index_graph.cpp
@@ -35,8 +35,8 @@ bool IsBoarding(bool prevIsFerry, bool nextIsFerry)
 
 IndexGraph::IndexGraph(shared_ptr<Geometry> geometry, shared_ptr<EdgeEstimator> estimator,
                        RoutingOptions routingOptions)
-  : m_geometry(std::move(geometry)),
-    m_estimator(std::move(estimator)),
+  : m_geometry(move(geometry)),
+    m_estimator(move(estimator)),
     m_avoidRoutingOptions(routingOptions)
 {
   CHECK(m_geometry, ());
@@ -240,7 +240,7 @@ void IndexGraph::SetUTurnRestrictions(vector<RestrictionUTurn> && noUTurnRestric
 
 void IndexGraph::SetRoadAccess(RoadAccess && roadAccess)
 {
-  m_roadAccess = std::move(roadAccess);
+  m_roadAccess = move(roadAccess);
   m_roadAccess.SetCurrentTimeGetter(m_currentTimeGetter);
 }
 
diff --git a/routing/index_graph_loader.cpp b/routing/index_graph_loader.cpp
index af84fb8037..67c69319ad 100644
--- a/routing/index_graph_loader.cpp
+++ b/routing/index_graph_loader.cpp
@@ -37,8 +37,8 @@ public:
     : m_vehicleType(vehicleType)
     , m_loadAltitudes(loadAltitudes)
     , m_dataSource(dataSource)
-    , m_vehicleModelFactory(std::move(vehicleModelFactory))
-    , m_estimator(std::move(estimator))
+    , m_vehicleModelFactory(move(vehicleModelFactory))
+    , m_estimator(move(estimator))
     , m_avoidRoutingOptions(routingOptions)
   {
     CHECK(m_vehicleModelFactory, ());
@@ -250,7 +250,7 @@ void DeserializeIndexGraph(MwmValue const & mwmValue, VehicleType vehicleType, I
 
   RoadAccess roadAccess;
   if (ReadRoadAccessFromMwm(mwmValue, vehicleType, roadAccess))
-    graph.SetRoadAccess(std::move(roadAccess));
+    graph.SetRoadAccess(move(roadAccess));
 }
 
 uint32_t DeserializeIndexGraphNumRoads(MwmValue const & mwmValue, VehicleType vehicleType)
diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index 965a1927a2..8e89651ecb 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -251,8 +251,8 @@ IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes,
   , m_vehicleModelFactory(CreateVehicleModelFactory(m_vehicleType, countryParentNameGetterFn))
   , m_countryFileFn(countryFileFn)
   , m_countryRectFn(countryRectFn)
-  , m_numMwmIds(std::move(numMwmIds))
-  , m_numMwmTree(std::move(numMwmTree))
+  , m_numMwmIds(move(numMwmIds))
+  , m_numMwmTree(move(numMwmTree))
   , m_trafficStash(CreateTrafficStash(m_vehicleType, m_numMwmIds, trafficCache))
   , m_roadGraph(m_dataSource,
                 vehicleType == VehicleType::Pedestrian || vehicleType == VehicleType::Transit
@@ -641,13 +641,13 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
     snapping.SetNextStartSegment(nextSegment);
 
     if (!starter)
-      starter = make_unique<IndexGraphStarter>(std::move(subrouteStarter));
+      starter = make_unique<IndexGraphStarter>(move(subrouteStarter));
     else
-      starter->Append(FakeEdgesContainer(std::move(subrouteStarter)));
+      starter->Append(FakeEdgesContainer(move(subrouteStarter)));
   }
 
   route.SetCurrentSubrouteIdx(checkpoints.GetPassedIdx());
-  route.SetSubroteAttrs(std::move(subroutes));
+  route.SetSubroteAttrs(move(subroutes));
 
   IndexGraphStarter::CheckValidRoute(segments);
 
@@ -665,7 +665,7 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
   for (Segment const & segment : segments)
     m_lastRoute->AddStep(segment, mercator::FromLatLon(starter->GetPoint(segment, true /* front */)));
 
-  m_lastFakeEdges = make_unique<FakeEdgesContainer>(std::move(*starter));
+  m_lastFakeEdges = make_unique<FakeEdgesContainer>(move(*starter));
 
   return RouterResultCode::NoError;
 }
@@ -684,7 +684,7 @@ vector<Segment> ProcessJoints(vector<JointSegment> const & jointsPath,
 
     if (path.empty())
     {
-      path = std::move(jointPath);
+      path = move(jointPath);
       continue;
     }
 
@@ -742,7 +742,7 @@ RouterResultCode IndexRouter::CalculateSubrouteJointsMode(
 
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AStarLengthChecker> params(
       jointStarter, jointStarter.GetStartJoint(), jointStarter.GetFinishJoint(),
-      delegate.GetCancellable(), std::move(visitor),
+      delegate.GetCancellable(), move(visitor),
       AStarLengthChecker(starter));
 
   RoutingResult<Vertex, Weight> routingResult;
@@ -769,7 +769,7 @@ RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(
 
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AStarLengthChecker> params(
       starter, starter.GetStartSegment(), starter.GetFinishSegment(),
-      delegate.GetCancellable(), std::move(visitor), AStarLengthChecker(starter));
+      delegate.GetCancellable(), move(visitor), AStarLengthChecker(starter));
 
   RoutingResult<Vertex, Weight> routingResult;
   set<NumMwmId> const mwmIds = starter.GetMwms();
@@ -779,7 +779,7 @@ RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(
     return result;
 
   LOG(LDEBUG, ("Result route weight:", routingResult.m_distance));
-  subroute = std::move(routingResult.m_path);
+  subroute = move(routingResult.m_path);
   return result;
 }
 
@@ -1041,7 +1041,7 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
   AStarAlgorithm<Vertex, Edge, Weight> algorithm;
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AdjustLengthChecker> params(
       starter, starter.GetStartSegment(), {} /* finalVertex */,
-      delegate.GetCancellable(), std::move(visitor), AdjustLengthChecker(starter));
+      delegate.GetCancellable(), move(visitor), AdjustLengthChecker(starter));
 
   RoutingResult<Segment, RouteWeight> result;
   auto const resultCode =
@@ -1075,7 +1075,7 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
   CHECK_EQUAL(result.m_path.size(), subrouteOffset, ());
 
   route.SetCurrentSubrouteIdx(checkpoints.GetPassedIdx());
-  route.SetSubroteAttrs(std::move(subroutes));
+  route.SetSubroteAttrs(move(subroutes));
 
   auto const redressResult = RedressRoute(result.m_path, delegate.GetCancellable(), starter, route);
   if (redressResult != RouterResultCode::NoError)
@@ -1108,15 +1108,15 @@ unique_ptr<WorldGraph> IndexRouter::MakeWorldGraph()
   if (m_vehicleType != VehicleType::Transit)
   {
     auto graph = make_unique<SingleVehicleWorldGraph>(
-        std::move(crossMwmGraph), std::move(indexGraphLoader), m_estimator,
+        move(crossMwmGraph), move(indexGraphLoader), m_estimator,
         MwmHierarchyHandler(m_numMwmIds, m_countryParentNameGetterFn));
     graph->SetRoutingOptions(routingOptions);
     return graph;
   }
 
   auto transitGraphLoader = TransitGraphLoader::Create(m_dataSource, m_estimator);
-  return make_unique<TransitWorldGraph>(std::move(crossMwmGraph), std::move(indexGraphLoader),
-                                        std::move(transitGraphLoader), m_estimator);
+  return make_unique<TransitWorldGraph>(move(crossMwmGraph), move(indexGraphLoader),
+                                        move(transitGraphLoader), m_estimator);
 }
 
 int IndexRouter::PointsOnEdgesSnapping::Snap(
@@ -1458,9 +1458,7 @@ RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
                                                  RoutesCalculator & calculator,
                                                  RoutingResultT & result)
 {
-  // { fake, mwmId1, mwmId2, mwmId2, mwmId3, .. pairs of ids .. , fake }.
-  ASSERT_GREATER_OR_EQUAL(input.size(), 4, ());
-  ASSERT(input.size() % 2 == 0, ());
+  CHECK_GREATER_OR_EQUAL(input.size(), 4, ());
 
   WorldGraph & worldGraph = starter.GetGraph();
 
@@ -1473,33 +1471,43 @@ RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
   // then we have small unneeded leap in other mwm which returns us to start mwm, then we have leap in start mwm
   // to the correct start mwm exit and then we have normal route.
   // |input| mwm ids for such case look like
-  // { fake, startId, otherId, otherId, startId, startId, .. pairs of ids for other leaps .. , finishId, fake }.
+  // { fake, startId, otherId, otherId, startId, startId, .. pairs of ids for other leaps .. , finishId, fake}.
+  // To avoid this behavior we collapse all leaps from start to  last occurrence of startId to one leap and
+  // use WorldGraph with NoLeaps mode to proccess these leap. Unlike SingleMwm mode used to process ordinary leaps
+  // NoLeaps allows to use all mwms so if we really need to visit other mwm we will.
 
-  // Stable solution here is to calculate all routes with and without loops, and choose the best one.
+  /// @todo By VNG: Have a feeling that this routine can be simplified.
+  // Stable solution here is to calculate all (max = 4) routes with and without loops, and choose the best one.
   // https://github.com/organicmaps/organicmaps/issues/821
   // https://github.com/organicmaps/organicmaps/issues/2085
-  // https://github.com/organicmaps/organicmaps/issues/5069
 
-  buffer_vector<size_t, 4> arrBeg, arrEnd;
-  size_t const begIdx = 1;
-  size_t const endIdx = input.size() - 2;
-
-  auto const firstMwmId = input[begIdx].GetMwmId();
-  for (size_t i = begIdx; i < endIdx; ++i)
-    if (input[i].GetMwmId() == firstMwmId && (i % 2 == 1))
-      arrBeg.push_back(i);
-
-  auto const lastMwmId = input[endIdx].GetMwmId();
-  for (size_t i = endIdx; i > begIdx; --i)
-    if (input[i].GetMwmId() == lastMwmId && (i % 2 == 0))
-      arrEnd.push_back(i);
-
-  size_t const variantsCount = arrBeg.size() * arrEnd.size();
-  ASSERT(variantsCount > 0, ());
-
-  for (size_t startLeapEnd : arrBeg)
-  for (size_t finishLeapStart : arrEnd)
+  buffer_vector<std::pair<size_t, size_t>, 4> arrBegEnd;
+  arrBegEnd.emplace_back(1, input.size() - 2);
   {
+    auto const firstMwmId = input[1].GetMwmId();
+    auto const startLeapEndReverseIt = find_if(input.rbegin() + 2, input.rend(),
+                                               [firstMwmId](Segment const & s) { return s.GetMwmId() == firstMwmId; });
+    auto const startLeapEndIt = startLeapEndReverseIt.base() - 1;
+    auto const startLeapEnd = static_cast<size_t>(distance(input.begin(), startLeapEndIt));
+    if (startLeapEnd != arrBegEnd[0].first)
+      arrBegEnd.emplace_back(startLeapEnd, arrBegEnd[0].second);
+
+    // The last leap processed the same way. See the comment above.
+    auto const lastMwmId = input[input.size() - 2].GetMwmId();
+    auto const finishLeapStartIt = find_if(startLeapEndIt, input.end(),
+                                           [lastMwmId](Segment const & s) { return s.GetMwmId() == lastMwmId; });
+    auto const finishLeapStart = static_cast<size_t>(distance(input.begin(), finishLeapStartIt));
+    if (finishLeapStart != arrBegEnd[0].second)
+      arrBegEnd.emplace_back(arrBegEnd[0].first, finishLeapStart);
+
+    if (arrBegEnd.size() == 3)
+      arrBegEnd.emplace_back(startLeapEnd, finishLeapStart);
+  }
+
+  for (auto const & eBegEnd : arrBegEnd)
+  {
+    size_t const startLeapEnd = eBegEnd.first;
+    size_t const finishLeapStart = eBegEnd.second;
     size_t maxStart = 0;
 
     auto const runAStarAlgorithm = [&](size_t start, size_t end, WorldGraphMode mode)
@@ -1508,7 +1516,7 @@ RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
       ASSERT_LESS(end, input.size(), ());
 
       maxStart = max(maxStart, start);
-      auto const contribCoef = static_cast<double>(end - maxStart + 1) / input.size() / variantsCount;
+      auto const contribCoef = static_cast<double>(end - maxStart + 1) / input.size() / arrBegEnd.size();
 
       // VNG: I don't like this strategy with clearing previous caches, taking into account
       // that all MWMs were quite likely already loaded before in calculating Leaps path.
@@ -1740,7 +1748,7 @@ RouterResultCode IndexRouter::RedressRoute(vector<Segment> const & segments,
 
   vector<platform::CountryFile> speedCamProhibited;
   FillSpeedCamProhibitedMwms(segments, speedCamProhibited);
-  route.SetMwmsPartlyProhibitedForSpeedCams(std::move(speedCamProhibited));
+  route.SetMwmsPartlyProhibitedForSpeedCams(move(speedCamProhibited));
 
   return RouterResultCode::NoError;
 }
diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp
index 99257188fd..066a2c8f0f 100644
--- a/routing/pedestrian_directions.cpp
+++ b/routing/pedestrian_directions.cpp
@@ -12,7 +12,7 @@ using namespace std;
 using namespace turns;
 
 PedestrianDirectionsEngine::PedestrianDirectionsEngine(MwmDataSource & dataSource, shared_ptr<NumMwmIds> numMwmIds)
-  : DirectionsEngine(dataSource, std::move(numMwmIds))
+  : DirectionsEngine(dataSource, move(numMwmIds))
 {
 }
 
diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp
index 76f1c20de0..7bee929c74 100644
--- a/routing/road_graph.cpp
+++ b/routing/road_graph.cpp
@@ -151,7 +151,7 @@ IRoadGraph::RoadInfo::RoadInfo()
   : m_speedKMPH(0.0), m_bidirectional(false)
 {}
 IRoadGraph::RoadInfo::RoadInfo(RoadInfo && ri)
-  : m_junctions(std::move(ri.m_junctions))
+  : m_junctions(move(ri.m_junctions))
   , m_speedKMPH(ri.m_speedKMPH)
   , m_bidirectional(ri.m_bidirectional)
 {}
diff --git a/routing/route.cpp b/routing/route.cpp
index 810fb6def7..fe5b5fcf1a 100644
--- a/routing/route.cpp
+++ b/routing/route.cpp
@@ -323,11 +323,11 @@ bool Route::GetNextTurns(vector<TurnItemDist> & turns) const
   GetNearestTurn(currentTurn.m_distMeters, currentTurn.m_turnItem);
 
   turns.clear();
-  turns.emplace_back(std::move(currentTurn));
+  turns.emplace_back(move(currentTurn));
 
   TurnItemDist nextTurn;
   if (GetNextTurn(nextTurn.m_distMeters, nextTurn.m_turnItem))
-    turns.emplace_back(std::move(nextTurn));
+    turns.emplace_back(move(nextTurn));
   return true;
 }
 
@@ -339,7 +339,7 @@ void Route::GetCurrentDirectionPoint(m2::PointD & pt) const
 void Route::SetRouteSegments(vector<RouteSegment> && routeSegments)
 {
   vector<size_t> fakeSegmentIndexes;
-  m_routeSegments = std::move(routeSegments);
+  m_routeSegments = move(routeSegments);
   m_haveAltitudes = true;
   for (size_t i = 0; i < m_routeSegments.size(); ++i)
   {
@@ -353,7 +353,7 @@ void Route::SetRouteSegments(vector<RouteSegment> && routeSegments)
       fakeSegmentIndexes.push_back(i);
   }
 
-  m_poly.SetFakeSegmentIndexes(std::move(fakeSegmentIndexes));
+  m_poly.SetFakeSegmentIndexes(move(fakeSegmentIndexes));
 }
 
 bool Route::MoveIterator(location::GpsInfo const & info)
@@ -497,7 +497,7 @@ double Route::GetSegLenMeters(size_t segIdx) const
 
 void Route::SetMwmsPartlyProhibitedForSpeedCams(vector<platform::CountryFile> && mwms)
 {
-  m_speedCamPartlyProhibitedMwms = std::move(mwms);
+  m_speedCamPartlyProhibitedMwms = move(mwms);
 }
 
 bool Route::CrossMwmsPartlyProhibitedForSpeedCams() const
diff --git a/routing/route.hpp b/routing/route.hpp
index afd4557533..97676d1b5c 100644
--- a/routing/route.hpp
+++ b/routing/route.hpp
@@ -115,7 +115,7 @@ public:
 
   void SetTransitInfo(std::unique_ptr<TransitInfo> transitInfo)
   {
-    m_transitInfo.Set(std::move(transitInfo));
+    m_transitInfo.Set(move(transitInfo));
   }
 
   Segment const & GetSegment() const { return m_segment; }
diff --git a/routing/routing_helpers.cpp b/routing/routing_helpers.cpp
index 78dff21fe5..ce48a5d028 100644
--- a/routing/routing_helpers.cpp
+++ b/routing/routing_helpers.cpp
@@ -65,7 +65,7 @@ void ReconstructRoute(DirectionsEngine & engine, IndexRoadGraph const & graph,
     return;
 
   FillSegmentInfo(times, routeSegments);
-  route.SetRouteSegments(std::move(routeSegments));
+  route.SetRouteSegments(move(routeSegments));
 
   vector<m2::PointD> routeGeometry;
   JunctionsToPoints(path, routeGeometry);
diff --git a/routing/routing_integration_tests/absent_regions_finder_tests.cpp b/routing/routing_integration_tests/absent_regions_finder_tests.cpp
index ec5f962dd5..4c2f37a7cb 100644
--- a/routing/routing_integration_tests/absent_regions_finder_tests.cpp
+++ b/routing/routing_integration_tests/absent_regions_finder_tests.cpp
@@ -1,8 +1,13 @@
+#include "routing/routing_integration_tests/routing_test_tools.hpp"
+
 #include "testing/testing.hpp"
 
 #include "map/framework.hpp"
 #include "map/routing_manager.hpp"
 
+#include "routing/routing_callbacks.hpp"
+#include "routing/routing_options.hpp"
+
 #include "storage/routing_helpers.hpp"
 #include "storage/storage.hpp"
 
@@ -133,7 +138,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Kingston_DC)
 }
 
 // From "US_Colorado_Aspen" to "Canada_Saskatchewan_Saskatoon".
-// https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=39.95763%2C-106.79994%3B49.92034%2C-106.99302
+// https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=39.9578%2C-106.8238%3B49.9167%2C-106.9606#map=5/46.284/-101.609
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Colorado_Saskatchewan)
 {
   Checkpoints const checkpoints{mercator::FromLatLon(39.95763, -106.79994),
@@ -145,6 +150,9 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Colorado_Saskatchewan)
   TestRegions(checkpoints, planRegions);
 }
 
+/// @todo OSRM/GraphHopper route differs from Organic (check the links below). The difference is not significant,
+/// OM prefers major road E40 vs GraphHopper with E314.
+/// @{
 // From "Belgium_Flemish Brabant" to "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen".
 // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=50.87763%2C4.44676%3B50.76935%2C6.42488
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Belgium_Germany)
@@ -152,9 +160,6 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Belgium_Germany)
   Checkpoints const checkpoints{mercator::FromLatLon(50.87763, 4.44676),
                                 mercator::FromLatLon(50.76935, 6.42488)};
 
-  // OSRM, Valhalla prefers major road E40 vs GraphHopper with E314 (the difference is 5 minutes).
-  // "Belgium_Liege" should present for E40 and not present for E314.
-  /// @todo OM usually takes E40, but sometimes E314 :)
   std::set<std::string> const planRegions = {
     "Belgium_Flemish Brabant", "Belgium_Liege", "Belgium_Limburg",
     "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
@@ -178,6 +183,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Germany_Belgium)
 
   TestRegions(checkpoints, planRegions);
 }
+/// @}
 
 // From "Kazakhstan_South" to "Mongolia".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Kazakhstan_Mongolia)
@@ -253,7 +259,9 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, China)
   Checkpoints const checkpoints{mercator::FromLatLon(30.78611, 102.55829),
                                 mercator::FromLatLon(27.54127, 102.02502)};
 
-  TestRegions(checkpoints, {});
+  std::set<std::string> const planRegions{};
+
+  TestRegions(checkpoints, planRegions);
 }
 
 // Inside "Finland_Eastern Finland_North".
@@ -262,7 +270,9 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Finland)
   Checkpoints const checkpoints{mercator::FromLatLon(63.54162, 28.71141),
                                 mercator::FromLatLon(64.6790, 28.73029)};
 
-  TestRegions(checkpoints, {});
+  std::set<std::string> const planRegions{};
+
+  TestRegions(checkpoints, planRegions);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/980
@@ -276,16 +286,4 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, BC_Alberta)
 
   TestRegions(checkpoints, planRegions);
 }
-
-// https://github.com/organicmaps/organicmaps/issues/1721
-UNIT_CLASS_TEST(TestAbsentRegionsFinder, Germany_Cologne_Croatia_Zagreb)
-{
-  Checkpoints const checkpoints{mercator::FromLatLon(50.924, 6.943),
-                                mercator::FromLatLon(45.806, 15.963)};
-
-  /// @todo Well, optimal route should include Graz-Maribor-Zagreb.
-  auto const & rgns = GetRegions(checkpoints);
-  TEST(rgns.count("Austria_Styria_Graz") > 0, ());
-}
-
 } // namespace absent_regions_finder_tests
diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp
index fca94161bd..6c070c3a01 100644
--- a/routing/routing_integration_tests/route_test.cpp
+++ b/routing/routing_integration_tests/route_test.cpp
@@ -811,46 +811,4 @@ UNIT_TEST(Turkey_Salarialaca_Sanliurfa)
   TestRouteLength(route, 656891);
   TestRouteTime(route, 21138);  // should be less than 6 hours (6 * 3600)
 }
-
-// https://github.com/organicmaps/organicmaps/issues/4924
-// https://github.com/organicmaps/organicmaps/issues/4996
-UNIT_TEST(UK_MiniRoundabout)
-{
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                FromLatLon(50.4155631, -4.17201038), {0., 0.},
-                FromLatLon(50.4161337, -4.17226314), 114.957);
-
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                FromLatLon(50.4173675, -4.14913092), {0., 0.},
-                FromLatLon(50.4170013, -4.1471226), 153.223);
-
-  /// @todo Fancy case, changing start/end point a little and the route is OK. Also check m_exitNum.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                FromLatLon(51.5686491, -0.00590868183), {0., 0.},
-                FromLatLon(51.5684408, -0.00596725822), 40);
-}
-
-// https://github.com/organicmaps/organicmaps/issues/5069
-UNIT_TEST(Germany_Netherlands_AvoidLoops)
-{
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                                  FromLatLon(51.6823791, 10.2197113), {0., 0.},
-                                                  FromLatLon(51.9187916, 5.8452563));
-
-  RouterResultCode const result = routeResult.second;
-  TEST_EQUAL(result, RouterResultCode::NoError, ());
-
-  TEST(routeResult.first, ());
-  Route const & route = *routeResult.first;
-  TestRouteLength(route, 405159);
-  TestRouteTime(route, 13768.9);
-}
-
-UNIT_TEST(Germany_Cologne_Croatia_Zagreb)
-{
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(50.924, 6.943), {0., 0.},
-                                   FromLatLon(45.806, 15.963), 1074730);
-}
-
 } // namespace route_test
diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp
index 3e7105f781..fcc320e14f 100644
--- a/routing/routing_integration_tests/routing_test_tools.cpp
+++ b/routing/routing_integration_tests/routing_test_tools.cpp
@@ -154,7 +154,7 @@ TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
 {
   RouterDelegate delegate;
   shared_ptr<Route> route = make_shared<Route>("mapsme", 0 /* route id */);
-  routerComponents.GetRouter().SetGuides(std::move(guides));
+  routerComponents.GetRouter().SetGuides(move(guides));
   RouterResultCode result = routerComponents.GetRouter().CalculateRoute(
       checkpoints, m2::PointD::Zero() /* startDirection */, false /* adjust */, delegate, *route);
   ASSERT(route, ());
diff --git a/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp b/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
index 7545dcfda1..0545bb3ea2 100644
--- a/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
+++ b/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
@@ -34,6 +34,6 @@ UNIT_TEST(RoutingQuality_Sokol2Mayakovskaya)
     {55.79599, 37.54114}, {55.78142, 37.57364}, {55.77863, 37.57989}
   }};
 
-  TEST_EQUAL(CheckWaypoints(params, std::move(waypoints)), 0.0, ());
+  TEST_EQUAL(CheckWaypoints(params, move(waypoints)), 0.0, ());
 }
 }  // namespace waypoins_tests
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index d5128dcf1b..993967d9fc 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -539,7 +539,7 @@ void RoutingSession::SetRouter(std::unique_ptr<IRouter> && router,
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(m_router != nullptr, ());
   Reset();
-  m_router->SetRouter(std::move(router), std::move(finder));
+  m_router->SetRouter(move(router), move(finder));
 }
 
 void RoutingSession::MatchLocationToRoadGraph(location::GpsInfo & location)
diff --git a/routing/routing_tests/applying_traffic_test.cpp b/routing/routing_tests/applying_traffic_test.cpp
index c29f563188..004e1d38da 100644
--- a/routing/routing_tests/applying_traffic_test.cpp
+++ b/routing/routing_tests/applying_traffic_test.cpp
@@ -91,7 +91,7 @@ unique_ptr<WorldGraph> BuildXXGraph(shared_ptr<EdgeEstimator> estimator)
       MakeJoint({{7, 1}, {8, 0}}),                         /* joint at point (3, 0) */
   };
 
-  return BuildWorldGraph(std::move(loader), estimator, joints);
+  return BuildWorldGraph(move(loader), estimator, joints);
 }
 
 class ApplyingTrafficTest
diff --git a/routing/routing_tests/astar_algorithm_test.cpp b/routing/routing_tests/astar_algorithm_test.cpp
index 9056f34043..6431de446e 100644
--- a/routing/routing_tests/astar_algorithm_test.cpp
+++ b/routing/routing_tests/astar_algorithm_test.cpp
@@ -67,7 +67,7 @@ UNIT_TEST(AStarAlgorithm_CheckLength)
   Algorithm algo;
   Algorithm::ParamsForTests<decltype(checkLength)> params(
       graph, 0u /* startVertex */, 4u /* finishVertex */,
-      std::move(checkLength));
+      move(checkLength));
 
   RoutingResult<unsigned /* Vertex */, double /* Weight */> routingResult;
   Algorithm::Result result = algo.FindPath(params, routingResult);
@@ -97,7 +97,7 @@ UNIT_TEST(AdjustRoute)
   auto checkLength = [](double weight) { return weight <= 1.0; };
   Algorithm algo;
   Algorithm::ParamsForTests<decltype(checkLength)> params(
-      graph, 6 /* startVertex */, {} /* finishVertex */, std::move(checkLength));
+      graph, 6 /* startVertex */, {} /* finishVertex */, move(checkLength));
 
   RoutingResult<unsigned /* Vertex */, double /* Weight */> result;
   auto const code = algo.AdjustRoute(params, prevRoute, result);
@@ -121,7 +121,7 @@ UNIT_TEST(AdjustRouteNoPath)
   auto checkLength = [](double weight) { return weight <= 1.0; };
   Algorithm algo;
   Algorithm::ParamsForTests<decltype(checkLength)> params(
-        graph, 6 /* startVertex */, {} /* finishVertex */, std::move(checkLength));
+        graph, 6 /* startVertex */, {} /* finishVertex */, move(checkLength));
   RoutingResult<unsigned /* Vertex */, double /* Weight */> result;
   auto const code = algo.AdjustRoute(params, prevRoute, result);
 
@@ -144,7 +144,7 @@ UNIT_TEST(AdjustRouteOutOfLimit)
   auto checkLength = [](double weight) { return weight <= 1.0; };
   Algorithm algo;
   Algorithm::ParamsForTests<decltype(checkLength)> params(
-      graph, 6 /* startVertex */, {} /* finishVertex */, std::move(checkLength));
+      graph, 6 /* startVertex */, {} /* finishVertex */, move(checkLength));
 
   RoutingResult<unsigned /* Vertex */, double /* Weight */> result;
   auto const code = algo.AdjustRoute(params, prevRoute, result);
diff --git a/routing/routing_tests/async_router_test.cpp b/routing/routing_tests/async_router_test.cpp
index 7704f1090d..339d98c8c0 100644
--- a/routing/routing_tests/async_router_test.cpp
+++ b/routing/routing_tests/async_router_test.cpp
@@ -111,7 +111,7 @@ struct DummyRoutingCallbacks
 //  unique_ptr<IRouter> router(new DummyRouter(RouterResultCode::NoError, {}));
 //  DummyRoutingCallbacks resultCallback(2 /* expectedCalls */);
 //  AsyncRouter async(DummyStatisticsCallback, nullptr /* pointCheckCallback */);
-//  async.SetRouter(std::move(router), std::move(fetcher));
+//  async.SetRouter(move(router), move(fetcher));
 //  async.CalculateRoute(Checkpoints({1, 2} /* start */, {5, 6} /* finish */), {3, 4}, false,
 //                       bind(ref(resultCallback), _1, _2) /* readyCallback */,
 //                       bind(ref(resultCallback), _1, _2) /* needMoreMapsCallback */,
@@ -134,7 +134,7 @@ struct DummyRoutingCallbacks
 //  unique_ptr<IRouter> router(new DummyRouter(RouterResultCode::NoError, {}));
 //  DummyRoutingCallbacks resultCallback(1 /* expectedCalls */);
 //  AsyncRouter async(DummyStatisticsCallback, nullptr /* pointCheckCallback */);
-//  async.SetRouter(std::move(router), std::move(fetcher));
+//  async.SetRouter(move(router), move(fetcher));
 //  async.CalculateRoute(Checkpoints({1, 2} /* start */, {5, 6} /* finish */), {3, 4}, false,
 //                       bind(ref(resultCallback), _1, _2), nullptr /* needMoreMapsCallback */,
 //                       nullptr /* progressCallback */, nullptr /* removeRouteCallback */);
diff --git a/routing/routing_tests/cumulative_restriction_test.cpp b/routing/routing_tests/cumulative_restriction_test.cpp
index fec7d8d5d1..e41a459522 100644
--- a/routing/routing_tests/cumulative_restriction_test.cpp
+++ b/routing/routing_tests/cumulative_restriction_test.cpp
@@ -69,7 +69,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildXYGraph()
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  return BuildWorldGraph(std::move(loader), estimator, joints);
+  return BuildWorldGraph(move(loader), estimator, joints);
 }
 
 using Algorithm = AStarAlgorithm<Segment, SegmentEdge, RouteWeight>;
@@ -101,7 +101,7 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF1F3Only)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 // Route through XY graph with one restriction (type only) from F3 to F5.
@@ -119,7 +119,7 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF3F5Only)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 // Cumulative case. Route through XY graph with two restricitons (type only) applying
@@ -139,7 +139,7 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_PermutationsF3F5OnlyF1F3Only)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 // Cumulative case. Route through XY graph with two restricitons (type only and type no) applying
@@ -162,7 +162,7 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_PermutationsF3F5OnlyAndF0F2No)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 // Cumulative case. Trying to build route through XY graph with two restricitons applying
@@ -183,7 +183,7 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF3F5OnlyAndF1F3No)
   TestRestrictions(
       {} /* expectedGeom */, Algorithm::Result::NoPath,
       MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 //                        Finish
@@ -246,7 +246,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildXXGraph()
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  return BuildWorldGraph(std::move(loader), estimator, joints);
+  return BuildWorldGraph(move(loader), estimator, joints);
 }
 
 
@@ -293,7 +293,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildCubeGraph()
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  return BuildWorldGraph(std::move(loader), estimator, joints);
+  return BuildWorldGraph(move(loader), estimator, joints);
 }
 
 // Route through XY graph without any restrictions.
@@ -305,7 +305,7 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictions), *this);
+      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), move(restrictions), *this);
 }
 
 // Cumulative case. Route through XX graph with two restricitons (type only) applying
@@ -325,7 +325,7 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_PermutationsF1F3OnlyAndF3F6Only)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 // Route through XX graph with one restriciton (type no) from F1 to F3.
@@ -341,7 +341,7 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_RestrictionF1F3No)
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 // Cumulative case. Route through XX graph with four restricitons of different types applying
@@ -366,7 +366,7 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_PermutationsF1F3NoF7F8OnlyF8F4OnlyF4F6O
   TestRestrictions(
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
+      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, XXGraph_CheckOnlyRestriction)
@@ -380,7 +380,7 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_CheckOnlyRestriction)
       expectedGeom, Algorithm::Result::OK,
       MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
       MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, finish, *m_graph),
-      std::move(restrictionsNo), *this);
+      move(restrictionsNo), *this);
   };
 
   RestrictionVec restrictionsOnly = {
@@ -391,7 +391,7 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_CheckOnlyRestriction)
                               restrictionsNo);
 
   // Check that without restrictions we can find path better.
-  test({start, {2, 0}, {1, 1}, {2, 2}, {3, 1}, finish}, std::move(restrictionsNo));
+  test({start, {2, 0}, {1, 1}, {2, 2}, {3, 1}, finish}, move(restrictionsNo));
   test({start, {2, 0}, {3, 0}, finish}, RestrictionVec());
 }
 }  // namespace cumulative_restriction_test
diff --git a/routing/routing_tests/index_graph_test.cpp b/routing/routing_tests/index_graph_test.cpp
index 4aee50a2f7..fb9834aab4 100644
--- a/routing/routing_tests/index_graph_test.cpp
+++ b/routing/routing_tests/index_graph_test.cpp
@@ -143,7 +143,7 @@ UNIT_TEST(EdgesTest)
                   RoadGeometry::Points({{3.0, -1.0}, {3.0, 0.0}, {3.0, 1.0}}));
 
   traffic::TrafficCache const trafficCache;
-  IndexGraph graph(make_shared<Geometry>(std::move(loader)), CreateEstimatorForCar(trafficCache));
+  IndexGraph graph(make_shared<Geometry>(move(loader)), CreateEstimatorForCar(trafficCache));
 
   vector<Joint> joints;
   joints.emplace_back(MakeJoint({{0, 1}, {3, 1}}));  // J0
@@ -204,7 +204,7 @@ UNIT_TEST(FindPathCross)
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
   unique_ptr<WorldGraph> worldGraph =
-      BuildWorldGraph(std::move(loader), estimator, {MakeJoint({{0, 2}, {1, 2}})});
+      BuildWorldGraph(move(loader), estimator, {MakeJoint({{0, 2}, {1, 2}})});
 
   vector<FakeEnding> endPoints;
   for (uint32_t i = 0; i < 4; ++i)
@@ -281,7 +281,7 @@ UNIT_TEST(FindPathManhattan)
       joints.emplace_back(MakeJoint({{i, j}, {j + kCitySize, i}}));
   }
 
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, joints);
 
   vector<FakeEnding> endPoints;
   for (uint32_t featureId = 0; featureId < kCitySize; ++featureId)
@@ -378,7 +378,7 @@ UNIT_TEST(RoadSpeed)
   joints.emplace_back(MakeJoint({{0, 0}, {1, 1}}));  // J0
   joints.emplace_back(MakeJoint({{0, 4}, {1, 3}}));  // J1
 
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, joints);
 
   auto const start =
       MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(0.5, 0), *worldGraph);
@@ -416,7 +416,7 @@ UNIT_TEST(OneSegmentWay)
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, vector<Joint>());
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, vector<Joint>());
   vector<Segment> const expectedRoute(
       {{kTestNumMwmId, 0 /* featureId */, 0 /* seg id */, true /* forward */}});
 
@@ -455,7 +455,7 @@ UNIT_TEST(OneSegmentWayBackward)
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, vector<Joint>());
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, vector<Joint>());
 
   auto const start =
       MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *worldGraph);
@@ -490,7 +490,7 @@ UNIT_TEST(FakeSegmentCoordinates)
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, joints);
   vector<m2::PointD> const expectedGeom = {{1.0 /* x */, 0.0 /* y */}, {2.0, 0.0}, {3.0, 0.0}};
 
   // Test fake segments have valid coordinates for any combination of start and finish directions
@@ -533,7 +533,7 @@ UNIT_TEST(FakeEndingAStarInvariant)
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, joints);
   vector<Segment> const expectedRoute(
       {{kTestNumMwmId, 0 /* featureId */, 0 /* seg id */, true /* forward */}});
 
@@ -664,7 +664,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildLoopGraph()
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  return BuildWorldGraph(std::move(loader), estimator, joints);
+  return BuildWorldGraph(move(loader), estimator, joints);
 }
 
 // This test checks that the route from Start to Finish doesn't make an extra loop in F0.
@@ -839,7 +839,7 @@ UNIT_TEST(FinishNearZeroEdge)
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(move(loader), estimator, joints);
   auto const start = MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, true /* forward */)},
                                     m2::PointD(1.0, 0.0), *worldGraph);
   auto const finish = MakeFakeEnding({Segment(kTestNumMwmId, 1, 0, false /* forward */)},
diff --git a/routing/routing_tests/index_graph_tools.cpp b/routing/routing_tests/index_graph_tools.cpp
index de1addf9f7..425f9a7d97 100644
--- a/routing/routing_tests/index_graph_tools.cpp
+++ b/routing/routing_tests/index_graph_tools.cpp
@@ -35,7 +35,7 @@ void AddGraph(unordered_map<NumMwmId, unique_ptr<Graph>> & graphs, NumMwmId mwmI
 {
   auto it = graphs.find(mwmId);
   CHECK(it == graphs.end(), ("Already contains graph for mwm", mwmId));
-  graphs[mwmId] = std::move(graph);
+  graphs[mwmId] = move(graph);
 }
 
 // RestrictionTest ---------------------------------------------------------------------------------
@@ -47,30 +47,30 @@ void RestrictionTest::SetStarter(FakeEnding const & start, FakeEnding const & fi
 
 void RestrictionTest::SetRestrictions(RestrictionVec && restrictions)
 {
-  m_graph->GetIndexGraphForTests(kTestNumMwmId).SetRestrictions(std::move(restrictions));
+  m_graph->GetIndexGraphForTests(kTestNumMwmId).SetRestrictions(move(restrictions));
 }
 
 void RestrictionTest::SetUTurnRestrictions(vector<RestrictionUTurn> && restrictions)
 {
-  m_graph->GetIndexGraphForTests(kTestNumMwmId).SetUTurnRestrictions(std::move(restrictions));
+  m_graph->GetIndexGraphForTests(kTestNumMwmId).SetUTurnRestrictions(move(restrictions));
 }
 
 // NoUTurnRestrictionTest --------------------------------------------------------------------------
 void NoUTurnRestrictionTest::Init(unique_ptr<SingleVehicleWorldGraph> graph)
 {
-  m_graph = make_unique<WorldGraphForAStar>(std::move(graph));
+  m_graph = make_unique<WorldGraphForAStar>(move(graph));
 }
 
 void NoUTurnRestrictionTest::SetRestrictions(RestrictionVec && restrictions)
 {
   auto & indexGraph = m_graph->GetWorldGraph().GetIndexGraph(kTestNumMwmId);
-  indexGraph.SetRestrictions(std::move(restrictions));
+  indexGraph.SetRestrictions(move(restrictions));
 }
 
 void NoUTurnRestrictionTest::SetNoUTurnRestrictions(vector<RestrictionUTurn> && restrictions)
 {
   auto & indexGraph = m_graph->GetWorldGraph().GetIndexGraph(kTestNumMwmId);
-  indexGraph.SetUTurnRestrictions(std::move(restrictions));
+  indexGraph.SetUTurnRestrictions(move(restrictions));
 }
 
 void NoUTurnRestrictionTest::TestRouteGeom(Segment const & start, Segment const & finish,
@@ -119,7 +119,7 @@ void TestIndexGraphLoader::Clear() { m_graphs.clear(); }
 
 void TestIndexGraphLoader::AddGraph(NumMwmId mwmId, unique_ptr<IndexGraph> graph)
 {
-  routing_test::AddGraph(m_graphs, mwmId, std::move(graph));
+  routing_test::AddGraph(m_graphs, mwmId, move(graph));
 }
 
 // TestTransitGraphLoader ----------------------------------------------------------------------------
@@ -132,7 +132,7 @@ void TestTransitGraphLoader::Clear() { m_graphs.clear(); }
 
 void TestTransitGraphLoader::AddGraph(NumMwmId mwmId, unique_ptr<TransitGraph> graph)
 {
-  routing_test::AddGraph(m_graphs, mwmId, std::move(graph));
+  routing_test::AddGraph(m_graphs, mwmId, move(graph));
 }
 
 // WeightedEdgeEstimator --------------------------------------------------------------
@@ -178,7 +178,7 @@ void TestIndexGraphTopology::SetEdgeAccessConditional(Vertex from, Vertex to, Ro
     {
       osmoh::OpeningHours openingHours(condition);
       CHECK(openingHours.IsValid(), (condition));
-      r.m_accessConditionalType.Insert(type, std::move(openingHours));
+      r.m_accessConditionalType.Insert(type, move(openingHours));
       return;
     }
   }
@@ -218,12 +218,12 @@ void TestIndexGraphTopology::SetVertexAccessConditional(Vertex v, RoadAccess::Ty
   {
     if (r.m_from == v)
     {
-      r.m_fromAccessConditionalType.Insert(type, std::move(openingHours));
+      r.m_fromAccessConditionalType.Insert(type, move(openingHours));
       found = true;
     }
     else if (r.m_to == v)
     {
-      r.m_toAccessConditionalType.Insert(type, std::move(openingHours));
+      r.m_toAccessConditionalType.Insert(type, move(openingHours));
       found = true;
     }
 
@@ -271,7 +271,7 @@ bool TestIndexGraphTopology::FindPath(Vertex start, Vertex finish, double & path
 
   AlgorithmForWorldGraph algorithm;
 
-  WorldGraphForAStar graphForAStar(std::move(worldGraph));
+  WorldGraphForAStar graphForAStar(move(worldGraph));
 
   AlgorithmForWorldGraph::ParamsForTests<> params(graphForAStar, startSegment, finishSegment);
   RoutingResult<Segment, RouteWeight> routingResult;
@@ -331,11 +331,11 @@ unique_ptr<SingleVehicleWorldGraph> TestIndexGraphTopology::Builder::PrepareInde
 
   BuildJoints();
 
-  auto worldGraph = BuildWorldGraph(std::move(loader), estimator, m_joints);
+  auto worldGraph = BuildWorldGraph(move(loader), estimator, m_joints);
   auto & indexGraph = worldGraph->GetIndexGraphForTests(kTestNumMwmId);
   if (m_currentTimeGetter)
     indexGraph.SetCurrentTimeGetter(m_currentTimeGetter);
-  indexGraph.SetRoadAccess(std::move(m_roadAccess));
+  indexGraph.SetRoadAccess(move(m_roadAccess));
   return worldGraph;
 }
 
@@ -389,8 +389,8 @@ void TestIndexGraphTopology::Builder::BuildGraphFromRequests(vector<EdgeRequest>
     }
   }
 
-  m_roadAccess.SetAccess(std::move(wayToAccess), std::move(pointToAccess));
-  m_roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+  m_roadAccess.SetAccess(move(wayToAccess), move(pointToAccess));
+  m_roadAccess.SetAccessConditional(move(wayToAccessConditional), move(pointToAccessConditional));
   if (m_currentTimeGetter)
     m_roadAccess.SetCurrentTimeGetter(m_currentTimeGetter);
 }
@@ -415,11 +415,11 @@ unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoade
                                                     shared_ptr<EdgeEstimator> estimator,
                                                     vector<Joint> const & joints)
 {
-  auto graph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
+  auto graph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator);
   graph->Import(joints);
   auto indexLoader = make_unique<TestIndexGraphLoader>();
-  indexLoader->AddGraph(kTestNumMwmId, std::move(graph));
-  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader),
+  indexLoader->AddGraph(kTestNumMwmId, move(graph));
+  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, move(indexLoader),
                                               estimator, MwmHierarchyHandler());
 }
 
@@ -427,7 +427,7 @@ unique_ptr<IndexGraph> BuildIndexGraph(unique_ptr<TestGeometryLoader> geometryLo
                                        shared_ptr<EdgeEstimator> estimator,
                                        vector<Joint> const & joints)
 {
-  auto graph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
+  auto graph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator);
   graph->Import(joints);
   return graph;
 }
@@ -436,12 +436,12 @@ unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(unique_ptr<ZeroGeometryLoade
                                                     shared_ptr<EdgeEstimator> estimator,
                                                     vector<Joint> const & joints)
 {
-  auto graph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
+  auto graph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator);
 
   graph->Import(joints);
   auto indexLoader = make_unique<TestIndexGraphLoader>();
-  indexLoader->AddGraph(kTestNumMwmId, std::move(graph));
-  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader),
+  indexLoader->AddGraph(kTestNumMwmId, move(graph));
+  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, move(indexLoader),
                                               estimator, MwmHierarchyHandler());
 }
 
@@ -450,7 +450,7 @@ unique_ptr<TransitWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoader> geo
                                               vector<Joint> const & joints,
                                               routing::transit::GraphData const & transitData)
 {
-  auto indexGraph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
+  auto indexGraph = make_unique<IndexGraph>(make_shared<Geometry>(move(geometryLoader)), estimator);
   indexGraph->Import(joints);
 
   auto transitGraph =
@@ -460,13 +460,13 @@ unique_ptr<TransitWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoader> geo
   transitGraph->Fill(transitData, gateEndings);
 
   auto indexLoader = make_unique<TestIndexGraphLoader>();
-  indexLoader->AddGraph(kTestNumMwmId, std::move(indexGraph));
+  indexLoader->AddGraph(kTestNumMwmId, move(indexGraph));
 
   auto transitLoader = make_unique<TestTransitGraphLoader>();
-  transitLoader->AddGraph(kTestNumMwmId, std::move(transitGraph));
+  transitLoader->AddGraph(kTestNumMwmId, move(transitGraph));
 
-  return make_unique<TransitWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader),
-                                        std::move(transitLoader), estimator);
+  return make_unique<TransitWorldGraph>(nullptr /* crossMwmGraph */, move(indexLoader),
+                                        move(transitLoader), estimator);
 }
 
 AlgorithmForWorldGraph::Result CalculateRoute(IndexGraphStarter & starter, vector<Segment> & roadPoints,
@@ -544,7 +544,7 @@ void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom,
                       RestrictionVec && restrictions,
                       RestrictionTest & restrictionTest)
 {
-  restrictionTest.SetRestrictions(std::move(restrictions));
+  restrictionTest.SetRestrictions(move(restrictions));
   restrictionTest.SetStarter(start, finish);
 
   TestRouteGeometry(*restrictionTest.m_starter, expectedRouteResult, expectedRouteGeom);
@@ -557,8 +557,8 @@ void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom,
                       vector<RestrictionUTurn> && restrictionsNoUTurn,
                       RestrictionTest & restrictionTest)
 {
-  restrictionTest.SetRestrictions(std::move(restrictions));
-  restrictionTest.SetUTurnRestrictions(std::move(restrictionsNoUTurn));
+  restrictionTest.SetRestrictions(move(restrictions));
+  restrictionTest.SetUTurnRestrictions(move(restrictionsNoUTurn));
 
   restrictionTest.SetStarter(start, finish);
   TestRouteGeometry(*restrictionTest.m_starter, expectedRouteResult, expectedRouteGeom);
@@ -568,7 +568,7 @@ void TestRestrictions(double expectedLength,
                       FakeEnding const & start, FakeEnding const & finish,
                       RestrictionVec && restrictions, RestrictionTest & restrictionTest)
 {
-  restrictionTest.SetRestrictions(std::move(restrictions));
+  restrictionTest.SetRestrictions(move(restrictions));
   restrictionTest.SetStarter(start, finish);
 
   auto & starter = *restrictionTest.m_starter;
diff --git a/routing/routing_tests/road_access_test.cpp b/routing/routing_tests/road_access_test.cpp
index 790efbb2b2..6dbc6e93ae 100644
--- a/routing/routing_tests/road_access_test.cpp
+++ b/routing/routing_tests/road_access_test.cpp
@@ -35,7 +35,7 @@ void FillRoadAccessBySample_1(RoadAccess & roadAccess)
       {RoadPoint(4 /* featureId */, 7 /* pointId */), RoadAccess::Type::Private},
   };
 
-  roadAccess.SetAccess(std::move(wayToAccess), std::move(pointToAccess));
+  roadAccess.SetAccess(move(wayToAccess), move(pointToAccess));
 }
 
 void FillRoadAccessBySample_2(RoadAccess & roadAccess)
@@ -50,7 +50,7 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
       {RoadPoint(4 /* featureId */, 0 /* pointId */), RoadAccess::Type::No},
   };
 
-  roadAccess.SetAccess(std::move(wayToAccess), std::move(pointToAccess));
+  roadAccess.SetAccess(move(wayToAccess), move(pointToAccess));
 }
 
 //void FillRoadAccessBySampleConditional_1(RoadAccess & roadAccess)
@@ -66,18 +66,18 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
 //  }
 //
 //  RoadAccess::Conditional conditional_1;
-//  conditional_1.Insert(RoadAccess::Type::No, std::move(openingHours[0]));
-//  conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[1]));
+//  conditional_1.Insert(RoadAccess::Type::No, move(openingHours[0]));
+//  conditional_1.Insert(RoadAccess::Type::Private, move(openingHours[1]));
 //
 //  RoadAccess::Conditional conditional_2;
-//  conditional_2.Insert(RoadAccess::Type::Destination, std::move(openingHours[2]));
+//  conditional_2.Insert(RoadAccess::Type::Destination, move(openingHours[2]));
 //
 //  RoadAccess::Conditional conditional_3;
-//  conditional_3.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
-//  conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
+//  conditional_3.Insert(RoadAccess::Type::No, move(openingHours[4]));
+//  conditional_3.Insert(RoadAccess::Type::Destination, move(openingHours[3]));
 //
 //  RoadAccess::Conditional conditional_4;
-//  conditional_4.Insert(RoadAccess::Type::Destination, std::move(openingHours[5]));
+//  conditional_4.Insert(RoadAccess::Type::Destination, move(openingHours[5]));
 //
 //  RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
 //                                                               {2 /* featureId */, conditional_2}};
@@ -86,7 +86,7 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
 //      {RoadPoint(3 /* featureId */, 0 /* pointId */), conditional_3},
 //      {RoadPoint(4 /* featureId */, 7 /* pointId */), conditional_4}};
 //
-//  roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+//  roadAccess.SetAccessConditional(move(wayToAccessConditional), move(pointToAccessConditional));
 //}
 //
 //void FillRoadAccessBySampleConditional_2(RoadAccess & roadAccess)
@@ -102,18 +102,18 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
 //  }
 //
 //  RoadAccess::Conditional conditional_1;
-//  conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[0]));
+//  conditional_1.Insert(RoadAccess::Type::Private, move(openingHours[0]));
 //
 //  RoadAccess::Conditional conditional_2;
-//  conditional_2.Insert(RoadAccess::Type::No, std::move(openingHours[1]));
-//  conditional_2.Insert(RoadAccess::Type::Private, std::move(openingHours[2]));
+//  conditional_2.Insert(RoadAccess::Type::No, move(openingHours[1]));
+//  conditional_2.Insert(RoadAccess::Type::Private, move(openingHours[2]));
 //
 //  RoadAccess::Conditional conditional_3;
-//  conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
+//  conditional_3.Insert(RoadAccess::Type::Destination, move(openingHours[3]));
 //
 //  RoadAccess::Conditional conditional_4;
-//  conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
-//  conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[5]));
+//  conditional_4.Insert(RoadAccess::Type::No, move(openingHours[4]));
+//  conditional_4.Insert(RoadAccess::Type::No, move(openingHours[5]));
 //
 //  RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
 //                                                               {2 /* featureId */, conditional_2}};
@@ -122,7 +122,7 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
 //      {RoadPoint(3 /* featureId */, 10 /* pointId */), conditional_3},
 //      {RoadPoint(4 /* featureId */, 2 /* pointId */), conditional_4}};
 //
-//  roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+//  roadAccess.SetAccessConditional(move(wayToAccessConditional), move(pointToAccessConditional));
 //}
 
 class RoadAccessSerDesTest
diff --git a/routing/routing_tests/road_graph_builder.cpp b/routing/routing_tests/road_graph_builder.cpp
index 0113d73276..041e7b1a7d 100644
--- a/routing/routing_tests/road_graph_builder.cpp
+++ b/routing/routing_tests/road_graph_builder.cpp
@@ -61,7 +61,7 @@ private:
 void RoadGraphMockSource::AddRoad(RoadInfo && ri)
 {
   CHECK_GREATER_OR_EQUAL(ri.m_junctions.size(), 2, ("Empty road"));
-  m_roads.push_back(std::move(ri));
+  m_roads.push_back(move(ri));
 }
 
 IRoadGraph::RoadInfo RoadGraphMockSource::GetRoadInfo(FeatureID const & featureId,
@@ -148,10 +148,10 @@ void InitRoadGraphMockSourceWithTest1(RoadGraphMockSource & src)
   ri3.m_junctions.push_back(geometry::MakePointWithAltitudeForTesting(m2::PointD(15, 5)));
   ri3.m_junctions.push_back(geometry::MakePointWithAltitudeForTesting(m2::PointD(20, 0)));
 
-  src.AddRoad(std::move(ri0));
-  src.AddRoad(std::move(ri1));
-  src.AddRoad(std::move(ri2));
-  src.AddRoad(std::move(ri3));
+  src.AddRoad(move(ri0));
+  src.AddRoad(move(ri1));
+  src.AddRoad(move(ri2));
+  src.AddRoad(move(ri3));
 }
 
 void InitRoadGraphMockSourceWithTest2(RoadGraphMockSource & graph)
@@ -226,15 +226,15 @@ void InitRoadGraphMockSourceWithTest2(RoadGraphMockSource & graph)
   ri8.m_junctions.push_back(geometry::MakePointWithAltitudeForTesting(m2::PointD(12, 25)));
   ri8.m_junctions.push_back(geometry::MakePointWithAltitudeForTesting(m2::PointD(5, 40)));
 
-  graph.AddRoad(std::move(ri0));
-  graph.AddRoad(std::move(ri1));
-  graph.AddRoad(std::move(ri2));
-  graph.AddRoad(std::move(ri3));
-  graph.AddRoad(std::move(ri4));
-  graph.AddRoad(std::move(ri5));
-  graph.AddRoad(std::move(ri6));
-  graph.AddRoad(std::move(ri7));
-  graph.AddRoad(std::move(ri8));
+  graph.AddRoad(move(ri0));
+  graph.AddRoad(move(ri1));
+  graph.AddRoad(move(ri2));
+  graph.AddRoad(move(ri3));
+  graph.AddRoad(move(ri4));
+  graph.AddRoad(move(ri5));
+  graph.AddRoad(move(ri6));
+  graph.AddRoad(move(ri7));
+  graph.AddRoad(move(ri8));
 }
 
 }  // namespace routing_test
diff --git a/routing/routing_tests/road_graph_nearest_edges_test.cpp b/routing/routing_tests/road_graph_nearest_edges_test.cpp
index 30b3df0fa7..f8df9e977c 100644
--- a/routing/routing_tests/road_graph_nearest_edges_test.cpp
+++ b/routing/routing_tests/road_graph_nearest_edges_test.cpp
@@ -52,8 +52,8 @@ UNIT_TEST(RoadGraph_NearestEdges)
     ri1.m_speedKMPH = 5;
     ri1.m_bidirectional = true;
 
-    graph.AddRoad(std::move(ri0));
-    graph.AddRoad(std::move(ri1));
+    graph.AddRoad(move(ri0));
+    graph.AddRoad(move(ri1));
   }
 
   // We are standing at x junction.
diff --git a/routing/routing_tests/route_tests.cpp b/routing/routing_tests/route_tests.cpp
index d9169089a2..5ccaba411a 100644
--- a/routing/routing_tests/route_tests.cpp
+++ b/routing/routing_tests/route_tests.cpp
@@ -111,7 +111,7 @@ UNIT_TEST(FinshRouteOnSomeDistanceToTheFinishPointTest)
       vector<RouteSegment> routeSegments;
       RouteSegmentsFrom(segments, kTestGeometry, kTestTurns, {}, routeSegments);
       FillSegmentInfo(kTestTimes, routeSegments);
-      route.SetRouteSegments(std::move(routeSegments));
+      route.SetRouteSegments(move(routeSegments));
 
       route.SetGeometry(kTestGeometry.begin(), kTestGeometry.end());
       route.SetSubroteAttrs(vector<Route::SubrouteAttrs>(
@@ -153,7 +153,7 @@ UNIT_TEST(DistanceAndTimeToCurrentTurnTest)
   route.SetGeometry(kTestGeometry.begin(), kTestGeometry.end());
   vector<turns::TurnItem> turns(kTestTurns);
 
-  route.SetRouteSegments(std::move(routeSegments));
+  route.SetRouteSegments(move(routeSegments));
 
   double distance;
   turns::TurnItem turn;
@@ -236,7 +236,7 @@ UNIT_TEST(NextTurnTest)
   Route route("TestRouter", 0 /* route id */);
   vector<RouteSegment> routeSegments;
   GetTestRouteSegments(kTestGeometry, kTestTurns, {}, {}, routeSegments);
-  route.SetRouteSegments(std::move(routeSegments));
+  route.SetRouteSegments(move(routeSegments));
   route.SetGeometry(kTestGeometry.begin(), kTestGeometry.end());
 
   double distance, nextDistance;
@@ -286,7 +286,7 @@ UNIT_TEST(NextTurnsTest)
   route.SetGeometry(kTestGeometry.begin(), kTestGeometry.end());
   vector<RouteSegment> routeSegments;
   GetTestRouteSegments(kTestGeometry, kTestTurns, {}, {}, routeSegments);
-  route.SetRouteSegments(std::move(routeSegments));
+  route.SetRouteSegments(move(routeSegments));
 
   vector<turns::TurnItem> turns(kTestTurns);
   vector<turns::TurnItemDist> turnsDist;
@@ -380,7 +380,7 @@ UNIT_TEST(SelfIntersectedRouteMatchingTest)
 
   vector<RouteSegment> routeSegments;
   GetTestRouteSegments(kRouteGeometry, {}, {}, {}, routeSegments);
-  route.SetRouteSegments(std::move(routeSegments));
+  route.SetRouteSegments(move(routeSegments));
 
   auto const testMachedPos = [&](location::GpsInfo const & pos,
                                  location::GpsInfo const & expectedMatchingPos,
@@ -431,7 +431,7 @@ UNIT_TEST(RouteNameTest)
   route.SetGeometry(kTestGeometry.begin(), kTestGeometry.end());
   vector<RouteSegment> routeSegments;
   GetTestRouteSegments(kTestGeometry, kTestTurns, kTestNames, {}, routeSegments);
-  route.SetRouteSegments(std::move(routeSegments));
+  route.SetRouteSegments(move(routeSegments));
 
   RouteSegment::RoadNameInfo roadNameInfo;
   route.GetCurrentStreetName(roadNameInfo);
diff --git a/routing/routing_tests/routing_session_test.cpp b/routing/routing_tests/routing_session_test.cpp
index 518ca6e7fa..a77f5ac2e9 100644
--- a/routing/routing_tests/routing_session_test.cpp
+++ b/routing/routing_tests/routing_session_test.cpp
@@ -204,7 +204,7 @@ void FillSubroutesInfo(Route & route, vector<turns::TurnItem> const & turns /* =
   vector<RouteSegment> segmentInfo;
   RouteSegmentsFrom(kTestSegments, kTestRoute, turns, {}, segmentInfo);
   FillSegmentInfo(kTestTimes, segmentInfo);
-  route.SetRouteSegments(std::move(segmentInfo));
+  route.SetRouteSegments(move(segmentInfo));
   route.SetSubroteAttrs(vector<Route::SubrouteAttrs>(
       {Route::SubrouteAttrs(junctions.front(), junctions.back(), 0, kTestSegments.size())}));
 }
@@ -250,7 +250,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteBuilding)
 
     unique_ptr<DummyRouter> router =
         make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
-    m_session->SetRouter(std::move(router), nullptr);
+    m_session->SetRouter(move(router), nullptr);
     m_session->SetRoutingCallbacks(
         [&timedSignal](Route const &, RouterResultCode) {
           LOG(LINFO, ("Ready"));
@@ -282,7 +282,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingA
 
     unique_ptr<DummyRouter> router =
         make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
-    m_session->SetRouter(std::move(router), nullptr);
+    m_session->SetRouter(move(router), nullptr);
 
     // Go along the route.
     m_session->SetRoutingCallbacks(
@@ -364,7 +364,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingT
 
     unique_ptr<DummyRouter> router =
         make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
-    m_session->SetRouter(std::move(router), nullptr);
+    m_session->SetRouter(move(router), nullptr);
 
     m_session->SetRoutingCallbacks(
         [&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
@@ -414,7 +414,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRouteFlagPersist
     FillSubroutesInfo(masterRoute, kTestTurns);
     unique_ptr<DummyRouter> router =
         make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
-    m_session->SetRouter(std::move(router), nullptr);
+    m_session->SetRouter(move(router), nullptr);
 
     // Go along the route.
     m_session->SetRoutingCallbacks(
@@ -504,7 +504,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRoutePercentTest
     size_t counter = 0;
     unique_ptr<DummyRouter> router =
         make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
-    m_session->SetRouter(std::move(router), nullptr);
+    m_session->SetRouter(move(router), nullptr);
 
     // Get completion percent of unexisted route.
     TEST_EQUAL(m_session->GetCompletionPercent(), 0, (m_session->GetCompletionPercent()));
@@ -566,7 +566,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingError)
     InitRoutingSession();
     unique_ptr<ReturnCodesRouter> router = make_unique<ReturnCodesRouter>(initializer_list<
         RouterResultCode>{RouterResultCode::NoError, RouterResultCode::InternalError}, kRoute);
-    m_session->SetRouter(std::move(router), nullptr);
+    m_session->SetRouter(move(router), nullptr);
     createTimedSignal.Signal();
   });
   TEST(createTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
diff --git a/routing/routing_tests/world_graph_builder.cpp b/routing/routing_tests/world_graph_builder.cpp
index 8c9abda983..5eb54f4e50 100644
--- a/routing/routing_tests/world_graph_builder.cpp
+++ b/routing/routing_tests/world_graph_builder.cpp
@@ -63,7 +63,7 @@ std::unique_ptr<SingleVehicleWorldGraph> BuildCrossGraph()
   traffic::TrafficCache const trafficCache;
   std::shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
 
-  return BuildWorldGraph(std::move(loader), estimator, joints);
+  return BuildWorldGraph(move(loader), estimator, joints);
 }
 
 //
diff --git a/routing/traffic_stash.cpp b/routing/traffic_stash.cpp
index b00d4f5bfe..29f1057669 100644
--- a/routing/traffic_stash.cpp
+++ b/routing/traffic_stash.cpp
@@ -9,7 +9,7 @@ namespace routing
 using namespace std;
 
 TrafficStash::TrafficStash(traffic::TrafficCache const & source, shared_ptr<NumMwmIds> numMwmIds)
-  : m_source(source), m_numMwmIds(std::move(numMwmIds))
+  : m_source(source), m_numMwmIds(move(numMwmIds))
 {
   CHECK(m_numMwmIds, ());
 }
diff --git a/routing/transit_info.hpp b/routing/transit_info.hpp
index 9c8977e01a..8ae92bf319 100644
--- a/routing/transit_info.hpp
+++ b/routing/transit_info.hpp
@@ -195,7 +195,7 @@ private:
 class TransitInfoWrapper final
 {
 public:
-  explicit TransitInfoWrapper(std::unique_ptr<TransitInfo> ptr) : m_ptr(std::move(ptr)) {}
+  explicit TransitInfoWrapper(std::unique_ptr<TransitInfo> ptr) : m_ptr(move(ptr)) {}
   explicit TransitInfoWrapper(TransitInfoWrapper && rhs) { swap(m_ptr, rhs.m_ptr); }
   explicit TransitInfoWrapper(TransitInfoWrapper const & rhs)
   {
@@ -228,7 +228,7 @@ public:
     return *m_ptr;
   }
 
-  void Set(std::unique_ptr<TransitInfo> ptr) { m_ptr = std::move(ptr); }
+  void Set(std::unique_ptr<TransitInfo> ptr) { m_ptr = move(ptr); }
 
 private:
   std::unique_ptr<TransitInfo> m_ptr;
diff --git a/routing/transit_world_graph.cpp b/routing/transit_world_graph.cpp
index f734ce954b..7d1f4d86e0 100644
--- a/routing/transit_world_graph.cpp
+++ b/routing/transit_world_graph.cpp
@@ -14,9 +14,9 @@ TransitWorldGraph::TransitWorldGraph(unique_ptr<CrossMwmGraph> crossMwmGraph,
                                      unique_ptr<IndexGraphLoader> indexLoader,
                                      unique_ptr<TransitGraphLoader> transitLoader,
                                      shared_ptr<EdgeEstimator> estimator)
-  : m_crossMwmGraph(std::move(crossMwmGraph))
-  , m_indexLoader(std::move(indexLoader))
-  , m_transitLoader(std::move(transitLoader))
+  : m_crossMwmGraph(move(crossMwmGraph))
+  , m_indexLoader(move(indexLoader))
+  , m_transitLoader(move(transitLoader))
   , m_estimator(estimator)
 {
   CHECK(m_indexLoader, ());
diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp
index 7cb6a86611..d5a7c16d0c 100644
--- a/routing/turns_generator.cpp
+++ b/routing/turns_generator.cpp
@@ -1,6 +1,7 @@
 #include "routing/turns_generator.hpp"
 
 #include "routing/turns_generator_utils.hpp"
+#include "routing/router.hpp"
 
 #include "indexer/ftypes_matcher.hpp"
 
@@ -271,19 +272,15 @@ void CorrectCandidatesSegmentByOutgoing(TurnInfo const & turnInfo, Segment const
                                         TurnCandidates & nodes)
 {
   double const turnAngle = CalcOneSegmentTurnAngle(turnInfo);
-  auto const IsFirstOutgoingSeg = [&firstOutgoingSeg](TurnCandidate const & turnCandidate)
-  {
-    return turnCandidate.m_segment == firstOutgoingSeg;
-  };
+  auto IsFirstOutgoingSeg = [&firstOutgoingSeg](TurnCandidate const & turnCandidate) { return turnCandidate.m_segment == firstOutgoingSeg; };
   auto & candidates = nodes.candidates;
   auto it = find_if(candidates.begin(), candidates.end(), IsFirstOutgoingSeg);
   if (it == candidates.end())
   {
     // firstOutgoingSeg not found. Try to match by angle.
-    auto const DoesAngleMatch = [&turnAngle](TurnCandidate const & candidate)
+    auto DoesAngleMatch = [&turnAngle](TurnCandidate const & candidate)
     {
-      return (base::AlmostEqualAbs(candidate.m_angle, turnAngle, 0.001) ||
-              fabs(candidate.m_angle) + fabs(turnAngle) > 359.999);
+      return base::AlmostEqualAbs(candidate.m_angle, turnAngle, 0.001) || abs(candidate.m_angle) + abs(turnAngle) > 359.999;
     };
     auto it = find_if(candidates.begin(), candidates.end(), DoesAngleMatch);
     if (it != candidates.end())
@@ -295,21 +292,18 @@ void CorrectCandidatesSegmentByOutgoing(TurnInfo const & turnInfo, Segment const
       it->m_segment = firstOutgoingSeg;
     }
     else if (nodes.isCandidatesAngleValid)
-    {
       // Typically all candidates are from one mwm, and missed one (firstOutgoingSegment) from another.
       LOG(LWARNING, ("Can't match any candidate with firstOutgoingSegment but isCandidatesAngleValid == true."));
-    }
     else
     {
       LOG(LWARNING, ("Can't match any candidate with firstOutgoingSegment and isCandidatesAngleValid == false"));
       if (candidates.size() == 1)
       {
-        auto & c = candidates.front();
-        ASSERT(c.m_segment.GetMwmId() != firstOutgoingSeg.GetMwmId(), ());
-        ASSERT(c.m_segment.GetSegmentIdx() == firstOutgoingSeg.GetSegmentIdx(), ());
-        ASSERT(c.m_segment.IsForward() == firstOutgoingSeg.IsForward(), ());
-        c.m_segment = firstOutgoingSeg;
-        c.m_angle = turnAngle;
+        ASSERT(candidates.front().m_segment.GetMwmId() != firstOutgoingSeg.GetMwmId(), ());
+        ASSERT(candidates.front().m_segment.GetSegmentIdx() == firstOutgoingSeg.GetSegmentIdx(), ());
+        ASSERT(candidates.front().m_segment.IsForward() == firstOutgoingSeg.IsForward(), ());
+        candidates.front().m_segment = firstOutgoingSeg;
+        candidates.front().m_angle = turnAngle;
         nodes.isCandidatesAngleValid = true;
         LOG(LWARNING, ("but since candidates.size() == 1, this was fixed."));
       }
diff --git a/search/base/text_index/mem.cpp b/search/base/text_index/mem.cpp
index 9563fab18c..cf701baee6 100644
--- a/search/base/text_index/mem.cpp
+++ b/search/base/text_index/mem.cpp
@@ -29,6 +29,6 @@ void MemTextIndex::BuildDictionary()
   tokens.reserve(m_postingsByToken.size());
   for (auto const & entry : m_postingsByToken)
     tokens.emplace_back(entry.first);
-  m_dictionary.SetTokens(std::move(tokens));
+  m_dictionary.SetTokens(move(tokens));
 }
 }  // namespace search_base
diff --git a/search/base/text_index/merger.cpp b/search/base/text_index/merger.cpp
index b2e26b4d3e..c1cba71c5d 100644
--- a/search/base/text_index/merger.cpp
+++ b/search/base/text_index/merger.cpp
@@ -93,7 +93,7 @@ TextIndexDictionary MergeDictionaries(TextIndexDictionary const & dict1,
   commonTokens.erase(unique(commonTokens.begin(), commonTokens.end()), commonTokens.end());
 
   TextIndexDictionary dict;
-  dict.SetTokens(std::move(commonTokens));
+  dict.SetTokens(move(commonTokens));
   return dict;
 }
 }  // namespace
diff --git a/search/cbv.cpp b/search/cbv.cpp
index ccd394bbc3..29b25c8d3d 100644
--- a/search/cbv.cpp
+++ b/search/cbv.cpp
@@ -19,15 +19,15 @@ CBV const & CBV::GetFull()
   return fullCBV;
 }
 
-CBV::CBV(unique_ptr<coding::CompressedBitVector> p) : m_p(std::move(p)) {}
+CBV::CBV(unique_ptr<coding::CompressedBitVector> p) : m_p(move(p)) {}
 
-CBV::CBV(CBV && cbv) : m_p(std::move(cbv.m_p)), m_isFull(cbv.m_isFull) { cbv.m_isFull = false; }
+CBV::CBV(CBV && cbv) : m_p(move(cbv.m_p)), m_isFull(cbv.m_isFull) { cbv.m_isFull = false; }
 
 CBV::CBV(bool full) : m_isFull(full) {}
 
 CBV & CBV::operator=(unique_ptr<coding::CompressedBitVector> p)
 {
-  m_p = std::move(p);
+  m_p = move(p);
   m_isFull = false;
 
   return *this;
@@ -38,7 +38,7 @@ CBV & CBV::operator=(CBV && rhs)
   if (this == &rhs)
     return *this;
 
-  m_p = std::move(rhs.m_p);
+  m_p = move(rhs.m_p);
   m_isFull = rhs.m_isFull;
 
   rhs.m_isFull = false;
@@ -106,7 +106,7 @@ CBV CBV::Take(uint64_t n) const
       ASSERT(!groups.empty(), ());
       groups.back() = (static_cast<uint64_t>(1) << r) - 1;
     }
-    return CBV(coding::DenseCBV::BuildFromBitGroups(std::move(groups)));
+    return CBV(coding::DenseCBV::BuildFromBitGroups(move(groups)));
   }
 
   return CBV(m_p->LeaveFirstSetNBits(n));
diff --git a/search/cities_boundaries_table.cpp b/search/cities_boundaries_table.cpp
index 1351e75f41..48bd5d8081 100644
--- a/search/cities_boundaries_table.cpp
+++ b/search/cities_boundaries_table.cpp
@@ -54,7 +54,7 @@ bool CitiesBoundariesTable::Load()
   if (handle.GetId() == m_mwmId)
     return true;
 
-  MwmContext context(std::move(handle));
+  MwmContext context(move(handle));
   base::Cancellable const cancellable;
   auto const localities = CategoriesCache(LocalitiesSource{}, cancellable).Get(context);
 
diff --git a/search/editor_delegate.cpp b/search/editor_delegate.cpp
index dc59a80630..0cb7383adc 100644
--- a/search/editor_delegate.cpp
+++ b/search/editor_delegate.cpp
@@ -40,6 +40,6 @@ void EditorDelegate::ForEachFeatureAtPoint(osm::Editor::FeatureTypeFn && fn,
                                            m2::PointD const & point) const
 {
   auto const kToleranceMeters = 1e-2;
-  indexer::ForEachFeatureAtPoint(m_dataSource, std::move(fn), point, kToleranceMeters);
+  indexer::ForEachFeatureAtPoint(m_dataSource, move(fn), point, kToleranceMeters);
 }
 }  // namespace search
diff --git a/search/engine.cpp b/search/engine.cpp
index a96b856209..c130447fc0 100644
--- a/search/engine.cpp
+++ b/search/engine.cpp
@@ -93,7 +93,7 @@ Engine::Engine(DataSource & dataSource, CategoriesHolder const & categories,
   {
     auto processor = make_unique<Processor>(dataSource, categories, m_suggests, infoGetter);
     processor->SetPreferredLocale(params.m_locale);
-    m_contexts[i].m_processor = std::move(processor);
+    m_contexts[i].m_processor = move(processor);
   }
 
   m_threads.reserve(params.m_numThreads);
@@ -253,7 +253,7 @@ void Engine::MainLoop(Context & context)
       // next free search thread.
       if (!m_messages.empty())
       {
-        context.m_messages.push(std::move(m_messages.front()));
+        context.m_messages.push(move(m_messages.front()));
         m_messages.pop();
       }
 
@@ -275,7 +275,7 @@ template <typename... Args>
 void Engine::PostMessage(Args &&... args)
 {
   lock_guard<mutex> lock(m_mu);
-  m_messages.emplace(std::forward<Args>(args)...);
+  m_messages.emplace(forward<Args>(args)...);
   m_cv.notify_one();
 }
 
diff --git a/search/features_layer_matcher.cpp b/search/features_layer_matcher.cpp
index ac89345942..a1a144f17d 100644
--- a/search/features_layer_matcher.cpp
+++ b/search/features_layer_matcher.cpp
@@ -55,8 +55,6 @@ void FeaturesLayerMatcher::OnQueryFinished()
 
 uint32_t FeaturesLayerMatcher::GetMatchingStreet(uint32_t houseId)
 {
-  /// @todo But what if houseId was edited? Should we check it like in GetMatchingStreet(FeatureType) ?
-  /// I think, we should implement more robust logic with invalidating all caches when editor was invoked.
   auto entry = m_matchingStreetsCache.Get(houseId);
   if (!entry.second)
     return entry.first;
@@ -70,6 +68,8 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreet(uint32_t houseId)
 
 FeaturesLayerMatcher::Streets const & FeaturesLayerMatcher::GetNearbyStreets(FeatureType & feature)
 {
+  static FeaturesLayerMatcher::Streets const kEmptyStreets;
+
   auto entry = m_nearbyStreetsCache.Get(feature.GetID().m_index);
   if (!entry.second)
     return entry.first;
@@ -84,7 +84,8 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreet(FeatureType & houseFeature)
 {
   // Check if this feature is modified - the logic will be different.
   string streetName;
-  bool const edited = osm::Editor::Instance().GetEditedFeatureStreet(houseFeature.GetID(), streetName);
+  bool const edited =
+      osm::Editor::Instance().GetEditedFeatureStreet(houseFeature.GetID(), streetName);
 
   // Check the cached result value.
   auto entry = m_matchingStreetsCache.Get(houseFeature.GetID().m_index);
@@ -95,7 +96,10 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreet(FeatureType & houseFeature)
   result = kInvalidId;
 
   FeatureID streetId;
-  if (!edited && m_reverseGeocoder.GetOriginalStreetByHouse(houseFeature, streetId))
+  CHECK(m_context, ());
+  CHECK(m_context->m_handle.IsAlive(), (m_context->m_handle.GetId()));
+  CHECK(m_context->m_handle.GetId().IsAlive(), (m_context->m_handle.GetId()));
+  if (!edited && m_reverseGeocoder.GetStreetByHouse(houseFeature, streetId))
   {
     result = streetId.m_index;
     return result;
diff --git a/search/features_layer_matcher.hpp b/search/features_layer_matcher.hpp
index 337b57201b..c69e65053f 100644
--- a/search/features_layer_matcher.hpp
+++ b/search/features_layer_matcher.hpp
@@ -111,15 +111,6 @@ public:
 private:
   void BailIfCancelled() { ::search::BailIfCancelled(m_cancellable); }
 
-  static bool HouseNumbersMatch(FeatureType & feature, std::vector<house_numbers::Token> const & queryParse)
-  {
-    auto const interpol = ftypes::IsAddressInterpolChecker::Instance().GetInterpolType(feature);
-    if (interpol != feature::InterpolType::None)
-      return house_numbers::HouseNumbersMatchRange(feature.GetRef(), queryParse, interpol);
-    else
-      return house_numbers::HouseNumbersMatch(strings::MakeUniString(feature.GetHouseNumber()), queryParse);
-  }
-
   template <typename Fn>
   void MatchPOIsWithParent(FeaturesLayer const & child, FeaturesLayer const & parent, Fn && fn)
   {
@@ -208,8 +199,7 @@ private:
 
       m_context->ForEachFeature(
           mercator::RectByCenterXYAndSizeInMeters(poiCenters[i].m_point, maxRadius),
-          [&](FeatureType & ft)
-          {
+          [&](FeatureType & ft) {
             BailIfCancelled();
 
             if (m_postcodes && !m_postcodes->HasBit(ft.GetID().m_index) &&
@@ -217,7 +207,8 @@ private:
             {
               return;
             }
-            if (HouseNumbersMatch(ft, queryParse))
+            if (house_numbers::HouseNumbersMatch(strings::MakeUniString(ft.GetHouseNumber()),
+                                                 queryParse))
             {
               double const distanceM =
                   mercator::DistanceOnEarth(feature::GetCenter(ft), poiCenters[i].m_point);
@@ -335,9 +326,8 @@ private:
     ParseQuery(child.m_subQuery, child.m_lastTokenIsPrefix, queryParse);
 
     uint32_t numFilterInvocations = 0;
-    auto const houseNumberFilter = [&](uint32_t houseId, uint32_t streetId,
-                                       std::unique_ptr<FeatureType> & feature)
-    {
+    auto houseNumberFilter = [&](uint32_t houseId, uint32_t streetId,
+                                 std::unique_ptr<FeatureType> & feature, bool & loaded) -> bool {
       ++numFilterInvocations;
       if ((numFilterInvocations & 0xFF) == 0)
         BailIfCancelled();
@@ -348,28 +338,30 @@ private:
       if (m_postcodes && !m_postcodes->HasBit(houseId) && !m_postcodes->HasBit(streetId))
         return false;
 
-      if (!feature)
+      if (!loaded)
       {
         feature = GetByIndex(houseId);
-        if (!feature)
-          return false;
+        loaded = feature != nullptr;
       }
 
+      if (!loaded)
+        return false;
+
       if (!child.m_hasDelayedFeatures)
         return false;
 
-      return HouseNumbersMatch(*feature, queryParse);
+      strings::UniString const houseNumber(strings::MakeUniString(feature->GetHouseNumber()));
+      return house_numbers::HouseNumbersMatch(houseNumber, queryParse);
     };
 
-    /// @todo We can't make FeatureType robust cache now, but good to have some FeatureCached class.
     std::unordered_map<uint32_t, bool> cache;
-    auto const cachingHouseNumberFilter = [&](uint32_t houseId, uint32_t streetId,
-                                              std::unique_ptr<FeatureType> & feature)
-    {
+    auto cachingHouseNumberFilter = [&](uint32_t houseId, uint32_t streetId,
+                                        std::unique_ptr<FeatureType> & feature,
+                                        bool & loaded) -> bool {
       auto const it = cache.find(houseId);
       if (it != cache.cend())
         return it->second;
-      bool const result = houseNumberFilter(houseId, streetId, feature);
+      bool const result = houseNumberFilter(houseId, streetId, feature, loaded);
       cache[houseId] = result;
       return result;
     };
@@ -386,17 +378,16 @@ private:
       for (uint32_t houseId : street.m_features)
       {
         std::unique_ptr<FeatureType> feature;
-        if (!cachingHouseNumberFilter(houseId, streetId, feature))
+        bool loaded = false;
+        if (!cachingHouseNumberFilter(houseId, streetId, feature, loaded))
           continue;
 
-        if (!feature)
-        {
+        if (!loaded)
           feature = GetByIndex(houseId);
-          if (!feature)
-            continue;
-        }
 
-        /// @todo Should be optimized, we already have street candidate and no need to call GetNearbyStreets inside.
+        if (!feature)
+          continue;
+
         if (GetMatchingStreet(*feature) == streetId)
           fn(houseId, streetId);
       }
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 1aa60ea88b..044929634c 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -1,5 +1,10 @@
 #include "house_detector.hpp"
 
+#include "search/algos.hpp"
+#include "search/common.hpp"
+
+#include "indexer/classificator.hpp"
+#include "indexer/feature_impl.hpp"
 #include "indexer/search_string_utils.hpp"
 
 #include "platform/platform.hpp"
@@ -7,6 +12,7 @@
 #include "coding/string_utf8_multilang.hpp"
 
 #include "geometry/angles.hpp"
+#include "geometry/parametrized_segment.hpp"
 
 #include "base/limited_priority_queue.hpp"
 #include "base/logging.hpp"
@@ -24,14 +30,13 @@
 
 #include <boost/iterator/transform_iterator.hpp>
 
-
-namespace search
-{
 using namespace std;
 using namespace std::placeholders;
 
 using boost::make_transform_iterator;
 
+namespace search
+{
 namespace
 {
 #if 0
@@ -1087,36 +1092,38 @@ HouseProjection const * MergedStreet::GetHousePivot(bool isOdd, bool & sign) con
 template <typename ProjectionCalculator>
 void HouseDetector::ReadHouse(FeatureType & f, Street * st, ProjectionCalculator & calc)
 {
-  string const & hn = f.GetHouseNumber();
-  if (hn.empty() || !ftypes::IsBuildingChecker::Instance()(f))
-    return;
+  string const houseNumber = f.GetHouseNumber();
 
-  auto const it = m_id2house.find(f.GetID());
-  bool const isNew = it == m_id2house.end();
-
-  m2::PointD const pt =
-      isNew ? f.GetLimitRect(FeatureType::BEST_GEOMETRY).Center() : it->second->GetPosition();
-
-  HouseProjection pr;
-  if (calc.GetProjection(pt, pr) && pr.m_distMeters <= m_houseOffsetM)
+  /// @todo After new data generation we can skip IsHouseNumber check here.
+  if (ftypes::IsBuildingChecker::Instance()(f) && feature::IsHouseNumber(houseNumber))
   {
-    pr.m_streetDistance =
-        st->GetPrefixLength(pr.m_segIndex) + st->m_points[pr.m_segIndex].Length(pr.m_proj);
+    auto const it = m_id2house.find(f.GetID());
+    bool const isNew = it == m_id2house.end();
 
-    House * p;
-    if (isNew)
-    {
-      p = new House(hn, pt);
-      m_id2house[f.GetID()] = p;
-    }
-    else
-    {
-      p = it->second;
-      ASSERT(p != 0, ());
-    }
+    m2::PointD const pt =
+        isNew ? f.GetLimitRect(FeatureType::BEST_GEOMETRY).Center() : it->second->GetPosition();
 
-    pr.m_house = p;
-    st->m_houses.push_back(pr);
+    HouseProjection pr;
+    if (calc.GetProjection(pt, pr) && pr.m_distMeters <= m_houseOffsetM)
+    {
+      pr.m_streetDistance =
+          st->GetPrefixLength(pr.m_segIndex) + st->m_points[pr.m_segIndex].Length(pr.m_proj);
+
+      House * p;
+      if (isNew)
+      {
+        p = new House(houseNumber, pt);
+        m_id2house[f.GetID()] = p;
+      }
+      else
+      {
+        p = it->second;
+        ASSERT(p != 0, ());
+      }
+
+      pr.m_house = p;
+      st->m_houses.push_back(pr);
+    }
   }
 }
 
diff --git a/search/house_numbers_matcher.cpp b/search/house_numbers_matcher.cpp
index 32e5ad7f0d..0967fc017b 100644
--- a/search/house_numbers_matcher.cpp
+++ b/search/house_numbers_matcher.cpp
@@ -29,52 +29,48 @@ namespace
 // sort | uniq
 //
 // *NOTE* there is a list of exceptions at the end.
-
-/// @todo By VNG: This list looks hillarious :) Definitely should set some lower bound number
-/// to filter very exotic entries in addr:housenumber.
-/// Removed street keywords for now.
 vector<string> const g_strings = {
     "a",      "aa",      "ab",      "abc",  "ac",   "ad",      "ae",      "af",       "ag",
     "ah",     "ai",      "aj",      "ak",   "al",   "am",      "an",      "ao",       "ap",
-    "aq",     "ar",      "are",     "as",   "at",   "au",      "av",      /*"avenida",*/  "aw",
+    "aq",     "ar",      "are",     "as",   "at",   "au",      "av",      "avenida",  "aw",
     "ax",     "ay",      "az",      "azm",  "b",    "ba",      "bab",     "bah",      "bak",
     "bb",     "bc",      "bd",      "be",   "bedr", "ben",     "bf",      "bg",       "bh",
     "bij",    "bis",     "bk",      "bl",   "bldg", "blk",     "bloc",    "block",    "bloco",
     "blok",   "bm",      "bmn",     "bn",   "bo",   "boe",     "bol",     "bor",      "bov",
     "box",    "bp",      "br",      "bra",  "brc",  "bs",      "bsa",     "bu",       "building",
-    "bv",      "bwn",     "bx",   "by",   "c",       "ca",      "cab",      "cal",
-    /*"calle",  "carrera",*/ "cat",     "cbi",  "cbu",  "cc",      "ccz",     "cd",       "ce",
-    "centre", "cfn",     "cgc",     "cjg",  "cl",   "club",    "cottage", "cottages", /*"court",*/
+    "bus",    "bv",      "bwn",     "bx",   "by",   "c",       "ca",      "cab",      "cal",
+    "calle",  "carrera", "cat",     "cbi",  "cbu",  "cc",      "ccz",     "cd",       "ce",
+    "centre", "cfn",     "cgc",     "cjg",  "cl",   "club",    "cottage", "cottages", "court",
     "cso",    "cum",     "d",       "da",   "db",   "dd",      "de",      "df",       "di",
     "dia",    "dvu",     "e",       "ec",   "ee",   "eh",      "em",      "en",       "esm",
-    "ev",     "f",       "fdo",  "fer",  "ff",      "flat",     "flats",
-    "floor",  /*"g",*/       "ga",      "gar",  "gara", "gas",     "gb",      "gg",       "gr",
+    "ev",     "f",       "farm",    "fdo",  "fer",  "ff",      "fixme",   "flat",     "flats",
+    "floor",  "g",       "ga",      "gar",  "gara", "gas",     "gb",      "gg",       "gr",
     "grg",    "h",       "ha",      "haus", "hh",   "hl",      "ho",      "house",    "hr",
     "hs",     "hv",      "i",       "ii",   "iii",  "int",     "iv",      "ix",       "j",
     "jab",    "jf",      "jj",      "jms",  "jtg",  "k",       "ka",      "kab",      "kk",
-    "kmb",     "kmk",     "knn",  "koy",  "kp",      "kra",     "ksn",      "kud",
+    "km",     "kmb",     "kmk",     "knn",  "koy",  "kp",      "kra",     "ksn",      "kud",
     "l",      "ł",       "la",      "ldo",  "ll",   "local",   "loja",    "lot",      "lote",
     "lsb",    "lt",      "m",       "mac",  "mad",  "mah",     "mak",     "mat",      "mb",
     "mbb",    "mbn",     "mch",     "mei",  "mks",  "mm",      "mny",     "mo",       "mok",
-    "mor",     "msb",  "mtj",  "mtk",     "mvd",     "n",        "na",
+    "monica", "mor",     "morocco", "msb",  "mtj",  "mtk",     "mvd",     "n",        "na",
     "ncc",    "ne",      "nij",     "nn",   "no",   "nr",      "nst",     "nu",       "nut",
     "o",      "of",      "ofof",    "old",  "one",  "oo",      "opl",     "p",        "pa",
-    "pap",    "par",     /*"park",*/    "pav",  "pb",   "pch",     "pg",      "ph",       "phd",
-    "pkf",    /*"plaza",*/   "plot",    "po",   "pos",  "pp",      "pr",      "pra",      "pya",
+    "pap",    "par",     "park",    "pav",  "pb",   "pch",     "pg",      "ph",       "phd",
+    "pkf",    "plaza",   "plot",    "po",   "pos",  "pp",      "pr",      "pra",      "pya",
     "q",      "qq",      "quater",  "r",    "ra",   "rbo",     "rd",      "rear",     "reisach",
-    "rk",     "rm",      "ro",      /*"road",*/ "rosso",   "rs",      "rw",       "s",
+    "rk",     "rm",      "ro",      "road", "rood", "rosso",   "rs",      "rw",       "s",
     "sab",    "sal",     "sav",     "sb",   "sba",  "sbb",     "sbl",     "sbn",      "sbx",
-    "sc",     "sch",     "sco",     "seb",  "sep",  "sf",      "sgr",     "sir",
-    "sj",     "sl",      "sm",      "sn",   "snc",  "so",      "som",     /*"south",*/    "sp",
-    "spi",    "spn",     "ss",      "st",   "sta",  "stc",     "std",     "stiege",   /*"street",*/
+    "sc",     "sch",     "sco",     "seb",  "sep",  "sf",      "sgr",     "shop",     "sir",
+    "sj",     "sl",      "sm",      "sn",   "snc",  "so",      "som",     "south",    "sp",
+    "spi",    "spn",     "ss",      "st",   "sta",  "stc",     "std",     "stiege",   "street",
     "suite",  "sur",     "t",       "tam",  "ter",  "terrace", "tf",      "th",       "the",
     "tl",     "to",      "torre",   "tr",   "traf", "trd",     "ts",      "tt",       "tu",
     "u",      "uhm",     "unit",    "utc",  "v",    "vi",      "vii",     "w",        "wa",
-    /*"way",*/    "we",      /*"west",*/    "wf",   "wink", "wrh",     "ws",      "wsb",      "x",
+    "way",    "we",      "west",    "wf",   "wink", "wrh",     "ws",      "wsb",      "x",
     "xx",     "y",       "z",       "za",   "zh",   "zona",    "zu",      "zw",       "א",
     "ב",      "ג",       "α",       "а",    "б",    "бб",      "бл",      "в",        "вл",
     "вх",     "г",       "д",       "е",    "ж",    "з",       "и",       "к",        "л",
-    "лит",    "м",       "н",    "о",    "п",       "р",       "разр",     "с",
+    "лит",    "м",       "магазин", "н",    "о",    "п",       "р",       "разр",     "с",
     "стр",    "т",       "тп",      "у",    "уч",   "участок", "ф",       "ц",        "ა",
     "丁目",   "之",      "号",      "號",
 
@@ -204,7 +200,7 @@ public:
   // true).
   bool LooksGood(UniString const & s, bool isPrefix) const
   {
-    TokensT parse;
+    vector<Token> parse;
     Tokenize(s, isPrefix, parse);
 
     size_t i = 0;
@@ -304,7 +300,7 @@ bool IsLiteralType(Token::Type type)
 // * when there is at least one number, drops all tokens until the
 //   number and sorts the rest
 // * when there are no numbers at all, sorts tokens
-void SimplifyParse(TokensT & tokens)
+void SimplifyParse(vector<Token> & tokens)
 {
   if (!tokens.empty() && tokens.back().m_prefix)
     tokens.pop_back();
@@ -364,7 +360,7 @@ bool IsShortBuildingSynonym(UniString const & t)
 }
 
 template <typename Fn>
-void ForEachGroup(TokensT const & ts, Fn && fn)
+void ForEachGroup(vector<Token> const & ts, Fn && fn)
 {
   size_t i = 0;
   while (i < ts.size())
@@ -392,7 +388,7 @@ void TransformString(UniString && token, Fn && fn)
 
   if (IsBuildingPartSynonym(token))
   {
-    fn(std::move(token), Token::TYPE_BUILDING_PART);
+    fn(move(token), Token::TYPE_BUILDING_PART);
   }
   else if (size == 4 && StartsWith(token, kLiter))
   {
@@ -404,51 +400,34 @@ void TransformString(UniString && token, Fn && fn)
     UniString firstLetter(token.begin(), token.begin() + 1);
     if (IsShortBuildingSynonym(firstLetter))
     {
-      fn(std::move(firstLetter), Token::TYPE_BUILDING_PART);
+      fn(move(firstLetter), Token::TYPE_BUILDING_PART);
       fn(UniString(token.begin() + 1, token.end()), Token::TYPE_LETTER);
     }
     else
     {
-      fn(std::move(token), Token::TYPE_STRING);
+      fn(move(token), Token::TYPE_STRING);
     }
   }
   else if (size == 1)
   {
     if (IsShortBuildingSynonym(token))
-      fn(std::move(token), Token::TYPE_BUILDING_PART_OR_LETTER);
+      fn(move(token), Token::TYPE_BUILDING_PART_OR_LETTER);
     else
-      fn(std::move(token), Token::TYPE_LETTER);
+      fn(move(token), Token::TYPE_LETTER);
   }
   else
   {
-    fn(std::move(token), Token::TYPE_STRING);
+    fn(move(token), Token::TYPE_STRING);
   }
 }
 }  // namespace
 
-uint64_t ToUInt(UniString const & s)
-{
-  uint64_t res = 0;
-  uint64_t pow = 1;
-
-  int i = int(s.size()) - 1;
-  ASSERT(i >= 0 && i <= 10, (i));
-  for (; i >= 0; --i)
-  {
-    ASSERT(IsASCIIDigit(s[i]), (s[i]));
-
-    res += (s[i] - '0') * pow;
-    pow *= 10;
-  }
-  return res;
-}
-
-void Tokenize(UniString s, bool isPrefix, TokensT & ts)
+void Tokenize(UniString s, bool isPrefix, vector<Token> & ts)
 {
   MakeLowerCaseInplace(s);
   auto addToken = [&ts](UniString && value, Token::Type type)
   {
-    ts.emplace_back(std::move(value), type);
+    ts.emplace_back(move(value), type);
   };
 
   size_t i = 0;
@@ -467,21 +446,21 @@ void Tokenize(UniString s, bool isPrefix, TokensT & ts)
       {
         if (j != s.size() || !isPrefix)
         {
-          TransformString(std::move(token), addToken);
+          TransformString(move(token), addToken);
         }
         else if (i + 1 == j)
         {
-          ts.emplace_back(std::move(token), Token::TYPE_LETTER);
+          ts.emplace_back(move(token), Token::TYPE_LETTER);
         }
         else
         {
-          ts.emplace_back(std::move(token), Token::TYPE_STRING);
+          ts.emplace_back(move(token), Token::TYPE_STRING);
           ts.back().m_prefix = true;
         }
       }
       else
       {
-        addToken(std::move(token), type);
+        addToken(move(token), type);
       }
     }
 
@@ -500,9 +479,9 @@ void Tokenize(UniString s, bool isPrefix, TokensT & ts)
   }
 }
 
-void ParseHouseNumber(strings::UniString const & s, vector<TokensT> & parses)
+void ParseHouseNumber(strings::UniString const & s, vector<vector<Token>> & parses)
 {
-  TokensT tokens;
+  vector<Token> tokens;
   Tokenize(s, false /* isPrefix */, tokens);
 
   bool numbersSequence = true;
@@ -530,37 +509,50 @@ void ParseHouseNumber(strings::UniString const & s, vector<TokensT> & parses)
                    parses.emplace_back();
                    auto & parse = parses.back();
                    for (size_t k = i; k < j; ++k)
-                     parse.emplace_back(std::move(tokens[k]));
+                     parse.emplace_back(move(tokens[k]));
                  });
   }
   else
   {
-    parses.emplace_back(std::move(tokens));
+    parses.emplace_back(move(tokens));
   }
 
   for (size_t i = oldSize; i < parses.size(); ++i)
     SimplifyParse(parses[i]);
 }
 
-void ParseQuery(strings::UniString const & query, bool queryIsPrefix, TokensT & parse)
+void ParseQuery(strings::UniString const & query, bool queryIsPrefix, vector<Token> & parse)
 {
   Tokenize(query, queryIsPrefix, parse);
   SimplifyParse(parse);
 }
 
-bool HouseNumbersMatch(strings::UniString const & houseNumber, TokensT const & queryParse)
+bool HouseNumbersMatch(strings::UniString const & houseNumber, strings::UniString const & query,
+                       bool queryIsPrefix)
+{
+  if (houseNumber == query)
+    return true;
+
+  vector<Token> queryParse;
+  ParseQuery(query, queryIsPrefix, queryParse);
+
+  return HouseNumbersMatch(houseNumber, queryParse);
+}
+
+bool HouseNumbersMatch(strings::UniString const & houseNumber, vector<Token> const & queryParse)
 {
   if (houseNumber.empty() || queryParse.empty())
     return false;
 
-  // Fast pre-check, helps to early exit without complex house number parsing.
+  // Fast pre-check, helps to early exit without complex house number
+  // parsing.
   if (IsASCIIDigit(houseNumber[0]) && IsASCIIDigit(queryParse[0].m_value[0]) &&
       houseNumber[0] != queryParse[0].m_value[0])
   {
     return false;
   }
 
-  vector<TokensT> houseNumberParses;
+  vector<vector<Token>> houseNumberParses;
   ParseHouseNumber(houseNumber, houseNumberParses);
 
   for (auto & parse : houseNumberParses)
@@ -577,38 +569,6 @@ bool HouseNumbersMatch(strings::UniString const & houseNumber, TokensT const & q
   return false;
 }
 
-bool HouseNumbersMatchRange(std::string_view const & hnRange, TokensT const & queryParse, feature::InterpolType interpol)
-{
-  ASSERT(interpol != feature::InterpolType::None, ());
-
-  if (queryParse[0].m_type != Token::TYPE_NUMBER)
-    return false;
-
-  uint64_t const val = ToUInt(queryParse[0].m_value);
-  bool const isEven = (val % 2 == 0);
-  if (interpol == feature::InterpolType::Odd && isEven)
-    return false;
-  if (interpol == feature::InterpolType::Even && !isEven)
-    return false;
-
-  // Generator makes valid normalized values.
-  size_t const i = hnRange.find(':');
-  if (i == std::string_view::npos)
-  {
-    ASSERT(false, (hnRange));
-    return false;
-  }
-
-  uint64_t left, right;
-  if (!strings::to_uint(hnRange.substr(0, i), left) || !strings::to_uint(hnRange.substr(i + 1), right))
-  {
-    ASSERT(false, (hnRange));
-    return false;
-  }
-
-  return left < val && val < right;
-}
-
 bool LooksLikeHouseNumber(strings::UniString const & s, bool isPrefix)
 {
   static HouseNumberClassifier const classifier;
diff --git a/search/house_numbers_matcher.hpp b/search/house_numbers_matcher.hpp
index e40c9645e6..000540894a 100644
--- a/search/house_numbers_matcher.hpp
+++ b/search/house_numbers_matcher.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "indexer/feature_utils.hpp"
-
 #include "base/string_utils.hpp"
 
 #include <string>
@@ -54,26 +52,23 @@ struct Token
   bool m_prefix = false;
 };
 
-using TokensT = std::vector<Token>;
-
-// Used to convert Token::Type::TYPE_NUMBER into int value.
-uint64_t ToUInt(strings::UniString const & s);
-
 // Tokenizes |s| that may be a house number.
-void Tokenize(strings::UniString s, bool isPrefix, TokensT & ts);
+void Tokenize(strings::UniString s, bool isPrefix, std::vector<Token> & ts);
 
 // Parses a string that can be one or more house numbers. This method
 // can be used to parse addr:housenumber fields.
-void ParseHouseNumber(strings::UniString const & s, std::vector<TokensT> & parses);
+void ParseHouseNumber(strings::UniString const & s, std::vector<std::vector<Token>> & parses);
 
 // Parses a part of search query that can be a house number.
-void ParseQuery(strings::UniString const & query, bool queryIsPrefix, TokensT & parse);
+void ParseQuery(strings::UniString const & query, bool queryIsPrefix, std::vector<Token> & parse);
 
-/// @return true if house number matches to a given parsed query.
-/// @{
-bool HouseNumbersMatch(strings::UniString const & houseNumber, TokensT const & queryParse);
-bool HouseNumbersMatchRange(std::string_view const & hnRange, TokensT const & queryParse, feature::InterpolType interpol);
-/// @}
+// Returns true if house number matches to a given query.
+bool HouseNumbersMatch(strings::UniString const & houseNumber, strings::UniString const & query,
+                       bool queryIsPrefix);
+
+// Returns true if house number matches to a given parsed query.
+bool HouseNumbersMatch(strings::UniString const & houseNumber,
+                       std::vector<Token> const & queryParse);
 
 // Returns true if |s| looks like a house number.
 bool LooksLikeHouseNumber(strings::UniString const & s, bool isPrefix);
diff --git a/search/house_to_street_table.cpp b/search/house_to_street_table.cpp
index 5a46ac5657..a38a8bf3c8 100644
--- a/search/house_to_street_table.cpp
+++ b/search/house_to_street_table.cpp
@@ -29,7 +29,7 @@ class EliasFanoMap : public HouseToStreetTable
 public:
   using Map = MapUint32ToValue<uint32_t>;
 
-  explicit EliasFanoMap(unique_ptr<Reader> && reader) : m_reader(std::move(reader))
+  explicit EliasFanoMap(unique_ptr<Reader> && reader) : m_reader(move(reader))
   {
     ASSERT(m_reader, ());
     auto readBlockCallback = [](auto & source, uint32_t blockSize, vector<uint32_t> & values)
@@ -89,7 +89,7 @@ unique_ptr<HouseToStreetTable> LoadHouseToStreetTable(MwmValue const & value)
 
     auto subreader = reader.GetPtr()->CreateSubReader(header.m_tableOffset, header.m_tableSize);
     CHECK(subreader, ());
-    result = make_unique<EliasFanoMap>(std::move(subreader));
+    result = make_unique<EliasFanoMap>(move(subreader));
   }
   catch (Reader::OpenException const & ex)
   {
diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp
index 91f33adbf6..4ae9e1b8f3 100644
--- a/search/intermediate_result.cpp
+++ b/search/intermediate_result.cpp
@@ -11,7 +11,6 @@
 #include "indexer/feature_utils.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/map_object.hpp"
-#include "indexer/road_shields_parser.hpp"
 
 #include "platform/measurement_utils.hpp"
 
@@ -293,7 +292,7 @@ void FillDetails(FeatureType & ft, Result::Details & details)
   auto const cuisines = feature::GetLocalizedCuisines(feature::TypesHolder(ft));
   details.m_cuisine = strings::JoinStrings(cuisines, osm::MapObject::kFieldsSeparator);
 
-  auto const roadShields = ftypes::GetRoadShieldsNames(ft);
+  auto const roadShields = feature::GetRoadShieldsNames(ft.GetRoadNumber());
   details.m_roadShields = strings::JoinStrings(roadShields, osm::MapObject::kFieldsSeparator);
 
   details.m_isInitialized = true;
diff --git a/search/keyword_lang_matcher.cpp b/search/keyword_lang_matcher.cpp
index c44b10d5dc..e3c5c6e8a5 100644
--- a/search/keyword_lang_matcher.cpp
+++ b/search/keyword_lang_matcher.cpp
@@ -50,7 +50,7 @@ KeywordLangMatcher::KeywordLangMatcher(size_t maxLanguageTiers)
 void KeywordLangMatcher::SetLanguages(size_t tier, std::vector<int8_t> && languages)
 {
   ASSERT_LESS(tier, m_languagePriorities.size(), ());
-  m_languagePriorities[tier] = std::move(languages);
+  m_languagePriorities[tier] = move(languages);
 }
 
 int KeywordLangMatcher::CalcLangScore(int8_t lang) const
diff --git a/search/latlon_match.cpp b/search/latlon_match.cpp
index 655757fe80..95741a4cca 100644
--- a/search/latlon_match.cpp
+++ b/search/latlon_match.cpp
@@ -68,7 +68,7 @@ int GetDMSIndex(char const * & s)
   return -1;
 }
 
-bool SkipNSEW(char const * & s, char const * (&arrPos) [4])
+void SkipNSEW(char const * & s, char const * (&arrPos) [4])
 {
   Skip(s);
 
@@ -79,11 +79,12 @@ bool SkipNSEW(char const * & s, char const * (&arrPos) [4])
   case 'S': case 's': ind = 1; break;
   case 'E': case 'e': ind = 2; break;
   case 'W': case 'w': ind = 3; break;
-  default: return false;
+  default: return;
   }
 
   arrPos[ind] = s++;
-  return true;
+
+  Skip(s);
 }
 
 // Attempts to read a double from the start of |str|
@@ -154,27 +155,20 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
   while (true)
   {
     char const * s1 = s;
-    char const * s11 = s;
-    if (SkipNSEW(s, arrPos))
-    {
-      s11 = s;
-      Skip(s);
-    }
-    else
-      SkipSpaces(s);
-
+    SkipNSEW(s, arrPos);
     if (!*s)
     {
       // End of the string - check matching.
       break;
     }
 
+    SkipSpaces(s);
     char * s2;
     double const x = EatDouble(s, &s2);
     if (s == s2)
     {
       // invalid token
-      if (s == s11)
+      if (s == s1)
       {
         // Return error if there are no any delimiters.
         return false;
diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp
index 8032ef6184..9c46593302 100644
--- a/search/locality_finder.cpp
+++ b/search/locality_finder.cpp
@@ -267,7 +267,7 @@ void LocalityFinder::LoadVicinity(m2::PointD const & p, bool loadCities, bool lo
       if (!m_ranks)
         m_ranks = make_unique<DummyRankTable>();
 
-      MwmContext ctx(std::move(handle));
+      MwmContext ctx(move(handle));
       ctx.ForEachIndex(crect, LocalitiesLoader(ctx, m_boundariesTable, CityFilter(*m_ranks),
                                                m_cities, m_loadedIds));
     }
@@ -284,7 +284,7 @@ void LocalityFinder::LoadVicinity(m2::PointD const & p, bool loadCities, bool lo
         return;
 
       static int const scale = GetVillagesScale();
-      MwmContext ctx(std::move(handle));
+      MwmContext ctx(move(handle));
       ctx.ForEachIndex(vrect, scale,
                        LocalitiesLoader(ctx, m_boundariesTable, VillageFilter(ctx, m_villagesCache),
                                         m_villages, m_loadedIds));
diff --git a/search/locality_scorer.cpp b/search/locality_scorer.cpp
index 1dbbb1a8b4..25e5bb5921 100644
--- a/search/locality_scorer.cpp
+++ b/search/locality_scorer.cpp
@@ -295,7 +295,7 @@ void LocalityScorer::GroupBySimilarityAndOther(vector<ExLocality> & els) const
     for (auto it = range.first; it != range.second; ++it)
     {
       if (it != closest)
-        tmp.emplace_back(std::move(*it));
+        tmp.emplace_back(move(*it));
     }
     begin = range.second;
   }
diff --git a/search/pre_ranker.cpp b/search/pre_ranker.cpp
index 3eb1d4c1c2..4f25cc97c2 100644
--- a/search/pre_ranker.cpp
+++ b/search/pre_ranker.cpp
@@ -47,7 +47,7 @@ void SweepNearbyResults(m2::PointD const & eps, unordered_set<FeatureID> const &
   filtered.reserve(results.size());
   sweeper.Sweep([&filtered, &results](size_t i)
   {
-    filtered.push_back(std::move(results[i]));
+    filtered.push_back(move(results[i]));
   });
 
   results.swap(filtered);
@@ -223,7 +223,7 @@ void PreRanker::UpdateResults(bool lastUpdate)
   FillMissingFieldsInPreResults();
   Filter(m_params.m_viewportSearch);
   m_numSentResults += m_results.size();
-  m_ranker.AddPreRankerResults(std::move(m_results));
+  m_ranker.AddPreRankerResults(move(m_results));
   m_results.clear();
   m_ranker.UpdateResults(lastUpdate);
 
diff --git a/search/processor.cpp b/search/processor.cpp
index 1b8f3f3ba3..edfd878f63 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -918,8 +918,8 @@ void Processor::EmitFeaturesByIndexFromAllMwms(vector<shared_ptr<MwmInfo>> const
     // Distance needed for sorting.
     auto const center = feature::GetCenter(*ft, FeatureType::WORST_GEOMETRY);
     double const dist = center.SquaredLength(m_viewport.Center());
-    results.emplace_back(dist, guard->GetCountryFileName(), std::move(ft));
-    guards.push_back(std::move(guard));
+    results.emplace_back(dist, guard->GetCountryFileName(), move(ft));
+    guards.push_back(move(guard));
   }
 
   sort(results.begin(), results.end());
diff --git a/search/projection_on_street.cpp b/search/projection_on_street.cpp
index 4a0a1aa331..562a3430f4 100644
--- a/search/projection_on_street.cpp
+++ b/search/projection_on_street.cpp
@@ -6,6 +6,7 @@
 
 #include <limits>
 
+using namespace std;
 
 namespace search
 {
@@ -16,15 +17,16 @@ ProjectionOnStreet::ProjectionOnStreet()
 }
 
 // ProjectionOnStreetCalculator --------------------------------------------------------------------
-ProjectionOnStreetCalculator::ProjectionOnStreetCalculator(std::vector<m2::PointD> const & points)
+ProjectionOnStreetCalculator::ProjectionOnStreetCalculator(vector<m2::PointD> const & points)
 {
   size_t const count = points.size();
   if (count < 2)
     return;
 
+  m_segments.clear();
   m_segments.reserve(count - 1);
-  for (size_t i = 1; i < count; ++i)
-    m_segments.emplace_back(points[i - 1], points[i]);
+  for (size_t i = 0; i + 1 < count; ++i)
+    m_segments.emplace_back(points[i], points[i + 1]);
 }
 
 bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
@@ -32,7 +34,7 @@ bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
 {
   size_t const kInvalidIndex = m_segments.size();
   proj.m_segIndex = kInvalidIndex;
-  proj.m_distMeters = std::numeric_limits<double>::max();
+  proj.m_distMeters = numeric_limits<double>::max();
 
   for (size_t index = 0; index < m_segments.size(); ++index)
   {
@@ -50,4 +52,4 @@ bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
 
   return (proj.m_segIndex < kInvalidIndex);
 }
-} // namespace search
+}  // namespace search
diff --git a/search/ranker.cpp b/search/ranker.cpp
index f823b9f9d1..d8390791c8 100644
--- a/search/ranker.cpp
+++ b/search/ranker.cpp
@@ -15,8 +15,8 @@
 #include "indexer/data_source.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_data.hpp"
+#include "indexer/feature_utils.hpp"
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/road_shields_parser.hpp"
 #include "indexer/search_string_utils.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
@@ -37,7 +37,7 @@ namespace
 template <typename Slice>
 void UpdateNameScores(string_view name, uint8_t lang, Slice const & slice, NameScores & bestScores)
 {
-  if (StringUtf8Multilang::IsAltOrOldName(lang))
+  if (lang == StringUtf8Multilang::kAltNameCode || lang == StringUtf8Multilang::kOldNameCode)
   {
     strings::Tokenize(name, ";", [&](string_view n)
     {
@@ -129,7 +129,7 @@ NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
       }
     };
 
-    if (StringUtf8Multilang::IsAltOrOldName(lang))
+    if (lang == StringUtf8Multilang::kAltNameCode || lang == StringUtf8Multilang::kOldNameCode)
     {
       strings::Tokenize(name, ";", [&updateScore](string_view n)
       {
@@ -170,7 +170,7 @@ NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
 
   if (type == Model::TYPE_STREET)
   {
-    for (auto const & shield : ftypes::GetRoadShieldsNames(ft))
+    for (auto const & shield : feature::GetRoadShieldsNames(ft.GetRoadNumber()))
       UpdateNameScores(shield, StringUtf8Multilang::kDefaultCode, sliceNoCategories, bestScores);
   }
 
@@ -278,8 +278,7 @@ string FormatStreetAndHouse(ReverseGeocoder::Address const & addr)
 // TODO: Share common formatting code for search results and place page.
 string FormatFullAddress(ReverseGeocoder::Address const & addr, string const & region)
 {
-  /// @todo Print "near" for not exact addresses.
-  /// Add some threshold for addr:interpolation or refactor ReverseGeocoder?
+  // TODO: Print "near" for not exact addresses.
   if (addr.GetDistance() != 0)
     return region;
 
@@ -306,6 +305,47 @@ bool ResultExists(RankerResult const & p, vector<RankerResult> const & results,
   return find_if(results.begin(), results.end(), equalCmp) != results.cend();
 }
 
+class LazyAddressGetter
+{
+public:
+  LazyAddressGetter(ReverseGeocoder const & reverseGeocoder, m2::PointD const & center)
+    : m_reverseGeocoder(reverseGeocoder), m_center(center)
+  {
+  }
+
+  ReverseGeocoder::Address const & GetNearbyAddress()
+  {
+    if (m_computedNearby)
+      return m_address;
+    m_reverseGeocoder.GetNearbyAddress(m_center, m_address);
+    m_computedNearby = true;
+    return m_address;
+  }
+
+  bool GetExactAddress(ReverseGeocoder::Address & address)
+  {
+    if (m_computedExact)
+    {
+      address = m_address;
+      return true;
+    }
+    m_reverseGeocoder.GetNearbyAddress(m_center, 0.0, m_address);
+    if (m_address.IsValid())
+    {
+      m_computedExact = true;
+      m_computedNearby = true;
+      address = m_address;
+    }
+    return m_computedExact;
+  }
+
+private:
+  ReverseGeocoder const & m_reverseGeocoder;
+  m2::PointD const m_center;
+  ReverseGeocoder::Address m_address;
+  bool m_computedExact = false;
+  bool m_computedNearby = false;
+};
 }  // namespace
 
 class RankerResultMaker
@@ -413,15 +453,6 @@ private:
     return ft;
   }
 
-  bool GetExactAddress(FeatureType & ft, m2::PointD const & center, ReverseGeocoder::Address & addr) const
-  {
-    if (m_reverseGeocoder.GetExactAddress(ft, addr))
-      return true;
-
-    m_reverseGeocoder.GetNearbyAddress(center, 0.0 /* maxDistanceM */, addr);
-    return addr.IsValid();
-  }
-
   // For the best performance, incoming ids should be sorted by id.first (mwm file id).
   unique_ptr<FeatureType> LoadFeature(FeatureID const & id, m2::PointD & center, string & name,
                                       string & country)
@@ -444,7 +475,7 @@ private:
     if (name.empty())
     {
       ReverseGeocoder::Address addr;
-      if (GetExactAddress(*ft, center, addr))
+      if (LazyAddressGetter(m_reverseGeocoder, center).GetExactAddress(addr))
       {
         unique_ptr<FeatureType> streetFeature;
 
@@ -690,13 +721,7 @@ Result Ranker::MakeResult(RankerResult const & rankerResult, bool needAddress, b
 
     // Format full address only for suitable results.
     if (ftypes::IsAddressObjectChecker::Instance()(rankerResult.GetTypes()))
-    {
-      ReverseGeocoder::Address addr;
-      if (!(rankerResult.GetID().IsValid() && m_reverseGeocoder.GetExactAddress(rankerResult.GetID(), addr)))
-        m_reverseGeocoder.GetNearbyAddress(rankerResult.GetCenter(), addr);
-
-      address = FormatFullAddress(addr, address);
-    }
+      address = FormatFullAddress(LazyAddressGetter(m_reverseGeocoder, rankerResult.GetCenter()).GetNearbyAddress(), address);
 
     res.SetAddress(std::move(address));
   }
@@ -727,7 +752,7 @@ Result Ranker::MakeResult(RankerResult const & rankerResult, bool needAddress, b
   res.SetRankingInfo(rankerResult.m_dbgInfo);
 
 #ifdef SEARCH_USE_PROVENANCE
-  res.SetProvenance(std::move(rankerResult.m_provenance));
+  res.SetProvenance(move(rankerResult.m_provenance));
 #endif
 
   return res;
@@ -806,12 +831,12 @@ void Ranker::UpdateResults(bool lastUpdate)
 
     if (m_params.m_viewportSearch)
     {
-      m_emitter.AddResultNoChecks(std::move(result));
+      m_emitter.AddResultNoChecks(move(result));
       ++count;
     }
     else
     {
-      if (m_emitter.AddResult(std::move(result)))
+      if (m_emitter.AddResult(move(result)))
         ++count;
     }
   }
@@ -851,7 +876,7 @@ void Ranker::MakeRankerResults()
 
     /// @todo Is it ok to make duplication check for O(N) here? Especially when we make RemoveDuplicatingLinear later.
     if (isViewportMode || !ResultExists(*p, m_tentativeResults, m_params.m_minDistanceBetweenResultsM))
-      m_tentativeResults.push_back(std::move(*p));
+      m_tentativeResults.push_back(move(*p));
   };
 
   m_preRankerResults.clear();
@@ -875,7 +900,7 @@ void Ranker::GetBestMatchName(FeatureType & f, string & name) const
 
   auto bestNameFinder = [&](int8_t lang, string_view s)
   {
-    if (StringUtf8Multilang::IsAltOrOldName(lang))
+    if (lang == StringUtf8Multilang::kAltNameCode || lang == StringUtf8Multilang::kOldNameCode)
     {
       strings::Tokenize(s, ";", [lang, &updateScore](std::string_view n)
       {
@@ -899,7 +924,8 @@ void Ranker::GetBestMatchName(FeatureType & f, string & name) const
   };
   UNUSED_VALUE(f.ForEachName(bestNameFinder));
 
-  if (StringUtf8Multilang::IsAltOrOldName(bestLang))
+  if (bestLang == StringUtf8Multilang::kAltNameCode ||
+      bestLang == StringUtf8Multilang::kOldNameCode)
   {
     string_view const readableName = f.GetReadableName();
     // Do nothing if alt/old name is the only name we have.
@@ -922,7 +948,7 @@ void Ranker::MatchForSuggestions(strings::UniString const & token, int8_t locale
       string const utf8Str = strings::ToUtf8(s);
       Result r(utf8Str, prologue + utf8Str + " ");
       HighlightResult(m_params.m_tokens, m_params.m_prefix, r);
-      m_emitter.AddResult(std::move(r));
+      m_emitter.AddResult(move(r));
     }
   }
 }
@@ -946,7 +972,7 @@ void Ranker::ProcessSuggestions(vector<RankerResult> const & vec) const
       {
         // todo(@m) RankingInfo is lost here. Should it be?
         if (m_emitter.AddResult(Result(MakeResult(r, false /* needAddress */, true /* needHighlighting */),
-                                       std::move(suggestion))))
+                                       move(suggestion))))
         {
           ++added;
         }
@@ -965,5 +991,4 @@ string Ranker::GetLocalizedRegionInfoForResult(RankerResult const & result) cons
 
   return m_regionInfoGetter.GetLocalizedFullName(id);
 }
-
 }  // namespace search
diff --git a/search/ranking_utils.hpp b/search/ranking_utils.hpp
index 1983e4aef9..9172023c38 100644
--- a/search/ranking_utils.hpp
+++ b/search/ranking_utils.hpp
@@ -273,7 +273,8 @@ NameScores GetNameScores(std::vector<strings::UniString> const & tokens, uint8_t
         // Update the match quality
         totalErrorsMade += errorsMade;
         matchedLength += slice.Get(i).GetOriginal().size();
-        isAltOrOldName = StringUtf8Multilang::IsAltOrOldName(lang);
+        isAltOrOldName =
+            lang == StringUtf8Multilang::kAltNameCode || lang == StringUtf8Multilang::kOldNameCode;
       }
       else
       {
diff --git a/search/result.cpp b/search/result.cpp
index 0223c41570..2276ef0102 100644
--- a/search/result.cpp
+++ b/search/result.cpp
@@ -26,18 +26,18 @@ void Result::FromFeature(FeatureID const & id, uint32_t featureType, Details con
 }
 
 Result::Result(string str, string && suggest)
-  : m_resultType(Type::PureSuggest), m_str(std::move(str)), m_suggestionStr(std::move(suggest))
+  : m_resultType(Type::PureSuggest), m_str(move(str)), m_suggestionStr(move(suggest))
 {
 }
 
 Result::Result(Result && res, string && suggest)
-  : m_id(std::move(res.m_id))
+  : m_id(move(res.m_id))
   , m_center(res.m_center)
-  , m_str(std::move(res.m_str))
-  , m_address(std::move(res.m_address))
+  , m_str(move(res.m_str))
+  , m_address(move(res.m_address))
   , m_featureType(res.m_featureType)
-  , m_suggestionStr(std::move(suggest))
-  , m_hightlightRanges(std::move(res.m_hightlightRanges))
+  , m_suggestionStr(move(suggest))
+  , m_hightlightRanges(move(res.m_hightlightRanges))
 {
   m_resultType = m_id.IsValid() ? Type::SuggestFromFeature : Type::PureSuggest;
 }
@@ -54,13 +54,13 @@ bool Result::HasPoint() const
 
 FeatureID const & Result::GetFeatureID() const
 {
-  ASSERT_EQUAL(m_resultType, Type::Feature, ());
+  ASSERT_EQUAL(m_resultType, Type::Feature, (m_resultType));
   return m_id;
 }
 
 uint32_t Result::GetFeatureType() const
 {
-  ASSERT_EQUAL(m_resultType, Type::Feature, ());
+  ASSERT_EQUAL(m_resultType, Type::Feature, (m_resultType));
   return m_featureType;
 }
 
@@ -198,7 +198,7 @@ bool Results::AddResult(Result && result)
       if (result.IsEqualSuggest(*i))
         return false;
     }
-    InsertResult(it, std::move(result));
+    InsertResult(it, move(result));
   }
   else
   {
@@ -207,7 +207,7 @@ bool Results::AddResult(Result && result)
       if (result.IsEqualFeature(*it))
         return false;
     }
-    InsertResult(m_results.end(), std::move(result));
+    InsertResult(m_results.end(), move(result));
   }
 
   return true;
@@ -215,7 +215,7 @@ bool Results::AddResult(Result && result)
 
 void Results::AddResultNoChecks(Result && result)
 {
-  InsertResult(m_results.end(), std::move(result));
+  InsertResult(m_results.end(), move(result));
 }
 
 void Results::AddResultsNoChecks(ConstIter first, ConstIter last)
@@ -223,7 +223,7 @@ void Results::AddResultsNoChecks(ConstIter first, ConstIter last)
   while (first != last)
   {
     auto resultCopy = *first++;
-    AddResultNoChecks(std::move(resultCopy));
+    AddResultNoChecks(move(resultCopy));
   }
 }
 
@@ -267,7 +267,7 @@ void Results::InsertResult(vector<Result>::iterator where, Result && result)
   }
 
   result.SetPositionInResults(static_cast<int32_t>(distance(m_results.begin(), where)));
-  m_results.insert(where, std::move(result));
+  m_results.insert(where, move(result));
 }
 
 string DebugPrint(search::Results const & results)
diff --git a/search/retrieval.cpp b/search/retrieval.cpp
index fae5110438..2da5da9337 100644
--- a/search/retrieval.cpp
+++ b/search/retrieval.cpp
@@ -134,16 +134,16 @@ Retrieval::ExtendedFeatures SortFeaturesAndBuildResult(vector<uint64_t> && featu
   using Builder = coding::CompressedBitVectorBuilder;
   base::SortUnique(features);
   base::SortUnique(exactlyMatchedFeatures);
-  auto featuresCBV = CBV(Builder::FromBitPositions(std::move(features)));
-  auto exactlyMatchedFeaturesCBV = CBV(Builder::FromBitPositions(std::move(exactlyMatchedFeatures)));
-  return Retrieval::ExtendedFeatures(std::move(featuresCBV), std::move(exactlyMatchedFeaturesCBV));
+  auto featuresCBV = CBV(Builder::FromBitPositions(move(features)));
+  auto exactlyMatchedFeaturesCBV = CBV(Builder::FromBitPositions(move(exactlyMatchedFeatures)));
+  return Retrieval::ExtendedFeatures(move(featuresCBV), move(exactlyMatchedFeaturesCBV));
 }
 
 Retrieval::ExtendedFeatures SortFeaturesAndBuildResult(vector<uint64_t> && features)
 {
   using Builder = coding::CompressedBitVectorBuilder;
   base::SortUnique(features);
-  auto const featuresCBV = CBV(Builder::FromBitPositions(std::move(features)));
+  auto const featuresCBV = CBV(Builder::FromBitPositions(move(features)));
   return Retrieval::ExtendedFeatures(featuresCBV);
 }
 
@@ -266,7 +266,7 @@ Retrieval::ExtendedFeatures RetrieveAddressFeaturesImpl(Retrieval::TrieRoot<Valu
     }
   });
 
-  return SortFeaturesAndBuildResult(std::move(features), std::move(exactlyMatchedFeatures));
+  return SortFeaturesAndBuildResult(move(features), move(exactlyMatchedFeatures));
 }
 
 template <typename Value>
@@ -292,7 +292,7 @@ Retrieval::ExtendedFeatures RetrievePostcodeFeaturesImpl(Retrieval::TrieRoot<Val
       features.push_back(index);
   });
 
-  return SortFeaturesAndBuildResult(std::move(features));
+  return SortFeaturesAndBuildResult(move(features));
 }
 
 Retrieval::ExtendedFeatures RetrieveGeometryFeaturesImpl(MwmContext const & context,
@@ -316,7 +316,7 @@ Retrieval::ExtendedFeatures RetrieveGeometryFeaturesImpl(MwmContext const & cont
     if (rect.IsPointInside(center))
       features.push_back(index);
   });
-  return SortFeaturesAndBuildResult(std::move(features), std::move(exactlyMatchedFeatures));
+  return SortFeaturesAndBuildResult(move(features), move(exactlyMatchedFeatures));
 }
 
 template <typename T>
@@ -325,7 +325,7 @@ struct RetrieveAddressFeaturesAdaptor
   template <typename... Args>
   Retrieval::ExtendedFeatures operator()(Args &&... args)
   {
-    return RetrieveAddressFeaturesImpl<T>(std::forward<Args>(args)...);
+    return RetrieveAddressFeaturesImpl<T>(forward<Args>(args)...);
   }
 };
 
@@ -335,7 +335,7 @@ struct RetrievePostcodeFeaturesAdaptor
   template <typename... Args>
   Retrieval::ExtendedFeatures operator()(Args &&... args)
   {
-    return RetrievePostcodeFeaturesImpl<T>(std::forward<Args>(args)...);
+    return RetrievePostcodeFeaturesImpl<T>(forward<Args>(args)...);
   }
 };
 
@@ -414,6 +414,6 @@ Retrieval::ExtendedFeatures Retrieval::Retrieve(Args &&... args) const
 {
   R<Uint64IndexValue> r;
   ASSERT(m_root, ());
-  return r(*m_root, m_context, m_cancellable, std::forward<Args>(args)...);
+  return r(*m_root, m_context, m_cancellable, forward<Args>(args)...);
 }
 }  // namespace search
diff --git a/search/reverse_geocoder.cpp b/search/reverse_geocoder.cpp
index 62809ff17b..f213413252 100644
--- a/search/reverse_geocoder.cpp
+++ b/search/reverse_geocoder.cpp
@@ -70,27 +70,13 @@ string Join(string const & s)
 template <typename... Args>
 string Join(string const & s, Args &&... args)
 {
-  auto tail = Join(std::forward<Args>(args)...);
+  auto tail = Join(forward<Args>(args)...);
   if (s.empty())
     return tail;
   if (tail.empty())
     return s;
   return s + ", " + tail;
 }
-
-ReverseGeocoder::Building FromFeatureImpl(FeatureType & ft, std::string const & hn, double distMeters)
-{
-  return { ft.GetID(), distMeters, hn, feature::GetCenter(ft) };
-}
-
-std::string const & GetHouseNumber(FeatureType & ft)
-{
-  std::string const & hn = ft.GetHouseNumber();
-  if (hn.empty() && ftypes::IsAddressInterpolChecker::Instance()(ft))
-    return ft.GetRef();
-  return hn;
-}
-
 }  // namespace
 
 ReverseGeocoder::ReverseGeocoder(DataSource const & dataSource) : m_dataSource(dataSource) {}
@@ -109,17 +95,15 @@ optional<uint32_t> ReverseGeocoder::GetMatchedStreetIndex(string_view keyName,
     for (auto const & street : streets)
     {
       bool fullMatchFound = false;
-      street.m_multilangName.ForEach([&](int8_t lang, string_view name)
+      street.m_multilangName.ForEach([&](int8_t /* langCode */, string_view name)
       {
         if (fullMatchFound)
           return;
 
-        // Skip _non-language_ names for street<->address matching.
-        if (StringUtf8Multilang::IsAltOrOldName(lang))
-          return;
-
         strings::UniString const actual = GetStreetNameAsKey(name, ignoreStreetSynonyms);
-        size_t const editDistance = strings::EditDistance(key.begin(), key.end(), actual.begin(), actual.end());
+
+        size_t const editDistance =
+            strings::EditDistance(key.begin(), key.end(), actual.begin(), actual.end());
 
         if (editDistance == 0)
         {
@@ -174,7 +158,7 @@ void ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD cons
   MwmSet::MwmHandle mwmHandle = m_dataSource.GetMwmHandleById(id);
   if (mwmHandle.IsAlive())
   {
-    search::MwmContext context(std::move(mwmHandle));
+    search::MwmContext context(move(mwmHandle));
     GetNearbyStreets(context, center, true /* includeSquaresAndSuburbs */, streets);
   }
 }
@@ -191,7 +175,7 @@ void ReverseGeocoder::GetNearbyStreetsWaysOnly(MwmSet::MwmId const & id, m2::Poi
   MwmSet::MwmHandle mwmHandle = m_dataSource.GetMwmHandleById(id);
   if (mwmHandle.IsAlive())
   {
-    search::MwmContext context(std::move(mwmHandle));
+    search::MwmContext context(move(mwmHandle));
     GetNearbyStreets(context, center, false /* includeSquaresAndSuburbs */, streets);
   }
 }
@@ -216,13 +200,11 @@ string ReverseGeocoder::GetOriginalFeatureStreetName(FeatureID const & fid) cons
   return addr.m_street.m_name;
 }
 
-bool ReverseGeocoder::GetOriginalStreetByHouse(FeatureType & house, FeatureID & streetId) const
+bool ReverseGeocoder::GetStreetByHouse(FeatureType & house, FeatureID & streetId) const
 {
   Address addr;
   HouseTable table(m_dataSource);
-
-  // Ignore edits here, because this function is called once with edits check before.
-  if (GetNearbyAddress(table, FromFeature(house, 0.0 /* distMeters */), true /* ignoreEdits */, addr))
+  if (GetNearbyAddress(table, FromFeature(house, 0.0 /* distMeters */), false /* ignoreEdits */, addr))
   {
     streetId = addr.m_street.m_id;
     return true;
@@ -233,10 +215,11 @@ bool ReverseGeocoder::GetOriginalStreetByHouse(FeatureType & house, FeatureID &
 
 void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, Address & addr) const
 {
-  GetNearbyAddress(center, kLookupRadiusM, addr);
+  return GetNearbyAddress(center, kLookupRadiusM, addr);
 }
 
-void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, double maxDistanceM, Address & addr) const
+void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, double maxDistanceM,
+                                       Address & addr) const
 {
   vector<Building> buildings;
   GetNearbyBuildings(center, maxDistanceM, buildings);
@@ -256,12 +239,11 @@ void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, double maxDist
 
 bool ReverseGeocoder::GetExactAddress(FeatureType & ft, Address & addr) const
 {
-  std::string const & hn = GetHouseNumber(ft);
-  if (hn.empty())
+  if (ft.GetHouseNumber().empty())
     return false;
-
   HouseTable table(m_dataSource);
-  return GetNearbyAddress(table, FromFeatureImpl(ft, hn, 0.0 /* distMeters */), false /* ignoreEdits */, addr);
+  return GetNearbyAddress(table, FromFeature(ft, 0.0 /* distMeters */), false /* ignoreEdits */,
+                          addr);
 }
 
 bool ReverseGeocoder::GetExactAddress(FeatureID const & fid, Address & addr) const
@@ -327,15 +309,10 @@ bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld,
 void ReverseGeocoder::GetNearbyBuildings(m2::PointD const & center, double radius,
                                          vector<Building> & buildings) const
 {
-  auto const addBuilding = [&](FeatureType & ft)
-  {
-    std::string const & hn = GetHouseNumber(ft);
-    if (hn.empty())
-      return;
-
+  auto const addBuilding = [&](FeatureType & ft) {
     auto const distance = feature::GetMinDistanceMeters(ft, center);
-    if (distance <= radius)
-      buildings.push_back(FromFeatureImpl(ft, hn, distance));
+    if (!ft.GetHouseNumber().empty() && distance <= radius)
+      buildings.push_back(FromFeature(ft, distance));
   };
 
   auto const stop = [&]() { return buildings.size() >= kMaxNumTriesToApproxAddress; };
@@ -392,7 +369,7 @@ string ReverseGeocoder::GetLocalizedRegionAddress(RegionAddress const & addr,
 // static
 ReverseGeocoder::Building ReverseGeocoder::FromFeature(FeatureType & ft, double distMeters)
 {
-  return FromFeatureImpl(ft, ft.GetHouseNumber(), distMeters);
+  return { ft.GetID(), distMeters, ft.GetHouseNumber(), feature::GetCenter(ft) };
 }
 
 std::optional<HouseToStreetTable::Result> ReverseGeocoder::HouseTable::Get(FeatureID const & fid)
diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp
index eaf9deebab..0d34370da6 100644
--- a/search/reverse_geocoder.hpp
+++ b/search/reverse_geocoder.hpp
@@ -131,7 +131,7 @@ public:
   std::string GetOriginalFeatureStreetName(FeatureID const & fid) const;
   /// For |houseId| with street information sets |streetId| to FeatureID of street corresponding to
   /// |houseId| and returns true. Returs false otherwise.
-  bool GetOriginalStreetByHouse(FeatureType & house, FeatureID & streetId) const;
+  bool GetStreetByHouse(FeatureType & house, FeatureID & streetId) const;
 
   /// @return The nearest exact address where building has house number and valid street match.
   void GetNearbyAddress(m2::PointD const & center, Address & addr) const;
diff --git a/search/search_index_values.hpp b/search/search_index_values.hpp
index 11d2246925..353c81a4e5 100644
--- a/search/search_index_values.hpp
+++ b/search/search_index_values.hpp
@@ -1,10 +1,15 @@
 #pragma once
 
 #include "coding/compressed_bit_vector.hpp"
+#include "coding/geometry_coding.hpp"
+#include "coding/read_write_utils.hpp"
 #include "coding/write_to_sink.hpp"
 
 #include "base/assert.hpp"
+#include "base/logging.hpp"
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -104,7 +109,7 @@ public:
     std::vector<uint64_t> ids(values.size());
     for (size_t i = 0; i < ids.size(); ++i)
       ids[i] = values[i].m_featureId;
-    m_cbv = coding::CompressedBitVectorBuilder::FromBitPositions(std::move(ids));
+    m_cbv = coding::CompressedBitVectorBuilder::FromBitPositions(move(ids));
   }
 
   // This method returns number of values in the current instance of
diff --git a/search/search_integration_tests/pre_ranker_test.cpp b/search/search_integration_tests/pre_ranker_test.cpp
index e667c0ad64..5ad98a6728 100644
--- a/search/search_integration_tests/pre_ranker_test.cpp
+++ b/search/search_integration_tests/pre_ranker_test.cpp
@@ -63,7 +63,7 @@ public:
   void AddPreRankerResults(vector<PreRankerResult> && preRankerResults) override
   {
     CHECK(!Finished(), ());
-    std::move(preRankerResults.begin(), preRankerResults.end(), back_inserter(m_results));
+    move(preRankerResults.begin(), preRankerResults.end(), back_inserter(m_results));
     preRankerResults.clear();
   }
 
diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp
index 8bf5998de9..236c8f1338 100644
--- a/search/search_integration_tests/processor_test.cpp
+++ b/search/search_integration_tests/processor_test.cpp
@@ -105,72 +105,10 @@ private:
   string m_brand;
 };
 
-class TestAddrInterpol : public TestStreet
+class ProcessorTest : public SearchTest
 {
-public:
-  TestAddrInterpol(vector<m2::PointD> const & points, feature::InterpolType interpol,
-                   string const & hnBeg, string const & hnEnd, string_view const & street = {})
-    : TestStreet(points, {}), m_street(street)
-  {
-    SetRoadNumber(hnBeg + ":" + hnEnd); // assigned as ref
-    switch (interpol)
-    {
-    case feature::InterpolType::Odd: SetType({"addr:interpolation", "odd"}); break;
-    case feature::InterpolType::Even: SetType({"addr:interpolation", "even"}); break;
-    default: SetType({"addr:interpolation"}); break;
-    }
-  }
-
-  // TestStreet overrides:
-  void Serialize(FeatureBuilder & fb) const override
-  {
-    TestStreet::Serialize(fb);
-
-    if (!m_street.empty())
-      fb.GetParams().AddStreet(m_street);
-  }
-
-private:
-  string m_street;
 };
 
-using ProcessorTest = SearchTest;
-
-
-UNIT_CLASS_TEST(ProcessorTest, AddressSmoke)
-{
-  string const countryName = "Address";
-  string const lang = "default";
-  double constexpr coord = 0.01;
-  string const streetName = "1st street";
-
-  TestStreet street({{-coord, -coord}, {0, 0}, {coord, coord}}, streetName, lang);
-
-  m2::PointD p1{-coord/2, -coord/2};
-  m2::PointD p2{coord/2, coord/2};
-
-  TestBuilding withRef(p1, {}/* name */, "20", streetName, lang);
-  TestBuilding withoutRef(p2, {}/* name */, "40", lang);
-
-  TestAddrInterpol even({p1, p2}, feature::InterpolType::Even, "20", "40", streetName);
-  TestAddrInterpol odd({p1, p2}, feature::InterpolType::Odd, "21", "41");
-
-  auto const wonderlandId = BuildCountry(countryName, [&](TestMwmBuilder & builder)
-  {
-    builder.Add(street);
-    builder.Add(withRef);
-    builder.Add(withoutRef);
-    builder.Add(even);
-    builder.Add(odd);
-  });
-
-  SetViewport(m2::RectD(-coord, -coord, coord, coord));
-  TEST(ResultsMatch("20 1st", {ExactMatch(wonderlandId, withRef)}), ());
-  TEST(ResultsMatch("40 1st", {ExactMatch(wonderlandId, withoutRef)}), ());
-  TEST(ResultsMatch("36 1st", {ExactMatch(wonderlandId, even)}), ());
-  TEST(ResultsMatch("35 1st", {ExactMatch(wonderlandId, odd)}), ());
-}
-
 UNIT_CLASS_TEST(ProcessorTest, Smoke)
 {
   string const countryName = "Wonderland";
@@ -3376,6 +3314,7 @@ UNIT_CLASS_TEST(ProcessorTest, StreetCategories)
     Rules const rules = {
       ExactMatch(wonderlandId, street),
       ExactMatch(wonderlandId, bus),
+      ExactMatch(wonderlandId, shop),
     };
     TEST(OrderedResultsMatch("avenida santa fe street ", rules), ());
   }
diff --git a/search/search_integration_tests/ranker_test.cpp b/search/search_integration_tests/ranker_test.cpp
index 64e68b414d..e90b72fbf3 100644
--- a/search/search_integration_tests/ranker_test.cpp
+++ b/search/search_integration_tests/ranker_test.cpp
@@ -99,8 +99,8 @@ UNIT_CLASS_TEST(RankerTest, UniteSameResults)
       fastfoodRules.push_back(ExactMatch(id, f));
 
     TEST(ResultsMatch(results,
-                      {AlternativesMatch(std::move(barRules)), AlternativesMatch(std::move(cafeRules)),
-                       AlternativesMatch(std::move(fastfoodRules))}),
+                      {AlternativesMatch(move(barRules)), AlternativesMatch(move(cafeRules)),
+                       AlternativesMatch(move(fastfoodRules))}),
          ());
   }
 }
diff --git a/search/search_quality/assessment_tool/context.cpp b/search/search_quality/assessment_tool/context.cpp
index 0875f56077..2223c9986b 100644
--- a/search/search_quality/assessment_tool/context.cpp
+++ b/search/search_quality/assessment_tool/context.cpp
@@ -76,7 +76,7 @@ search::Sample Context::MakeSample(search::FeatureLoader & loader) const
 
     auto result = m_sample.m_results[i];
     result.m_relevance = *foundEntries[j].m_currRelevance;
-    outResults.push_back(std::move(result));
+    outResults.push_back(move(result));
   }
 
   // Iterates over results retrieved during assessment.
diff --git a/search/search_quality/assessment_tool/feature_info_dialog.cpp b/search/search_quality/assessment_tool/feature_info_dialog.cpp
index b7f5f501cd..2f8e7c56d4 100644
--- a/search/search_quality/assessment_tool/feature_info_dialog.cpp
+++ b/search/search_quality/assessment_tool/feature_info_dialog.cpp
@@ -72,10 +72,10 @@ FeatureInfoDialog::FeatureInfoDialog(QWidget * parent, osm::MapObject const & ma
       if (!mapObject.GetNameMultilang().GetString(code, name))
         continue;
 
-      auto const lang = StringUtf8Multilang::GetLangByCode(code);
-      CHECK(!lang.empty(), ("Can't find lang by code:", code));
-      auto * label = new QLabel(QString::fromStdString(std::string{lang} + ":"));
-      auto * content = MakeSelectableLabel(std::string{name});
+      auto const * lang = StringUtf8Multilang::GetLangByCode(code);
+      CHECK(lang, ("Can't find lang by code:", code));
+      auto * label = new QLabel(QString::fromStdString(string(lang) + ":"));
+      auto * content = MakeSelectableLabel(std::string(name));
 
       AddRow(*layout, label, content);
     }
diff --git a/search/search_quality/assessment_tool/search_request_runner.cpp b/search/search_quality/assessment_tool/search_request_runner.cpp
index 18b88423c8..539c54963a 100644
--- a/search/search_quality/assessment_tool/search_request_runner.cpp
+++ b/search/search_quality/assessment_tool/search_request_runner.cpp
@@ -18,8 +18,8 @@ SearchRequestRunner::SearchRequestRunner(Framework & framework, DataSource const
   : m_framework(framework)
   , m_dataSource(dataSource)
   , m_contexts(contexts)
-  , m_updateViewOnResults(std::move(updateViewOnResults))
-  , m_updateSampleSearchState(std::move(updateSampleSearchState))
+  , m_updateViewOnResults(move(updateViewOnResults))
+  , m_updateSampleSearchState(move(updateSampleSearchState))
 {
 }
 
diff --git a/search/search_quality/matcher.cpp b/search/search_quality/matcher.cpp
index 3be55aa692..c56a3a3916 100644
--- a/search/search_quality/matcher.cpp
+++ b/search/search_quality/matcher.cpp
@@ -5,7 +5,6 @@
 
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
-#include "indexer/road_shields_parser.hpp"
 #include "indexer/search_string_utils.hpp"
 
 #include "base/control_flow.hpp"
@@ -152,6 +151,10 @@ bool Matcher::Matches(strings::UniString const & query, Sample::Result const & g
 bool Matcher::Matches(strings::UniString const & query, Sample::Result const & golden,
                       FeatureType & ft)
 {
+  static double constexpr kToleranceMeters = 50;
+
+  auto const houseNumber = ft.GetHouseNumber();
+
   auto const queryTokens = NormalizeAndTokenizeAsUtf8(ToUtf8(query));
 
   bool nameMatches = false;
@@ -163,14 +166,7 @@ bool Matcher::Matches(strings::UniString const & query, Sample::Result const & g
   {
     if (ft.GetGeomType() == feature::GeomType::Line)
     {
-      for (auto const & name : ftypes::GetRoadShieldsNames(ft))
-      {
-        if (StreetMatches(name, queryTokens))
-        {
-          nameMatches = true;
-          break;
-        }
-      }
+      nameMatches = StreetMatches(ft.GetRoadNumber(), queryTokens);
     }
     else
     {
@@ -199,11 +195,10 @@ bool Matcher::Matches(strings::UniString const & query, Sample::Result const & g
   });
 
   bool houseNumberMatches = true;
-  std::string const & hn = ft.GetHouseNumber();
-  if (!golden.m_houseNumber.empty() && !hn.empty())
-    houseNumberMatches = golden.m_houseNumber == hn;
+  if (!golden.m_houseNumber.empty() && !houseNumber.empty())
+    houseNumberMatches = golden.m_houseNumber == houseNumber;
 
-  /// @todo Where are 50 meters came from?
-  return (nameMatches && houseNumberMatches && feature::GetMinDistanceMeters(ft, golden.m_pos) < 50.0);
+  return (nameMatches && houseNumberMatches &&
+          feature::GetMinDistanceMeters(ft, golden.m_pos) < kToleranceMeters);
 }
 }  // namespace search
diff --git a/search/search_quality/sample.cpp b/search/search_quality/sample.cpp
index f7ff1729b2..008a71bcc6 100644
--- a/search/search_quality/sample.cpp
+++ b/search/search_quality/sample.cpp
@@ -137,7 +137,7 @@ bool Sample::DeserializeFromJSONLines(string const & lines, vector<Sample> & sam
     Sample sample;
     if (!sample.DeserializeFromJSON(line))
       return false;
-    result.emplace_back(std::move(sample));
+    result.emplace_back(move(sample));
   }
 
   samples.insert(samples.end(), result.begin(), result.end());
diff --git a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
index dd5d391b4a..79e2c74f5b 100644
--- a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
+++ b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
@@ -215,9 +215,12 @@ m2::RectD GenerateNearbyViewport(m2::PointD const & point)
 
 bool GetBuildingInfo(FeatureType & ft, search::ReverseGeocoder const & coder, string & street)
 {
-  std::string const & hn = ft.GetHouseNumber();
-  if (hn.empty() || !search::house_numbers::LooksLikeHouseNumber(hn, false /* prefix */))
+  auto const houseNumber = ft.GetHouseNumber();
+  if (houseNumber.empty() ||
+      !search::house_numbers::LooksLikeHouseNumber(houseNumber, false /* prefix */))
+  {
     return false;
+  }
 
   street = coder.GetFeatureStreetName(ft);
   if (street.empty())
@@ -320,8 +323,9 @@ optional<Sample> GenerateRequest(
   }
   }
 
+  auto const house = ft.GetHouseNumber();
   auto const featureCenter = feature::GetCenter(ft);
-  auto const address = ModifyAddress(std::move(street), ft.GetHouseNumber(), lang);
+  auto const address = ModifyAddress(street, house, lang);
   auto query = address;
   if (!cafeStr.empty())
     query = FLAGS_add_cafe_address ? CombineRandomly(cafeStr, address) : cafeStr;
diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp
index f82b1f1fce..34ed748f04 100644
--- a/search/search_quality/search_quality_tool/search_quality_tool.cpp
+++ b/search/search_quality/search_quality_tool/search_quality_tool.cpp
@@ -246,10 +246,10 @@ void CheckCompleteness(string const & path, DataSource & dataSource, TestSearchE
     ++totalQueries;
     try
     {
-      CompletenessQuery q(std::move(line));
+      CompletenessQuery q(move(line));
       q.m_request =
           make_unique<TestSearchRequest>(engine, q.m_query, locale, Mode::Everywhere, viewport);
-      queries.push_back(std::move(q));
+      queries.push_back(move(q));
     }
     catch (CompletenessQuery::MalformedQueryException & e)
     {
diff --git a/search/search_tests/house_numbers_matcher_test.cpp b/search/search_tests/house_numbers_matcher_test.cpp
index 91ba8da105..e29e569334 100644
--- a/search/search_tests/house_numbers_matcher_test.cpp
+++ b/search/search_tests/house_numbers_matcher_test.cpp
@@ -2,30 +2,22 @@
 
 #include "search/house_numbers_matcher.hpp"
 
-#include "base/string_utils.hpp"
-
 #include <string>
 #include <vector>
 
+#include "base/string_utils.hpp"
 
-namespace house_number_matcher_test
-{
 using namespace search::house_numbers;
+using namespace search;
 using namespace strings;
 using namespace std;
 
+namespace
+{
 bool HouseNumbersMatch(string const & houseNumber, string const & query, bool queryIsPrefix = false)
 {
-  vector<Token> queryParse;
-  ParseQuery(MakeUniString(query), queryIsPrefix, queryParse);
-  return search::house_numbers::HouseNumbersMatch(MakeUniString(houseNumber), queryParse);
-}
-
-bool HouseNumbersMatchRange(string_view const & hnRange, string const & query, feature::InterpolType interpol)
-{
-  vector<Token> queryParse;
-  ParseQuery(MakeUniString(query), false /* isPrefix */, queryParse);
-  return search::house_numbers::HouseNumbersMatchRange(hnRange, queryParse, interpol);
+  return search::house_numbers::HouseNumbersMatch(MakeUniString(houseNumber), MakeUniString(query),
+                                                  queryIsPrefix);
 }
 
 bool CheckTokenizer(string const & utf8s, vector<string> const & expected)
@@ -73,13 +65,9 @@ bool CheckParser(string const & utf8s, string const & expected)
 
   return true;
 }
+}  // namespace
 
-UNIT_TEST(HouseNumber_ToUInt)
-{
-  TEST_EQUAL(ToUInt(MakeUniString("1234987650")), 1234987650ULL, ());
-}
-
-UNIT_TEST(HouseNumber_Tokenizer)
+UNIT_TEST(HouseNumberTokenizer_Smoke)
 {
   TEST(CheckTokenizer("123Б", {"123", "б"}), ());
   TEST(CheckTokenizer("123/Б", {"123", "/", "б"}), ());
@@ -89,7 +77,7 @@ UNIT_TEST(HouseNumber_Tokenizer)
   TEST(CheckTokenizer("9 литер аб1", {"9", "литер", "аб", "1"}), ());
 }
 
-UNIT_TEST(HouseNumber_Parser)
+UNIT_TEST(HouseNumberParser_Smoke)
 {
   TEST(CheckParser("123Б", "123 б"), ());
   TEST(CheckParser("123/4 Литер А", "123 4 а"), ());
@@ -99,16 +87,14 @@ UNIT_TEST(HouseNumber_Parser)
   TEST(CheckParser("9 литер А корпус 2", "9 2 а"), ());
   TEST(CheckParser("39с79", "39 79"), ());
   TEST(CheckParser("9 литер аб1", "9 1"), ());
-  TEST(CheckParser("1-100", "1 100"), ());
 }
 
-UNIT_TEST(HouseNumber_Matcher)
+UNIT_TEST(HouseNumbersMatcher_Smoke)
 {
   TEST(HouseNumbersMatch("39с79", "39"), ());
   TEST(HouseNumbersMatch("39с79", "39 Строение 79"), ());
   TEST(HouseNumbersMatch("39с79", "39 к. 79"), ());
   TEST(HouseNumbersMatch("39 - 79", "39 строение 79"), ());
-  TEST(!HouseNumbersMatch("39-79", "49"), ());
   TEST(HouseNumbersMatch("39/79", "39 строение 79"), ());
   TEST(HouseNumbersMatch("127а корпус 2", "127а"), ());
   TEST(HouseNumbersMatch("127а корпус 2", "127а кор. 2"), ());
@@ -158,31 +144,9 @@ UNIT_TEST(HouseNumber_Matcher)
   TEST(HouseNumbersMatch("16 к1", "16 к1"), ());
   TEST(HouseNumbersMatch("16 к1", "дом 16 к1"), ());
   TEST(HouseNumbersMatch("14 д 1", "дом 14 д1"), ());
-
-  TEST(HouseNumbersMatch("12;14", "12"), ());
-  TEST(HouseNumbersMatch("12;14", "14"), ());
-  TEST(!HouseNumbersMatch("12;14", "13"), ());
-  TEST(HouseNumbersMatch("12,14", "12"), ());
-  TEST(HouseNumbersMatch("12,14", "14"), ());
-  TEST(!HouseNumbersMatch("12,14", "13"), ());
 }
 
-UNIT_TEST(HouseNumber_Matcher_Range)
-{
-  using IType = feature::InterpolType;
-
-  TEST(HouseNumbersMatchRange("3000:3100", "3088", IType::Even), ());
-  TEST(!HouseNumbersMatchRange("3000:3100", "3088", IType::Odd), ());
-  TEST(!HouseNumbersMatchRange("3000:3100", "3000", IType::Any), ());
-  TEST(!HouseNumbersMatchRange("3000:3100", "3100", IType::Any), ());
-  TEST(HouseNumbersMatchRange("2:40", "32A", IType::Even), ());
-  TEST(!HouseNumbersMatchRange("2:40", "33B", IType::Even), ());
-
-  /// @todo Maybe some day ..
-  //TEST(HouseNumbersMatchRange("30A:30D", "30B", IType::Any), ());
-}
-
-UNIT_TEST(HouseNumber_LooksLike)
+UNIT_TEST(LooksLikeHouseNumber_Smoke)
 {
   TEST(LooksLikeHouseNumber("1", false /* isPrefix */), ());
   TEST(LooksLikeHouseNumber("ev 10", false /* isPrefix */), ());
@@ -227,13 +191,9 @@ UNIT_TEST(HouseNumber_LooksLike)
   TEST(LooksLikeHouseNumber("дом 16", false /* isPrefix */), ());
   TEST(LooksLikeHouseNumber("дом 14 д 1", false /* isPrefix */), ());
 
-  TEST(LooksLikeHouseNumber("12;14", false /* isPrefix */), ());
-  TEST(LooksLikeHouseNumber("12,14", true /* isPrefix */), ());
-
   TEST(!LooksLikeHouseNumber("улица", false /* isPrefix */), ());
-  TEST(!LooksLikeHouseNumber("avenida", false /* isPrefix */), ());
-  TEST(!LooksLikeHouseNumber("street", false /* isPrefix */), ());
-
-  TEST(LooksLikeHouseNumber("2:40", false /* isPrefix */), ());
+  /// @todo By VNG: Don't know is it supposed or not, but next tokens are _looks like house numbers_!
+  /// @see g_strings in house_numbers_matching.cpp
+  TEST(LooksLikeHouseNumber("avenida", false /* isPrefix */), ());
+  TEST(LooksLikeHouseNumber("street", false /* isPrefix */), ());
 }
-} // namespace house_number_matcher_test
diff --git a/search/search_tests/keyword_lang_matcher_test.cpp b/search/search_tests/keyword_lang_matcher_test.cpp
index bd2f2bc683..45903bf163 100644
--- a/search/search_tests/keyword_lang_matcher_test.cpp
+++ b/search/search_tests/keyword_lang_matcher_test.cpp
@@ -35,7 +35,7 @@ KeywordLangMatcher CreateMatcher(string const & query)
     // langPriorities[3] is intentionally left empty.
 
     for (size_t i = 0; i < langPriorities.size(); ++i)
-      matcher.SetLanguages(i /* tier */, std::move(langPriorities[i]));
+      matcher.SetLanguages(i /* tier */, move(langPriorities[i]));
   }
 
   vector<strings::UniString> keywords;
diff --git a/search/search_tests/latlon_match_test.cpp b/search/search_tests/latlon_match_test.cpp
index c807312ff1..58f7f98290 100644
--- a/search/search_tests/latlon_match_test.cpp
+++ b/search/search_tests/latlon_match_test.cpp
@@ -4,10 +4,10 @@
 
 #include "base/math.hpp"
 
-namespace latlon_match_test
-{
 using namespace search;
 
+namespace
+{
 // We expect the results to be quite precise.
 double const kEps = 1e-12;
 
@@ -16,7 +16,7 @@ void TestAlmostEqual(double actual, double expected)
   TEST(base::AlmostEqualAbsOrRel(actual, expected, kEps), (actual, expected));
 }
 
-UNIT_TEST(LatLon_Match_Smoke)
+UNIT_TEST(LatLon_Degree_Match)
 {
   double lat, lon;
 
@@ -154,11 +154,4 @@ UNIT_TEST(LatLon_Match_Smoke)
   TEST(!MatchLatLonDegree("N 33.217\' E 11* 10.113", lat, lon), ());
   TEST(!MatchLatLonDegree("N 51* 33.217 E 11* 10.113\"", lat, lon), ());
 }
-
-UNIT_TEST(LatLon_Match_False)
-{
-  double lat, lon;
-  TEST(!MatchLatLonDegree("2 1st", lat, lon), ());
-}
-
-} // namespace latlon_match_test
+}  //  namespace
diff --git a/search/search_tests/ranking_tests.cpp b/search/search_tests/ranking_tests.cpp
index f8a7bc116c..cf36336e64 100644
--- a/search/search_tests/ranking_tests.cpp
+++ b/search/search_tests/ranking_tests.cpp
@@ -183,7 +183,7 @@ class MwmIdWrapper
 {
   FeatureID m_id;
 public:
-  MwmIdWrapper(MwmSet::MwmId id) : m_id(std::move(id), 0) {}
+  MwmIdWrapper(MwmSet::MwmId id) : m_id(move(id), 0) {}
   FeatureID const & GetId() const { return m_id; }
 };
 
diff --git a/search/search_tests_support/test_results_matching.cpp b/search/search_tests_support/test_results_matching.cpp
index 85c32398bc..0f1496619c 100644
--- a/search/search_tests_support/test_results_matching.cpp
+++ b/search/search_tests_support/test_results_matching.cpp
@@ -35,7 +35,7 @@ string ExactMatchingRule::ToString() const
 }
 
 AlternativesMatchingRule::AlternativesMatchingRule(vector<shared_ptr<MatchingRule>> && rules)
-  : m_rules(std::move(rules))
+  : m_rules(move(rules))
 {
 }
 
diff --git a/search/street_vicinity_loader.cpp b/search/street_vicinity_loader.cpp
index 76c71e5cfd..06a64491bc 100644
--- a/search/street_vicinity_loader.cpp
+++ b/search/street_vicinity_loader.cpp
@@ -54,29 +54,24 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
   if (!isStreet && !isSquareOrSuburb)
     return;
 
-  /// @todo Can be optimized here. Do not aggregate rect, but aggregate covering intervals for each segment, instead.
-  auto const sumRect = [&street, this](m2::PointD const & pt)
-  {
-    street.m_rect.Add(mercator::RectByCenterXYAndSizeInMeters(pt, m_offsetMeters));
-  };
-
+  std::vector<m2::PointD> points;
   if (feature->GetGeomType() == feature::GeomType::Area)
   {
-    feature->ForEachTriangle([&sumRect](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
-                             {
-                               sumRect(p1);
-                               sumRect(p2);
-                               sumRect(p3);
-                             }, FeatureType::BEST_GEOMETRY);
+    points = feature->GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY);
   }
   else
-    feature->ForEachPoint(sumRect, FeatureType::BEST_GEOMETRY);
-  ASSERT(street.m_rect.IsValid(), ());
+  {
+    feature->ForEachPoint(base::MakeBackInsertFunctor(points), FeatureType::BEST_GEOMETRY);
+  }
+  ASSERT(!points.empty(), ());
+
+  for (auto const & point : points)
+    street.m_rect.Add(mercator::RectByCenterXYAndSizeInMeters(point, m_offsetMeters));
 
   covering::CoveringGetter coveringGetter(street.m_rect, covering::ViewportWithLowLevels);
   auto const & intervals = coveringGetter.Get<RectId::DEPTH_LEVELS>(m_scale);
   m_context->ForEachIndex(intervals, m_scale, base::MakeBackInsertFunctor(street.m_features));
 
-  //street.m_calculator = std::make_unique<ProjectionOnStreetCalculator>(points);
+  street.m_calculator = std::make_unique<ProjectionOnStreetCalculator>(points);
 }
 }  // namespace search
diff --git a/search/street_vicinity_loader.hpp b/search/street_vicinity_loader.hpp
index d8ed41b00d..ca1f80e25e 100644
--- a/search/street_vicinity_loader.hpp
+++ b/search/street_vicinity_loader.hpp
@@ -1,17 +1,18 @@
 #pragma once
 
 #include "search/mwm_context.hpp"
-//#include "search/projection_on_street.hpp"
+#include "search/projection_on_street.hpp"
 #include "search/stats_cache.hpp"
 
-//#include "indexer/feature.hpp"
-//#include "indexer/feature_algo.hpp"
+#include "indexer/feature.hpp"
+#include "indexer/feature_algo.hpp"
 
 #include "geometry/rect2d.hpp"
 
 #include "base/macros.hpp"
 
-//#include <algorithm>
+#include <algorithm>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -27,14 +28,19 @@ class StreetVicinityLoader
 public:
   struct Street
   {
-    inline bool IsEmpty() const { return m_rect.IsEmptyInterior(); }
+    Street() = default;
+    Street(Street && street) = default;
+
+    inline bool IsEmpty() const { return !m_calculator || m_rect.IsEmptyInterior(); }
 
     std::vector<uint32_t> m_features;
     m2::RectD m_rect;
-    //std::unique_ptr<ProjectionOnStreetCalculator> m_calculator;
+    std::unique_ptr<ProjectionOnStreetCalculator> m_calculator;
 
     /// @todo Cache GetProjection results for features here, because
     /// feature::GetCenter and ProjectionOnStreetCalculator::GetProjection are not so fast.
+
+    DISALLOW_COPY(Street);
   };
 
   StreetVicinityLoader(int scale, double offsetMeters);
@@ -42,7 +48,6 @@ public:
 
   // Calls |fn| on each index in |sortedIds| where sortedIds[index]
   // belongs to the street's vicinity.
-  /*
   template <typename TFn>
   void ForEachInVicinity(uint32_t streetId, std::vector<uint32_t> const & sortedIds,
                          double offsetMeters, TFn const & fn)
@@ -73,7 +78,6 @@ public:
       }
     }
   }
-  */
 
   void OnQueryFinished();
 
diff --git a/storage/country_tree.cpp b/storage/country_tree.cpp
index 3b5b08a07a..6b496e8cd5 100644
--- a/storage/country_tree.cpp
+++ b/storage/country_tree.cpp
@@ -107,7 +107,7 @@ public:
     ASSERT(!countryId.empty(), ());
     ASSERT_NOT_EQUAL(geoObjectId, 0, ());
     base::GeoObjectId id(geoObjectId);
-    m_mwmTopCityGeoIds.emplace(countryId, std::move(id));
+    m_mwmTopCityGeoIds.emplace(countryId, move(id));
   }
 
   void InsertTopCountryGeoIds(CountryId const & countryId,
@@ -116,7 +116,7 @@ public:
     ASSERT(!countryId.empty(), ());
     ASSERT(!geoObjectIds.empty(), ());
     vector<base::GeoObjectId> ids(geoObjectIds.cbegin(), geoObjectIds.cend());
-    m_mwmTopCountryGeoIds.emplace(countryId, std::move(ids));
+    m_mwmTopCountryGeoIds.emplace(countryId, move(ids));
   }
 
   OldMwmMapping GetMapping() const override { return m_idsMapping; }
@@ -137,7 +137,7 @@ public:
                                 CountryId const & /* parent */) override
   {
     CountryInfo info(id);
-    m_file2info[id] = std::move(info);
+    m_file2info[id] = move(info);
     return nullptr;
   }
 
diff --git a/storage/diff_scheme/diff_scheme_loader.cpp b/storage/diff_scheme/diff_scheme_loader.cpp
index 923b5912fd..6b04e7d88a 100644
--- a/storage/diff_scheme/diff_scheme_loader.cpp
+++ b/storage/diff_scheme/diff_scheme_loader.cpp
@@ -97,7 +97,7 @@ NameDiffInfoMap DeserializeResponse(string const & response, LocalMapsInfo::Name
     }
 
     DiffInfo info(size, nameVersionMap.at(name));
-    diffs.emplace(std::move(name), std::move(info));
+    diffs.emplace(move(name), move(info));
   }
 
   return diffs;
@@ -137,11 +137,11 @@ namespace diffs
 // static
 void Loader::Load(LocalMapsInfo && info, DiffsReceivedCallback && callback)
 {
-  GetPlatform().RunTask(Platform::Thread::Network, [info = std::move(info), callback = std::move(callback)]() {
+  GetPlatform().RunTask(Platform::Thread::Network, [info = move(info), callback = move(callback)]() {
     auto result = ::Load(info);
     GetPlatform().RunTask(Platform::Thread::Gui,
-                          [result = std::move(result), callback = std::move(callback)]() mutable {
-                            callback(std::move(result));
+                          [result = move(result), callback = move(callback)]() mutable {
+                            callback(move(result));
                           });
   });
 }
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 382790fd75..032d3c381e 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -134,7 +134,7 @@ Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */,
 
 Storage::Storage(string const & referenceCountriesTxtJsonForTesting,
                  unique_ptr<MapFilesDownloader> mapDownloaderForTesting)
-  : m_downloader(std::move(mapDownloaderForTesting))
+  : m_downloader(move(mapDownloaderForTesting))
 {
   m_downloader->SetDownloadingPolicy(m_downloadingPolicy);
 
@@ -877,7 +877,7 @@ void Storage::SetDownloaderForTesting(unique_ptr<MapFilesDownloader> downloader)
   if (m_downloader)
     m_downloader->Clear();
 
-  m_downloader = std::move(downloader);
+  m_downloader = move(downloader);
   m_downloader->SetDownloadingPolicy(m_downloadingPolicy);
 }
 
@@ -1379,9 +1379,9 @@ void Storage::LoadDiffScheme()
     return;
   }
 
-  diffs::Loader::Load(std::move(localMapsInfo), [this](diffs::NameDiffInfoMap && diffs)
+  diffs::Loader::Load(move(localMapsInfo), [this](diffs::NameDiffInfoMap && diffs)
   {
-    OnDiffStatusReceived(std::move(diffs));
+    OnDiffStatusReceived(move(diffs));
   });
 }
 */
@@ -1415,7 +1415,7 @@ void Storage::ApplyDiff(CountryId const & countryId, function<void(bool isSucces
 
   LocalFilePtr & diffFile = params.m_diffFile;
   diffs::ApplyDiff(
-      std::move(params), *emplaceResult.first->second,
+      move(params), *emplaceResult.first->second,
       [this, fn, countryId, diffFile](DiffApplicationResult result)
       {
         CHECK_THREAD_CHECKER(m_threadChecker, ());
@@ -1531,7 +1531,7 @@ void Storage::OnFinishDownloading()
 
 void Storage::OnDiffStatusReceived(diffs::NameDiffInfoMap && diffs)
 {
-  m_diffsDataSource->SetDiffInfo(std::move(diffs));
+  m_diffsDataSource->SetDiffInfo(move(diffs));
 
   SetMapSchemeForCountriesWithAbsentDiffs([this] (auto const & id)
   {
@@ -1684,7 +1684,7 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c
       countryIdAndName.m_localName = string();
     else
       countryIdAndName.m_localName = m_countryNameGetter(countryIdAndName.m_id);
-    nodeAttrs.m_parentInfo.emplace_back(std::move(countryIdAndName));
+    nodeAttrs.m_parentInfo.emplace_back(move(countryIdAndName));
   }
   // Parents country.
   nodeAttrs.m_topmostParentInfo.clear();
diff --git a/storage/storage_tests/country_info_getter_tests.cpp b/storage/storage_tests/country_info_getter_tests.cpp
index 0d38a22cb4..93a75129a1 100644
--- a/storage/storage_tests/country_info_getter_tests.cpp
+++ b/storage/storage_tests/country_info_getter_tests.cpp
@@ -287,7 +287,7 @@ BENCHMARK_TEST(CountryInfoGetter_RegionsByRect)
   {
     vector<m2::RegionD> regions;
     reader->LoadRegionsFromDisk(i, regions);
-    allRegions.emplace_back(std::move(regions));
+    allRegions.emplace_back(move(regions));
   }
 
   size_t totalPoints = 0;
diff --git a/tools/python/stylesheet/cat_stat.py b/tools/python/stylesheet/cat_stat.py
index da1d9f8055..b405d54c1d 100755
--- a/tools/python/stylesheet/cat_stat.py
+++ b/tools/python/stylesheet/cat_stat.py
@@ -1,10 +1,4 @@
 #!/usr/bin/env python
-
-"""
-First lists tags used by Organic Maps
-Then, popular tags among selected keys (see find_popular_taginfo for list) which are not yet used by Organic Maps are listed
-"""
-
 import csv
 import drules_struct_pb2
 import os
@@ -121,12 +115,6 @@ if __name__ == '__main__':
     if len(sys.argv) < 2:
         print('Calculates tag usage and categories stats, suggesting new types.')
         print('Usage: {} <path_to_taginfo.db> [<path_to_omim_data>]'.format(sys.argv[0]))
-        print('To obtain taginfo files visit https://taginfo.openstreetmap.org/download')
-        print('On Linux you can obtain this files by following operations')
-        print('wget https://taginfo.openstreetmap.org/download/taginfo-db.db.bz2')
-        print('wget https://taginfo.openstreetmap.org/download/taginfo-wiki.db.bz2')
-        print('bzip2 -dk taginfo-wiki.db.bz2')
-        print('bzip2 -dk taginfo-db.db.bz2')
         sys.exit(1)
 
     data_path = sys.argv[2] if len(sys.argv) >= 3 else os.path.join(os.path.dirname(sys.argv[0]), '..', '..', '..', 'data')
@@ -167,7 +155,7 @@ if __name__ == '__main__':
 
     # Iterate over know classificator types
     w = csv.writer(sys.stdout)
-    w.writerow(('type', 'is editable', 'can add', 'drawn', 'icon', 'area', 'name drawn', 'usage count in osm', 'source'))
+    w.writerow(('type', 'is editable', 'can add', 'drawn', 'icon', 'area', 'name drawn', 'usages in osm'))
     no_editor = EditStat()
     no_drawn = DruleStat()
     seen = set()
@@ -193,7 +181,7 @@ if __name__ == '__main__':
     for row in find_popular_taginfo(cursor, seen):
         r = ['{}={}'.format(row[0], row[1])] + ['']*6 + [row[2]]
         if wcur is not None:
-            wcur.execute("select description from wikipages where key=? and value=? and lang is 'en'", (row[0], row[1]))
+            wcur.execute("select description from wikipages where key=? and value=? and lang in ('en', 'ru') order by lang desc", (row[0], row[1]))
             wrow = wcur.fetchone()
-            r.append('' if wrow is None or wrow[0] is None else wrow[0])
+            r.append('' if wrow is None or wrow[0] is None else wrow[0].encode('utf-8'))
         w.writerow(r)
diff --git a/track_analyzing/log_parser.cpp b/track_analyzing/log_parser.cpp
index dc02fe8f9b..9a7e6df469 100644
--- a/track_analyzing/log_parser.cpp
+++ b/track_analyzing/log_parser.cpp
@@ -91,7 +91,7 @@ namespace track_analyzing
 {
 LogParser::LogParser(shared_ptr<routing::NumMwmIds> numMwmIds,
                      unique_ptr<m4::Tree<routing::NumMwmId>> mwmTree, string const & dataDir)
-  : m_numMwmIds(std::move(numMwmIds)), m_mwmTree(std::move(mwmTree)), m_dataDir(dataDir)
+  : m_numMwmIds(move(numMwmIds)), m_mwmTree(move(mwmTree)), m_dataDir(dataDir)
 {
   CHECK(m_numMwmIds, ());
   CHECK(m_mwmTree, ());
diff --git a/track_analyzing/serialization.hpp b/track_analyzing/serialization.hpp
index 9ef3a89069..1a5ebf49fd 100644
--- a/track_analyzing/serialization.hpp
+++ b/track_analyzing/serialization.hpp
@@ -28,7 +28,7 @@ class MwmToMatchedTracksSerializer final
 {
 public:
   MwmToMatchedTracksSerializer(std::shared_ptr<routing::NumMwmIds> numMwmIds)
-    : m_numMwmIds(std::move(numMwmIds))
+    : m_numMwmIds(move(numMwmIds))
   {
   }
 
diff --git a/track_analyzing/track_analyzer/cmd_balance_csv.cpp b/track_analyzing/track_analyzer/cmd_balance_csv.cpp
index 3e46d3ca78..ef7da05d08 100644
--- a/track_analyzing/track_analyzer/cmd_balance_csv.cpp
+++ b/track_analyzing/track_analyzer/cmd_balance_csv.cpp
@@ -203,9 +203,9 @@ void FilterTable(MwmToDataPoints const & balancedDataPointNumbers, vector<TableR
   for (auto const & kv : tableIdx)
   {
     for (auto const idx : kv.second)
-      balancedTable.emplace_back(std::move(table[idx]));
+      balancedTable.emplace_back(move(table[idx]));
   }
-  table = std::move(balancedTable);
+  table = move(balancedTable);
 }
 
 void BalanceDataPoints(basic_istream<char> & tableCsvStream,
@@ -244,7 +244,7 @@ void BalanceDataPoints(basic_istream<char> & tableCsvStream,
 
   // Calculating how many points should have every mwm to keep the |distribution|.
   MwmToDataPoints const balancedDataPointNumber =
-      BalancedDataPointNumber(std::move(matchedDataPoints), std::move(distribution), ignoreDataPointsNumber);
+      BalancedDataPointNumber(move(matchedDataPoints), move(distribution), ignoreDataPointsNumber);
   uint64_t const totalBalancedDataPointsNumber = ValueSum(balancedDataPointNumber);
   LOG(LINFO, ("Total balanced data points number:", totalBalancedDataPointsNumber));
 
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp
index 22fe4b961a..465fd2507b 100644
--- a/track_analyzing/track_analyzer/cmd_table.cpp
+++ b/track_analyzing/track_analyzer/cmd_table.cpp
@@ -460,7 +460,7 @@ void CmdTagsTable(string const & filepath, string const & trackExtension, String
                                                 info);
           }
 
-          aggregator.Add(std::move(moveType), info, subtrackBegin, end, geometry);
+          aggregator.Add(move(moveType), info, subtrackBegin, end, geometry);
           subtrackBegin = end;
           info.fill(0);
         }
diff --git a/track_analyzing/track_analyzer/utils.cpp b/track_analyzing/track_analyzer/utils.cpp
index e3dac5df50..7d9fe637c7 100644
--- a/track_analyzing/track_analyzer/utils.cpp
+++ b/track_analyzing/track_analyzer/utils.cpp
@@ -229,7 +229,7 @@ void ParseTracks(string const & logFile, shared_ptr<NumMwmIds> const & numMwmIds
   unique_ptr<m4::Tree<NumMwmId>> mwmTree = MakeNumMwmTree(*numMwmIds, *countryInfoGetter);
 
   LOG(LINFO, ("Parsing", logFile));
-  LogParser parser(numMwmIds, std::move(mwmTree), dataDir);
+  LogParser parser(numMwmIds, move(mwmTree), dataDir);
   parser.Parse(logFile, mwmToTracks);
 }
 
diff --git a/track_analyzing/track_analyzing_tests/balance_tests.cpp b/track_analyzing/track_analyzing_tests/balance_tests.cpp
index 8bad8209d4..f39f5e4994 100644
--- a/track_analyzing/track_analyzing_tests/balance_tests.cpp
+++ b/track_analyzing/track_analyzing_tests/balance_tests.cpp
@@ -161,7 +161,7 @@ UNIT_TEST(BalancedDataPointNumberTheSameTest)
     auto distr = distribution;
     auto matched = matchedDataPoints;
     auto const balancedDataPointNumber =
-        BalancedDataPointNumber(std::move(matched), std::move(distr), 0 /* ignoreDataPointsNumber */);
+        BalancedDataPointNumber(move(matched), move(distr), 0 /* ignoreDataPointsNumber */);
     TEST_EQUAL(balancedDataPointNumber, matchedDataPoints, ());
   }
 
@@ -171,7 +171,7 @@ UNIT_TEST(BalancedDataPointNumberTheSameTest)
     auto distr = distribution;
     auto matched = matchedDataPoints;
     auto const balancedDataPointNumber =
-        BalancedDataPointNumber(std::move(matched), std::move(distr), 7 /* ignoreDataPointsNumber */);
+        BalancedDataPointNumber(move(matched), move(distr), 7 /* ignoreDataPointsNumber */);
     MwmToDataPoints expectedBalancedDataPointNumber = {{"Russia_Moscow", 10 /* data points */}};
     TEST_EQUAL(balancedDataPointNumber, expectedBalancedDataPointNumber, ());
   }
@@ -189,7 +189,7 @@ UNIT_TEST(BalancedDataPointNumberTest)
     auto distr = distribution;
     auto matched = matchedDataPoints;
     auto const balancedDataPointNumber =
-        BalancedDataPointNumber(std::move(matched), std::move(distr), 7 /* ignoreDataPointsNumber */);
+        BalancedDataPointNumber(move(matched), move(distr), 7 /* ignoreDataPointsNumber */);
     MwmToDataPoints expectedBalancedDataPointNumber = {{"Russia_Moscow", 60 /* data points */},
                                                        {"San Marino", 30 /* data points */},
                                                        {"Slovakia", 10 /* data points */}};
@@ -209,7 +209,7 @@ UNIT_TEST(BalancedDataPointNumberUint64Test)
     auto distr = distribution;
     auto matched = matchedDataPoints;
     auto const balancedDataPointNumber =
-        BalancedDataPointNumber(std::move(matched), std::move(distr), 7'000'000'000 /* ignoreDataPointsNumber */);
+        BalancedDataPointNumber(move(matched), move(distr), 7'000'000'000 /* ignoreDataPointsNumber */);
     MwmToDataPoints expectedBalancedDataPointNumber = {{"Russia_Moscow", 60'000'000'000 /* data points */},
                                                        {"San Marino", 30'000'000'000 /* data points */},
                                                        {"Slovakia", 10'000'000'000 /* data points */}};
diff --git a/track_analyzing/track_archive_reader.cpp b/track_analyzing/track_archive_reader.cpp
index a3e31f585c..6f9603f7e7 100644
--- a/track_analyzing/track_archive_reader.cpp
+++ b/track_analyzing/track_archive_reader.cpp
@@ -261,7 +261,7 @@ optional<Track> ParseTrackArchiveData(string const & content, TemporaryFile & tm
   if (unzip::Close(zipReader) != unzip::Code::Ok)
     LOG(LERROR, ("Unable to close temporary zip archive"));
 
-  return result ? optional<Track>(std::move(trackData)) : nullopt;
+  return result ? optional<Track>(move(trackData)) : nullopt;
 }
 
 optional<UserTrackInfo> ParseLogRecord(string const & record, TemporaryFile & tmpArchiveFile)
@@ -278,7 +278,7 @@ optional<UserTrackInfo> ParseLogRecord(string const & record, TemporaryFile & tm
   optional<Track> track = ParseTrackArchiveData(items[kTrackRecordDataIndex], tmpArchiveFile);
 
   if (track)
-    return optional<UserTrackInfo>({items[kTrackRecordUserIdIndex], std::move(*track)});
+    return optional<UserTrackInfo>({items[kTrackRecordUserIdIndex], move(*track)});
 
   return nullopt;
 }
diff --git a/tracking/connection.cpp b/tracking/connection.cpp
index 75192c1661..274475e588 100644
--- a/tracking/connection.cpp
+++ b/tracking/connection.cpp
@@ -14,7 +14,7 @@ namespace tracking
 {
 Connection::Connection(std::unique_ptr<platform::Socket> socket, std::string const & host,
                        uint16_t port, bool isHistorical)
-  : m_socket(std::move(socket)), m_host(host), m_port(port)
+  : m_socket(move(socket)), m_host(host), m_port(port)
 {
   if (!m_socket)
     return;
diff --git a/tracking/reporter.cpp b/tracking/reporter.cpp
index 2ad0820113..3b86ca03d8 100644
--- a/tracking/reporter.cpp
+++ b/tracking/reporter.cpp
@@ -35,7 +35,7 @@ milliseconds const Reporter::kPushDelayMs = milliseconds(20000);
 Reporter::Reporter(unique_ptr<platform::Socket> socket, string const & host, uint16_t port,
                    milliseconds pushDelay)
   : m_allowSendingPoints(true)
-  , m_realtimeSender(std::move(socket), host, port, false)
+  , m_realtimeSender(move(socket), host, port, false)
   , m_pushDelay(pushDelay)
   , m_points(ceil(duration_cast<seconds>(pushDelay).count() + kReconnectDelaySeconds) / kMinDelaySeconds)
   , m_thread([this] { Run(); })
diff --git a/tracking/tracking_tests/reporter_test.cpp b/tracking/tracking_tests/reporter_test.cpp
index e6a3f8af08..59e80b3582 100644
--- a/tracking/tracking_tests/reporter_test.cpp
+++ b/tracking/tracking_tests/reporter_test.cpp
@@ -82,15 +82,15 @@ UNIT_TEST(Reporter_Smoke)
 {
   {
     unique_ptr<platform::Socket> socket;
-    Reporter reporter(std::move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
+    Reporter reporter(move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
   }
   {
     auto socket = make_unique<TestSocket>();
-    Reporter reporter(std::move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
+    Reporter reporter(move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
   }
   {
     auto socket = platform::CreateSocket();
-    Reporter reporter(std::move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
+    Reporter reporter(move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
   }
 }
 
@@ -99,7 +99,7 @@ UNIT_TEST(Reporter_TransferLocations)
   auto socket = make_unique<TestSocket>();
   TestSocket & testSocket = *socket.get();
 
-  Reporter reporter(std::move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
+  Reporter reporter(move(socket), "localhost", 0, milliseconds(10) /* pushDelay */);
   TransferLocation(reporter, testSocket, 1.0, 2.0, 3.0);
   TransferLocation(reporter, testSocket, 4.0, 5.0, 6.0);
   TransferLocation(reporter, testSocket, 7.0, 8.0, 9.0);
diff --git a/traffic/traffic_info.cpp b/traffic/traffic_info.cpp
index 095bfdf4ac..db8a94bb4b 100644
--- a/traffic/traffic_info.cpp
+++ b/traffic/traffic_info.cpp
@@ -139,7 +139,7 @@ TrafficInfo::TrafficInfo(MwmSet::MwmId const & mwmId, int64_t currentDataVersion
 TrafficInfo TrafficInfo::BuildForTesting(Coloring && coloring)
 {
   TrafficInfo info;
-  info.m_coloring = std::move(coloring);
+  info.m_coloring = move(coloring);
   return info;
 }