diff --git a/3party/Alohalytics b/3party/Alohalytics
index 5c46d5b4c7..6fc3b425c3 160000
--- a/3party/Alohalytics
+++ b/3party/Alohalytics
@@ -1 +1 @@
-Subproject commit 5c46d5b4c7fc6f24fa01076be1ce55a824a2b5e8
+Subproject commit 6fc3b425c324855b3a8bfdce706bdb32b1947cee
diff --git a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
index 3bef1f5c31..833462d77c 100644
--- a/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
+++ b/3party/opening_hours/opening_hours_tests/opening_hours_tests.cpp
@@ -924,6 +924,11 @@ BOOST_AUTO_TEST_CASE(OpeningHoursWeekRanges_TestParseUnparse)
 
 BOOST_AUTO_TEST_CASE(OpeningHoursRuleSequence_TestParseUnparse)
 {
+  {
+    auto const rule = "";
+    auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule);
+    BOOST_CHECK_EQUAL(parsedUnparsed, rule);
+  }
   {
     auto const rule = "24/7";
     auto const parsedUnparsed = ParseAndUnparse<osmoh::TRuleSequences>(rule);
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index b18b5f247c..b552b89b0d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -237,6 +237,7 @@
       android:configChanges="orientation|screenLayout|screenSize"
       android:label="@string/edit_place"
       android:theme="@style/MwmTheme.EditorActivity"
+      android:windowSoftInputMode="adjustResize|stateHidden"
       android:parentActivityName="com.mapswithme.maps.MwmActivity">
       <!-- The meta-data element is needed for versions lower than 4.1 -->
       <meta-data
diff --git a/android/gradle.properties b/android/gradle.properties
index cf3b0fbe1c..325aa0f257 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,8 +3,8 @@ propMinSdkVersion=15
 # https://code.google.com/p/android/issues/detail?id=184567
 propTargetSdkVersion=22
 propBuildToolsVersion=22.0.1
-propVersionCode=610
-propVersionName=6.1.0
+propVersionCode=613
+propVersionName=6.1.3
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
 
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index edf88c245f..be8a7c2335 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -99,7 +99,7 @@ void Framework::UpdateCompassSensor(int ind, float * arr)
 
 void Framework::MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive)
 {
-  if (m_myPositionModeSignal != nullptr)
+  if (m_myPositionModeSignal)
     m_myPositionModeSignal(mode, routingActive);
 }
 
@@ -211,6 +211,11 @@ void Framework::SetChoosePositionMode(bool isChoosePositionMode, bool isBusiness
   m_work.EnableChoosePositionMode(isChoosePositionMode, isBusiness, hasPosition, position);
 }
 
+bool Framework::GetChoosePositionMode()
+{
+  return m_isChoosePositionMode;
+}
+
 Storage & Framework::Storage()
 {
   return m_work.Storage();
@@ -826,12 +831,14 @@ Java_com_mapswithme_maps_Framework_nativeShowCountry(JNIEnv * env, jclass, jstri
 JNIEXPORT void JNICALL
 Java_com_mapswithme_maps_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jobject listener)
 {
+  CHECK(g_framework, ("Framework isn't created yet!"));
   frm()->SetRouteBuildingListener(bind(&CallRoutingListener, jni::make_global_ref(listener), _1, _2));
 }
 
 JNIEXPORT void JNICALL
 Java_com_mapswithme_maps_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass, jobject listener)
 {
+  CHECK(g_framework, ("Framework isn't created yet!"));
   frm()->SetRouteProgressListener(bind(&CallRouteProgressListener, jni::make_global_ref(listener), _1));
 }
 
@@ -980,10 +987,21 @@ Java_com_mapswithme_maps_Framework_nativeOnBookmarkCategoryChanged(JNIEnv * env,
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_Framework_nativeTurnChoosePositionMode(JNIEnv *, jclass, jboolean turnOn, jboolean isBusiness)
+Java_com_mapswithme_maps_Framework_nativeTurnOnChoosePositionMode(JNIEnv *, jclass, jboolean isBusiness, jboolean applyPosition)
 {
-  //TODO(Android team): implement positioning
-  g_framework->SetChoosePositionMode(turnOn, isBusiness, false /* hasPosition */, m2::PointD());
+  g_framework->SetChoosePositionMode(true, isBusiness, applyPosition, applyPosition ? g_framework->GetPlacePageInfo().GetMercator() : m2::PointD());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_Framework_nativeTurnOffChoosePositionMode(JNIEnv *, jclass)
+{
+  g_framework->SetChoosePositionMode(false, false, false, m2::PointD());
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_Framework_nativeIsInChoosePositionMode(JNIEnv *, jclass)
+{
+  return g_framework->GetChoosePositionMode();
 }
 
 JNIEXPORT jboolean JNICALL
@@ -1004,4 +1022,10 @@ Java_com_mapswithme_maps_Framework_nativeIsActiveObjectABuilding(JNIEnv * env, j
 {
   return g_framework->GetPlacePageInfo().IsBuilding();
 }
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_Framework_nativeCanAddPlaceFromPlacePage(JNIEnv * env, jclass clazz)
+{
+  return g_framework->GetPlacePageInfo().ShouldShowAddPlace();
+}
 } // extern "C"
diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index 154b0f5130..b95cb0c7f5 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -138,6 +138,7 @@ namespace android
     void Get3dMode(bool & allow3d, bool & allow3dBuildings);
 
     void SetChoosePositionMode(bool isChoosePositionMode, bool isBusiness, bool hasPosition, m2::PointD const & position);
+    bool GetChoosePositionMode();
 
     void SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor);
     void ApplyWidgets();
diff --git a/android/jni/com/mapswithme/maps/LocationState.cpp b/android/jni/com/mapswithme/maps/LocationState.cpp
index 346f6f960d..6d12d1c2b6 100644
--- a/android/jni/com/mapswithme/maps/LocationState.cpp
+++ b/android/jni/com/mapswithme/maps/LocationState.cpp
@@ -6,36 +6,36 @@
 
 extern "C"
 {
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_LocationState_switchToNextMode(JNIEnv * env, jobject thiz)
-  {
-    g_framework->NativeFramework()->SwitchMyPositionNextMode();
-  }
-
-  JNIEXPORT jint JNICALL
-  Java_com_mapswithme_maps_LocationState_getLocationStateMode(JNIEnv * env, jobject thiz)
-  {
-    return g_framework->GetMyPositionMode();
-  }
-
-  void LocationStateModeChanged(location::EMyPositionMode mode, bool routingActive, shared_ptr<jobject> const & obj)
-  {
-    g_framework->SetMyPositionMode(mode);
-
-    JNIEnv * env = jni::GetEnv();
-    env->CallVoidMethod(*obj, jni::GetMethodID(env, *obj.get(), "onMyPositionModeChangedCallback", "(IZ)V"),
-                        static_cast<jint>(mode), static_cast<jboolean>(routingActive));
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_LocationState_setMyPositionModeListener(JNIEnv * env, jobject thiz, jobject obj)
-  {
-    g_framework->SetMyPositionModeListener(bind(&LocationStateModeChanged, _1, _2, jni::make_global_ref(obj)));
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_LocationState_removeMyPositionModeListener(JNIEnv * env, jobject thiz, jint slotID)
-  {
-    g_framework->SetMyPositionModeListener(location::TMyPositionModeChanged());
-  }
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_LocationState_nativeSwitchToNextMode(JNIEnv * env, jobject thiz)
+{
+  g_framework->NativeFramework()->SwitchMyPositionNextMode();
 }
+
+JNIEXPORT jint JNICALL
+Java_com_mapswithme_maps_LocationState_nativeGetMode(JNIEnv * env, jobject thiz)
+{
+  return g_framework->GetMyPositionMode();
+}
+
+void LocationStateModeChanged(location::EMyPositionMode mode, bool routingActive, shared_ptr<jobject> const & obj)
+{
+  g_framework->SetMyPositionMode(mode);
+
+  JNIEnv * env = jni::GetEnv();
+  env->CallVoidMethod(*obj, jni::GetMethodID(env, *obj.get(), "onMyPositionModeChangedCallback", "(IZ)V"),
+                      static_cast<jint>(mode), static_cast<jboolean>(routingActive));
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_LocationState_nativeSetListener(JNIEnv * env, jobject thiz, jobject obj)
+{
+  g_framework->SetMyPositionModeListener(bind(&LocationStateModeChanged, _1, _2, jni::make_global_ref(obj)));
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_LocationState_nativeRemoveListener(JNIEnv * env, jobject thiz, jint slotID)
+{
+  g_framework->SetMyPositionModeListener(location::TMyPositionModeChanged());
+}
+} // extern "C"
diff --git a/android/jni/com/mapswithme/maps/MwmApplication.cpp b/android/jni/com/mapswithme/maps/MwmApplication.cpp
index d3d461764d..161e23400a 100644
--- a/android/jni/com/mapswithme/maps/MwmApplication.cpp
+++ b/android/jni/com/mapswithme/maps/MwmApplication.cpp
@@ -29,12 +29,6 @@ extern "C"
     android::Platform::Instance().ProcessFunctor(functorPointer);
   }
 
-  JNIEXPORT jboolean JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeHasFreeSpace(JNIEnv * env, jclass clazz, jlong size)
-  {
-    return android::Platform::Instance().HasAvailableSpaceForWriting(size);
-  }
-
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_MwmApplication_nativeAddLocalization(JNIEnv * env, jclass clazz, jstring name, jstring value)
   {
diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp
index b1a5697699..8384ca5dd7 100644
--- a/android/jni/com/mapswithme/maps/editor/Editor.cpp
+++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp
@@ -401,6 +401,28 @@ Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv *, jclass, j
         ("Couldn't create mapobject, wrong coordinates of missing mwm"));
 }
 
+// static void nativeCreateNote(String text);
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
+{
+  Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
+                                osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
+}
+
+// static void nativePlaceDoesNotExist(String comment);
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment)
+{
+  Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
+                                osm::Editor::NoteProblemType::PlaceDoesNotExist, jni::ToNativeString(env, comment));
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz)
+{
+  g_framework->NativeFramework()->RollBackChanges(g_editableMapObject.GetID());
+}
+
 JNIEXPORT jobjectArray JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeGetAllFeatureCategories(JNIEnv * env, jclass clazz, jstring jLang)
 {
@@ -481,22 +503,6 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass
   return g_editableMapObject.GetID().GetMwmVersion();
 }
 
-// static void nativeCreateNote(String text);
-JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
-{
-  Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
-                                osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
-}
-
-// static void nativePlaceDoesNotExist();
-JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz)
-{
-  Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
-                                osm::Editor::NoteProblemType::PlaceDoesNotExist, "");
-}
-
 // static boolean nativeIsHouseValid(String houseNumber);
 JNIEXPORT jboolean JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber)
@@ -509,4 +515,18 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass cl
 {
   return jni::ToJavaString(env, g_editableMapObject.GetLocalizedType());
 }
+
+// @FeatureStatus
+// static native int nativeGetMapObjectStatus();
+JNIEXPORT jint JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz)
+{
+  return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
+{
+  return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index);
+}
 } // extern "C"
diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index b64cf1308d..91521d69e0 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -121,11 +121,9 @@ namespace android
     m_settingsDir = jni::ToNativeString(env, storagePath);
     m_tmpDir = jni::ToNativeString(env, tmpPath);
 
+    // Custom storage isn't set. Use primary storage.
     if (!settings::Get("StoragePath", m_writableDir))
-    {
-      LOG(LINFO, ("Could not read writable dir. Use primary storage."));
       m_writableDir = m_settingsDir;
-    }
 
     string const obbPath = jni::ToNativeString(env, obbGooglePath);
     Platform::FilesList files;
diff --git a/android/res/color/color_timepicker_tab.xml b/android/res/color/color_timepicker_tab.xml
deleted file mode 100644
index dbb832244a..0000000000
--- a/android/res/color/color_timepicker_tab.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item
-    android:color="@color/base_accent"
-    android:state_selected="true"/>
-
-  <item
-    android:color="@color/text_dark_subtitle"/>
-</selector>
\ No newline at end of file
diff --git a/android/res/layout-w600dp-port/place_page_details.xml b/android/res/layout-w600dp-port/place_page_details.xml
index 851a2a809b..33f1f3fcdf 100644
--- a/android/res/layout-w600dp-port/place_page_details.xml
+++ b/android/res/layout-w600dp-port/place_page_details.xml
@@ -57,6 +57,8 @@
           <include layout="@layout/place_page_editor"/>
 
           <include layout="@layout/place_page_add_business"/>
+
+          <include layout="@layout/place_page_add"/>
         </LinearLayout>
 
         <LinearLayout
diff --git a/android/res/layout/dialog_edit_text.xml b/android/res/layout/dialog_edit_text.xml
index 30a346dbaa..8c6c31e3d4 100644
--- a/android/res/layout/dialog_edit_text.xml
+++ b/android/res/layout/dialog_edit_text.xml
@@ -1,8 +1,8 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
-  android:minWidth="@dimen/width_dialog_base"
   android:layout_height="wrap_content"
+  android:minWidth="@dimen/width_dialog_base"
   android:orientation="vertical"
   android:padding="@dimen/margin_base_plus">
 
@@ -13,7 +13,8 @@
     android:layout_marginBottom="@dimen/margin_base"
     android:textAppearance="@style/MwmTextAppearance.Title"/>
 
-  <com.mapswithme.maps.widget.CustomTextInputLayout
+  <android.support.design.widget.TextInputLayout
+    android:id="@+id/input"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -22,9 +23,8 @@
       style="@style/MwmWidget.PlacePage.EditText"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:hint="@string/name"
       android:singleLine="true"/>
 
-  </com.mapswithme.maps.widget.CustomTextInputLayout>
+  </android.support.design.widget.TextInputLayout>
 
 </LinearLayout>
diff --git a/android/res/layout/fragment_auth_editor.xml b/android/res/layout/fragment_auth_editor.xml
index 1b244827ad..ebcbcfd8c7 100644
--- a/android/res/layout/fragment_auth_editor.xml
+++ b/android/res/layout/fragment_auth_editor.xml
@@ -40,6 +40,8 @@
       android:layout_height="match_parent"
       android:orientation="vertical"
       android:padding="@dimen/margin_half_plus"
+      android:clipToPadding="false"
+      android:clipChildren="false"
       tools:ignore="ScrollViewSize">
 
       <LinearLayout
@@ -69,7 +71,9 @@
         android:id="@+id/block_auth"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:clipToPadding="false"
+        android:clipChildren="false">
 
         <TextView
           android:id="@+id/first_osm_edit"
@@ -84,6 +88,8 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:orientation="horizontal"
+          android:clipToPadding="false"
+          android:clipChildren="false"
           tools:ignore="ButtonStyle">
 
           <Button
@@ -153,8 +159,7 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="@dimen/margin_half"
           android:background="?clickableBackground"
-          android:paddingBottom="@dimen/margin_half"
-          android:paddingTop="@dimen/margin_half"
+          android:padding="@dimen/margin_half"
           android:text="@string/register_at_openstreetmap"
           android:textAllCaps="true"
           android:textAppearance="@style/MwmTextAppearance.Body1.Light"
diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml
index 221dc2168a..18110a1685 100644
--- a/android/res/layout/fragment_editor.xml
+++ b/android/res/layout/fragment_editor.xml
@@ -4,13 +4,13 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:padding="@dimen/margin_half"
   tools:context=".editor.EditorActivity"
   tools:ignore="DuplicateIds">
 
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="@dimen/margin_half"
     android:orientation="vertical">
 
     <android.support.v7.widget.CardView
@@ -21,9 +21,8 @@
         android:id="@+id/category"
         style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/editor_height_field"
         android:layout_marginBottom="0dp"
-        android:minHeight="@dimen/editor_height_field"
         android:padding="@dimen/margin_half_plus">
 
         <ImageView
@@ -291,8 +290,7 @@
 
         <com.mapswithme.maps.widget.CustomTextInputLayout
           android:id="@+id/custom_input"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
+          style="@style/MwmWidget.Editor.CustomTextInput"
           android:gravity="center_vertical"
           android:minHeight="74dp">
 
@@ -311,9 +309,12 @@
           android:textAppearance="@style/MwmTextAppearance.Body4"/>
 
         <TextView
+          android:id="@+id/about_osm"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginTop="@dimen/margin_half"
+          android:background="?clickableBackground"
+          android:paddingBottom="@dimen/margin_half"
+          android:paddingTop="@dimen/margin_half"
           android:text="@string/editor_more_about_osm"
           android:textAppearance="@style/MwmTextAppearance.Body4"
           android:textColor="?colorAccent"
@@ -323,6 +324,23 @@
 
     </android.support.v7.widget.CardView>
 
+    <android.support.v7.widget.CardView
+      android:id="@+id/cv__more"
+      style="@style/MwmWidget.Editor.CardView"
+      android:layout_marginTop="@dimen/margin_double"
+      android:layout_marginBottom="@dimen/margin_base">
+
+      <TextView
+        android:id="@+id/reset"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="?selectableItemBackground"
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Button"
+        android:textColor="@color/base_red"
+        tools:text="Reset my changes"/>
+    </android.support.v7.widget.CardView>
+
   </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
index cf1f9f63e3..77a92ecc0a 100644
--- a/android/res/layout/fragment_osm_login.xml
+++ b/android/res/layout/fragment_osm_login.xml
@@ -11,7 +11,7 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/bg_cards"
+    android:background="?cardBackground"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme.Light"
     tools:ignore="UnusedAttribute"/>
@@ -19,7 +19,7 @@
   <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_cards"
+    android:background="?cardBackground"
     android:fillViewport="true"
     tools:ignore="DuplicateIds">
 
@@ -28,11 +28,12 @@
       android:layout_height="match_parent"
       android:orientation="vertical"
       android:padding="@dimen/margin_base"
+      android:clipChildren="false"
+      android:clipToPadding="false"
       tools:ignore="ScrollViewSize">
 
       <com.mapswithme.maps.widget.CustomTextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_marginTop="@dimen/margin_base"
         android:minHeight="@dimen/height_block_base">
 
@@ -45,8 +46,7 @@
       </com.mapswithme.maps.widget.CustomTextInputLayout>
 
       <com.mapswithme.maps.widget.CustomTextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_marginTop="@dimen/margin_base"
         android:minHeight="@dimen/height_block_base">
 
@@ -69,7 +69,7 @@
           style="@style/MwmWidget.Button.Accent"
           android:layout_width="match_parent"
           android:layout_height="@dimen/editor_auth_btn_height"
-          android:text="Log in"
+          android:text="@string/login"
           android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
 
         <ProgressBar
diff --git a/android/res/layout/fragment_prefs_help.xml b/android/res/layout/fragment_prefs_help.xml
index 48e9b96f49..df40755cb7 100644
--- a/android/res/layout/fragment_prefs_help.xml
+++ b/android/res/layout/fragment_prefs_help.xml
@@ -34,9 +34,6 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/margin_base"
         android:text="@string/feedback"
-        android:drawableLeft="@drawable/ic_feedback"
-        android:drawableStart="@drawable/ic_feedback"
-        android:drawablePadding="@dimen/margin_base"
         android:textAppearance="@style/MwmTextAppearance.Button"
         android:background="?clickableBackground"/>
   </FrameLayout>
diff --git a/android/res/layout/fragment_timetable_picker.xml b/android/res/layout/fragment_timetable_picker.xml
index c704595b09..df2e1922ec 100644
--- a/android/res/layout/fragment_timetable_picker.xml
+++ b/android/res/layout/fragment_timetable_picker.xml
@@ -12,7 +12,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_block_base"
     android:elevation="@dimen/appbar_elevation"
-    android:background="@android:color/white"
+    android:background="?android:windowBackground"
     app:tabGravity="fill"
     app:tabIndicatorColor="?colorAccent"
     app:tabMode="fixed"
@@ -22,5 +22,5 @@
     android:id="@+id/picker"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"/>
+    android:background="?android:windowBackground"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/item_editor_input.xml b/android/res/layout/item_editor_input.xml
index 522088237b..2f8e24a69a 100644
--- a/android/res/layout/item_editor_input.xml
+++ b/android/res/layout/item_editor_input.xml
@@ -11,8 +11,7 @@
 
   <android.support.design.widget.TextInputLayout
     android:id="@+id/custom_input"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    style="@style/MwmWidget.Editor.CustomTextInput"
     android:layout_centerVertical="true"
     android:layout_marginLeft="54dp"
     android:layout_marginStart="54dp">
diff --git a/android/res/layout/place_page_add.xml b/android/res/layout/place_page_add.xml
new file mode 100644
index 0000000000..ddc6c05a9c
--- /dev/null
+++ b/android/res/layout/place_page_add.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/ll__place_add"
+  style="@style/PlacePageItemFrame"
+  tools:visibility="visible">
+
+  <ImageView
+    style="@style/PlacePageMetadataIcon"
+    android:src="@drawable/ic_add_place"
+    android:tint="?colorAccent"/>
+
+  <TextView
+    android:id="@+id/tv__editor"
+    style="@style/PlacePageMetadataText"
+    android:text="@string/placepage_add_place_button"
+    android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml
index 24eb01f851..68c64c54a6 100644
--- a/android/res/layout/place_page_details.xml
+++ b/android/res/layout/place_page_details.xml
@@ -55,6 +55,8 @@
 
       <include layout="@layout/place_page_add_business"/>
 
+      <include layout="@layout/place_page_add"/>
+
       <Space
         android:layout_width="match_parent"
         android:layout_height="@dimen/margin_half"/>
diff --git a/android/res/layout/placeholder.xml b/android/res/layout/placeholder.xml
index ad00f51d24..6418eeb5ef 100644
--- a/android/res/layout/placeholder.xml
+++ b/android/res/layout/placeholder.xml
@@ -5,6 +5,8 @@
   android:id="@+id/placeholder"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:paddingLeft="@dimen/margin_half"
+  android:paddingRight="@dimen/margin_half"
   android:visibility="gone"
   tools:visibility="visible">
   <LinearLayout
diff --git a/android/res/layout/tab_timepicker.xml b/android/res/layout/tab_timepicker.xml
index 23da60db86..b0598da056 100644
--- a/android/res/layout/tab_timepicker.xml
+++ b/android/res/layout/tab_timepicker.xml
@@ -4,6 +4,5 @@
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Tab"
   android:textAppearance="@style/MwmTextAppearance.Body3"
-  android:textColor="@color/color_timepicker_tab"
   tools:drawableLeft="@drawable/ic_menu_open"
   tools:text="Some tab"/>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index bd1cc41155..30360523a4 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -827,7 +827,7 @@
 	<string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
 	<string name="download_over_mobile_message">Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden.</string>
 	<string name="error_enter_correct_house_number">Richtige Hausnummer eingeben</string>
-	<string name="editor_storey_number">Anzahl der Etagen (%2d maximal)</string>
+	<string name="editor_storey_number">Anzahl der Etagen (%d maximal)</string>
 	<string name="error_enter_correct_storey_number">Bearbeiten Sie die Gebäude mit maximal 25 Etagen</string>
 	<string name="editor_zip_code">Postleitzahl</string>
 	<string name="error_enter_correct_zip_code">Geben Sie die korrekte Postleitzahl ein</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 8b17c1f23b..8ad31519c2 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -797,7 +797,7 @@
 	<string name="download_over_mobile_header">Lataa käyttämällä puhelinverkkoyhteyttä?</string>
 	<string name="download_over_mobile_message">Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä.</string>
 	<string name="error_enter_correct_house_number">Syötä oikea talon numero</string>
-	<string name="editor_storey_number">Kerrosten määrä (maks. %2d)</string>
+	<string name="editor_storey_number">Kerrosten määrä (maks. %d)</string>
 	<string name="error_enter_correct_storey_number">Muokkaa kerroksia, enintään 25 kerrosta</string>
 	<string name="editor_zip_code">Postinumero</string>
 	<string name="error_enter_correct_zip_code">Anna kelvollinen postinumero</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 4bdc7aad30..62a26edc4e 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -863,7 +863,7 @@
 	<string name="current_location_unknown_continue_button">Continue</string>
 	<string name="current_location_unknown_stop_button">Stop</string>
 	<string name="current_location_unknown_error_title">Current location is unknown.</string>
-	<string name="current_location_unknown_error_message">An error occured while searching for your location. Check that your device is working properly and try again later.</string>
+	<string name="current_location_unknown_error_message">An error occurred while searching for your location. Check that your device is working properly and try again later.</string>
 	<string name="whatsnew_update_editor_title">We\&#39;ve updated the map editor</string>
 	<string name="whatsnew_update_editor_message">MAPS.ME users have made 50 000 map changes. Together we are making the most detailed maps in the World. Join us!</string>
 	<!-- Additional text in whats new -->
diff --git a/android/res/values/styles-editor.xml b/android/res/values/styles-editor.xml
index 88509aed45..24ed287d22 100644
--- a/android/res/values/styles-editor.xml
+++ b/android/res/values/styles-editor.xml
@@ -57,19 +57,24 @@
     <item name="android:orientation">vertical</item>
   </style>
 
+  <style name="MwmWidget.Editor.CustomTextInput">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">match_parent</item>
+  </style>
+
   <style name="MwmWidget.Editor.FieldLayout">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:ellipsize">end</item>
     <item name="android:layout_marginLeft">@dimen/editor_margin_left</item>
     <item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">@dimen/editor_margin_left</item>
   </style>
 
-  <style name="MwmWidget.Editor.FieldLayout.EditText">
+  <style name="MwmWidget.Editor.FieldLayout.EditText" parent="MwmWidget.Editor">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:ellipsize">end</item>
     <item name="android:singleLine">true</item>
     <item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
-    <!-- TODO check night colors -->
-    <item name="android:theme">@style/MwmTheme.Editor.EditText</item>
   </style>
 
   <style name="MwmWidget.Editor.Problem" tools:ignore="NewApi">
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index ddd2256645..ce0cd00b8f 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -86,7 +86,7 @@
     <item name="windowBackgroundForced">@color/bg_window_night</item>
     <item name="cardFrame">@drawable/card_frame_night</item>
     <item name="cardBackground">@color/bg_cards_night</item>
-    <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
+    <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
 
     <item name="statusBar">@color/bg_statusbar_night</item>
     <item name="colorPrimary">@color/bg_primary_night</item>
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 8fe93fccf7..bb030dc26f 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -59,11 +59,11 @@
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="android:colorPrimaryDark" tools:targetApi="lollipop">?statusBar</item>
-    <item name="clickableBackground">?selectableItemBackground</item>
-    <item name="colorControlNormal">?secondary</item>
     <item name="colorAccent">@color/base_accent</item>
+    <item name="clickableBackground">?selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_light_hint</item>
     <item name="android:windowIsFloating">false</item>
-    <item name="android:textColorHint">?secondary</item>
+    <item name="android:textColorHint">@color/text_dark_hint</item>
     <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
@@ -72,8 +72,14 @@
   <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
     <item name="colorPrimary">@color/bg_primary_night</item>
     <item name="android:colorPrimaryDark" tools:targetApi="lollipop">?statusBar</item>
-    <item name="colorAccent">@color/base_accent</item>
-    <item name="android:textColorHint">?secondary</item>
+    <item name="colorAccent">@color/base_accent_night</item>
+    <item name="clickableBackground">?selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_dark_hint</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:textColorHint">@color/text_light_hint</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
@@ -83,8 +89,19 @@
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
+    <item name="colorAccent">@color/base_accent</item>
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
-    <item name="android:background">@android:color/white</item>
+    <item name="android:windowBackground">@color/bg_cards</item>
+    <item name="android:background">@color/bg_cards</item>
+  </style>
+
+  <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.AppCompat.Dialog.Alert">
+    <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item>
+    <item name="colorAccent">@color/base_accent_night</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
+    <item name="android:windowBackground">@color/bg_cards_night</item>
+    <item name="android:background">@color/bg_cards_night</item>
   </style>
 
   <style name="BottomSheet.Dialog.Dark">
@@ -100,11 +117,6 @@
 
   <style name="MwmTheme.Editor"/>
 
-  <style name="MwmTheme.Editor.EditText">
-    <item name="android:colorControlNormal" tools:ignore="NewApi">?dividerHorizontal</item>
-    <item name="colorControlNormal">?dividerHorizontal</item>
-  </style>
-
   <style name="MwmTheme.Downloader">
     <item name="status_done">@drawable/ic_downloader_done</item>
     <item name="status_downloadable">@drawable/ic_downloader_download</item>
diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java
index 93b64dedef..4d1a1954a8 100644
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@@ -197,11 +197,19 @@ public class Framework
 
   public static native void nativeZoomToPoint(double lat, double lon, int zoom, boolean animate);
 
-  public static native void nativeTurnChoosePositionMode(boolean turnedOn, boolean isBusiness);
+  /**
+   * @param isBusiness selection area will be bounded by building borders, if its true(eg. true for businesses in buildings).
+   * @param applyPosition if true, map'll be animated to currently selected object.
+   */
+  public static native void nativeTurnOnChoosePositionMode(boolean isBusiness, boolean applyPosition);
+  public static native void nativeTurnOffChoosePositionMode();
+  public static native boolean nativeIsInChoosePositionMode();
 
   public static native boolean nativeIsDownloadedMapAtScreenCenter();
 
   public static native String nativeGetActiveObjectFormattedCuisine();
 
   public static native boolean nativeIsActiveObjectABuilding();
+
+  public static native boolean nativeCanAddPlaceFromPlacePage();
 }
diff --git a/android/src/com/mapswithme/maps/LocationState.java b/android/src/com/mapswithme/maps/LocationState.java
index 533d95e0a6..ed00f92d20 100644
--- a/android/src/com/mapswithme/maps/LocationState.java
+++ b/android/src/com/mapswithme/maps/LocationState.java
@@ -4,26 +4,30 @@ public enum LocationState
 {
   INSTANCE;
 
-  /// These values should correspond to values of
-  /// location::EMyPositionMode defined in platform/location.hpp
+  public interface ModeChangeListener
+  {
+    @SuppressWarnings("unused")
+    void onMyPositionModeChangedCallback(final int newMode, final boolean routingActive);
+  }
+
+  // These values should correspond to location::EMyPositionMode enum (from platform/location.hpp)
   public static final int PENDING_POSITION = 0;
   public static final int NOT_FOLLOW_NO_POSITION = 1;
   public static final int NOT_FOLLOW = 2;
   public static final int FOLLOW = 3;
   public static final int FOLLOW_AND_ROTATE = 4;
 
-  public native void switchToNextMode();
+  public native void nativeSwitchToNextMode();
+  public native int nativeGetMode();
 
-  public native int getLocationStateMode();
-
-  public native void setMyPositionModeListener(Object l);
-  public native void removeMyPositionModeListener();
+  public native void nativeSetListener(ModeChangeListener listener);
+  public native void nativeRemoveListener();
 
   /**
    * Checks if location state on the map is active (so its not turned off or pending).
    */
   public boolean isTurnedOn()
   {
-    return getLocationStateMode() > NOT_FOLLOW_NO_POSITION;
+    return nativeGetMode() > NOT_FOLLOW_NO_POSITION;
   }
 }
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index d40a5f3d73..ee10ccd7ef 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -100,7 +100,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
                                  MapFragment.MapRenderingListener,
                                  CustomNavigateUpListener,
                                  ChooseBookmarkCategoryFragment.Listener,
-                                 RoutingController.Container
+                                 RoutingController.Container,
+                                 LocationState.ModeChangeListener
 {
   public static final String EXTRA_TASK = "map_task";
   private static final String EXTRA_CONSUMED = "mwm.extra.intent.processed";
@@ -116,6 +117,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private static final String STATE_PP_OPENED = "PpOpened";
   private static final String STATE_MAP_OBJECT = "MapObject";
 
+  public static final int REQUEST_CHECK_SETTINGS = 101;
+
   // Map tasks that we run AFTER rendering initialized
   private final Stack<MapTask> mTasks = new Stack<>();
   private final StoragePathManager mPathManager = new StoragePathManager();
@@ -383,7 +386,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       @Override
       public void onClick(View v)
       {
-        showPositionChooser(false);
+        hidePositionChooser();
       }
     });
     mPositionChooser.findViewById(R.id.done).setOnClickListener(new OnClickListener()
@@ -392,7 +395,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       public void onClick(View v)
       {
         Statistics.INSTANCE.trackEditorLaunch(true);
-        showPositionChooser(false);
+        hidePositionChooser();
         if (Framework.nativeIsDownloadedMapAtScreenCenter())
           startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
         else
@@ -402,15 +405,22 @@ public class MwmActivity extends BaseMwmFragmentActivity
     UiUtils.hide(mPositionChooser);
   }
 
-  public void showPositionChooser(boolean show)
+  public void showPositionChooser(boolean isBusiness, boolean applyPosition)
   {
-    UiUtils.showIf(show, mPositionChooser);
-    setFullscreen(show);
-    Framework.nativeTurnChoosePositionMode(show, false /* isBusiness */); //TODO(Android team): set isBusiness correctly
+    UiUtils.show(mPositionChooser);
+    setFullscreen(true);
+    Framework.nativeTurnOnChoosePositionMode(isBusiness, applyPosition);
     closePlacePage();
     mSearchController.hide();
   }
 
+  public void hidePositionChooser()
+  {
+    UiUtils.hide(mPositionChooser);
+    Framework.nativeTurnOffChoosePositionMode();
+    setFullscreen(false);
+  }
+
   private void initMap()
   {
     mMapFrame = findViewById(R.id.map_fragment_container);
@@ -501,7 +511,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     if (UiUtils.isVisible(mPositionChooser))
     {
-      showPositionChooser(false);
+      hidePositionChooser();
       return true;
     }
 
@@ -577,7 +587,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
             {
               Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_ADD_CLICK,
                                              Statistics.params().add(Statistics.EventParam.FROM, "main_menu"));
-              showPositionChooser(true);
+              showPositionChooser(false, false);
             }
           });
           break;
@@ -825,8 +835,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mNavigationController.updateNorth(mLastCompassData.north);
   }
 
-  // Callback from native location state mode element processing.
-  @SuppressWarnings("unused")
+  @Override
   public void onMyPositionModeChangedCallback(final int newMode, final boolean routingActive)
   {
     mLocationPredictor.myPositionModeChanged(newMode);
@@ -839,12 +848,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
     {
     case LocationState.PENDING_POSITION:
       resumeLocation();
+      LocationHelper.INSTANCE.restart(); // restart to check settings again
       break;
 
     case LocationState.NOT_FOLLOW_NO_POSITION:
       if (sColdStart)
       {
-        LocationState.INSTANCE.switchToNextMode();
+        LocationState.INSTANCE.nativeSwitchToNextMode();
         break;
       }
 
@@ -861,19 +871,22 @@ public class MwmActivity extends BaseMwmFragmentActivity
         break;
       }
 
-      String message = String.format("%s\n\n%s", getString(R.string.current_location_unknown_message),
-                                                 getString(R.string.current_location_unknown_title));
-      new AlertDialog.Builder(this)
-                     .setMessage(message)
-                     .setNegativeButton(R.string.current_location_unknown_stop_button, null)
-                     .setPositiveButton(R.string.current_location_unknown_continue_button, new DialogInterface.OnClickListener()
-                     {
-                       @Override
-                       public void onClick(DialogInterface dialog, int which)
-                       {
-                         LocationState.INSTANCE.switchToNextMode();
-                       }
-                     }).show();
+      if (LocationHelper.INSTANCE.shouldResolveErrors())
+      {
+        String message = String.format("%s\n\n%s", getString(R.string.current_location_unknown_message),
+                                       getString(R.string.current_location_unknown_title));
+        new AlertDialog.Builder(this)
+            .setMessage(message)
+            .setNegativeButton(R.string.current_location_unknown_stop_button, null)
+            .setPositiveButton(R.string.current_location_unknown_continue_button, new DialogInterface.OnClickListener()
+            {
+              @Override
+              public void onClick(DialogInterface dialog, int which)
+              {
+                LocationState.INSTANCE.nativeSwitchToNextMode();
+              }
+            }).show();
+      }
       break;
 
     default:
@@ -884,20 +897,55 @@ public class MwmActivity extends BaseMwmFragmentActivity
     sColdStart = false;
   }
 
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent data)
+  {
+    if (requestCode == REQUEST_CHECK_SETTINGS)
+    {
+      if (resultCode == RESULT_OK)
+      {
+        LocationHelper.INSTANCE.setShouldResolveErrors(true);
+        LocationHelper.INSTANCE.restart();
+        return;
+      }
+
+      LocationHelper.INSTANCE.setShouldResolveErrors(false);
+    }
+
+    super.onActivityResult(requestCode, resultCode, data);
+  }
+
   @Override
   protected void onResume()
   {
     super.onResume();
-
-    LocationState.INSTANCE.setMyPositionModeListener(this);
-    refreshLocationState();
-
+    LocationState.INSTANCE.nativeSetListener(this);
+    mMainMenu.getMyPositionButton().update(LocationState.INSTANCE.nativeGetMode());
+    resumeLocation();
     mSearchController.refreshToolbar();
-
-    mMainMenu.onResume();
+    mMainMenu.onResume(new Runnable()
+    {
+      @Override
+      public void run()
+      {
+        if (Framework.nativeIsInChoosePositionMode())
+        {
+          UiUtils.show(mPositionChooser);
+          setFullscreen(true);
+        }
+      }
+    });
     mOnmapDownloader.onResume();
   }
 
+  private void resumeLocation()
+  {
+    LocationHelper.INSTANCE.addLocationListener(this, true);
+    // Do not turn off the screen while displaying position
+    Utils.keepScreenOn(true, getWindow());
+    mLocationPredictor.resume();
+  }
+
   @Override
   public void recreate()
   {
@@ -906,39 +954,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     super.recreate();
   }
 
-  private void initShowcase()
-  {
-    NativeAppwallAd.AppwallAdListener listener = new NativeAppwallAd.AppwallAdListener()
-    {
-      @Override
-      public void onLoad(NativeAppwallAd nativeAppwallAd)
-      {
-        if (nativeAppwallAd.getBanners().isEmpty())
-        {
-          mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
-          return;
-        }
-
-        final NativeAppwallBanner menuBanner = nativeAppwallAd.getBanners().get(0);
-        mMainMenu.setShowcaseText(menuBanner.getTitle());
-        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, true);
-      }
-
-      @Override
-      public void onNoAd(String reason, NativeAppwallAd nativeAppwallAd)
-      {
-        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
-      }
-
-      @Override
-      public void onClick(NativeAppwallBanner nativeAppwallBanner, NativeAppwallAd nativeAppwallAd) {}
-
-      @Override
-      public void onDismissDialog(NativeAppwallAd nativeAppwallAd) {}
-    };
-    mMytargetHelper = new MytargetHelper(listener, this);
-  }
-
   @Override
   protected void onResumeFragments()
   {
@@ -956,7 +971,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
             public boolean run(MwmActivity target)
             {
               if (LocationState.INSTANCE.isTurnedOn())
-                LocationState.INSTANCE.switchToNextMode();
+                LocationState.INSTANCE.nativeSwitchToNextMode();
               return false;
             }
           });
@@ -1008,7 +1023,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Override
   protected void onPause()
   {
-    LocationState.INSTANCE.removeMyPositionModeListener();
+    LocationState.INSTANCE.nativeRemoveListener();
     pauseLocation();
     TtsPlayer.INSTANCE.stop();
     LikesManager.INSTANCE.cancelDialogs();
@@ -1016,14 +1031,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     super.onPause();
   }
 
-  private void resumeLocation()
-  {
-    LocationHelper.INSTANCE.addLocationListener(this, true);
-    // Do not turn off the screen while displaying position
-    Utils.keepScreenOn(true, getWindow());
-    mLocationPredictor.resume();
-  }
-
   private void pauseLocation()
   {
     LocationHelper.INSTANCE.removeLocationListener(this);
@@ -1032,15 +1039,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mLocationPredictor.pause();
   }
 
-  private void refreshLocationState()
-  {
-    int newMode = LocationState.INSTANCE.getLocationStateMode();
-    mMainMenu.getMyPositionButton().update(newMode);
-
-    if (LocationState.INSTANCE.isTurnedOn())
-      resumeLocation();
-  }
-
   @Override
   protected void onStart()
   {
@@ -1051,6 +1049,39 @@ public class MwmActivity extends BaseMwmFragmentActivity
       mRoutingPlanInplaceController.setStartButton();
   }
 
+  private void initShowcase()
+  {
+    NativeAppwallAd.AppwallAdListener listener = new NativeAppwallAd.AppwallAdListener()
+    {
+      @Override
+      public void onLoad(NativeAppwallAd nativeAppwallAd)
+      {
+        if (nativeAppwallAd.getBanners().isEmpty())
+        {
+          mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
+          return;
+        }
+
+        final NativeAppwallBanner menuBanner = nativeAppwallAd.getBanners().get(0);
+        mMainMenu.setShowcaseText(menuBanner.getTitle());
+        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, true);
+      }
+
+      @Override
+      public void onNoAd(String reason, NativeAppwallAd nativeAppwallAd)
+      {
+        mMainMenu.setVisible(MainMenu.Item.SHOWCASE, false);
+      }
+
+      @Override
+      public void onClick(NativeAppwallBanner nativeAppwallBanner, NativeAppwallAd nativeAppwallAd) {}
+
+      @Override
+      public void onDismissDialog(NativeAppwallAd nativeAppwallAd) {}
+    };
+    mMytargetHelper = new MytargetHelper(listener, this);
+  }
+
   @Override
   protected void onStop()
   {
diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index f4731589f1..ff1780e27f 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -23,6 +23,7 @@ import com.mapswithme.maps.downloader.CountryItem;
 import com.mapswithme.maps.downloader.MapManager;
 import com.mapswithme.maps.editor.Editor;
 import com.mapswithme.maps.location.TrackRecorder;
+import com.mapswithme.maps.routing.RoutingController;
 import com.mapswithme.maps.sound.TtsPlayer;
 import com.mapswithme.util.Config;
 import com.mapswithme.util.Constants;
@@ -131,6 +132,7 @@ public class MwmApplication extends Application
     BookmarkManager.nativeLoadBookmarks();
     TtsPlayer.INSTANCE.init(this);
     ThemeSwitcher.restart();
+    RoutingController.get().initialize();
     mIsFrameworkInitialized = true;
   }
 
diff --git a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
index e33c5b0002..d6156ea667 100644
--- a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
+++ b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
@@ -6,6 +6,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
@@ -23,9 +24,11 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
   public static final String EXTRA_INITIAL = "InitialText";
   public static final String EXTRA_POSITIVE_BUTTON = "PositiveText";
   public static final String EXTRA_NEGATIVE_BUTTON = "NegativeText";
+  public static final String EXTRA_HINT = "Hint";
 
   private String mTitle;
   private String mInitialText;
+  private String mHint;
   private EditText mEtInput;
 
   public interface OnTextSaveListener
@@ -34,12 +37,18 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
   }
 
   public static void show(String title, String initialText, String positiveBtn, String negativeBtn, Fragment parent)
+  {
+    show(title, initialText, "", positiveBtn, negativeBtn, parent);
+  }
+
+  public static void show(String title, String initialText, String hint, String positiveBtn, String negativeBtn, Fragment parent)
   {
     final Bundle args = new Bundle();
     args.putString(EXTRA_TITLE, title);
     args.putString(EXTRA_INITIAL, initialText);
-    args.putString(EXTRA_POSITIVE_BUTTON, positiveBtn);
-    args.putString(EXTRA_NEGATIVE_BUTTON, negativeBtn);
+    args.putString(EXTRA_POSITIVE_BUTTON, positiveBtn == null ? null : positiveBtn.toUpperCase());
+    args.putString(EXTRA_NEGATIVE_BUTTON, negativeBtn == null ? null : negativeBtn.toUpperCase());
+    args.putString(EXTRA_HINT, hint);
     final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.instantiate(parent.getActivity(), EditTextDialogFragment.class.getName());
     fragment.setArguments(args);
     fragment.show(parent.getChildFragmentManager(), EditTextDialogFragment.class.getName());
@@ -56,38 +65,42 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
     {
       mTitle = args.getString(EXTRA_TITLE);
       mInitialText = args.getString(EXTRA_INITIAL);
+      mHint = args.getString(EXTRA_HINT);
 
       positiveButtonText = args.getString(EXTRA_POSITIVE_BUTTON);
       negativeButtonText = args.getString(EXTRA_NEGATIVE_BUTTON);
     }
 
-    final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()).setView(buildView()).
-        setPositiveButton(positiveButtonText, new DialogInterface.OnClickListener()
-            {
-              @Override
-              public void onClick(DialogInterface dialog, int which)
-              {
-                final Fragment parentFragment = getParentFragment();
-                final String result = mEtInput.getText().toString();
-                if (parentFragment instanceof OnTextSaveListener)
-                {
-                  ((OnTextSaveListener) parentFragment).onSaveText(result);
-                  return;
-                }
+    return new AlertDialog.Builder(getActivity())
+                          .setView(buildView())
+                          .setNegativeButton(negativeButtonText, null)
+                          .setPositiveButton(positiveButtonText, new DialogInterface.OnClickListener()
+                          {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which)
+                            {
+                              final Fragment parentFragment = getParentFragment();
+                              final String result = mEtInput.getText().toString();
+                              if (parentFragment instanceof OnTextSaveListener)
+                              {
+                                dismiss();
+                                ((OnTextSaveListener) parentFragment).onSaveText(result);
+                                return;
+                              }
 
-                final Activity activity = getActivity();
-                if (activity instanceof OnTextSaveListener)
-                  ((OnTextSaveListener) activity).onSaveText(result);
-              }
-            }).setNegativeButton(negativeButtonText, null);
-
-    return builder.create();
+                              final Activity activity = getActivity();
+                              if (activity instanceof OnTextSaveListener)
+                                ((OnTextSaveListener) activity).onSaveText(result);
+                            }
+                          }).create();
   }
 
   private View buildView()
   {
     @SuppressLint("InflateParams") final View root = getActivity().getLayoutInflater().inflate(R.layout.dialog_edit_text, null);
-    mEtInput = (EditText) root.findViewById(R.id.et__input);
+    TextInputLayout inputLayout = (TextInputLayout) root.findViewById(R.id.input);
+    inputLayout.setHint(TextUtils.isEmpty(mHint) ? getString(R.string.name) : mHint);
+    mEtInput = (EditText) inputLayout.findViewById(R.id.et__input);
     if (!TextUtils.isEmpty(mInitialText))
     {
       mEtInput.setText(mInitialText);
diff --git a/android/src/com/mapswithme/maps/downloader/BottomPanel.java b/android/src/com/mapswithme/maps/downloader/BottomPanel.java
index 37208d8090..a2f4fc51ac 100644
--- a/android/src/com/mapswithme/maps/downloader/BottomPanel.java
+++ b/android/src/com/mapswithme/maps/downloader/BottomPanel.java
@@ -121,7 +121,7 @@ class BottomPanel
 
     if (show)
     {
-      String root = adapter.getCurrentRoot();
+      String root = adapter.getCurrentRootId();
       if (adapter.isMyMapsMode())
       {
         int status = MapManager.nativeGetStatus(root);
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index 94f3529cfa..ca5f9a9bfa 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -214,16 +214,14 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
   private static class PathEntry
   {
-    final String countryId;
-    final String name;
+    final CountryItem item;
     final boolean myMapsMode;
     final int topPosition;
     final int topOffset;
 
-    private PathEntry(String countryId, String name, boolean myMapsMode, int topPosition, int topOffset)
+    private PathEntry(CountryItem item, boolean myMapsMode, int topPosition, int topOffset)
     {
-      this.countryId = countryId;
-      this.name = name;
+      this.item = item;
       this.myMapsMode = myMapsMode;
       this.topPosition = topPosition;
       this.topOffset = topOffset;
@@ -232,7 +230,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     @Override
     public String toString()
     {
-      return countryId + " (" + name + "), " +
+      return item.id + " (" + item.name + "), " +
              "myMapsMode: " + myMapsMode +
              ", topPosition: " + topPosition +
              ", topOffset: " + topOffset;
@@ -432,7 +430,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         public void onClick(View v)
         {
           if (mItem.isExpandable())
-            goDeeper(mItem.id, mItem.name, true);
+            goDeeper(mItem, true);
           else
             processClick(false);
         }
@@ -637,7 +635,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
     mItems.clear();
 
-    String parent = getCurrentRoot();
+    String parent = getCurrentRootId();
     boolean hasLocation = false;
     double lat = 0.0;
     double lon = 0.0;
@@ -738,7 +736,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     return mItems.size();
   }
 
-  private void goDeeper(String childId, String childName, boolean refresh)
+  private void goDeeper(CountryItem child, boolean refresh)
   {
     LinearLayoutManager lm = (LinearLayoutManager)mRecycler.getLayoutManager();
 
@@ -755,7 +753,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     }
 
     boolean wasEmpty = mPath.isEmpty();
-    mPath.push(new PathEntry(childId, childName, mMyMapsMode, position, offset));
+    mPath.push(new PathEntry(child, mMyMapsMode, position, offset));
+    mMyMapsMode &= (!mSearchResultsMode || child.childCount > 0);
 
     if (wasEmpty)
       mFragment.clearSearchQuery();
@@ -792,19 +791,24 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
   void setAvailableMapsMode()
   {
-    goDeeper(getCurrentRoot(), getCurrentRootName(), false);
+    goDeeper(getCurrentRootItem(), false);
     mMyMapsMode = false;
     refreshData();
   }
 
-  @NonNull String getCurrentRoot()
+  private CountryItem getCurrentRootItem()
   {
-    return (canGoUpwards() ? mPath.peek().countryId : CountryItem.getRootId());
+    return (canGoUpwards() ? mPath.peek().item : CountryItem.fill(CountryItem.getRootId()));
+  }
+
+  @NonNull String getCurrentRootId()
+  {
+    return (canGoUpwards() ? getCurrentRootItem().id : CountryItem.getRootId());
   }
 
   @Nullable String getCurrentRootName()
   {
-    return (canGoUpwards() ? mPath.peek().name : null);
+    return (canGoUpwards() ? getCurrentRootItem().name : null);
   }
 
   boolean isMyMapsMode()
diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
index fd08a7850e..0f949a3f96 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java
@@ -205,7 +205,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment
 
   @NonNull String getCurrentRoot()
   {
-    return mAdapter.getCurrentRoot();
+    return mAdapter.getCurrentRootId();
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
index 2e11bee631..d9396c151c 100644
--- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
+++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
@@ -100,7 +100,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
 
       if (showFrame)
       {
-        boolean hasParent = !TextUtils.isEmpty(mCurrentCountry.directParentName);
+        boolean hasParent = !CountryItem.isRoot(mCurrentCountry.directParentName);
 
         UiUtils.showIf(progress || enqueued, mProgress);
         UiUtils.showIf(!progress && !enqueued, mButton);
diff --git a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
index e639e9ab8b..5884bf4401 100644
--- a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
+++ b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps.editor;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
@@ -11,8 +12,6 @@ import com.mapswithme.maps.base.BaseMwmDialogFragment;
 
 public class AuthDialogFragment extends BaseMwmDialogFragment
 {
-  private OsmAuthFragmentDelegate mOsmAuthDelegate;
-
   @Nullable
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@@ -30,7 +29,15 @@ public class AuthDialogFragment extends BaseMwmDialogFragment
   public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    mOsmAuthDelegate = new OsmAuthFragmentDelegate(this);
-    mOsmAuthDelegate.onViewCreated(view, savedInstanceState);
+    OsmAuthFragmentDelegate osmAuthDelegate = new OsmAuthFragmentDelegate(this)
+    {
+      @Override
+      protected void loginOsm()
+      {
+        startActivity(new Intent(getContext(), OsmAuthActivity.class));
+        dismiss();
+      }
+    };
+    osmAuthDelegate.onViewCreated(view, savedInstanceState);
   }
 }
diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java
index 2d91e4d9f8..4eb87fee58 100644
--- a/android/src/com/mapswithme/maps/editor/AuthFragment.java
+++ b/android/src/com/mapswithme/maps/editor/AuthFragment.java
@@ -8,14 +8,13 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 import com.mapswithme.maps.base.BaseMwmToolbarFragment;
 import com.mapswithme.maps.widget.ToolbarController;
 import com.mapswithme.util.statistics.Statistics;
 
 public class AuthFragment extends BaseMwmToolbarFragment
 {
-  private OsmAuthFragmentDelegate mOsmAuthDelegate;
-
   @Nullable
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@@ -28,8 +27,15 @@ public class AuthFragment extends BaseMwmToolbarFragment
   {
     super.onViewCreated(view, savedInstanceState);
     mToolbarController.setTitle(R.string.thank_you);
-    mOsmAuthDelegate = new OsmAuthFragmentDelegate(this);
-    mOsmAuthDelegate.onViewCreated(view, savedInstanceState);
+    OsmAuthFragmentDelegate osmAuthDelegate = new OsmAuthFragmentDelegate(this)
+    {
+      @Override
+      protected void loginOsm()
+      {
+        ((BaseMwmFragmentActivity) getActivity()).replaceFragment(OsmAuthFragment.class, null, null);
+      }
+    };
+    osmAuthDelegate.onViewCreated(view, savedInstanceState);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java
index 62c08cabca..c3ca815328 100644
--- a/android/src/com/mapswithme/maps/editor/Editor.java
+++ b/android/src/com/mapswithme/maps/editor/Editor.java
@@ -1,9 +1,13 @@
 package com.mapswithme.maps.editor;
 
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Size;
 import android.support.annotation.WorkerThread;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 import com.mapswithme.maps.BuildConfig;
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.MwmApplication;
@@ -20,6 +24,16 @@ import com.mapswithme.maps.editor.data.LocalizedStreet;
  */
 public final class Editor
 {
+  // Should correspond to core osm::FeatureStatus.
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({UNTOUCHED, DELETED, MODIFIED, CREATED})
+  public @interface FeatureStatus {}
+
+  public static final int UNTOUCHED = 0;
+  public static final int DELETED = 1;
+  public static final int MODIFIED = 2;
+  public static final int CREATED = 3;
+
   private static final AppBackgroundTracker.OnTransitionListener sOsmUploader = new AppBackgroundTracker.OnTransitionListener()
   {
     @Override
@@ -97,6 +111,7 @@ public final class Editor
 
   public static native String nativeGetHouseNumber();
   public static native void nativeSetHouseNumber(String houseNumber);
+  public static native boolean nativeIsHouseValid(String houseNumber);
 
   public static native boolean nativeHasSomethingToUpload();
   @WorkerThread
@@ -134,6 +149,9 @@ public final class Editor
     nativeCreateMapObject(category.category);
   }
   public static native void nativeCreateMapObject(int categoryId);
+  public static native void nativeCreateNote(String text);
+  public static native void nativePlaceDoesNotExist(String comment);
+  public static native void nativeRollbackMapObject();
 
   /**
    * @return all cuisines keys.
@@ -154,8 +172,7 @@ public final class Editor
   public static native String nativeGetMwmName();
   public static native long nativeGetMwmVersion();
 
-  public static native void nativeCreateNote(String text);
-  public static native void nativePlaceDoesNotExist();
-
-  public static native boolean nativeIsHouseValid(String houseNumber);
+  @FeatureStatus
+  public static native int nativeGetMapObjectStatus();
+  public static native boolean nativeIsMapObjectUploaded();
 }
diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java
index ba323eb96d..5a05741508 100644
--- a/android/src/com/mapswithme/maps/editor/EditorFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java
@@ -1,11 +1,15 @@
 package com.mapswithme.maps.editor;
 
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.design.widget.TextInputLayout;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SwitchCompat;
 import android.util.SparseArray;
@@ -19,16 +23,18 @@ import android.widget.TextView;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmFragment;
 import com.mapswithme.maps.bookmarks.data.Metadata.MetadataType;
+import com.mapswithme.maps.dialog.EditTextDialogFragment;
 import com.mapswithme.maps.editor.data.LocalizedStreet;
 import com.mapswithme.maps.editor.data.TimeFormatUtils;
 import com.mapswithme.maps.editor.data.Timetable;
+import com.mapswithme.util.Constants;
 import com.mapswithme.util.Graphics;
 import com.mapswithme.util.InputUtils;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 import org.solovyev.android.views.llm.LinearLayoutManager;
 
-public class EditorFragment extends BaseMwmFragment implements View.OnClickListener
+public class EditorFragment extends BaseMwmFragment implements View.OnClickListener, EditTextDialogFragment.OnTextSaveListener
 {
   private TextView mCategory;
   private View mCardName;
@@ -90,8 +96,9 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   private View mEditOpeningHours;
   private EditText mDescription;
   private final SparseArray<View> mMetaBlocks = new SparseArray<>(7);
+  private TextView mReset;
 
-  protected EditorHostFragment mParent;
+  private EditorHostFragment mParent;
 
   @Nullable
   @Override
@@ -123,11 +130,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
         if (!Editor.nativeIsHouseValid(text))
         {
-          mInputHouseNumber.setError(getString(R.string.error_enter_correct_house_number));
+          UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number);
           return;
         }
 
-        mInputHouseNumber.setError(null);
+        UiUtils.setInputError(mInputHouseNumber, 0);
       }
     });
     mZipcode.setText(Editor.nativeGetZipCode());
@@ -140,6 +147,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mWifi.setChecked(Editor.nativeHasWifi());
     refreshOpeningTime();
     refreshEditableFields();
+    refreshResetButton();
   }
 
   @Override
@@ -162,6 +170,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     Editor.nativeSetWebsite(mWebsite.getText().toString());
     Editor.nativeSetEmail(mEmail.getText().toString());
     Editor.nativeSetHasWifi(mWifi.isChecked());
+    Editor.nativeSetOperator(mOperator.getText().toString());
     // TODO set localizated names
 
     return true;
@@ -242,7 +251,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mCardMetadata = view.findViewById(R.id.cv__metadata);
     mName = findInput(mCardName);
     // TODO uncomment and finish localized name
-//    view.findViewById(R.id.add_langs).setOnClickListener(this);
+    //    view.findViewById(R.id.add_langs).setOnClickListener(this);
     UiUtils.hide(view.findViewById(R.id.add_langs));
     mLocalizedShow = (TextView) view.findViewById(R.id.show_langs);
     mLocalizedShow.setOnClickListener(this);
@@ -262,8 +271,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     View blockZipcode = view.findViewById(R.id.block_zipcode);
     mZipcode = findInputAndInitBlock(blockZipcode, 0, R.string.editor_zip_code);
     mBlockLevels = view.findViewById(R.id.block_levels);
-    // TODO set levels limit (25 or more, get it from the core)
-    mBuildingLevels = findInputAndInitBlock(mBlockLevels, 0, R.string.editor_storey_number);
+    // TODO set level limits from core
+    mBuildingLevels = findInputAndInitBlock(mBlockLevels, 0, getString(R.string.editor_storey_number, 25));
     // Details
     View blockPhone = view.findViewById(R.id.block_phone);
     mPhone = findInputAndInitBlock(blockPhone, R.drawable.ic_phone, R.string.phone);
@@ -286,7 +295,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mEmptyOpeningHours.setOnClickListener(this);
     mOpeningHours = (TextView) blockOpeningHours.findViewById(R.id.opening_hours);
     mOpeningHours.setOnClickListener(this);
-    mDescription = findInput(view.findViewById(R.id.cv__more));
+    final View cardMore = view.findViewById(R.id.cv__more);
+    mDescription = findInput(cardMore);
+    cardMore.findViewById(R.id.about_osm).setOnClickListener(this);
+    mReset = (TextView) view.findViewById(R.id.reset);
+    mReset.setOnClickListener(this);
 
     mMetaBlocks.append(MetadataType.FMD_OPEN_HOURS.toInt(), blockOpeningHours);
     mMetaBlocks.append(MetadataType.FMD_PHONE_NUMBER.toInt(), blockPhone);
@@ -303,10 +316,15 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   }
 
   private EditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, @StringRes int hint)
+  {
+    return findInputAndInitBlock(blockWithInput, icon, getString(hint));
+  }
+
+  private EditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, String hint)
   {
     ((ImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
     final TextInputLayout input = (TextInputLayout) blockWithInput.findViewById(R.id.custom_input);
-    input.setHint(getString(hint));
+    input.setHint(hint);
     return (EditText) input.findViewById(R.id.input);
   }
 
@@ -338,13 +356,19 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     case R.id.add_langs:
       mParent.addLocalizedLanguage();
       break;
+    case R.id.about_osm:
+      startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(Constants.Url.OSM_ABOUT)));
+      break;
+    case R.id.reset:
+      reset();
+      break;
     }
   }
 
   private void refreshLocalizedNames()
   {
     // TODO uncomment and finish localized names
-//    UiUtils.showIf(mLocalizedNamesAdapter.getItemCount() > 0, mLocalizedShow);
+    //    UiUtils.showIf(mLocalizedNamesAdapter.getItemCount() > 0, mLocalizedShow);
     UiUtils.hide(mLocalizedNames, mLocalizedShow);
   }
 
@@ -367,4 +391,100 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
   {
     mLocalizedShow.setCompoundDrawablesWithIntrinsicBounds(null, null, Graphics.tint(getActivity(), right, R.attr.iconTint), null);
   }
+
+  private void refreshResetButton()
+  {
+    if (mParent.addingNewObject())
+    {
+      UiUtils.hide(mReset);
+      return;
+    }
+
+    if (Editor.nativeIsMapObjectUploaded())
+    {
+      mReset.setText(R.string.editor_place_doesnt_exist);
+      return;
+    }
+
+    switch (Editor.nativeGetMapObjectStatus())
+    {
+    case Editor.CREATED:
+      mReset.setText(R.string.editor_remove_place_button);
+      break;
+    case Editor.MODIFIED:
+      mReset.setText(R.string.editor_reset_edits_button);
+      break;
+    case Editor.UNTOUCHED:
+      mReset.setText(R.string.editor_place_doesnt_exist);
+      break;
+    case Editor.DELETED:
+      throw new IllegalStateException("Can't delete already deleted feature.");
+    }
+  }
+
+  private void reset()
+  {
+    if (Editor.nativeIsMapObjectUploaded())
+    {
+      placeDoesntExist();
+      return;
+    }
+
+    switch (Editor.nativeGetMapObjectStatus())
+    {
+    case Editor.CREATED:
+      rollback(Editor.CREATED);
+      break;
+    case Editor.MODIFIED:
+      rollback(Editor.MODIFIED);
+      break;
+    case Editor.UNTOUCHED:
+      placeDoesntExist();
+      break;
+    case Editor.DELETED:
+      throw new IllegalStateException("Can't delete already deleted feature.");
+    }
+  }
+
+  private void rollback(@Editor.FeatureStatus int status)
+  {
+    int title;
+    int message;
+    if (status == Editor.CREATED)
+    {
+      title = R.string.editor_remove_place_button;
+      message = R.string.editor_remove_place_message;
+    }
+    else
+    {
+      title = R.string.editor_reset_edits_button;
+      message = R.string.editor_reset_edits_message;
+    }
+
+    new AlertDialog.Builder(getActivity()).setTitle(message)
+                                          .setPositiveButton(getString(title).toUpperCase(), new DialogInterface.OnClickListener()
+                                          {
+                                            @Override
+                                            public void onClick(DialogInterface dialog, int which)
+                                            {
+                                              Editor.nativeRollbackMapObject();
+                                              mParent.onBackPressed();
+                                            }
+                                          })
+                                          .setNegativeButton(getString(R.string.cancel).toUpperCase(), null)
+                                          .show();
+  }
+
+  private void placeDoesntExist()
+  {
+    EditTextDialogFragment.show(getString(R.string.editor_place_doesnt_exist), "", getString(R.string.editor_comment_hint),
+                                getString(R.string.editor_report_problem_send_button), getString(R.string.cancel), this);
+  }
+
+  @Override
+  public void onSaveText(String text)
+  {
+    Editor.nativePlaceDoesNotExist(text);
+    mParent.onBackPressed();
+  }
 }
diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
index 0a3a1d88ef..f253b55c25 100644
--- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
@@ -128,12 +128,12 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
 
   protected void editCuisine()
   {
-    editWithFragment(Mode.CUISINE, 0, null, CuisineFragment.class, true);
+    editWithFragment(Mode.CUISINE, R.string.select_cuisine, null, CuisineFragment.class, true);
   }
 
   protected void addLocalizedLanguage()
   {
-    editWithFragment(Mode.LANGUAGE, 0, null, LanguagesFragment.class, false);
+    editWithFragment(Mode.LANGUAGE, R.string.choose_language, null, LanguagesFragment.class, false);
   }
 
   private void editWithFragment(Mode newMode, @StringRes int toolbarTitle, @Nullable Bundle args, Class<? extends Fragment> fragmentClass, boolean showSearch)
@@ -244,4 +244,9 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
     Editor.nativeSetStreet(street);
     editMapObject();
   }
+
+  public boolean addingNewObject()
+  {
+    return mIsNewObject;
+  }
 }
diff --git a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java
index 46a052b54e..a729c4f677 100644
--- a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java
+++ b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
@@ -14,12 +15,14 @@ import android.support.v7.app.AlertDialog;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmDialogFragment;
 import com.mapswithme.maps.editor.data.HoursMinutes;
+import com.mapswithme.util.ThemeUtils;
 
 public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
 {
@@ -39,6 +42,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
   private TabLayout mTabs;
 
   private int mId;
+  private Button mOkButton;
 
   public interface OnPickListener
   {
@@ -64,25 +68,45 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
   {
     readArgs();
     final View root = createView();
-    refreshPicker();
     //noinspection ConstantConditions
     mTabs.getTabAt(mSelectedTab).select();
+    final int theme = ThemeUtils.isNightTheme() ? R.style.MwmMain_DialogFragment_TimePicker_Night
+                                                : R.style.MwmMain_DialogFragment_TimePicker;
+    final AlertDialog dialog = new AlertDialog.Builder(getActivity(), theme)
+                                   .setView(root)
+                                   .setNegativeButton(android.R.string.cancel, null)
+                                   .setPositiveButton(android.R.string.ok, null)
+                                   .setCancelable(true)
+                                   .create();
 
-    return new AlertDialog.Builder(getActivity(), R.style.MwmMain_DialogFragment_TimePicker)
-               .setView(root)
-               .setNegativeButton(android.R.string.cancel, null)
-               .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener()
-               {
-                 @Override
-                 public void onClick(DialogInterface dialog, int which)
-                 {
-                   saveHoursMinutes(mPicker.getCurrentHour(), mPicker.getCurrentMinute());
-                   if (getParentFragment() instanceof OnPickListener)
-                     ((OnPickListener) getParentFragment()).onHoursMinutesPicked(mFrom, mTo, mId);
-                 }
-               })
-               .setCancelable(true)
-               .create();
+    dialog.setOnShowListener(new DialogInterface.OnShowListener()
+    {
+      @Override
+      public void onShow(DialogInterface dialogInterface)
+      {
+        mOkButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+        mOkButton.setOnClickListener(new View.OnClickListener()
+        {
+          @Override
+          public void onClick(View v)
+          {
+            if (mSelectedTab == TAB_FROM)
+            {
+              //noinspection ConstantConditions
+              mTabs.getTabAt(TAB_TO).select();
+              return;
+            }
+
+            dismiss();
+            if (getParentFragment() instanceof OnPickListener)
+              ((OnPickListener) getParentFragment()).onHoursMinutesPicked(mFrom, mTo, mId);
+          }
+        });
+        refreshPicker();
+      }
+    });
+
+    return dialog;
   }
 
   private void readArgs()
@@ -104,24 +128,29 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
     TextView tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
     // TODO @yunik add translations
     tabView.setText("From");
+    final ColorStateList textColor = getResources().getColorStateList(ThemeUtils.isNightTheme() ? R.color.tab_text_night
+                                                                                                : R.color.tab_text);
+    tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
     tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
     tabView.setText("To");
+    tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
     mTabs.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener()
     {
       @Override
       public void onTabSelected(TabLayout.Tab tab)
       {
+        if (!isInit())
+          return;
+
+        saveHoursMinutes();
         mSelectedTab = tab.getPosition();
         refreshPicker();
       }
 
       @Override
-      public void onTabUnselected(TabLayout.Tab tab)
-      {
-        saveHoursMinutes(mPicker.getCurrentHour(), mPicker.getCurrentMinute());
-      }
+      public void onTabUnselected(TabLayout.Tab tab) {}
 
       @Override
       public void onTabReselected(TabLayout.Tab tab) {}
@@ -129,30 +158,42 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
 
     mPicker = (TimePicker) root.findViewById(R.id.picker);
     mPicker.setIs24HourView(DateFormat.is24HourFormat(getActivity()));
-    mPicker.setOnTimeChangedListener(new TimePicker.OnTimeChangedListener()
-    {
-      @Override
-      public void onTimeChanged(TimePicker view, int hourOfDay, int minute)
-      {
-        saveHoursMinutes(hourOfDay, minute);
-      }
-    });
-
     return root;
   }
 
-  private void saveHoursMinutes(int hourOfDay, int minute)
+  private void saveHoursMinutes()
   {
+    final HoursMinutes hoursMinutes = new HoursMinutes(mPicker.getCurrentHour(), mPicker.getCurrentMinute());
     if (mSelectedTab == TAB_FROM)
-      mFrom = new HoursMinutes(hourOfDay, minute);
+      mFrom = hoursMinutes;
     else
-      mTo = new HoursMinutes(hourOfDay, minute);
+      mTo = hoursMinutes;
+  }
+
+  private boolean isInit()
+  {
+    return mOkButton != null && mPicker != null;
   }
 
   private void refreshPicker()
   {
-    final HoursMinutes hoursMinutes = mSelectedTab == TAB_FROM ? mFrom : mTo;
+    if (!isInit())
+      return;
+
+    HoursMinutes hoursMinutes;
+    int okBtnRes;
+    if (mSelectedTab == TAB_FROM)
+    {
+      hoursMinutes = mFrom;
+      okBtnRes = R.string.whats_new_next_button;
+    }
+    else
+    {
+      hoursMinutes = mTo;
+      okBtnRes = R.string.ok;
+    }
     mPicker.setCurrentMinute((int) hoursMinutes.minutes);
     mPicker.setCurrentHour((int) hoursMinutes.hours);
+    mOkButton.setText(okBtnRes);
   }
 }
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
index cdabc1ae7d..906edea210 100644
--- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
+++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
@@ -14,13 +14,14 @@ import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 import com.mapswithme.maps.base.BaseMwmToolbarFragment;
 import com.mapswithme.maps.widget.ToolbarController;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.Graphics;
 import com.mapswithme.util.InputUtils;
+import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.concurrency.ThreadPool;
 import com.mapswithme.util.concurrency.UiThread;
@@ -38,15 +39,8 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl
     AuthToolbarController(View root, Activity activity)
     {
       super(root, activity);
-      mToolbar.setNavigationIcon(Graphics.tint(activity,
-                                               activity.getResources().getDrawable(R.drawable.ic_cancel)));
-      mToolbar.setTitleTextColor(MwmApplication.get().getResources().getColor(R.color.text_dark));
-    }
-
-    @Override
-    public void onUpClick()
-    {
-      super.onUpClick();
+      mToolbar.setNavigationIcon(Graphics.tint(activity, activity.getResources().getDrawable(R.drawable.ic_cancel)));
+      mToolbar.setTitleTextColor(ThemeUtils.getColor(activity, android.R.attr.textColorPrimary));
     }
   }
 
@@ -64,7 +58,14 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl
   public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    mDelegate = new OsmAuthFragmentDelegate(this);
+    mDelegate = new OsmAuthFragmentDelegate(this)
+    {
+      @Override
+      protected void loginOsm()
+      {
+        ((BaseMwmFragmentActivity) getActivity()).replaceFragment(OsmAuthFragment.class, null, null);
+      }
+    };
     mDelegate.onViewCreated(view, savedInstanceState);
     mToolbarController.setTitle(R.string.login);
     mEtLogin = (EditText) view.findViewById(R.id.osm_username);
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
index dae9661680..2cd4f3818a 100644
--- a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
+++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
@@ -15,7 +15,6 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 import com.mapswithme.maps.widget.InputWebView;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.Utils;
@@ -23,10 +22,12 @@ import com.mapswithme.util.concurrency.ThreadPool;
 import com.mapswithme.util.concurrency.UiThread;
 import com.mapswithme.util.statistics.Statistics;
 
-public class OsmAuthFragmentDelegate implements View.OnClickListener
+public abstract class OsmAuthFragmentDelegate implements View.OnClickListener
 {
   private final Fragment mFragment;
 
+  protected abstract void loginOsm();
+
   public OsmAuthFragmentDelegate(Fragment fragment)
   {
     mFragment = fragment;
@@ -92,11 +93,6 @@ public class OsmAuthFragmentDelegate implements View.OnClickListener
                                    Statistics.params().add(Statistics.EventParam.IS_SUCCESS, true).add(Statistics.EventParam.TYPE, type.name));
   }
 
-  protected void loginOsm()
-  {
-    ((BaseMwmFragmentActivity) mFragment.getActivity()).replaceFragment(OsmAuthFragment.class, null, null);
-  }
-
   @SuppressLint("SetJavaScriptEnabled")
   protected void loginWebview(final OsmOAuth.AuthType type)
   {
diff --git a/android/src/com/mapswithme/maps/editor/ReportFragment.java b/android/src/com/mapswithme/maps/editor/ReportFragment.java
index d392cc4f0e..44d2bf8f50 100644
--- a/android/src/com/mapswithme/maps/editor/ReportFragment.java
+++ b/android/src/com/mapswithme/maps/editor/ReportFragment.java
@@ -63,7 +63,7 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
 
   private void sendNotExist()
   {
-    Editor.nativePlaceDoesNotExist();
+    Editor.nativePlaceDoesNotExist("");
     mToolbarController.onUpClick();
   }
 
diff --git a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java
index 70fff3e79e..0233ba8d7d 100644
--- a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java
+++ b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java
@@ -1,6 +1,5 @@
 package com.mapswithme.maps.location;
 
-
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
@@ -60,7 +59,8 @@ class AndroidNativeProvider extends BaseLocationProvider
     mIsActive = false;
   }
 
-  @Nullable Location findBestNotExpiredLocation(List<String> providers, long expirationMs)
+  @Nullable
+  Location findBestNotExpiredLocation(List<String> providers, long expirationMs)
   {
     Location res = null;
     for (final String pr : providers)
@@ -85,14 +85,14 @@ class AndroidNativeProvider extends BaseLocationProvider
       if (LocationManager.PASSIVE_PROVIDER.equals(prov))
         continue;
 
-      if (!mLocationManager.isProviderEnabled(prov))
+      if (mLocationManager.isProviderEnabled(prov))
       {
-        if (LocationManager.GPS_PROVIDER.equals(prov))
-          LocationHelper.INSTANCE.notifyLocationError(LocationHelper.ERROR_GPS_OFF);
+        acceptedProviders.add(prov);
         continue;
       }
 
-      acceptedProviders.add(prov);
+      if (LocationManager.GPS_PROVIDER.equals(prov)) // warn about turned off gps
+        LocationHelper.INSTANCE.notifyLocationError(LocationHelper.ERROR_GPS_OFF);
     }
 
     return acceptedProviders;
diff --git a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
index 6f2c5b0768..7bbd2b6c7a 100644
--- a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
+++ b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
@@ -2,12 +2,19 @@ package com.mapswithme.maps.location;
 
 import android.location.Location;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.PendingResult;
+import com.google.android.gms.common.api.ResultCallback;
+import com.google.android.gms.common.api.Status;
 import com.google.android.gms.location.LocationListener;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.LocationSettingsRequest;
+import com.google.android.gms.location.LocationSettingsResult;
+import com.google.android.gms.location.LocationSettingsStatusCodes;
 import com.mapswithme.maps.MwmApplication;
 
 class GoogleFusedLocationProvider extends BaseLocationProvider
@@ -15,10 +22,11 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
                                           GoogleApiClient.OnConnectionFailedListener,
                                           LocationListener
 {
-  private static final String GS_LOCATION_PROVIDER = "fused";
+  private static final String GMS_LOCATION_PROVIDER = "fused";
 
   private final GoogleApiClient mGoogleApiClient;
   private LocationRequest mLocationRequest;
+  private PendingResult<LocationSettingsResult> mLocationSettingsResult;
 
   public GoogleFusedLocationProvider()
   {
@@ -32,48 +40,98 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
   @Override
   protected void startUpdates()
   {
-    if (mGoogleApiClient != null && !mGoogleApiClient.isConnected() && !mGoogleApiClient.isConnecting())
-    {
-      mLocationRequest = LocationRequest.create();
-      mLocationRequest.setPriority(LocationHelper.INSTANCE.isHighAccuracy() ? LocationRequest.PRIORITY_HIGH_ACCURACY
-                                                                            : LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
-      long interval = LocationHelper.INSTANCE.getInterval();
-      mLocationRequest.setInterval(interval);
-      mLocationRequest.setFastestInterval(interval / 2);
+    if (mGoogleApiClient == null || mGoogleApiClient.isConnected() || mGoogleApiClient.isConnecting())
+      return;
 
-      mGoogleApiClient.connect();
-    }
+    mLocationRequest = LocationRequest.create();
+//    mLocationRequest.setPriority(LocationHelper.INSTANCE.isHighAccuracy() ? LocationRequest.PRIORITY_HIGH_ACCURACY
+//                                                                          : LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
+    // TODO @yunikkk
+    // Currently there are some problems concerning location strategies switching.
+    // With LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY priority GPS is not used and location icon isn't shown in system navbar,
+    // hence it confuses user.
+    // We should reconsider if balanced mode is needed at all after results of tests for battery usage will arrive.
+    mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+    long interval = LocationHelper.INSTANCE.getInterval();
+    mLocationRequest.setInterval(interval);
+    mLocationRequest.setFastestInterval(interval / 2);
+
+    mGoogleApiClient.connect();
   }
 
   @Override
   protected void stopUpdates()
   {
-    if (mGoogleApiClient != null)
-    {
-      if (mGoogleApiClient.isConnected())
-        LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
-      mGoogleApiClient.disconnect();
-    }
+    if (mGoogleApiClient == null)
+      return;
+
+    if (mGoogleApiClient.isConnected())
+      LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
+    if (mLocationSettingsResult != null && !mLocationSettingsResult.isCanceled())
+      mLocationSettingsResult.cancel();
+    mGoogleApiClient.disconnect();
   }
 
   @Override
   protected boolean isLocationBetterThanLast(Location newLocation, Location lastLocation)
   {
-    // We believe that google service always returns good locations.
-    return GS_LOCATION_PROVIDER.equalsIgnoreCase(newLocation.getProvider()) ||
-           !GS_LOCATION_PROVIDER.equalsIgnoreCase(lastLocation.getProvider()) && super.isLocationBetterThanLast(newLocation, lastLocation);
+    // We believe that google services always returns good locations.
+    return isFromFusedProvider(newLocation) ||
+           !isFromFusedProvider(lastLocation) && super.isLocationBetterThanLast(newLocation, lastLocation);
 
   }
 
+  private boolean isFromFusedProvider(Location location)
+  {
+    return GMS_LOCATION_PROVIDER.equalsIgnoreCase(location.getProvider());
+  }
+
   @Override
   public void onConnected(Bundle bundle)
   {
     sLogger.d("Fused onConnected. Bundle " + bundle);
+    checkSettingsAndRequestUpdates();
+  }
+
+  private void checkSettingsAndRequestUpdates()
+  {
+    LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder().addLocationRequest(mLocationRequest);
+    builder.setAlwaysShow(true); // hides 'never' button in resolve dialog afterwards.
+    mLocationSettingsResult = LocationServices.SettingsApi.checkLocationSettings(mGoogleApiClient, builder.build());
+    mLocationSettingsResult.setResultCallback(new ResultCallback<LocationSettingsResult>()
+    {
+      @Override
+      public void onResult(@NonNull LocationSettingsResult locationSettingsResult)
+      {
+        final Status status = locationSettingsResult.getStatus();
+        switch (status.getStatusCode())
+        {
+        case LocationSettingsStatusCodes.SUCCESS:
+          LocationHelper.INSTANCE.setShouldResolveErrors(true);
+          requestLocationUpdates();
+          break;
+        case LocationSettingsStatusCodes.RESOLUTION_REQUIRED:
+          // Location settings are not satisfied, but this can be fixed by showing the user a dialog.
+          LocationHelper.INSTANCE.resolveLocationError(status);
+          break;
+        case LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE:
+          // Location settings are not satisfied. However, we have no way to fix the settings so we won't show the dialog.
+          break;
+        }
+      }
+    });
+  }
+
+  private void requestLocationUpdates()
+  {
+    if (!mGoogleApiClient.isConnected())
+      return;
+
     LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
     LocationHelper.INSTANCE.registerSensorListeners();
-    final Location l = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
-    if (l != null)
-      LocationHelper.INSTANCE.saveLocation(l);
+    final Location last = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient);
+    if (last != null)
+      LocationHelper.INSTANCE.saveLocation(last);
   }
 
   @Override
@@ -83,7 +141,7 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
   }
 
   @Override
-  public void onConnectionFailed(ConnectionResult connectionResult)
+  public void onConnectionFailed(@NonNull ConnectionResult connectionResult)
   {
     sLogger.d("Fused onConnectionFailed. Fall back to native provider. ConnResult " + connectionResult);
     // TODO handle error in a smarter way
diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java
index fca83bb081..9be461c35e 100644
--- a/android/src/com/mapswithme/maps/location/LocationHelper.java
+++ b/android/src/com/mapswithme/maps/location/LocationHelper.java
@@ -1,27 +1,27 @@
 package com.mapswithme.maps.location;
 
-import android.content.ContentResolver;
+import android.app.Activity;
 import android.content.Context;
+import android.content.IntentSender;
+import android.content.SharedPreferences;
 import android.hardware.GeomagneticField;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.location.Location;
-import android.os.Build;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Log;
 
 import java.util.List;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.common.api.Status;
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.LocationState;
+import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.bookmarks.data.MapObject;
@@ -54,6 +54,8 @@ public enum LocationHelper implements SensorEventListener
   private static final float DISTANCE_TO_RECREATE_MAGNETIC_FIELD_M = 1000;
   private static final long STOP_DELAY_MS = 5000;
 
+  private static final String PREF_RESOLVE_ERRORS = "ResolveLocationErrors";
+
   public interface LocationListener
   {
     void onLocationUpdated(final Location l);
@@ -123,36 +125,14 @@ public enum LocationHelper implements SensorEventListener
     }
   }
 
-  @SuppressWarnings("deprecation")
   public void initLocationProvider(boolean forceNativeProvider)
   {
-    boolean isLocationTurnedOn = false;
-
     final MwmApplication application = MwmApplication.get();
-    // If location is turned off(by user in system settings), google client( = fused provider) api doesn't work at all
-    // but external gps receivers still can work. In that case we prefer native provider instead of fused - it works.
-    final ContentResolver resolver = application.getContentResolver();
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT)
-    {
-      final String providers = Settings.Secure.getString(resolver, Settings.Secure.LOCATION_PROVIDERS_ALLOWED);
-      isLocationTurnedOn = !TextUtils.isEmpty(providers);
-    }
-    else
-    {
-      try
-      {
-        final int mode = Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE);
-        isLocationTurnedOn = mode != Settings.Secure.LOCATION_MODE_OFF;
-      } catch (Settings.SettingNotFoundException e)
-      {
-        e.printStackTrace();
-      }
-    }
-
-    if (isLocationTurnedOn &&
-        !forceNativeProvider &&
-        GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(application) == ConnectionResult.SUCCESS &&
-        PreferenceManager.getDefaultSharedPreferences(application).getBoolean(application.getString(R.string.pref_play_services), false))
+    final boolean containsGoogleServices = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(application) == ConnectionResult.SUCCESS;
+    final boolean googleServicesTurnedInSettings = prefs().getBoolean(application.getString(R.string.pref_play_services), false);
+    if (!forceNativeProvider &&
+        containsGoogleServices &&
+        googleServicesTurnedInSettings)
     {
       mLogger.d("Use fused provider.");
       mLocationProvider = new GoogleFusedLocationProvider();
@@ -220,6 +200,35 @@ public enum LocationHelper implements SensorEventListener
     mListeners.finishIterate();
   }
 
+  public boolean shouldResolveErrors()
+  {
+    return prefs().getBoolean(PREF_RESOLVE_ERRORS, true);
+  }
+
+  public void setShouldResolveErrors(boolean shouldResolve)
+  {
+    prefs().edit().putBoolean(PREF_RESOLVE_ERRORS, shouldResolve).apply();
+  }
+
+  protected void resolveLocationError(Status status)
+  {
+    if (!shouldResolveErrors())
+      return;
+
+    for (LocationListener listener : mListeners)
+    {
+      if (listener instanceof Activity)
+      {
+        // Show the dialog and check the result in onActivityResult().
+        try
+        {
+          status.startResolutionForResult((Activity) listener, MwmActivity.REQUEST_CHECK_SETTINGS);
+        } catch (IntentSender.SendIntentException ignored) {}
+      }
+    }
+    mListeners.finishIterate();
+  }
+
   private void notifyCompassUpdated(long time, double magneticNorth, double trueNorth, double accuracy)
   {
     for (LocationListener listener : mListeners)
@@ -333,7 +342,7 @@ public enum LocationHelper implements SensorEventListener
       return;
     }
 
-    int mode = LocationState.INSTANCE.getLocationStateMode();
+    int mode = LocationState.INSTANCE.nativeGetMode();
     switch (mode)
     {
     default:
@@ -364,8 +373,7 @@ public enum LocationHelper implements SensorEventListener
 
   public void restart()
   {
-    Log.d("LOCATION", "restart");
-
+    mLogger.d("restart");
     mLocationProvider.stopUpdates();
 
     mActive &= !mListeners.isEmpty();
@@ -378,7 +386,7 @@ public enum LocationHelper implements SensorEventListener
     mActive = true;
     calcParams();
 
-    Log.d("LOCATION", "start. Params: " + mInterval + ", high: " + mHighAccuracy);
+    mLogger.d("start. Params: " + mInterval + ", high: " + mHighAccuracy);
     mLocationProvider.startUpdates();
   }
 
@@ -416,6 +424,11 @@ public enum LocationHelper implements SensorEventListener
     return getLastKnownLocation(LocationUtils.LOCATION_EXPIRATION_TIME_MILLIS_LONG);
   }
 
+  private SharedPreferences prefs()
+  {
+    return PreferenceManager.getDefaultSharedPreferences(MwmApplication.get());
+  }
+
   public static native void nativeOnLocationError(int errorCode);
   private static native void nativeLocationUpdated(long time, double lat, double lon, float accuracy, double altitude, float speed, float bearing);
   private static native float[] nativeUpdateCompassSensor(int ind, float[] arr);
diff --git a/android/src/com/mapswithme/maps/location/LocationPredictor.java b/android/src/com/mapswithme/maps/location/LocationPredictor.java
index f22ebb752b..155673486d 100644
--- a/android/src/com/mapswithme/maps/location/LocationPredictor.java
+++ b/android/src/com/mapswithme/maps/location/LocationPredictor.java
@@ -37,7 +37,7 @@ public class LocationPredictor
 
   public void resume()
   {
-    myPositionModeChanged(LocationState.INSTANCE.getLocationStateMode());
+    myPositionModeChanged(LocationState.INSTANCE.nativeGetMode());
   }
 
   public void pause()
diff --git a/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java b/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
index e485650670..1fa134d088 100644
--- a/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
+++ b/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java
@@ -16,15 +16,15 @@ class ResultCodesHelper
   static final int NO_ERROR = 0;
   static final int CANCELLED = 1;
   static final int NO_POSITION = 2;
-  static final int INCONSISTENT_MWM_ROUTE = 3;
-  static final int ROUTING_FILE_NOT_EXIST = 4;
-  static final int START_POINT_NOT_FOUND = 5;
-  static final int END_POINT_NOT_FOUND = 6;
-  static final int DIFFERENT_MWM = 7;
-  static final int ROUTE_NOT_FOUND = 8;
-  static final int NEED_MORE_MAPS = 9;
-  static final int INTERNAL_ERROR = 10;
-  static final int FILE_TOO_OLD = 11;
+  private static final int INCONSISTENT_MWM_ROUTE = 3;
+  private static final int ROUTING_FILE_NOT_EXIST = 4;
+  private static final int START_POINT_NOT_FOUND = 5;
+  private static final int END_POINT_NOT_FOUND = 6;
+  private static final int DIFFERENT_MWM = 7;
+  private static final int ROUTE_NOT_FOUND = 8;
+  private static final int NEED_MORE_MAPS = 9;
+  private static final int INTERNAL_ERROR = 10;
+  private static final int FILE_TOO_OLD = 11;
 
   static Pair<String, String> getDialogTitleSubtitle(int errorCode, int missingCount)
   {
@@ -34,7 +34,7 @@ class ResultCodesHelper
     switch (errorCode)
     {
     case NO_POSITION:
-      if (LocationState.INSTANCE.getLocationStateMode() == LocationState.NOT_FOLLOW_NO_POSITION)
+      if (LocationState.INSTANCE.nativeGetMode() == LocationState.NOT_FOLLOW_NO_POSITION)
       {
         titleRes = R.string.dialog_routing_location_turn_on;
         messages.add(resources.getString(R.string.dialog_routing_location_unknown_turn_on));
@@ -104,8 +104,11 @@ class ResultCodesHelper
     return new Pair<>(titleRes == 0 ? "" : resources.getString(titleRes), builder.toString());
   }
 
-  static boolean isDownloadable(int resultCode)
+  static boolean isDownloadable(int resultCode, int missingCount)
   {
-    return resultCode == INCONSISTENT_MWM_ROUTE || resultCode == ROUTING_FILE_NOT_EXIST;
+    return (resultCode == INCONSISTENT_MWM_ROUTE ||
+            resultCode == ROUTING_FILE_NOT_EXIST ||
+            resultCode == NEED_MORE_MAPS ||
+            (resultCode == ROUTE_NOT_FOUND && missingCount > 0));
   }
 }
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 99148d13b7..44d10d921d 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -141,6 +141,11 @@ public class RoutingController
     }
   };
 
+  public static RoutingController get()
+  {
+    return sInstance;
+  }
+
   private void processRoutingEvent()
   {
     if (!mContainsCachedResult ||
@@ -164,17 +169,6 @@ public class RoutingController
     fragment.show(mContainer.getActivity().getSupportFragmentManager(), RoutingErrorDialogFragment.class.getSimpleName());
   }
 
-  private RoutingController()
-  {
-    Framework.nativeSetRoutingListener(mRoutingListener);
-    Framework.nativeSetRouteProgressListener(mRoutingProgressListener);
-  }
-
-  public static RoutingController get()
-  {
-    return sInstance;
-  }
-
   private void setState(State newState)
   {
     Log.d(TAG, "[S] State: " + mState + " -> " + newState + ", BuildState: " + mBuildState);
@@ -217,6 +211,12 @@ public class RoutingController
     mContainer = container;
   }
 
+  public void initialize()
+  {
+    Framework.nativeSetRoutingListener(mRoutingListener);
+    Framework.nativeSetRouteProgressListener(mRoutingProgressListener);
+  }
+
   public void detach()
   {
     mContainer = null;
diff --git a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
index 18bcb08371..40e0db20f2 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java
@@ -32,7 +32,7 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
     builder.setTitle(titleMessage.first);
     mMessage = titleMessage.second;
 
-    if (ResultCodesHelper.isDownloadable(mResultCode))
+    if (ResultCodesHelper.isDownloadable(mResultCode, mMissingMaps.size()))
       builder.setPositiveButton(R.string.download, null);
   }
 
diff --git a/android/src/com/mapswithme/maps/settings/HelpFragment.java b/android/src/com/mapswithme/maps/settings/HelpFragment.java
index de640835d3..2a6bc78853 100644
--- a/android/src/com/mapswithme/maps/settings/HelpFragment.java
+++ b/android/src/com/mapswithme/maps/settings/HelpFragment.java
@@ -17,7 +17,6 @@ import com.mapswithme.maps.widget.BaseShadowController;
 import com.mapswithme.maps.widget.ObservableWebView;
 import com.mapswithme.maps.widget.WebViewShadowController;
 import com.mapswithme.util.Constants;
-import com.mapswithme.util.Graphics;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.statistics.AlohaHelper;
 import com.mapswithme.util.statistics.Statistics;
@@ -56,8 +55,6 @@ public class HelpFragment extends BaseSettingsFragment
     };
 
     TextView feedback = (TextView)mFrame.findViewById(R.id.feedback);
-    Graphics.tint(feedback);
-
     feedback.setOnClickListener(new View.OnClickListener()
     {
       @Override
diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
index 50517fbf0d..679a3eb73a 100644
--- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
+++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
@@ -296,7 +296,7 @@ public class MainMenu
     return UiUtils.isVisible(mFrame);
   }
 
-  private void correctLayout()
+  private void correctLayout(@Nullable final Runnable procAfterCorrection)
   {
     if (isLayoutCorrected())
       return;
@@ -310,6 +310,9 @@ public class MainMenu
 
         UiUtils.hide(mContentFrame);
         UiUtils.show(mFrame);
+
+        if (procAfterCorrection != null)
+          procAfterCorrection.run();
       }
     });
   }
@@ -330,9 +333,9 @@ public class MainMenu
       mNewsCounter.setText(String.valueOf(count));
   }
 
-  public void onResume()
+  public void onResume(@Nullable Runnable procAfterCorrection)
   {
-    correctLayout();
+    correctLayout(procAfterCorrection);
     updateMarker();
   }
 
diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
index c0ad951343..b0681fd143 100644
--- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
+++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 
 import com.mapswithme.maps.LocationState;
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.util.Graphics;
 import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.statistics.AlohaHelper;
@@ -26,7 +27,9 @@ public class MyPositionButton
       {
         Statistics.INSTANCE.trackEvent(Statistics.EventName.TOOLBAR_MY_POSITION);
         AlohaHelper.logClick(AlohaHelper.TOOLBAR_MY_POSITION);
-        LocationState.INSTANCE.switchToNextMode();
+        LocationHelper.INSTANCE.setShouldResolveErrors(true);
+        LocationHelper.INSTANCE.restart(); // restart to check location settings again.
+        LocationState.INSTANCE.nativeSwitchToNextMode();
       }
     });
   }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 787f54a3f3..ab16c8d9f3 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -112,8 +112,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
   private View mWiki;
   private View mEntrance;
   private TextView mTvEntrance;
-  private View mEditor;
+  private View mEditPlace;
   private View mAddOrganisation;
+  private View mAddPlace;
   // Bookmark
   private ImageView mIvColor;
   private EditText mEtBookmarkName;
@@ -204,10 +205,12 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
     mWiki.setOnClickListener(this);
     mEntrance = mDetails.findViewById(R.id.ll__place_entrance);
     mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance);
-    mEditor = mDetails.findViewById(R.id.ll__place_editor);
-    mEditor.setOnClickListener(this);
+    mEditPlace = mDetails.findViewById(R.id.ll__place_editor);
+    mEditPlace.setOnClickListener(this);
     mAddOrganisation = mDetails.findViewById(R.id.ll__add_organisation);
     mAddOrganisation.setOnClickListener(this);
+    mAddPlace = mDetails.findViewById(R.id.ll__place_add);
+    mAddPlace.setOnClickListener(this);
     latlon.setOnLongClickListener(this);
     address.setOnLongClickListener(this);
     mPhone.setOnLongClickListener(this);
@@ -439,13 +442,17 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
     refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_INTERNET), mWifi, null);
     refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance);
     refreshOpeningHours();
-    UiUtils.showIf(mMapObject != null && Editor.nativeIsFeatureEditable() &&
-                   !RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode(),
-                   mEditor);
-    UiUtils.showIf(!RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode() &&
-                   !MapObject.isOfType(MapObject.MY_POSITION, mMapObject) &&
-                   Framework.nativeIsActiveObjectABuilding(),
-                   mAddOrganisation);
+
+    if (RoutingController.get().isNavigating() || MapManager.nativeIsLegacyMode())
+    {
+      UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace);
+    }
+    else
+    {
+      UiUtils.showIf(Editor.nativeIsFeatureEditable(), mEditPlace);
+      UiUtils.showIf(Framework.nativeIsActiveObjectABuilding(), mAddOrganisation);
+      UiUtils.showIf(Framework.nativeCanAddPlaceFromPlacePage(), mAddPlace);
+    }
   }
 
   private void refreshOpeningHours()
@@ -526,7 +533,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
     if (RoutingController.get().isPlanning())
     {
       UiUtils.show(mRouteButtonsFrame);
-      UiUtils.hide(mGeneralButtonsFrame, mEditor);
+      UiUtils.hide(mGeneralButtonsFrame, mEditPlace);
     }
     else
     {
@@ -679,7 +686,13 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
   {
     Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_ADD_CLICK,
                                    Statistics.params().add(Statistics.EventParam.FROM, "placepage"));
-    ((MwmActivity) getContext()).showPositionChooser(true);
+    ((MwmActivity) getContext()).showPositionChooser(true, false);
+  }
+
+  private void addPlace()
+  {
+    // TODO add statistics
+    ((MwmActivity) getContext()).showPositionChooser(false, true);
   }
 
   @Override
@@ -693,6 +706,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
     case R.id.ll__add_organisation:
       addOrganisation();
       break;
+    case R.id.ll__place_add:
+      addPlace();
+      break;
     case R.id.iv__bookmark_color:
       saveBookmarkTitle();
       selectBookmarkColor();
diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java
index 249f3495db..e5524a8604 100644
--- a/android/src/com/mapswithme/util/Constants.java
+++ b/android/src/com/mapswithme/util/Constants.java
@@ -35,6 +35,7 @@ public final class Constants
 
     public static final String OSM_REGISTER = "https://www.openstreetmap.org/user/new";
     public static final String OSM_RECOVER_PASSWORD = "https://www.openstreetmap.org/user/forgot-password";
+    public static final String OSM_ABOUT = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
 
     private Url() {}
   }
diff --git a/android/src/com/mapswithme/util/LocationUtils.java b/android/src/com/mapswithme/util/LocationUtils.java
index a3066689ad..8982609ca8 100644
--- a/android/src/com/mapswithme/util/LocationUtils.java
+++ b/android/src/com/mapswithme/util/LocationUtils.java
@@ -1,10 +1,14 @@
 package com.mapswithme.util;
 
+import android.content.ContentResolver;
 import android.location.Location;
 import android.os.Build;
 import android.os.SystemClock;
+import android.provider.Settings;
+import android.text.TextUtils;
 import android.view.Surface;
 
+import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.bookmarks.data.MapObject;
 import com.mapswithme.maps.location.LocationHelper;
 
@@ -107,4 +111,29 @@ public class LocationUtils
     return Math.abs(first.getLat() - second.getLat()) < LocationUtils.LAT_LON_EPSILON &&
            Math.abs(first.getLon() - second.getLon()) < LocationUtils.LAT_LON_EPSILON;
   }
+
+  @SuppressWarnings("deprecation")
+  public static boolean isLocationServicesTurnedOn()
+  {
+    // If location is turned off(by user in system settings), google client( = fused provider) api doesn't work at all
+    // but external gps receivers still can work. In that case we prefer native provider instead of fused - it works.
+    final ContentResolver resolver = MwmApplication.get().getContentResolver();
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT)
+    {
+      final String providers = Settings.Secure.getString(resolver, Settings.Secure.LOCATION_PROVIDERS_ALLOWED);
+      return !TextUtils.isEmpty(providers);
+    }
+    else
+    {
+      try
+      {
+        final int mode = Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE);
+        return mode != Settings.Secure.LOCATION_MODE_OFF;
+      } catch (Settings.SettingNotFoundException e)
+      {
+        e.printStackTrace();
+        return false;
+      }
+    }
+  }
 }
diff --git a/android/src/com/mapswithme/util/ThemeUtils.java b/android/src/com/mapswithme/util/ThemeUtils.java
index 784914b3eb..412329bda5 100644
--- a/android/src/com/mapswithme/util/ThemeUtils.java
+++ b/android/src/com/mapswithme/util/ThemeUtils.java
@@ -50,7 +50,6 @@ public final class ThemeUtils
     return VALUE_BUFFER.resourceId;
   }
 
-
   public static LayoutInflater themedInflater(LayoutInflater src, @StyleRes int theme)
   {
     Context wrapper = new ContextThemeWrapper(src.getContext(), theme);
diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index a635a69189..6000008b98 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -15,6 +15,7 @@ import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -315,6 +316,13 @@ public final class UiUtils
                          + resources.getResourceEntryName(resId));
   }
 
+  public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error)
+  {
+    layout.setError(error == 0 ? null : layout.getContext().getString(error));
+    layout.getEditText().setTextColor(error == 0 ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary)
+                                                 : layout.getContext().getResources().getColor(R.color.base_red));
+  }
+
   // utility class
   private UiUtils() {}
 }
diff --git a/data/World.mwm b/data/World.mwm
index 836b3f6315..c480de6f19 100644
Binary files a/data/World.mwm and b/data/World.mwm differ
diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm
index 9c3aea6d2f..b855b5c103 100644
Binary files a/data/WorldCoasts.mwm and b/data/WorldCoasts.mwm differ
diff --git a/data/categories.txt b/data/categories.txt
index 6ef291c56a..858710a8d4 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -389,7 +389,7 @@ tr:Pub|bar|Bira|içki|yemek
 uk:Паб|Бар|пиво|напої|їжа
 vi:Quán rượu|Quán bar|quán rượu|đồ uống|ẩm thực
 zh-Hans:酒吧์|酒馆์|啤酒|饮料|食物
-zh-Hant:啤酒吧|酒吧|酒館|飲酒|PUB|吧台|飲食
+zh-Hant:酒館|啤酒吧|酒吧|飲酒|PUB|吧台|飲食
 
 amenity-cafe
 en:3Cafe|3restaurant|3food|U+2615|U+1F356|U+1F357|U+1F35A|U+1F35B|U+1F35C|U+1F35D|U+1F363|U+1F366|U+1F367|U+1F368|U+1F369|U+1F370|U+1F372|U+1F374|U+1F377|U+1F60B|U+1F375
@@ -521,7 +521,7 @@ es:3Panadería|tienda
 fi:3Leipomo|kauppa
 fr:3Boulangerie|magasin
 hu:3Pékség|bolt
-id:Toko roti|toko
+id:Toko roti|toko|Roti
 it:3Panetteria|negozio
 ja:1パン屋|ベーカリー|パン|軽食|持ち帰り|買い物
 ko:1베이커리|쇼핑
@@ -575,7 +575,7 @@ en:4Beauty Care|home care|shop|U+1F3EC|U+1F3EA
 ar:ﻞﻴﻤﺠﺘﻟﺍ ﺕﺍﺮﻀﺤﺘﺴﻣ|تجميل|المتجر
 cs:4Kosmetika|domácí péče|obchod
 da:4Kosmetik|hjemmepleje|butik
-de:4Kosmetik|Geschäft
+de:4Kosmetik|Geschäft|Schönheitspflege
 el:Καλλυντικά|Μαγαζί
 es:4Productos cosméticos|tienda
 fi:Kosmetiikka|kotihoito|kauppa
@@ -1012,7 +1012,7 @@ en:Beauty Shop|beautician|U+1F484
 ar:ﻞﻴﻤﺠﺗ ﻥﻮﻟﺎﺻ
 cs:Kosmetický salon
 da:Skønhedssalon
-de:Schönheitssalon
+de:Schönheitssalon|Schönheitsshop
 el:Ινστιτούτο αισθητικής
 es:Salón de belleza
 fi:Kauneushoitola
@@ -1254,7 +1254,7 @@ es:Confitería|confitería|tienda
 fi:Makeiskauppa|kauppa
 fr:Pâtisserie|confiserie|magasin
 hu:Cukrászüzlet|édességbolt|bolt
-id:Penganan|toko
+id:Penganan|toko|manisan
 it:Pasticceria|drogheria|negozio
 ja:菓子類|菓子屋|買い物
 ko:제과점|베이커리|쇼핑
@@ -1445,7 +1445,7 @@ tr:Bisiklet|mağaza
 sv:4Cykelaffär|cykel|cykel|butik
 vi:3Cửa hàng xe đạp|cửa hàng
 id:3Toko sepeda|toko
-ro:3Bicicletă|magazin
+ro:3Bicicletă|magazin|Magazin biciclete
 nb:3Sykkel|butikk
 fi:3Polkupyörä|kauppa
 sw:Duka la baiskeli|baiskeli
@@ -1765,7 +1765,7 @@ nl:3Kunstwerk|3toerisme
 zh-Hant:1藝術品|3旅遊景點
 pl:3Rzeźba|turystyka|osobliwości miasta
 pt:3Artwork|turismo|vistas
-hu:3Szobor|3látnivaló
+hu:3Szobor|3látnivaló|Műalkotás
 th:งานศิลปะ|3การท่องเที่ยว|สถานที่ท่องเที่ยว
 zh-Hans:1旅游|景点
 ar:سياحة|مناظر
@@ -2171,7 +2171,7 @@ fr:Mémorial|monument|attraction|tourisme|site touristique
 it:Memoriale|monumento|turistico
 es:Memorial|turismo
 ko:1기념물|관광
-ja:追悼|1記念碑|観光
+ja:追悼|1記念碑|観光|追悼碑
 cs:Pomník|památka|zajímavost|pamětihodnost
 sk:Pomník|pamiatka|atrakcia|zaujímavosť|pamätihodnosť
 nl:Gedenkteken|monument|attractie|toerisme
@@ -2367,7 +2367,7 @@ tr:Bank
 sv:Bänk
 vi:Xe đạp
 id:Bangku panjang
-ro:Banchetă|Bancă
+ro:Banchetă|Bancă|Bancă parc
 nb:Benk
 fi:Penkki
 sw:Benchi
@@ -2396,7 +2396,7 @@ da:4Cykel
 tr:Bisiklet kiralama|4Bisiklet
 sv:4Cykeluthyrning|cykel|cykel|3uthyrning
 vi:Cho thuê xe đạp
-id:Menyewa sepeda
+id:Penyewaan Sepeda
 ro:Închiriere de biciclete|Bicicletă
 nb:Sykkelutleie
 fi:Polkupyöränvuokraus
@@ -2766,7 +2766,7 @@ en:Clinic|1hospital|doctor|U+1F3E5|U+1F489
 ar:عيادة|مستشفى|المستشفى
 cs:Klinika|nemocnice
 da:Klinik|hospital
-de:Krankenhaus|Klinik
+de:Klinik|Krankenhaus
 es:Clínica|hospital
 fi:Klinikka|sairaala
 fr:Clinique|hôpital
@@ -4055,7 +4055,7 @@ sk:3Hostel|hotel|ubytovňa|motel
 nl:3Hostel|jeugdherberg|hotel|motel
 zh-Hant:1旅舍|旅館|青年旅舍|青年旅館|住宿|飯店|3汽車旅館|3motel
 pl:4Hostel|4hotel|4motel
-pt:3Hostel|3Pousada|4hotel|motel
+pt:3Hostel|3Pousada|4hotel|motel|Albergue
 hu:3Hostel|szálloda|szállás
 th:3หอพัก|โรงแรม|โมเทล
 zh-Hans:2旅社|旅店
@@ -4168,8 +4168,8 @@ fr:Hôtel de montagne|hôtel|auberge de jeunesse|cabane alpine
 it:Hotel di montagna|baita|capanna|capanna di montagna|capanna alpina|hotel
 es:4Cabaña|cabaña de los Alpes|hotel de montaña|hotel
 ko:1고산 오두막|산 호텔|호텔
-ja:1山小屋|高山小屋|ヒュッテ
-cs:4Horská chata|horský hotel|hotel
+ja:1山小屋|高山小屋|ヒュッテ|山の宿泊施設
+cs:4Ubytování v horách|Horská chata|horský hotel|hotel
 sk:4Horská chata|horský hotel|hotel
 nl:3Berghut|alpenhut|hotel
 zh-Hant:1山上住宿|飯店|旅館|住宿|旅舍|2高山住宿
@@ -5074,7 +5074,7 @@ fi:Suutari
 fr:Cordonnier
 hu:Cipész
 id:Tukang sepatu
-it:Calzolaio
+it:Calzolaio|Riparazione di calzature
 ja:靴修理
 ko:구두수선
 nl:Schoenmaker|schoenmakerij
@@ -5269,20 +5269,61 @@ sw:Pwani
 
 highway-speed_camera
 en:3Speed Camera
-ru:3Камера скорости
-vi:Camera tốc độ
-id:Kamera kecepatan
-ro:Radar
-nb:Fartskamera
-nl:Flitscamera|snelheidscamera
-de:Blitzer|Radarkontrolle|Radarfalle
-fi:Nopeuskamera
+ru:Камера скорости
+fr:Radar de vitesse
+da:Automatisk Trafikkontrol
+id:Kamera Kecepatan
+ko:스피드 카메라
+sv:Hastighetskamera
+tr:Hız Kamerası
+uk:Камера безпеки дорожнього руху
+vi:Camera bắn tốc độ
+hu:Traffipax
+de:Blitzer
+fi:Nopeusvalvontakamera
+cs:Rychlostní kamera
+it:Autovelox
+nb:Fotoboks
+zh-Hant:測速照相機
+zh-Hans:测速照相机
+th:กล้องตรวจจับความเร็ว
+ja:オービス
+ro:Detector de viteză
+ar:كاميرا لرصد السرعة
+sk:Rýchlostná kamera
+es:Radar de velocidad
+pl:Fotoradar
+nl:Flitspaal
+pt:Radar de velocidade
 
 man_made-lighthouse
 en:Lighthouse
-nl:Vuurtoren
 ru:Маяк
+fr:Phare
+da:Fyrtårn
+id:Mercusuar
+ko:등대
+sv:Fyr
+tr:Deniz Feneri
+uk:Маяк
+vi:Hải đăng
+hu:Világítótorony
 de:Leuchtturm
+fi:Majakka
+cs:Maják
+it:Faro
+nb:Fyr
+zh-Hant:燈塔
+zh-Hans:灯塔
+th:ประภาคาร
+ja:灯台
+ro:Far
+ar:منارة
+sk:Maják
+es:Faro
+pl:Latarnia morska
+nl:Vuurtoren
+pt:Farol
 
 shop-copyshop
 en:Copy Shop|Printer
@@ -5550,7 +5591,7 @@ ru:Детская комната|ясли
 ar:حضانة|رعاية أطفال
 cs:Jesle|Péče o děti
 da:Vuggestue|Børnehave
-de:Kinderzimmer|Kindergarten|Kinderbetreuung
+de:Kindertagesstätte|Kinderzimmer|Kindergarten|Kinderbetreuung
 es:Habitación infantil|guardería
 fi:Päivähoito|Lastenhoito
 fr:Garderie|Garde d'enfant
@@ -5584,7 +5625,7 @@ es:Estacionamiento de bicis
 fi:Polkupyöräpysäköinti
 fr:Parking à vélo
 hu:Kerékpárparkoló
-id:Cykelparkering
+id:Parkir Sepeda
 it:Parcheggio biciclette
 ja:駐輪場
 ko:자전거보관소
@@ -5599,7 +5640,8 @@ th:ที่จอดจักรยาน
 tr:Parking à vélo
 uk:Велозупинка
 vi:Chỗ Đậu Xe Đạp
-zh-Hant:自行车存放处
+zh-Hans:自行车存放处
+zh-Hant:腳踏車停放區
 
 amenity-waste_basket
 en:Trash Bin|Litter Bin|Waste Basket
@@ -5612,7 +5654,7 @@ es:Papelera
 fi:Roska-astia
 fr:Poubelle
 hu:Szemétkosár
-id:Pepperskorg
+id:Kotak sampah
 it:Contenitore per rifiuti
 ja:くずかご
 ko:쓰레기통
@@ -5627,37 +5669,38 @@ th:ถังขยะ
 tr:Poubelle
 uk:Бак для сміття
 vi:Thùng rác
-zh-Hant:垃圾篓
+zh-Hans:垃圾篓
+zh-Hant:垃圾箱
 
 emergency-phone
 en:Emergency Phone
 ru:Телефон для экстренных вызовов
 ar:هاتف الطوارئ
-cs:tísňového volání
+cs:Tísňového volání
 da:Emergency telefon
 de:Nottelefon
 el:τηλεφώνου έκτακτης ανάγκης
 es:Teléfono de emergencia
-fi:hätänumero
-fr:téléphone d'urgence
+fi:Hätänumero
+fr:Téléphone d'urgence
 he:טלפון חירום
-hu:sürgősségi telefon
-id:telepon darurat
-it:telefono di emergenza
+hu:Sürgősségi telefon
+id:Telepon
+it:Telefono di emergenza
 ja:緊急電話
 ko:긴급 전화
-nb:nødtelefon
-nl:praatpaal
-pl:telefon alarmowy
-pt:telefone de emergência
-ro:telefon de urgență
-sk:tiesňového volania
-sv:nödtelefon
-sw:simu ya dharura
+nb:Nødtelefon
+nl:Praatpaal
+pl:Telefon alarmowy
+pt:Telefone de emergência
+ro:Telefon de urgență
+sk:Tiesňového volania
+sv:Nödtelefon
+sw:Simu ya dharura
 th:โทรศัพท์ฉุกเฉิน
-tr:acil telefon
-uk:аварійний телефон
-vi:điện thoại khẩn cấp
+tr:Acil telefon
+uk:Аварійний телефон
+vi:Điện thoại khẩn cấp
 zh-Hans:紧急电话
 zh-Hant:緊急電話
 
@@ -5672,7 +5715,7 @@ es:Centro de fitness|gimnasio
 fi:Kuntosali
 fr:Centre fitness|salle de gym
 hu:Fitnesz-terem
-id:Gym
+id:Pusat kebugaran|senam
 it:Centro benessere|palestra
 ja:フィットネスセンター、ジム
 ko:피트니스센터|체육관
@@ -5687,6 +5730,7 @@ th:ฟิตเนสเซ็นเตอร์|ยิม
 tr:Centre fitness|salle de gym
 uk:Фітнес-зал
 vi:Phòng Tập
+zh-Hans:健身中心|健身房
 zh-Hant:健身中心|健身房
 
 leisure-sauna
@@ -5700,7 +5744,7 @@ es:Sauna
 fi:Sauna
 fr:Sauna
 hu:Szauna
-id:Bastu
+id:Sauna
 it:Sauna
 ja:サウナ
 ko:사우나
@@ -5715,6 +5759,7 @@ th:ซาวน่า
 tr:Sauna
 uk:Лазня
 vi:Phòng xông hơi
+zh-Hans:桑拿
 zh-Hant:桑拿
 
 man_made-water_well
@@ -5728,7 +5773,7 @@ es:Pozo
 fi:Vesikaivo
 fr:Puits à eau
 hu:Ivókút
-id:Brunn
+id:Sumur air
 it:Pozzo d'acqua
 ja:井戸
 ko:우물
@@ -5743,6 +5788,7 @@ th:บ่อน้ำ
 tr:Puits à eau
 uk:Криниця
 vi:Giếng Nước
+zh-Hans:水井
 zh-Hant:水井
 
 shop-car_repair-tyres
@@ -5756,7 +5802,7 @@ es:Reparación de neumáticos
 fi:Rengashuolto
 fr:Réparation de pneus
 hu:Gumiszerviz
-id:Däckverkstad
+id:Tambal ban
 it:Gommista
 ja:タイヤ修理
 ko:타이어수리점
@@ -5771,11 +5817,37 @@ th:ร้านปะยาง
 tr:Réparation de pneus
 uk:Шиномонтаж
 vi:Vá Lốp
-zh-Hant:轮胎修理
+zh-Hans:轮胎修理
+zh-Hant:輪胎修補
 
 shop-chemist|@shop
 en:Chemist Shop
 ru:Бытовая химия
+ar:صيدلية
+cs:Drogerie
+da:Medicinbutik|Drugstore
+de:Drogerie
+es:Droguería
+fi:Apteekki
+fr:Pharmacie
+hu:Drogéria
+id:Toko bahan kimia
+it:Farmacia
+ja:化学薬品店
+ko:화학자 상점
+nl:Drogisterij
+nb:Dagligvareforretning
+pl:Drogeria
+pt:Farmácia
+ro:Mercerie
+sk:Drogéria
+sv:Apotek
+th:ร้านขายผลิตภัณฑ์ทางเคมี
+tr:Zincir eczane
+uk:Магазин побутової хімії
+vi:Cửa hàng Dược phẩm
+zh-Hant:藥妝店
+zh-Hans:药妆店
 
 shop-pet|@shop
 en:Petshop
@@ -5788,7 +5860,7 @@ es:Tienda de mascotas
 fi:Eläinkauppa
 fr:Animalerie
 hu:Házikedvenc-üzlet
-id:Djuraffär
+id:Toko hewan
 it:Negozio di animali
 ja:ペットショップ
 ko:애완동물점
@@ -5803,7 +5875,8 @@ th:เพ็ทชอป
 tr:Animalerie
 uk:Зоотовари
 vi:Cửa Hàng Vật Nuôi
-zh-Hant:宠物店
+zh-Hans:宠物店
+zh-Hant:寵物店
 
 tourism-information-office|@tourism
 en:Tourist Office
@@ -5816,7 +5889,7 @@ es:Oficina de turismo
 fi:Turistitoimisto
 fr:Office de tourisme
 hu:Idegenforgalmi iroda
-id:Turistcenter
+id:Kantor wisata
 it:Ufficio turistico
 ja:観光案内所
 ko:관광정보센터
@@ -5831,7 +5904,8 @@ th:ศูนย์บริการนักท่องเที่ยว
 tr:Office de tourisme
 uk:Туристичний офіс
 vi:Văn Phòng Du Lịch
-zh-Hant:旅游服务处
+zh-Hans:旅游服务处
+zh-Hant:旅遊辦事處
 
 amenity-community_centre
 en:Community Centre
@@ -5844,7 +5918,7 @@ es:Centro comunitario
 fi:Monitoimitalo
 fr:Centre communautaire
 hu:Közösségi központ
-id:Stadshus
+id:Pusat komunitas
 it:Centro ricreativo
 ja:コミュニティセンター
 ko:커뮤니티센터
@@ -5859,7 +5933,8 @@ th:ศูนย์ชุมชน
 tr:Centre communautaire
 uk:Центр культури та дозвілля, Дім культури
 vi:Trung Tâm Cộng Đồng
-zh-Hant:社区中心
+zh-Hans:社区中心
+zh-Hant:社區活動中心
 
 amenity-courthouse
 en:Courthouse
@@ -5872,7 +5947,7 @@ es:Juzgado
 fi:Oikeustalo
 fr:Palais de justice
 hu:Bíróság
-id:Domstol
+id:Gedung pengadilan
 it:Tribunale
 ja:裁判所
 ko:법원
@@ -5887,6 +5962,7 @@ th:ศาล
 tr:Palais de justice
 uk:Суд
 vi:Tòa án
+zh-Hans:法院
 zh-Hant:法院
 
 amenity-vending_machine-cigarettes
@@ -5900,7 +5976,7 @@ es:Máquina de tabaco
 fi:Savukeautomaatti
 fr:Distributeur de cigarettes
 hu:Cigarettaautomata
-id:Cigarettmaskin
+id:Mesin rokok
 it:Distributore automatico di sigarette
 ja:たばこ自動販売機
 ko:담배자판기
@@ -5915,7 +5991,8 @@ th:เครื่องขายบุหรี่
 tr:Distributeur de cigarettes
 uk:Автомат з продажу сигарет
 vi:Máy bán thuốc lá
-zh-Hant:自动售烟机
+zh-Hans:自动售烟机
+zh-Hant:香菸自動販賣機
 
 amenity-vending_machine-drinks
 en:Drink Dispenser
@@ -5928,7 +6005,7 @@ es:Máquina de bebidas
 fi:Juoma-automaatti
 fr:Distributeur de boissons
 hu:Italautomata
-id:Läskautomat
+id:Mesin penjual minuman
 it:Distributore automatico di bibite
 ja:飲料自動販売機
 ko:음료자동판매기
@@ -5943,7 +6020,8 @@ th:เครื่องขายเครื่องดื่มอัตโ
 tr:Distributeur de boissons
 uk:Автомат з напоями
 vi:Máy bán thức uống
-zh-Hant:饮料售卖机
+zh-Hans:饮料售卖机
+zh-Hant:飲料自動販賣機
 
 building-garage
 en:Garage
@@ -5956,7 +6034,7 @@ es:Taller mecánico
 fi:Autotalli
 fr:Garage
 hu:Garázs
-id:Garage
+id:Garasi
 it:Garage
 ja:車庫
 ko:정비소
@@ -5971,7 +6049,8 @@ th:อาคารจอดรถ
 tr:Garage
 uk:Гараж
 vi:Gara
-zh-Hant:车库
+zh-Hans:车库
+zh-Hant:車庫
 
 highway-rest_area
 en:Highway Rest Area
@@ -5984,7 +6063,7 @@ es:Zona de descanso
 fi:Levähdyspaikka
 fr:Aire de repos
 hu:Pihenőzóna
-id:Viloplats
+id:Tempat istirahat
 it:Area di sosta
 ja:休憩所
 ko:휴게소
@@ -5999,7 +6078,8 @@ th:บริเวณพักผ่อน
 tr:Aire de repos
 uk:Зона відпочинку
 vi:Khu Vực Thụt Vào Để Đỗ Xe
-zh-Hant:休息区
+zh-Hans:休息区
+zh-Hant:休息區
 
 highway-traffic_signals
 en:Traffic Lights
@@ -6012,7 +6092,7 @@ es:Semáforos
 fi:Liikennevalot
 fr:Feux de circulation
 hu:Közlekedési lámpák
-id:Trafikljus
+id:Lampu lalu lintas
 it:Semaforo
 ja:交通信号
 ko:신호등
@@ -6027,7 +6107,8 @@ th:สัญญาณไฟจราจร
 tr:Feux de circulation
 uk:Світлофор
 vi:Đèn Giao Thông
-zh-Hant:交通信号灯
+zh-Hans:交通信号灯
+zh-Hant:紅綠燈
 
 man_made-chimney
 en:Factory Chimney
@@ -6040,7 +6121,7 @@ es:Chimenea de fábrica
 fi:Tehtaan piippu
 fr:Cheminée d'usine
 hu:Gyárkémény
-id:Fabriksskorsten
+id:Cerobong asap pabrik
 it:Ciminiera industriale
 ja:工場煙突
 ko:공장 굴뚝
@@ -6055,7 +6136,8 @@ th:ปล่องควันโรงงาน
 tr:Cheminée d'usine
 uk:Заводська труба
 vi:Ống Khói Nhà Máy
-zh-Hant:工厂烟囱
+zh-Hans:工厂烟囱
+zh-Hant:工廠煙囪
 
 man_made-tower
 en:Tower
@@ -6068,7 +6150,7 @@ es:Torre
 fi:Torni
 fr:Tour
 hu:Torony
-id:Torn
+id:Menara
 it:Torre
 ja:タワー
 ko:타워
@@ -6083,7 +6165,8 @@ th:หอคอย
 tr:Tour
 uk:Вежа
 vi:Tháp
-zh-Hant:高塔
+zh-Hans:高塔
+zh-Hant:塔
 
 power-substation
 en:Substation
@@ -6096,7 +6179,7 @@ es:Subestación
 fi:Muuntoasema
 fr:Sous-station
 hu:Kapcsolószekrény
-id:Understation
+id:Stasiun bawah tanah
 it:Sottostazione elettrica
 ja:変電所
 ko:변전소
@@ -6111,7 +6194,8 @@ th:สถานีไฟฟ้า
 tr:Sous-station
 uk:Підстанція
 vi:Trạm biến áp
-zh-Hant:变电站
+zh-Hans:变电站
+zh-Hant:變電所
 
 shop-bookmaker
 en:Bookmaker
@@ -6124,7 +6208,7 @@ es:Casa de apuestas
 fi:Kustantaja
 fr:Bookmaker
 hu:Fogadóiroda
-id:Bokbindare
+id:Bandar judi
 it:Centro scommesse
 ja:ブックメーカー
 ko:마권판매소
@@ -6139,7 +6223,8 @@ th:ร้านรับแทงพนัน
 tr:Bookmaker
 uk:Букмекерська контора
 vi:Người nhận cá cược
-zh-Hant:书店
+zh-Hans:书店
+zh-Hant:賭博業者
 
 shop-seafood|@shop
 en:Seafood Shop
@@ -6152,7 +6237,7 @@ es:Pescadería
 fi:Kalakauppias
 fr:Poissonnier
 hu:Halüzlet
-id:Fiskhandlare
+id:Penjual Ikan
 it:Pescivendolo
 ja:魚屋
 ko:생선가게
@@ -6167,7 +6252,8 @@ th:ร้านขายปลา
 tr:Poissonnier
 uk:Рибна крамниця
 vi:Người bán cá
-zh-Hant:鱼商
+zh-Hans:鱼商
+zh-Hant:魚販
 
 shop-ticket|@shop
 en:Ticket Shop
@@ -6180,7 +6266,7 @@ es:Oficina de venta de entradas
 fi:Lippumyymälä
 fr:Billetterie
 hu:Jegyiroda
-id:Biljettkontor
+id:Tempat penjualan karcis
 it:Biglietteria
 ja:チケット売り場
 ko:매표소
@@ -6195,7 +6281,8 @@ th:จุดจำหน่ายตั๋ว
 tr:Billetterie
 uk:Білетна каса
 vi:Phòng vé
-zh-Hant:售票处
+zh-Hans:售票处
+zh-Hant:售票處
 
 shop-wine|@shop
 en:Wine Shop
@@ -6208,14 +6295,14 @@ es:Establecimiento de bebidas alcohólicas
 fi:Alkoholimyymälä
 fr:Hors licence
 hu:Szeszesital-üzlet
-id:Spritförsäljning
+id:Toko minuman keras
 it:Negozio di alcolici
-ja:ワイン|酒屋
+ja:ワイン|酒屋|ワインショップ
 ko:주류 판매점
 nl:Wijn|Slijterij
 nb:Alkoholutsalg
 pl:Sklep monopolowy
-pt:Vinho|Loja de bebidas
+pt:Vinho|Loja de Vinhos
 ro:Magazin de băuturi alcolice
 sk:Vinotéka
 sv:Spritförsäljning
@@ -6223,7 +6310,8 @@ th:ร้านขายไวน์
 tr:Caviste
 uk:Винна крамниця
 vi:Rượu|Cửa hàng rượu
-zh-Hant:酒店
+zh-Hans:酒店
+zh-Hant:販酒處
 
 shop-car_parts|@shop
 en:Car Parts
@@ -6268,7 +6356,7 @@ es:Chalé
 fi:Alppimaja
 fr:Chalet
 hu:Turistaház
-id:Stuga
+id:Chalet
 it:Chalet
 ja:シャレー|山小屋
 ko:별장
@@ -6283,6 +6371,7 @@ th:ชาเลต์
 tr:Chalet
 uk:Шале
 vi:Nhà vệ sinh công cộng
+zh-Hans:木屋
 zh-Hant:木屋
 
 tourism-information-board|@tourism
@@ -6296,7 +6385,7 @@ es:Tablón de información
 fi:Informaatio
 fr:Panneau d'informations
 hu:Információs tábla
-id:Anslagstavla
+id:Papan informasi
 it:Tabellone informativo
 ja:案内板
 ko:안내소
@@ -6311,7 +6400,8 @@ th:บอร์ดประชาสัมพันธ์
 tr:Panneau d'informations
 uk:Інформаційний щит
 vi:Bảng Thông Tin
-zh-Hant:公告板
+zh-Hans:公告板
+zh-Hant:資訊中心
 
 tourism-information-map|@tourism
 en:Tourist Map
@@ -6324,7 +6414,7 @@ es:Mapa turístico
 fi:Turistikartta
 fr:Carte touristique
 hu:Turistatérkép
-id:Turistkarta
+id:Peta wisata
 it:Mappa turistica
 ja:観光マップ
 ko:관광안내도
@@ -6339,7 +6429,8 @@ th:แผนที่ท่องเที่ยว
 tr:Carte touristique
 uk:Мапа
 vi:Bản Đồ Du Lịch
-zh-Hant:旅游地图
+zh-Hans:旅游地图
+zh-Hant:旅遊地圖
 
 aerialway-station
 en:Aerialway Station|Cable Car Station
@@ -6352,7 +6443,7 @@ es:Estación de teleférico
 fi:Köysirata-asema
 fr:Remontées mécaniques
 hu:Felvonóállomás
-id:Linbanestation
+id:Stasiun kereta gantung
 it:Stazione di rifornimento per auto elettriche
 ja:ケーブルカー駅
 ko:케이블카 역
@@ -6367,7 +6458,8 @@ th:สถานีกระเช้าลอยฟ้า
 tr:Remontées mécaniques
 uk:Канатна дорога
 vi:Trạm Cáp Treo
-zh-Hant:缆车车站
+zh-Hans:缆车车站
+zh-Hant:纜車站
 
 aeroway-helipad
 en:Helipad
@@ -6380,7 +6472,7 @@ es:Helipuerto
 fi:Helikopterialusta
 fr:Hélisurface
 hu:Helikopterleszálló
-id:Helikopterplatta
+id:Landasan helikopter
 it:Piattaforma per elicotteri
 ja:ヘリポート
 ko:헬기착륙장
@@ -6395,7 +6487,8 @@ th:ที่จอดเฮลิคอปเตอร์
 tr:Hélisurface
 uk:Майданчик для гелікоптерів
 vi:Bãi đỗ trực thăng
-zh-Hant:直升机停机坪
+zh-Hans:直升机停机坪
+zh-Hant:直升機停機坪
 
 amenity-vending_machine-parking_tickets
 en:Parking Tickets
@@ -6408,7 +6501,7 @@ es:Máquina de pago de tique de aparcamiento
 fi:Pysäköintimaksuautomaatti
 fr:Horodateur
 hu:Parkolóautomata
-id:Parkeringsautomat
+id:Mesin pembayaran tiket parkir
 it:Parcometro
 ja:駐車券支払機
 ko:주차티켓판매기
@@ -6423,7 +6516,8 @@ th:เครื่องชำระค่าที่จอดรถอัต
 tr:Horodateur
 uk:Паркомат
 vi:Máy trả tiền vé đậu xe
-zh-Hant:停车场付费机
+zh-Hans:停车场付费机
+zh-Hant:違規停車罰單繳費機
 
 barrier-block
 en:Block
@@ -6436,7 +6530,7 @@ es:Bloqueo
 fi:Este
 fr:Bloc
 hu:Blokk
-id:Byggnad
+id:Blok
 it:Blocco
 ja:ブロック
 ko:블록
@@ -6451,7 +6545,8 @@ th:บล็อก
 tr:Bloc
 uk:Блок
 vi:Khối
-zh-Hant:障碍
+zh-Hans:障碍
+zh-Hant:街區
 
 barrier-bollard
 en:Pillar
@@ -6464,7 +6559,7 @@ es:Pilar
 fi:Tolppa
 fr:Pilier
 hu:Oszlop
-id:Stolpe
+id:Pilar
 it:Pilastro
 ja:柱
 ko:기둥
@@ -6479,7 +6574,8 @@ th:เสา
 tr:Pilier
 uk:Стовпчик
 vi:Trụ
-zh-Hant:柱子
+zh-Hans:柱子
+zh-Hant:柱
 
 barrier-border_control
 en:Border Control
@@ -6492,7 +6588,7 @@ es:Control de fronteras
 fi:Rajavalvonta
 fr:Contrôle aux frontières
 hu:Határállomás
-id:Gränskontroll
+id:Gerbang perbatasan
 it:Controllo di frontiera
 ja:国境管理
 ko:국경통제소
@@ -6507,7 +6603,8 @@ th:ด่านตรวจคนเข้าเมือง
 tr:Contrôle aux frontières
 uk:Прикордонний контроль
 vi:Biên Phòng
-zh-Hant:边检
+zh-Hans:边检
+zh-Hant:邊境管制
 
 barrier-entrance
 en:Entrance
@@ -6520,7 +6617,7 @@ es:Entrada
 fi:Sisäänkäynti
 fr:Entrée
 hu:Bejárat
-id:Ingång
+id:Pintu masuk
 it:Ingresso
 ja:エントランス
 ko:입구
@@ -6535,6 +6632,7 @@ th:ทางเข้า
 tr:Entrée
 uk:Прохід
 vi:Lối vào
+zh-Hans:入口
 zh-Hant:入口
 
 barrier-gate
@@ -6548,7 +6646,7 @@ es:Puerta
 fi:Portti
 fr:Porte
 hu:Kapu
-id:Grind
+id:Gerbang
 it:Cancello
 ja:ゲート
 ko:게이트
@@ -6563,7 +6661,8 @@ th:ประตู
 tr:Porte
 uk:Ворота
 vi:Cổng
-zh-Hant:门
+zh-Hans:门
+zh-Hant:大門
 
 barrier-lift_gate
 en:Lift Gate
@@ -6576,7 +6675,7 @@ es:Barrera
 fi:Puomieste
 fr:Barrière levante
 hu:Sorompó
-id:Перелаз
+id:Polisi tidur
 it:Barriera ferroviaria
 ja:ブームバリア
 ko:차량차단기
@@ -6586,12 +6685,13 @@ pl:Szlaban
 pt:Barreira
 ro:Barieră cu braț
 sk:Závora
-sv:Перелаз
+sv:Bom
 th:ไม้กั้น
 tr:Barrière levante
 uk:Шлагбаум
 vi:Thanh Chắn
-zh-Hant:水栅门
+zh-Hans:水栅门
+zh-Hant:遮斷機
 
 barrier-stile
 en:Stile
@@ -6604,7 +6704,7 @@ es:Escalón
 fi:Portaat
 fr:Échalier
 hu:Átjáró
-id:Stätta
+id:Undakan
 it:Scaletta per recinzioni
 ja:回転扉
 ko:디딤대
@@ -6619,7 +6719,8 @@ th:บันไดข้าม
 tr:Échalier
 uk:Перелаз
 vi:Trụ chắn
-zh-Hant:台阶
+zh-Hans:台阶
+zh-Hant:梯磴
 
 barrier-toll_booth
 en:Toll Booth
@@ -6632,7 +6733,7 @@ es:Cabina de peaje
 fi:Tietulliasema
 fr:Poste de péage
 hu:Díjfizető kapu
-id:Tullhus
+id:Gerbang tol
 it:Casello di pedaggio
 ja:料金所
 ko:톨게이트
@@ -6647,7 +6748,8 @@ th:ด่านเก็บเงิน
 tr:Poste de péage
 uk:Пункт оплати
 vi:Quầy Soát Vé
-zh-Hant:收费亭
+zh-Hans:收费亭
+zh-Hant:收費站
 
 entrance
 en:Entrance
@@ -6660,7 +6762,7 @@ es:Entrada
 fi:Sisäänkäynti
 fr:Entrée
 hu:Bejárat
-id:Entré
+id:Pintu masuk
 it:Ingresso
 ja:エントランス
 ko:입구
@@ -6675,6 +6777,7 @@ th:ทางเข้า
 tr:Entrée
 uk:Вхід
 vi:Lối vào
+zh-Hans:入口
 zh-Hant:入口
 
 leisure-water_park
@@ -6688,7 +6791,7 @@ es:Parque acuático
 fi:Vesipuisto
 fr:Centre aquatique
 hu:Aquapark
-id:Äventyrspark
+id:Taman air
 it:Parco acquatico
 ja:ウォーターパーク
 ko:워터파크
@@ -6703,7 +6806,8 @@ th:สวนน้ำ
 tr:Centre aquatique
 uk:Аквапарк
 vi:Công Viên Nước
-zh-Hant:水上乐园
+zh-Hans:水上乐园
+zh-Hant:水上樂園
 
 man_made-water_tower
 en:Water Tower
@@ -6716,7 +6820,7 @@ es:Depósito de agua
 fi:Vesitorni
 fr:Château d'eau
 hu:Víztorony
-id:Vattentorn
+id:Menara air
 it:Cisterna per acqua
 ja:給水塔
 ko:급수탑
@@ -6731,6 +6835,7 @@ th:อ่างเก็บน้ำ
 tr:Château d'eau
 uk:Водонапірна вежа
 vi:Tháp Nước
+zh-Hans:水塔
 zh-Hant:水塔
 
 man_made-windmill
@@ -6744,7 +6849,7 @@ es:Molino
 fi:Tuulimylly
 fr:Moulin
 hu:Szélmalom
-id:Väderkvarn
+id:Kincir angin
 it:Mulino a vento
 ja:風車
 ko:풍차
@@ -6759,7 +6864,8 @@ th:กังหันลม
 tr:Moulin
 uk:Вітряк
 vi:Cối xay gió
-zh-Hant:风车
+zh-Hans:风车
+zh-Hant:風車
 
 military-bunker
 en:Bunker
@@ -6787,6 +6893,7 @@ th:บังเกอร์
 tr:Bunker
 uk:Бункер
 vi:Boongke
+zh-Hans:地堡
 zh-Hant:地堡
 
 natural-cave_entrance
@@ -6800,7 +6907,7 @@ es:Entrada a cueva
 fi:Luolan sisäänkäynti
 fr:Entrée de la cave
 hu:Barlangbejárat
-id:Grottöppning
+id:Mulut gua
 it:Ingresso grotta
 ja:洞穴入口
 ko:동굴입구
@@ -6815,7 +6922,8 @@ th:ทางเข้าถ้ำ
 tr:Entrée de la cave
 uk:Печера
 vi:Cửa Hang
-zh-Hant:山洞入口
+zh-Hans:山洞入口
+zh-Hant:洞穴入口
 
 natural-tree
 en:Tree
@@ -6828,7 +6936,7 @@ es:Árbol
 fi:Puu
 fr:Arbre
 hu:Fa
-id:Träd
+id:Pohon
 it:Albero
 ja:木
 ko:나무
@@ -6843,7 +6951,8 @@ th:ต้นไม้
 tr:Arbre
 uk:Дерево
 vi:Cây
-zh-Hant:树
+zh-Hans:树
+zh-Hant:樹
 
 natural-volcano
 en:Volcano
@@ -6856,7 +6965,7 @@ es:Volcán
 fi:Tulivuori
 fr:Volcan
 hu:Tűzhányó
-id:Vulkan
+id:Gunung berapi
 it:Vulcano
 ja:火山
 ko:화산
@@ -6871,6 +6980,7 @@ th:ภูเขาไฟ
 tr:Volcan
 uk:Вулкан
 vi:Núi lửa
+zh-Hans:火山
 zh-Hant:火山
 
 office-estate_agent
@@ -6884,7 +6994,7 @@ es:Agente inmobiliario
 fi:Kiinteistönvälittäjä
 fr:Agent immobilier
 hu:Ingatlanügynök
-id:Fastighetsmäklare
+id:Agen ril estat
 it:Agenzia immobiliare
 ja:不動産業者
 ko:부동산중개소
@@ -6899,7 +7009,8 @@ th:นายหน้าอสังหาริมทรัพย์
 tr:Agent immobilier
 uk:Агенція нерухомості/ріелтор
 vi:Đại Lý Bất Động Sản
-zh-Hant:房屋中介
+zh-Hans:房屋中介
+zh-Hant:地產代理
 
 power-pole|power-tower
 en:Power Tower
@@ -6912,7 +7023,7 @@ es:Poste eléctrico
 fi:Sähköpylväs
 fr:Poteau électrique
 hu:Villanyoszlop
-id:Elstolpe
+id:Menara listrik
 it:Palo elettrico
 ja:電柱
 ko:전봇대
@@ -6927,7 +7038,8 @@ th:เสาไฟฟ้า
 tr:Poteau électrique
 uk:Стовп ЛЕП
 vi:Trụ Điện
-zh-Hant:电线杆
+zh-Hans:电线杆
+zh-Hant:電塔
 
 waterway-lock_gate
 en:Lock Gate
@@ -6940,7 +7052,7 @@ es:Compuerta
 fi:Kanavasulku
 fr:Écluse
 hu:Zsilip
-id:Slussport
+id:Gerbang pengunci
 it:Sbarramento
 ja:水門
 ko:수문
@@ -6955,24 +7067,150 @@ th:ประตูระบายน้ำ
 tr:Écluse
 uk:Шлюз
 vi:Cổng Khóa
-zh-Hant:锁门
+zh-Hans:锁门
+zh-Hant:閘門
 
 amenity-public_bookcase
-en:Book Exchange|Bookcase
+en:Book Exchange|Bookcase|Book swapping
 ru:Книжный шкаф|Обмен книг
+fr:Bibliothèque
+id:Rak Buku|Bursa Buku
+ko:책장, 도서 교환
+sv:Bokskåp|bokutbyte
+tr:Kütüphane|Kitap Değişimi
+uk:Книги|обмін книгами
+vi:Kệ sách|Trao đổi sách
+hu:Nyilvános könyvespolc|könyvcsere
+de:Bücherregal|Büchertausch
+fi:Kirjahylly|Kirjakauppa
+cs:Knihovna|Směnárna knih
+it:Libreria|Scambio libri
+nb:Bokhylle|bokbytte
+zh-Hant:書架|書本交換
+zh-Hans:书架|书本交换
+th:ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ
+ja:書棚|図書交換
+ro:Bibliotecă|Schimb de cărți
+ar:مكتبة، تبادل كتب
+sk:Knižnica|možnosť výmeny kníh
+es:Intercambio de libros|librería
+pl:Biblioteka|wymiana książek
+nl:Boekenkast|Boekuitwisseling
+da:Bog udveksling
+pt:Biblioteca livre|troca de livros
 
 leisure-sports_centre-climbing
 en:Climbing Centre
 ru:Скалодром
+fr:Centre d'escalade
+da:Klatring center
+id:Pusat Peralatan Mendaki
+ko:등반 센터
+sv:Klättercentrum
+tr:Tırmanma Merkezi
+uk:Спортивний скеледром
+vi:Trung tâm leo núi
+hu:Hegymászó központ
+de:Kletterzentrum
+fi:Kiipeilykeskus
+cs:Horolezecké centrum
+it:Centro di arrampicata
+nb:Klatresenter
+zh-Hant:攀登中心
+zh-Hans:攀登中心
+th:ศูนย์ปีนเขา
+ja:クライミングセンター
+ro:Centru cățărare
+ar:مركز تسلق
+sk:Lezecké centrum
+es:Centro de escalada
+pl:Centrum wspinaczkowe
+nl:Klimhal
+pt:Ginásio de escalada
 
 leisure-sports_centre-shooting
 en:Shooting Range
 ru:Тир|стрельбище
+fr:Centre de tir
+da:Skydebane
+id:Lapangan tembak
+ko:발사 범위
+sv:Skjutbana
+tr:Poligon
+uk:Тир
+vi:Nơi bắn súng
+hu:Lőtér
+de:Schießanlage
+fi:Ampumarata
+cs:Střelnice
+it:Poligono di tiro
+nb:Skytebane
+zh-Hant:射擊域
+zh-Hans:射击域
+th:สนามยิงปืน
+ja:射撃場
+ro:Tir
+ar:ملعب رماية
+sk:Strelnica
+es:Campo de tiro
+pl:Strzelnica
+nl:Schietbaan
+pt:Clube de tiro
 
 leisure-sports_centre-swimming
 en:Swimming Centre
 ru:Плавательный бассейн
+fr:Piscine
+da:Svømmecenter
+id:Kolam Renang
+ko:수영 센터
+sv:Simhall
+tr:Yüzme Merkezi
+uk:Басейн
+vi:Trung tâm Bơi lội
+hu:Uszoda
+de:Schwimmhalle
+fi:Uimahalli
+cs:Plavecký bazén
+it:Centro natatorio
+nb:Svømmehall
+zh-Hant:遊泳中心
+zh-Hans:游泳中心
+th:ศูนย์ว่ายน้ำ
+ja:スイミングセンター
+ro:Piscină
+ar:مركز سباحة
+sk:Plavecký areál
+es:Centro de natación
+pl:Basen
+nl:Zwembad
+pt:Centro de natação
 
 leisure-sports_centre-yoga
 en:Yoga Studio
 ru:Йога-центр|Студия йоги
+fr:Yoga
+da: Yoga center
+id:Studio Yoga
+ko:요가 스튜디오
+sv:Yogastudio
+tr:Yoga Stüdyosu
+uk:Студія йоги
+vi:Phòng tập yoga
+hu:Jógastúdió
+de:Yoga Studio
+fi:Joogastudio
+cs:Studio jógy
+it:Centro Yoga
+nb:Yogastudio
+zh-Hant:瑜伽工作室
+zh-Hans:瑜伽工作室
+th:โยคะสตูดิโอ
+ja:ヨガスタジオ
+ro:Studio yoga
+ar:نادي يوغا
+sk:Štúdio jogy
+es:Estudio de yoga
+pl:Studio jogi
+nl:Yogastudio
+pt:Estúdio de ioga
\ No newline at end of file
diff --git a/data/countries.txt b/data/countries.txt
index 85110605b5..fd7d253063 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -1,10 +1,10 @@
 {
  "id": "Countries",
- "v": 160426,
+ "v": 160510,
  "g": [
   {
    "id": "Abkhazia",
-   "s": 4557239,
+   "s": 4557407,
    "affiliations": [
     "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b",
     "\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",
@@ -16,7 +16,7 @@
   },
   {
    "id": "Afghanistan",
-   "s": 23033678,
+   "s": 23088051,
    "affiliations": [
     "Badakhshan",
     "Badghis",
@@ -60,7 +60,7 @@
   },
   {
    "id": "Albania",
-   "s": 14593969,
+   "s": 14710977,
    "affiliations": [
     "Shqip\u00ebria"
    ],
@@ -73,7 +73,7 @@
    "g": [
     {
      "id": "Algeria_Central",
-     "s": 26047759,
+     "s": 26164103,
      "affiliations": [
       "Adrar \u2d30\u2d37\u2d54\u2d30\u2d54 \u0623\u062f\u0631\u0627\u0631",
       "Illizi \u2d49\u2d4d\u2d4d\u2d49\u2d63\u2d49 \u0625\u0644\u0640\u064a\u0640\u0632\u064a",
@@ -100,7 +100,7 @@
     },
     {
      "id": "Algeria_Coast",
-     "s": 71336718,
+     "s": 71558718,
      "affiliations": [
       "Alger - \u0627\u0644\u062c\u0632\u0627\u0626\u0631",
       "Alg\u00e9rie \u2d4d\u2d63\u2d63\u2d30\u2d62\u2d3b\u2d54 \u0627\u0644\u062c\u0632\u0627\u0626\u0631",
@@ -143,7 +143,7 @@
   },
   {
    "id": "Andorra",
-   "s": 864557,
+   "s": 865501,
    "affiliations": [
     "Andorra"
    ],
@@ -153,7 +153,7 @@
   },
   {
    "id": "Angola",
-   "s": 17321019,
+   "s": 17445700,
    "affiliations": [
     "Angola",
     "Bengo",
@@ -191,7 +191,7 @@
   },
   {
    "id": "Antigua and Barbuda",
-   "s": 1203036,
+   "s": 1216084,
    "affiliations": [
     "Antigua and Barbuda",
     "Montserrat"
@@ -202,7 +202,7 @@
   },
   {
    "id": "Barbados",
-   "s": 1606937,
+   "s": 1606329,
    "affiliations": [
     "Barbados"
    ],
@@ -222,7 +222,7 @@
   },
   {
    "id": "Caribisch Nederland",
-   "s": 4717765,
+   "s": 4758005,
    "affiliations": [
     "Caribisch Nederland",
     "Nederland",
@@ -236,7 +236,7 @@
   },
   {
    "id": "Dominica",
-   "s": 1637834,
+   "s": 1636714,
    "affiliations": [
     "Dominica",
     "Saint Andrew Parish",
@@ -266,7 +266,7 @@
   },
   {
    "id": "Guadeloupe",
-   "s": 11397058,
+   "s": 11396842,
    "affiliations": [
     "France",
     "Guadeloupe",
@@ -278,7 +278,7 @@
   },
   {
    "id": "Martinique",
-   "s": 9366980,
+   "s": 9372092,
    "affiliations": [
     "France",
     "Martinique",
@@ -290,7 +290,7 @@
   },
   {
    "id": "Montserrat",
-   "s": 195163,
+   "s": 196955,
    "affiliations": [
     "Montserrat"
    ],
@@ -300,7 +300,7 @@
   },
   {
    "id": "Saint Barthelemy",
-   "s": 232225,
+   "s": 232449,
    "affiliations": [
     "France"
    ],
@@ -310,7 +310,7 @@
   },
   {
    "id": "Saint Kitts and Nevis",
-   "s": 539903,
+   "s": 540111,
    "affiliations": [
     "Saint Kitts and Nevis"
    ],
@@ -320,7 +320,7 @@
   },
   {
    "id": "Saint Lucia",
-   "s": 1383906,
+   "s": 1383682,
    "affiliations": [
     "Saint Lucia",
     "Saint Vincent and the Grenadines"
@@ -331,7 +331,7 @@
   },
   {
    "id": "Saint Martin",
-   "s": 1249851,
+   "s": 1250123,
    "affiliations": [
     "Anguilla",
     "France",
@@ -353,7 +353,7 @@
   },
   {
    "id": "Trinidad and Tobago",
-   "s": 10440063,
+   "s": 10447007,
    "affiliations": [
     "Trinidad and Tobago"
    ],
@@ -363,7 +363,7 @@
   },
   {
    "id": "United States Virgin Islands",
-   "s": 1365840,
+   "s": 1365720,
    "affiliations": [
     "British Virgin Islands",
     "Puerto Rico",
@@ -379,14 +379,14 @@
    "g": [
     {
      "id": "Campo de Hielo Sur",
-     "s": 637074,
+     "s": 639602,
      "affiliations": [
       "Acuerdo de Campos de Hielo"
      ]
     },
     {
      "id": "Argentina_Buenos Aires_Buenos Aires",
-     "s": 56744557,
+     "s": 56853602,
      "affiliations": [
       "Argentina",
       "Ciudad Aut\u00f3noma de Buenos Aires",
@@ -398,7 +398,7 @@
     },
     {
      "id": "Argentina_Buenos Aires_North",
-     "s": 19270957,
+     "s": 19457802,
      "affiliations": [
       "Argentina",
       "Buenos Aires"
@@ -409,7 +409,7 @@
     },
     {
      "id": "Argentina_Buenos Aires_South",
-     "s": 22985613,
+     "s": 22998509,
      "affiliations": [
       "Argentina",
       "Buenos Aires"
@@ -420,7 +420,7 @@
     },
     {
      "id": "Argentina_Patagonia",
-     "s": 33194030,
+     "s": 33243046,
      "affiliations": [
       "Argentina",
       "Chubut",
@@ -435,7 +435,7 @@
     },
     {
      "id": "Argentina_Cuyo",
-     "s": 19107321,
+     "s": 19103897,
      "affiliations": [
       "Argentina",
       "La Rioja",
@@ -449,7 +449,7 @@
     },
     {
      "id": "Argentina_Mesopotamia",
-     "s": 37613878,
+     "s": 37694382,
      "affiliations": [
       "Argentina",
       "Corrientes",
@@ -470,7 +470,7 @@
     },
     {
      "id": "Argentina_Northwest",
-     "s": 41946175,
+     "s": 42014279,
      "affiliations": [
       "Chaco",
       "Argentina",
@@ -487,7 +487,7 @@
     },
     {
      "id": "Argentina_Pampas",
-     "s": 35077347,
+     "s": 35066107,
      "affiliations": [
       "Argentina",
       "C\u00f3rdoba",
@@ -499,7 +499,7 @@
     },
     {
      "id": "Argentina_Santa Fe",
-     "s": 25395033,
+     "s": 25482721,
      "affiliations": [
       "Argentina",
       "Santa Fe"
@@ -512,7 +512,7 @@
   },
   {
    "id": "Armenia",
-   "s": 13850933,
+   "s": 13952336,
    "affiliations": [
     "Border Azerbaijan - Armenia (Enclave AZE)",
     "Qazax rayonu",
@@ -538,7 +538,7 @@
    "g": [
     {
      "id": "Austria_Burgenland",
-     "s": 11193936,
+     "s": 11206144,
      "affiliations": [
       "Burgenland",
       "\u00d6sterreich"
@@ -549,7 +549,7 @@
     },
     {
      "id": "Austria_Carinthia",
-     "s": 29908433,
+     "s": 30027193,
      "affiliations": [
       "K\u00e4rnten",
       "\u00d6sterreich"
@@ -560,7 +560,7 @@
     },
     {
      "id": "Austria_Lower Austria_Wien",
-     "s": 52351391,
+     "s": 52584208,
      "affiliations": [
       "\u00d6sterreich",
       "Nieder\u00f6sterreich",
@@ -572,7 +572,7 @@
     },
     {
      "id": "Austria_Styria_Graz",
-     "s": 42779807,
+     "s": 43098192,
      "affiliations": [
       "\u00d6sterreich",
       "Steiermark"
@@ -583,7 +583,7 @@
     },
     {
      "id": "Austria_Styria_Leoben",
-     "s": 23320427,
+     "s": 23475499,
      "affiliations": [
       "\u00d6sterreich",
       "Steiermark"
@@ -594,7 +594,7 @@
     },
     {
      "id": "Austria_Upper Austria_Linz",
-     "s": 32202095,
+     "s": 32248000,
      "affiliations": [
       "\u00d6sterreich",
       "Ober\u00f6sterreich"
@@ -605,7 +605,7 @@
     },
     {
      "id": "Austria_Upper Austria_Wels",
-     "s": 40630523,
+     "s": 40838603,
      "affiliations": [
       "\u00d6sterreich",
       "Ober\u00f6sterreich"
@@ -616,7 +616,7 @@
     },
     {
      "id": "Austria_Lower Austria_West",
-     "s": 39319604,
+     "s": 39599092,
      "affiliations": [
       "\u00d6sterreich",
       "Nieder\u00f6sterreich"
@@ -627,7 +627,7 @@
     },
     {
      "id": "Austria_Tyrol",
-     "s": 45312247,
+     "s": 45351975,
      "affiliations": [
       "\u00d6sterreich",
       "Tirol"
@@ -638,7 +638,7 @@
     },
     {
      "id": "Austria_Salzburg",
-     "s": 28178308,
+     "s": 28309916,
      "affiliations": [
       "\u00d6sterreich",
       "Salzburg"
@@ -649,7 +649,7 @@
     },
     {
      "id": "Austria_Vorarlberg",
-     "s": 16436924,
+     "s": 16513420,
      "affiliations": [
       "\u00d6sterreich",
       "Vorarlberg"
@@ -674,7 +674,7 @@
     },
     {
      "id": "Australia_Melbourne",
-     "s": 47678369,
+     "s": 47803433,
      "affiliations": [
       "Australia",
       "Victoria"
@@ -685,7 +685,7 @@
     },
     {
      "id": "Australia_New South Wales",
-     "s": 26034074,
+     "s": 26060770,
      "affiliations": [
       "Australia",
       "Coral Sea Islands Territory",
@@ -699,7 +699,7 @@
     },
     {
      "id": "Australia_Northern Territory",
-     "s": 6896014,
+     "s": 6924054,
      "affiliations": [
       "Australia",
       "Northern Territory"
@@ -710,7 +710,7 @@
     },
     {
      "id": "Australia_Queensland",
-     "s": 20985483,
+     "s": 21287155,
      "affiliations": [
       "Australia",
       "Coral Sea Islands Territory",
@@ -722,7 +722,7 @@
     },
     {
      "id": "Australia_South Australia",
-     "s": 34238500,
+     "s": 34132108,
      "affiliations": [
       "Australia",
       "South Australia"
@@ -733,7 +733,7 @@
     },
     {
      "id": "Australia_Tasmania",
-     "s": 16376711,
+     "s": 16595551,
      "affiliations": [
       "Australia",
       "Tasmania"
@@ -744,7 +744,7 @@
     },
     {
      "id": "Australia_Victoria",
-     "s": 35479735,
+     "s": 35528967,
      "affiliations": [
       "Australia",
       "Victoria"
@@ -755,7 +755,7 @@
     },
     {
      "id": "Australia_Western Australia",
-     "s": 43191530,
+     "s": 43306394,
      "affiliations": [
       "Ashmore and Cartier Islands",
       "Christmas Island",
@@ -771,7 +771,7 @@
     },
     {
      "id": "Australia_Brisbane",
-     "s": 37141762,
+     "s": 37212906,
      "affiliations": [
       "Australia",
       "Coral Sea Islands Territory",
@@ -784,7 +784,7 @@
     },
     {
      "id": "Australia_Sydney",
-     "s": 50072602,
+     "s": 50390010,
      "affiliations": [
       "Australia",
       "Australian Capital Territory",
@@ -797,30 +797,12 @@
     }
    ]
   },
-  {
-   "id": "Nagorno-Karabakh",
-   "s": 2004950,
-   "affiliations": [
-    "Az\u0259rbaycan",
-    "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)",
-    "\u0547\u0578\u0582\u0577\u056b\u056b \u0577\u0580\u057b\u0561\u0576 (Shushi District)",
-    "\u0531\u057d\u056f\u0565\u0580\u0561\u0576\u056b \u0574\u0561\u0580\u0566 (Askeran Province)",
-    "\u0540\u0561\u0564\u0580\u0578\u0582\u0569\u056b \u0577\u0580\u057b\u0561\u0576 (Hadrut Province)",
-    "\u0554\u0561\u0577\u0561\u0569\u0561\u0572\u056b \u0577\u0580\u057b\u0561\u0576 (Kashatagh District)",
-    "\u0547\u0561\u0570\u0578\u0582\u0574\u0575\u0561\u0576 \u0577\u0580\u057b\u0561\u0576",
-    "\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)"
-   ],
-   "old": [
-    "Azerbaijan"
-   ]
-  },
   {
    "id": "Azerbaijan Region",
    "g": [
     {
      "id": "Nagorno-Karabakh",
-     "s": 2004950,
+     "s": 2034464,
      "affiliations": [
       "Az\u0259rbaycan",
       "\u0544\u0561\u0580\u057f\u0561\u056f\u0565\u0580\u057f\u056b \u0577\u0580\u057b\u0561\u0576 (Martakert Province)",
@@ -838,7 +820,7 @@
     },
     {
      "id": "Azerbaijan",
-     "s": 24766322,
+     "s": 24785970,
      "affiliations": [
       "Ab\u015feron rayonu",
       "A\u011fcab\u0259di rayonu",
@@ -920,7 +902,7 @@
   },
   {
    "id": "Bahrain",
-   "s": 3922714,
+   "s": 3981682,
    "affiliations": [
     "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0645\u062d\u0631\u0642",
     "\u0645\u062d\u0627\u0641\u0638\u0629 \u0627\u0644\u0639\u0627\u0635\u0645\u0629",
@@ -935,7 +917,7 @@
   },
   {
    "id": "Bangladesh",
-   "s": 17082940,
+   "s": 17277188,
    "affiliations": [
     "Border India - Bangladesh",
     "\u09b0\u09be\u099c\u09b6\u09be\u09b9\u09c0 \u09ac\u09bf\u09ad\u09be\u0997",
@@ -956,7 +938,7 @@
    "g": [
     {
      "id": "Belarus_Vitebsk Region",
-     "s": 32344099,
+     "s": 32563299,
      "affiliations": [
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c",
       "\u0412\u0438\u0442\u0435\u0431\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -967,7 +949,7 @@
     },
     {
      "id": "Belarus_Hrodna Region",
-     "s": 19988682,
+     "s": 20029368,
      "affiliations": [
       "\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"
@@ -978,7 +960,7 @@
     },
     {
      "id": "Belarus_Brest Region",
-     "s": 14987806,
+     "s": 15141094,
      "affiliations": [
       "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u044c",
       "\u0411\u0440\u0435\u0441\u0442\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -989,7 +971,7 @@
     },
     {
      "id": "Belarus_Homiel Region",
-     "s": 22496225,
+     "s": 22592337,
      "affiliations": [
       "\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"
@@ -1000,7 +982,7 @@
     },
     {
      "id": "Belarus_Maglieu Region",
-     "s": 18853539,
+     "s": 18905818,
      "affiliations": [
       "\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"
@@ -1011,7 +993,7 @@
     },
     {
      "id": "Belarus_Minsk Region",
-     "s": 36518181,
+     "s": 36758834,
      "affiliations": [
       "\u0413\u043e\u043b\u044c\u0444-\u043a\u043b\u0443\u0431",
       "\u041c\u0438\u043d\u0441\u043a",
@@ -1031,7 +1013,7 @@
    "g": [
     {
      "id": "Belgium_West Flanders",
-     "s": 28132608,
+     "s": 28211352,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Vlaanderen"
@@ -1043,7 +1025,7 @@
     },
     {
      "id": "Belgium_Antwerp",
-     "s": 37090962,
+     "s": 37201138,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Nederland - Belgique / Belgi\u00eb / Belgien",
@@ -1055,7 +1037,7 @@
     },
     {
      "id": "Belgium_East Flanders",
-     "s": 26890547,
+     "s": 26895987,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Vlaanderen"
@@ -1066,7 +1048,7 @@
     },
     {
      "id": "Belgium_Hainaut",
-     "s": 18870729,
+     "s": 18975625,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
@@ -1077,7 +1059,7 @@
     },
     {
      "id": "Belgium_Walloon Brabant",
-     "s": 5894868,
+     "s": 5926116,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
@@ -1088,7 +1070,7 @@
     },
     {
      "id": "Belgium_Namur",
-     "s": 9892212,
+     "s": 9934468,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
@@ -1099,7 +1081,7 @@
     },
     {
      "id": "Belgium_Limburg",
-     "s": 24394606,
+     "s": 24438774,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Vlaanderen"
@@ -1110,7 +1092,7 @@
     },
     {
      "id": "Belgium_Luxembourg",
-     "s": 9351705,
+     "s": 9393505,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
@@ -1121,7 +1103,7 @@
     },
     {
      "id": "Belgium_Flemish Brabant",
-     "s": 38816453,
+     "s": 38884021,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "R\u00e9gion de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest",
@@ -1133,7 +1115,7 @@
     },
     {
      "id": "Belgium_Liege",
-     "s": 25636045,
+     "s": 25718245,
      "affiliations": [
       "Belgi\u00eb - Belgique - Belgien",
       "Wallonie"
@@ -1146,7 +1128,7 @@
   },
   {
    "id": "Belize",
-   "s": 3658074,
+   "s": 3664970,
    "affiliations": [
     "Belize District",
     "Belize",
@@ -1164,7 +1146,7 @@
   },
   {
    "id": "Benin",
-   "s": 13914735,
+   "s": 14184663,
    "affiliations": [
     "Alibori",
     "Atakora",
@@ -1186,7 +1168,7 @@
   },
   {
    "id": "Bermuda",
-   "s": 654049,
+   "s": 656513,
    "affiliations": [
     "Bermuda"
    ],
@@ -1196,7 +1178,7 @@
   },
   {
    "id": "Bhutan",
-   "s": 1831002,
+   "s": 1864180,
    "affiliations": [
     "\u0f60\u0f56\u0fb2\u0f74\u0f42\u0f61\u0f74\u0f63\u0f0b",
     "\u0f58\u0f42\u0f62\u0f0b\u0f66\u0f0b\u0f62\u0fab\u0f7c\u0f44\u0f0b\u0f41\u0f42\u0f0b",
@@ -1229,7 +1211,7 @@
    "g": [
     {
      "id": "Bolivia_North",
-     "s": 42612324,
+     "s": 42964455,
      "affiliations": [
       "Bolivia",
       "Beni",
@@ -1243,7 +1225,7 @@
     },
     {
      "id": "Bolivia_South",
-     "s": 30911025,
+     "s": 31160915,
      "affiliations": [
       "Bolivia",
       "Chuquisaca",
@@ -1263,7 +1245,7 @@
    "g": [
     {
      "id": "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina",
-     "s": 36369365,
+     "s": 36459416,
      "affiliations": [
       "Bosna i Hercegovina",
       "Federacija Bosne i Hercegovine"
@@ -1274,7 +1256,7 @@
     },
     {
      "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina",
-     "s": 874919,
+     "s": 874559,
      "affiliations": [
       "Br\u010dko distrikt Bosne i Hercegovine",
       "Bosna i Hercegovina",
@@ -1286,7 +1268,7 @@
     },
     {
      "id": "Bosnia and Herzegovina_Republic of Srpska",
-     "s": 30595114,
+     "s": 30795121,
      "affiliations": [
       "Bosna i Hercegovina",
       "Republika Srpska"
@@ -1299,7 +1281,7 @@
   },
   {
    "id": "Botswana",
-   "s": 21609170,
+   "s": 21934002,
    "affiliations": [
     "Botswana",
     "Central District",
@@ -1321,7 +1303,7 @@
    "g": [
     {
      "id": "Brazil_Bahia",
-     "s": 43079826,
+     "s": 43720434,
      "affiliations": [
       "Bahia",
       "Brasil"
@@ -1332,7 +1314,7 @@
     },
     {
      "id": "Brazil_Goias_North",
-     "s": 13024402,
+     "s": 13169591,
      "affiliations": [
       "Brasil",
       "Goi\u00e1s"
@@ -1343,7 +1325,7 @@
     },
     {
      "id": "Brazil_Goias_Brasilia",
-     "s": 42386633,
+     "s": 42477486,
      "affiliations": [
       "Brasil",
       "Distrito Federal",
@@ -1355,7 +1337,7 @@
     },
     {
      "id": "Brazil_Mato Grosso Do Sul",
-     "s": 19906606,
+     "s": 19953035,
      "affiliations": [
       "Brasil",
       "Mato Grosso do Sul"
@@ -1366,7 +1348,7 @@
     },
     {
      "id": "Brazil_Mato Grosso",
-     "s": 22220791,
+     "s": 22902268,
      "affiliations": [
       "Brasil",
       "Mato Grosso"
@@ -1377,7 +1359,7 @@
     },
     {
      "id": "Brazil_North Region_East",
-     "s": 38383170,
+     "s": 39250802,
      "affiliations": [
       "Amap\u00e1",
       "Brasil",
@@ -1390,7 +1372,7 @@
     },
     {
      "id": "Brazil_North Region_West",
-     "s": 30640959,
+     "s": 30712780,
      "affiliations": [
       "Acre",
       "Amazonas",
@@ -1404,7 +1386,7 @@
     },
     {
      "id": "Brazil_Northeast Region_East",
-     "s": 34020791,
+     "s": 34126431,
      "affiliations": [
       "Alagoas",
       "Brasil",
@@ -1417,7 +1399,7 @@
     },
     {
      "id": "Brazil_Northeast Region_West",
-     "s": 54980428,
+     "s": 57013100,
      "affiliations": [
       "Brasil",
       "Cear\u00e1",
@@ -1431,7 +1413,7 @@
     },
     {
      "id": "Brazil_Paraiba",
-     "s": 13497205,
+     "s": 13602837,
      "affiliations": [
       "Brasil",
       "Para\u00edba"
@@ -1442,7 +1424,7 @@
     },
     {
      "id": "Brazil_Parana_East",
-     "s": 28375365,
+     "s": 28583021,
      "affiliations": [
       "Brasil",
       "Paran\u00e1"
@@ -1453,7 +1435,7 @@
     },
     {
      "id": "Brazil_Parana_West",
-     "s": 37074864,
+     "s": 37354889,
      "affiliations": [
       "Brasil",
       "Paran\u00e1"
@@ -1464,7 +1446,7 @@
     },
     {
      "id": "Brazil_Rio Grande do Norte",
-     "s": 10951896,
+     "s": 10968840,
      "affiliations": [
       "Brasil",
       "Pernambuco",
@@ -1476,7 +1458,7 @@
     },
     {
      "id": "Brazil_Santa Catarina",
-     "s": 43243232,
+     "s": 43673337,
      "affiliations": [
       "Brasil",
       "Santa Catarina"
@@ -1487,7 +1469,7 @@
     },
     {
      "id": "Brazil_South Region_East",
-     "s": 36078573,
+     "s": 36455598,
      "affiliations": [
       "Brasil",
       "Rio Grande do Sul"
@@ -1498,7 +1480,7 @@
     },
     {
      "id": "Brazil_South Region_West",
-     "s": 27178229,
+     "s": 27412453,
      "affiliations": [
       "Brasil",
       "Rio Grande do Sul"
@@ -1509,7 +1491,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Espirito Santo",
-     "s": 19949939,
+     "s": 19985859,
      "affiliations": [
       "Brasil",
       "Esp\u00edrito Santo"
@@ -1520,7 +1502,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Minas Gerais_Contagem",
-     "s": 58183021,
+     "s": 58596605,
      "affiliations": [
       "Brasil",
       "Minas Gerais"
@@ -1531,7 +1513,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Minas Gerais_North",
-     "s": 37886993,
+     "s": 38160237,
      "affiliations": [
       "Brasil",
       "Minas Gerais"
@@ -1542,7 +1524,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Rio de Janeiro",
-     "s": 43367399,
+     "s": 43421063,
      "affiliations": [
       "Brasil",
       "Rio de Janeiro"
@@ -1553,7 +1535,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_Campinas",
-     "s": 52501798,
+     "s": 52720399,
      "affiliations": [
       "Brasil",
       "S\u00e3o Paulo"
@@ -1564,7 +1546,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_City",
-     "s": 59185762,
+     "s": 59602583,
      "affiliations": [
       "Brasil",
       "S\u00e3o Paulo"
@@ -1575,7 +1557,7 @@
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_West",
-     "s": 49087893,
+     "s": 49210668,
      "affiliations": [
       "Brasil",
       "S\u00e3o Paulo"
@@ -1588,7 +1570,7 @@
   },
   {
    "id": "Brunei",
-   "s": 1451389,
+   "s": 1451293,
    "affiliations": [
     "Brunei Darussalam"
    ],
@@ -1601,7 +1583,7 @@
    "g": [
     {
      "id": "Bulgaria_East",
-     "s": 33610929,
+     "s": 33862425,
      "affiliations": [
       "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f"
      ],
@@ -1611,7 +1593,7 @@
     },
     {
      "id": "Bulgaria_West",
-     "s": 39860727,
+     "s": 40028135,
      "affiliations": [
       "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f"
      ],
@@ -1623,7 +1605,7 @@
   },
   {
    "id": "Burkina Faso",
-   "s": 21569429,
+   "s": 21657557,
    "affiliations": [
     "Boucle du Mouhoun",
     "Burkina Faso",
@@ -1646,7 +1628,7 @@
   },
   {
    "id": "Burundi",
-   "s": 9359018,
+   "s": 9333770,
    "affiliations": [
     "Cibitoke",
     "Bubanza",
@@ -1673,7 +1655,7 @@
   },
   {
    "id": "Cambodia",
-   "s": 11512002,
+   "s": 11628699,
    "affiliations": [
     "Bantey Meanchey",
     "Battambang",
@@ -1711,7 +1693,7 @@
    "g": [
     {
      "id": "Cameroon_Central",
-     "s": 51776213,
+     "s": 51899831,
      "affiliations": [
       "Adamaoua",
       "Cameroun",
@@ -1727,7 +1709,7 @@
     },
     {
      "id": "Cameroon_West",
-     "s": 37511167,
+     "s": 37543287,
      "affiliations": [
       "Cameroun",
       "Littoral",
@@ -1749,7 +1731,7 @@
      "g": [
       {
        "id": "Canada_Alberta_Edmonton",
-       "s": 65131936,
+       "s": 65219674,
        "affiliations": [
         "Alberta",
         "Canada"
@@ -1760,7 +1742,7 @@
       },
       {
        "id": "Canada_Alberta_North",
-       "s": 26328923,
+       "s": 26601379,
        "affiliations": [
         "Alberta",
         "Canada"
@@ -1771,7 +1753,7 @@
       },
       {
        "id": "Canada_Alberta_South",
-       "s": 30924365,
+       "s": 30973877,
        "affiliations": [
         "Alberta",
         "Canada"
@@ -1787,7 +1769,7 @@
      "g": [
       {
        "id": "Canada_British Columbia_Central",
-       "s": 44589447,
+       "s": 44617632,
        "affiliations": [
         "British Columbia",
         "Canada"
@@ -1798,7 +1780,7 @@
       },
       {
        "id": "Canada_British Columbia_Far_North",
-       "s": 26058118,
+       "s": 26062510,
        "affiliations": [
         "British Columbia",
         "Canada"
@@ -1809,7 +1791,7 @@
       },
       {
        "id": "Canada_British Columbia_Islands",
-       "s": 36957856,
+       "s": 37009808,
        "affiliations": [
         "British Columbia",
         "Canada"
@@ -1820,7 +1802,7 @@
       },
       {
        "id": "Canada_British Columbia_North",
-       "s": 38655210,
+       "s": 38675762,
        "affiliations": [
         "British Columbia",
         "Canada"
@@ -1842,7 +1824,7 @@
       },
       {
        "id": "Canada_British Columbia_Southeast",
-       "s": 44357304,
+       "s": 44368521,
        "affiliations": [
         "British Columbia",
         "Canada"
@@ -1853,7 +1835,7 @@
       },
       {
        "id": "Canada_British Columbia_Vancouver",
-       "s": 43035636,
+       "s": 43267628,
        "affiliations": [
         "British Columbia",
         "Canada"
@@ -1881,7 +1863,7 @@
       },
       {
        "id": "Canada_Labrador_South",
-       "s": 35167627,
+       "s": 35167643,
        "affiliations": [
         "Canada",
         "Newfoundland and Labrador"
@@ -1908,7 +1890,7 @@
      "g": [
       {
        "id": "Canada_Manitoba_Northeast",
-       "s": 33297554,
+       "s": 33298258,
        "affiliations": [
         "Canada",
         "Manitoba",
@@ -1921,7 +1903,7 @@
       },
       {
        "id": "Canada_Manitoba_Northwest",
-       "s": 38815496,
+       "s": 38825400,
        "affiliations": [
         "Canada",
         "Manitoba"
@@ -1932,7 +1914,7 @@
       },
       {
        "id": "Canada_Manitoba_South",
-       "s": 40568962,
+       "s": 40582930,
        "affiliations": [
         "Canada",
         "Manitoba"
@@ -1943,7 +1925,7 @@
       },
       {
        "id": "Canada_Manitoba_Winnipeg",
-       "s": 35929404,
+       "s": 35956820,
        "affiliations": [
         "Canada",
         "Manitoba"
@@ -1956,7 +1938,7 @@
     },
     {
      "id": "Canada_New Brunswick",
-     "s": 47555327,
+     "s": 47595660,
      "affiliations": [
       "Canada",
       "Devon Indian Reserve NO. 30",
@@ -1972,7 +1954,7 @@
      "g": [
       {
        "id": "Canada_Newfoundland_East",
-       "s": 18879468,
+       "s": 18880500,
        "affiliations": [
         "Canada",
         "Newfoundland and Labrador"
@@ -1983,7 +1965,7 @@
       },
       {
        "id": "Canada_Newfoundland_North",
-       "s": 20217205,
+       "s": 20217237,
        "affiliations": [
         "Canada",
         "Newfoundland and Labrador"
@@ -2008,7 +1990,7 @@
       },
       {
        "id": "Canada_Newfoundland_West",
-       "s": 19788036,
+       "s": 19788844,
        "affiliations": [
         "Canada",
         "Newfoundland and Labrador"
@@ -2024,7 +2006,7 @@
      "g": [
       {
        "id": "Canada_Northwest Territories_East",
-       "s": 16394859,
+       "s": 16394907,
        "affiliations": [
         "Canada",
         "Northwest Territories"
@@ -2035,7 +2017,7 @@
       },
       {
        "id": "Canada_Northwest Territories_North",
-       "s": 28287327,
+       "s": 28275047,
        "affiliations": [
         "Canada",
         "Northwest Territories"
@@ -2046,7 +2028,7 @@
       },
       {
        "id": "Canada_Northwest Territories_Yellowknife",
-       "s": 41690424,
+       "s": 41690992,
        "affiliations": [
         "Canada",
         "Northwest Territories"
@@ -2062,7 +2044,7 @@
      "g": [
       {
        "id": "Canada_Nova Scotia_Halifax",
-       "s": 42389002,
+       "s": 42394098,
        "affiliations": [
         "Canada",
         "Nova Scotia"
@@ -2073,7 +2055,7 @@
       },
       {
        "id": "Canada_Nova Scotia_Sydney",
-       "s": 18550757,
+       "s": 18552149,
        "affiliations": [
         "Canada",
         "Nova Scotia",
@@ -2090,7 +2072,7 @@
      "g": [
       {
        "id": "Canada_Nunavut_North",
-       "s": 33227846,
+       "s": 33231198,
        "affiliations": [
         "Canada",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
@@ -2101,7 +2083,7 @@
       },
       {
        "id": "Canada_Nunavut_South",
-       "s": 50396114,
+       "s": 51190642,
        "affiliations": [
         "Canada",
         "\u14c4\u14c7\u1557\u1466 Nunavut"
@@ -2117,7 +2099,7 @@
      "g": [
       {
        "id": "Canada_Ontario_Bame",
-       "s": 44549571,
+       "s": 44605235,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2128,7 +2110,7 @@
       },
       {
        "id": "Canada_Ontario_Kingston",
-       "s": 57368727,
+       "s": 57469479,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2139,7 +2121,7 @@
       },
       {
        "id": "Canada_Ontario_London",
-       "s": 48514161,
+       "s": 48562369,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2150,7 +2132,7 @@
       },
       {
        "id": "Canada_Ontario_Northeastern_Central",
-       "s": 31858001,
+       "s": 31807073,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2161,7 +2143,7 @@
       },
       {
        "id": "Canada_Ontario_Northeastern_North",
-       "s": 35920430,
+       "s": 36065206,
        "affiliations": [
         "Canada",
         "Ontario",
@@ -2174,7 +2156,7 @@
       },
       {
        "id": "Canada_Ontario_Northeastern_S",
-       "s": 35958279,
+       "s": 35947375,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2185,7 +2167,7 @@
       },
       {
        "id": "Canada_Ontario_Northeastern_SE",
-       "s": 20002085,
+       "s": 20019341,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2196,7 +2178,7 @@
       },
       {
        "id": "Canada_Ontario_Northeastern_SW",
-       "s": 39935009,
+       "s": 39799976,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2207,7 +2189,7 @@
       },
       {
        "id": "Canada_Ontario_Northeastern_Wawa",
-       "s": 30291697,
+       "s": 30308585,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2218,7 +2200,7 @@
       },
       {
        "id": "Canada_Ontario_Northern",
-       "s": 40895816,
+       "s": 41043824,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2229,7 +2211,7 @@
       },
       {
        "id": "Canada_Ontario_Northwestern",
-       "s": 70106543,
+       "s": 72246823,
        "affiliations": [
         "Canada",
         "NU",
@@ -2243,7 +2225,7 @@
       },
       {
        "id": "Canada_Ontario_Toronto",
-       "s": 61960745,
+       "s": 62154577,
        "affiliations": [
         "Canada",
         "Ontario"
@@ -2256,7 +2238,7 @@
     },
     {
      "id": "Canada_Prince Edward Island",
-     "s": 7251323,
+     "s": 7256867,
      "affiliations": [
       "Canada",
       "Prince Edward Island"
@@ -2270,7 +2252,7 @@
      "g": [
       {
        "id": "Canada_Quebec_Quebec",
-       "s": 47367070,
+       "s": 47792638,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2281,7 +2263,7 @@
       },
       {
        "id": "Canada_Quebek_Far North",
-       "s": 36955139,
+       "s": 36960907,
        "affiliations": [
         "Canada",
         "NU",
@@ -2295,7 +2277,7 @@
       },
       {
        "id": "Canada_Quebek_Montreal",
-       "s": 36875813,
+       "s": 36977030,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2306,7 +2288,7 @@
       },
       {
        "id": "Canada_Quebek_Lachute",
-       "s": 37364105,
+       "s": 37186854,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2317,7 +2299,7 @@
       },
       {
        "id": "Canada_Quebek_North",
-       "s": 41690088,
+       "s": 41690040,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2328,7 +2310,7 @@
       },
       {
        "id": "Canada_Quebek_Southeast_Rimouski",
-       "s": 19277854,
+       "s": 19287779,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2339,7 +2321,7 @@
       },
       {
        "id": "Canada_Quebek_Southeast_Saguenay",
-       "s": 35006021,
+       "s": 35011013,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2350,7 +2332,7 @@
       },
       {
        "id": "Canada_Quebek_West_Chibougamau",
-       "s": 46831500,
+       "s": 46832044,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2361,7 +2343,7 @@
       },
       {
        "id": "Canada_Quebek_West_Rouyn-Noranda",
-       "s": 30780825,
+       "s": 30775793,
        "affiliations": [
         "Canada",
         "Qu\u00e9bec"
@@ -2377,7 +2359,7 @@
      "g": [
       {
        "id": "Canada_Saskatchewan_North",
-       "s": 32774412,
+       "s": 32776604,
        "affiliations": [
         "Canada",
         "Saskatchewan"
@@ -2388,7 +2370,7 @@
       },
       {
        "id": "Canada_Saskatchewan_Saskatoon",
-       "s": 28898920,
+       "s": 28884320,
        "affiliations": [
         "Canada",
         "Saskatchewan"
@@ -2399,7 +2381,7 @@
       },
       {
        "id": "Canada_Saskatchewan_Regina",
-       "s": 40106775,
+       "s": 40100831,
        "affiliations": [
         "Canada",
         "Saskatchewan"
@@ -2415,7 +2397,7 @@
      "g": [
       {
        "id": "Canada_Yukon_North",
-       "s": 28402481,
+       "s": 28423041,
        "affiliations": [
         "Canada",
         "Yukon"
@@ -2426,7 +2408,7 @@
       },
       {
        "id": "Canada_Yukon_Whitehorse",
-       "s": 34561287,
+       "s": 34561271,
        "affiliations": [
         "Canada",
         "Yukon"
@@ -2441,7 +2423,7 @@
   },
   {
    "id": "Cape Verde",
-   "s": 2562983,
+   "s": 2574183,
    "affiliations": [
     "Cabo Verde"
    ],
@@ -2451,7 +2433,7 @@
   },
   {
    "id": "Cayman Islands",
-   "s": 1128777,
+   "s": 1120009,
    "affiliations": [
     "Cayman Islands"
    ],
@@ -2461,7 +2443,7 @@
   },
   {
    "id": "Central African Republic",
-   "s": 16103372,
+   "s": 16107916,
    "affiliations": [
     "Bamingui-Bangoran",
     "Basse-Kotto",
@@ -2487,7 +2469,7 @@
   },
   {
    "id": "Chad",
-   "s": 10070652,
+   "s": 10142637,
    "affiliations": [
     "Bahr el Gazel",
     "Batha",
@@ -2522,7 +2504,7 @@
    "g": [
     {
      "id": "Colombia_North",
-     "s": 49855033,
+     "s": 49932001,
      "affiliations": [
       "Bol\u00edvar",
       "Antioquia",
@@ -2544,7 +2526,7 @@
     },
     {
      "id": "Colombia_West",
-     "s": 50265501,
+     "s": 50380405,
      "affiliations": [
       "Cauca",
       "Bogot\u00e1",
@@ -2567,7 +2549,7 @@
     },
     {
      "id": "Colombia_East",
-     "s": 12950608,
+     "s": 12952840,
      "affiliations": [
       "Amazonas",
       "Arauca",
@@ -2589,7 +2571,7 @@
   },
   {
    "id": "Comoros",
-   "s": 846288,
+   "s": 848912,
    "affiliations": [
     "Komori",
     "Ngazidja",
@@ -2602,7 +2584,7 @@
   },
   {
    "id": "Congo-Brazzaville",
-   "s": 12923150,
+   "s": 12908255,
    "affiliations": [
     "Bouenza",
     "Brazzaville",
@@ -2627,7 +2609,7 @@
    "g": [
     {
      "id": "Congo-Kinshasa_West",
-     "s": 47760467,
+     "s": 47844084,
      "affiliations": [
       "Bas-Uele",
       "Haut-Katanga",
@@ -2661,7 +2643,7 @@
     },
     {
      "id": "Congo-Kinshasa_Kivu",
-     "s": 17647949,
+     "s": 17734101,
      "affiliations": [
       "R\u00e9publique d\u00e9mocratique du Congo",
       "Nord-Kivu",
@@ -2675,7 +2657,7 @@
   },
   {
    "id": "Cook Islands",
-   "s": 483168,
+   "s": 485584,
    "affiliations": [
     "Cook Islands"
    ],
@@ -2685,7 +2667,7 @@
   },
   {
    "id": "Costa Rica",
-   "s": 17626096,
+   "s": 17607329,
    "affiliations": [
     "Alajuela",
     "Cartago",
@@ -2707,7 +2689,7 @@
    "g": [
     {
      "id": "Croatia_Central",
-     "s": 32792545,
+     "s": 33006658,
      "affiliations": [
       "Hrvatska"
      ],
@@ -2717,7 +2699,7 @@
     },
     {
      "id": "Croatia_West",
-     "s": 34291437,
+     "s": 34471789,
      "affiliations": [
       "Hrvatska",
       "Italia"
@@ -2730,7 +2712,7 @@
   },
   {
    "id": "Cuba",
-   "s": 35586856,
+   "s": 35680600,
    "affiliations": [
     "Artemisa",
     "Ciego de \u00c1vila",
@@ -2754,7 +2736,7 @@
   },
   {
    "id": "Cyprus",
-   "s": 13223441,
+   "s": 13238985,
    "affiliations": [
     "British Sovereign Base Areas",
     "\u039a\u03cd\u03c0\u03c1\u03bf\u03c2 - K\u0131br\u0131s"
@@ -2768,7 +2750,7 @@
    "g": [
     {
      "id": "Czech_Praha",
-     "s": 19990117,
+     "s": 20031142,
      "affiliations": [
       "Praha",
       "\u010cesko"
@@ -2779,7 +2761,7 @@
     },
     {
      "id": "Czech_Severovychod_Pardubicky kraj",
-     "s": 26563094,
+     "s": 26629630,
      "affiliations": [
       "Severov\u00fdchod",
       "\u010cesko"
@@ -2790,7 +2772,7 @@
     },
     {
      "id": "Czech_Karlovasky kraj",
-     "s": 14023892,
+     "s": 14040532,
      "affiliations": [
       "Severoz\u00e1pad",
       "\u010cesko"
@@ -2801,7 +2783,7 @@
     },
     {
      "id": "Czech_Ustecky kraj",
-     "s": 33240094,
+     "s": 33295109,
      "affiliations": [
       "Severoz\u00e1pad",
       "\u010cesko"
@@ -2812,7 +2794,7 @@
     },
     {
      "id": "Czech_Jihozapad_Plzensky kraj",
-     "s": 35340075,
+     "s": 35387857,
      "affiliations": [
       "Jihoz\u00e1pad",
       "\u010cesko"
@@ -2823,7 +2805,7 @@
     },
     {
      "id": "Czech_Severovychod_Kralovehradecky kraj",
-     "s": 30246758,
+     "s": 30282459,
      "affiliations": [
       "Severov\u00fdchod",
       "\u010cesko"
@@ -2834,7 +2816,7 @@
     },
     {
      "id": "Czech_Olomoucky kraj",
-     "s": 28295479,
+     "s": 28309751,
      "affiliations": [
       "St\u0159edn\u00ed Morava",
       "\u010cesko"
@@ -2845,7 +2827,7 @@
     },
     {
      "id": "Czech_Zlinsky Kraj",
-     "s": 26218968,
+     "s": 26263008,
      "affiliations": [
       "St\u0159edn\u00ed Morava",
       "\u010cesko"
@@ -2856,7 +2838,7 @@
     },
     {
      "id": "Czech_Stredni Cechy_East",
-     "s": 42304450,
+     "s": 42358475,
      "affiliations": [
       "St\u0159edn\u00ed \u010cechy",
       "\u010cesko"
@@ -2867,7 +2849,7 @@
     },
     {
      "id": "Czech_Jihozapad_Jihocesky kraj",
-     "s": 49144893,
+     "s": 49248586,
      "affiliations": [
       "Jihoz\u00e1pad",
       "\u010cesko"
@@ -2878,7 +2860,7 @@
     },
     {
      "id": "Czech_Jihovychod_Kraj Vysocina",
-     "s": 39864667,
+     "s": 39975427,
      "affiliations": [
       "Jihov\u00fdchod",
       "\u010cesko"
@@ -2889,7 +2871,7 @@
     },
     {
      "id": "Czech_Severovychod_Liberecky kraj",
-     "s": 22775947,
+     "s": 22831525,
      "affiliations": [
       "Severov\u00fdchod",
       "\u010cesko"
@@ -2900,7 +2882,7 @@
     },
     {
      "id": "Czech_Stredni Cechy_West",
-     "s": 31366984,
+     "s": 31386097,
      "affiliations": [
       "St\u0159edn\u00ed \u010cechy",
       "\u010cesko"
@@ -2911,7 +2893,7 @@
     },
     {
      "id": "Czech_Moravskoslezsko",
-     "s": 41626744,
+     "s": 41696568,
      "affiliations": [
       "Moravskoslezsko",
       "\u010cesko"
@@ -2922,7 +2904,7 @@
     },
     {
      "id": "Czech_Jihovychod_Jihomoravsky kraj",
-     "s": 46586044,
+     "s": 46686473,
      "affiliations": [
       "Jihov\u00fdchod",
       "\u010cesko"
@@ -2935,7 +2917,7 @@
   },
   {
    "id": "Cote dIvoire",
-   "s": 18178646,
+   "s": 18307942,
    "affiliations": [
     "Abidjan",
     "Bas-Sassandra",
@@ -2962,7 +2944,7 @@
    "g": [
     {
      "id": "Denmark_North Denmark Region",
-     "s": 30608795,
+     "s": 30670931,
      "affiliations": [
       "Danmark",
       "Region Nordjylland"
@@ -2973,7 +2955,7 @@
     },
     {
      "id": "Denmark_Central Denmark Region",
-     "s": 54170282,
+     "s": 54351746,
      "affiliations": [
       "Danmark",
       "Region Midtjylland"
@@ -2984,7 +2966,7 @@
     },
     {
      "id": "Denmark_Capital Region of Denmark",
-     "s": 39091226,
+     "s": 39146634,
      "affiliations": [
       "Danmark",
       "Region Hovedstaden",
@@ -2996,7 +2978,7 @@
     },
     {
      "id": "Denmark_Region Zealand",
-     "s": 34820123,
+     "s": 34877507,
      "affiliations": [
       "Danmark",
       "Region Sj\u00e6lland"
@@ -3007,7 +2989,7 @@
     },
     {
      "id": "Denmark_Region of Southern Denmark",
-     "s": 61109371,
+     "s": 61212339,
      "affiliations": [
       "Danmark",
       "Region Syddanmark"
@@ -3036,7 +3018,7 @@
   },
   {
    "id": "Dominican Republic",
-   "s": 25782843,
+   "s": 26078091,
    "affiliations": [
     "Azua",
     "Baoruco",
@@ -3078,7 +3060,7 @@
   },
   {
    "id": "East Timor",
-   "s": 2893719,
+   "s": 2895783,
    "affiliations": [
     "Aileu",
     "Ainaro",
@@ -3107,14 +3089,14 @@
    "g": [
     {
      "id": "Campo de Hielo Sur",
-     "s": 637074,
+     "s": 639602,
      "affiliations": [
       "Acuerdo de Campos de Hielo"
      ]
     },
     {
      "id": "Chile_Central",
-     "s": 53840305,
+     "s": 53921697,
      "affiliations": [
       "Chile",
       "Islote Gaviota",
@@ -3131,7 +3113,7 @@
     },
     {
      "id": "Chile_North",
-     "s": 16663524,
+     "s": 16701780,
      "affiliations": [
       "Chile",
       "I Regi\u00f3n de Tarapac\u00e1",
@@ -3147,7 +3129,7 @@
     },
     {
      "id": "Chile_South",
-     "s": 51874700,
+     "s": 52127404,
      "affiliations": [
       "Chile",
       "IX Regi\u00f3n de la Araucan\u00eda",
@@ -3168,7 +3150,7 @@
    "g": [
     {
      "id": "Ecuador_East",
-     "s": 27591113,
+     "s": 27771033,
      "affiliations": [
       "Azuay",
       "Carchi",
@@ -3193,7 +3175,7 @@
     },
     {
      "id": "Ecuador_West",
-     "s": 39331764,
+     "s": 42432284,
      "affiliations": [
       "Bol\u00edvar",
       "Azuay",
@@ -3222,7 +3204,7 @@
   },
   {
    "id": "Egypt",
-   "s": 55882368,
+   "s": 76546320,
    "affiliations": [
     "\u062f\u0645\u064a\u0627\u0637\u200e\u200e",
     "\u200f\u0645\u062d\u0627\u0641\u0638\u0629 \u0628\u0646\u0649 \u0633\u0648\u064a\u0641",
@@ -3258,7 +3240,7 @@
   },
   {
    "id": "El Salvador",
-   "s": 13376590,
+   "s": 13476169,
    "affiliations": [
     "Departamento de Cuscatl\u00e1n",
     "Departamento de La Libertad",
@@ -3282,7 +3264,7 @@
   },
   {
    "id": "Equatorial Guinea",
-   "s": 1448809,
+   "s": 1450233,
    "affiliations": [
     "Centro Sur",
     "Annob\u00f3n",
@@ -3299,7 +3281,7 @@
   },
   {
    "id": "Eritrea",
-   "s": 3127230,
+   "s": 3134382,
    "affiliations": [
     "Debub",
     "Debubawi Kayih Bahri",
@@ -3318,7 +3300,7 @@
    "g": [
     {
      "id": "Estonia_West",
-     "s": 30401670,
+     "s": 30439374,
      "affiliations": [
       "Eesti"
      ],
@@ -3328,7 +3310,7 @@
     },
     {
      "id": "Estonia_East",
-     "s": 34664476,
+     "s": 34699324,
      "affiliations": [
       "Eesti"
      ],
@@ -3340,7 +3322,7 @@
   },
   {
    "id": "Ethiopia",
-   "s": 31789298,
+   "s": 32243954,
    "affiliations": [
     "Addis Abeba",
     "Afar",
@@ -3363,7 +3345,7 @@
   },
   {
    "id": "Faroe Islands",
-   "s": 1719507,
+   "s": 1719691,
    "affiliations": [
     "Eysturoyar s\u00fdsla",
     "F\u00f8royar",
@@ -3394,7 +3376,7 @@
   },
   {
    "id": "Fiji",
-   "s": 5489273,
+   "s": 5490465,
    "affiliations": [
     "Central",
     "Eastern",
@@ -3410,7 +3392,7 @@
    "g": [
     {
      "id": "Finland_Western Finland_Jyvaskyla",
-     "s": 20414249,
+     "s": 20474881,
      "affiliations": [
       "L\u00e4nsi-Suomi",
       "Suomi"
@@ -3421,7 +3403,7 @@
     },
     {
      "id": "Finland_Western Finland_Tampere",
-     "s": 39140755,
+     "s": 39394132,
      "affiliations": [
       "L\u00e4nsi-Suomi",
       "Suomi"
@@ -3432,7 +3414,7 @@
     },
     {
      "id": "Finland_Northern Finland",
-     "s": 36490134,
+     "s": 37123709,
      "affiliations": [
       "Pohjois-Suomi",
       "Suomi"
@@ -3443,7 +3425,7 @@
     },
     {
      "id": "Finland_Eastern Finland_North",
-     "s": 22598193,
+     "s": 22644185,
      "affiliations": [
       "It\u00e4-Suomi",
       "Suomi"
@@ -3454,7 +3436,7 @@
     },
     {
      "id": "Finland_Eastern Finland_South",
-     "s": 29429259,
+     "s": 29527035,
      "affiliations": [
       "It\u00e4-Suomi",
       "Suomi"
@@ -3465,7 +3447,7 @@
     },
     {
      "id": "Finland_Southern Finland_West",
-     "s": 20411043,
+     "s": 20530125,
      "affiliations": [
       "Etel\u00e4-Suomi",
       "Suomi",
@@ -3477,7 +3459,7 @@
     },
     {
      "id": "Finland_Southern Finland_Helsinki",
-     "s": 53916449,
+     "s": 53983161,
      "affiliations": [
       "Etel\u00e4-Suomi",
       "Suomi"
@@ -3488,7 +3470,7 @@
     },
     {
      "id": "Finland_Southern Finland_Lappeenranta",
-     "s": 27866920,
+     "s": 27889192,
      "affiliations": [
       "Etel\u00e4-Suomi",
       "Suomi"
@@ -3507,7 +3489,7 @@
      "g": [
       {
        "id": "France_Alsace_Bas-Rhin",
-       "s": 38476401,
+       "s": 38505097,
        "affiliations": [
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
@@ -3518,7 +3500,7 @@
       },
       {
        "id": "France_Alsace_Haut-Rhin",
-       "s": 28273840,
+       "s": 28356864,
        "affiliations": [
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
@@ -3534,7 +3516,7 @@
      "g": [
       {
        "id": "France_Aquitaine_Dordogne",
-       "s": 21795587,
+       "s": 22105595,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -3545,7 +3527,7 @@
       },
       {
        "id": "France_Aquitaine_Gironde",
-       "s": 48185222,
+       "s": 48277734,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -3556,7 +3538,7 @@
       },
       {
        "id": "France_Aquitaine_Landes",
-       "s": 22037185,
+       "s": 22090217,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -3567,7 +3549,7 @@
       },
       {
        "id": "France_Aquitaine_Lot-et-Garonne",
-       "s": 17002905,
+       "s": 17031160,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -3578,7 +3560,7 @@
       },
       {
        "id": "France_Aquitaine_Pyrenees-Atlantiques",
-       "s": 32246965,
+       "s": 32295813,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -3594,7 +3576,7 @@
      "g": [
       {
        "id": "France_Auvergne_Allier",
-       "s": 21481024,
+       "s": 21490136,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -3605,7 +3587,7 @@
       },
       {
        "id": "France_Auvergne_Cantal",
-       "s": 12792646,
+       "s": 12798806,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -3616,7 +3598,7 @@
       },
       {
        "id": "France_Auvergne_Haute-Loire",
-       "s": 13421661,
+       "s": 13452469,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -3627,7 +3609,7 @@
       },
       {
        "id": "France_Auvergne_Puy-de-Dome",
-       "s": 33926308,
+       "s": 33964860,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -3643,7 +3625,7 @@
      "g": [
       {
        "id": "France_Brittany_Cotes-dArmor",
-       "s": 33563353,
+       "s": 33635721,
        "affiliations": [
         "Bretagne",
         "France",
@@ -3656,7 +3638,7 @@
       },
       {
        "id": "France_Brittany_Finistere",
-       "s": 49957474,
+       "s": 50039050,
        "affiliations": [
         "Bretagne",
         "France"
@@ -3667,7 +3649,7 @@
       },
       {
        "id": "France_Brittany_Ille-et-Vilaine",
-       "s": 42518217,
+       "s": 42658913,
        "affiliations": [
         "Bretagne",
         "France",
@@ -3679,7 +3661,7 @@
       },
       {
        "id": "France_Brittany_Morbihan",
-       "s": 35680519,
+       "s": 35859463,
        "affiliations": [
         "Bretagne",
         "France"
@@ -3695,7 +3677,7 @@
      "g": [
       {
        "id": "France_Burgundy_Cote-dOr",
-       "s": 23220972,
+       "s": 23340604,
        "affiliations": [
         "Bourgogne-Franche-Comt\u00e9",
         "France"
@@ -3706,7 +3688,7 @@
       },
       {
        "id": "France_Burgundy_Nievre",
-       "s": 12436578,
+       "s": 12540306,
        "affiliations": [
         "Bourgogne-Franche-Comt\u00e9",
         "France"
@@ -3717,7 +3699,7 @@
       },
       {
        "id": "France_Burgundy_Saone-et-Loire",
-       "s": 40474230,
+       "s": 40480806,
        "affiliations": [
         "Bourgogne-Franche-Comt\u00e9",
         "France"
@@ -3728,7 +3710,7 @@
       },
       {
        "id": "France_Burgundy_Yonne",
-       "s": 20674081,
+       "s": 20800225,
        "affiliations": [
         "Bourgogne-Franche-Comt\u00e9",
         "France"
@@ -3744,7 +3726,7 @@
      "g": [
       {
        "id": "France_Centre-Val de Loire_Cher",
-       "s": 14305804,
+       "s": 14354156,
        "affiliations": [
         "Centre-Val de Loire",
         "France"
@@ -3755,7 +3737,7 @@
       },
       {
        "id": "France_Centre-Val de Loire_Eure-et-Loir",
-       "s": 12902096,
+       "s": 13171710,
        "affiliations": [
         "Centre-Val de Loire",
         "France"
@@ -3766,7 +3748,7 @@
       },
       {
        "id": "France_Centre-Val de Loire_Indre",
-       "s": 17624934,
+       "s": 17773606,
        "affiliations": [
         "Centre-Val de Loire",
         "France"
@@ -3777,7 +3759,7 @@
       },
       {
        "id": "France_Centre-Val de Loire_Indre-et-Loire",
-       "s": 25032750,
+       "s": 25179398,
        "affiliations": [
         "Centre-Val de Loire",
         "France"
@@ -3788,7 +3770,7 @@
       },
       {
        "id": "France_Centre-Val de Loire_Loir-et-Cher",
-       "s": 14273958,
+       "s": 14283999,
        "affiliations": [
         "Centre-Val de Loire",
         "France"
@@ -3799,7 +3781,7 @@
       },
       {
        "id": "France_Centre-Val de Loire_Loiret",
-       "s": 24013783,
+       "s": 24062903,
        "affiliations": [
         "Centre-Val de Loire",
         "France"
@@ -3812,7 +3794,7 @@
     },
     {
      "id": "France_Champagne-Ardenne",
-     "s": 44617770,
+     "s": 44736090,
      "affiliations": [
       "Alsace-Champagne-Ardenne-Lorraine",
       "France"
@@ -3823,7 +3805,7 @@
     },
     {
      "id": "France_Corsica",
-     "s": 10042397,
+     "s": 10055773,
      "affiliations": [
       "Corse - Mer M\u00e9diterran\u00e9e",
       "Corse",
@@ -3837,7 +3819,7 @@
     },
     {
      "id": "France_Free County_North",
-     "s": 30665121,
+     "s": 30817921,
      "affiliations": [
       "Bourgogne-Franche-Comt\u00e9",
       "France"
@@ -3848,7 +3830,7 @@
     },
     {
      "id": "France_Free County_South",
-     "s": 23124317,
+     "s": 23204824,
      "affiliations": [
       "Bourgogne-Franche-Comt\u00e9",
       "France"
@@ -3859,7 +3841,7 @@
     },
     {
      "id": "France_French Guiana",
-     "s": 6087660,
+     "s": 6098972,
      "affiliations": [
       "France",
       "Guyane"
@@ -3873,7 +3855,7 @@
      "g": [
       {
        "id": "France_Ile-de-France_Essonne",
-       "s": 25131631,
+       "s": 25138783,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3884,7 +3866,7 @@
       },
       {
        "id": "France_Ile-de-France_Hauts-de-Seine",
-       "s": 11973477,
+       "s": 11992246,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3895,7 +3877,7 @@
       },
       {
        "id": "France_Ile-de-France_Paris",
-       "s": 14271706,
+       "s": 14287746,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3906,7 +3888,7 @@
       },
       {
        "id": "France_Ile-de-France_Seine-Saint-Denis",
-       "s": 15102840,
+       "s": 15131556,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3917,7 +3899,7 @@
       },
       {
        "id": "France_Ile-de-France_Seine-et-Marne",
-       "s": 33331061,
+       "s": 33370364,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3928,7 +3910,7 @@
       },
       {
        "id": "France_Ile-de-France_Val-dOise",
-       "s": 17422209,
+       "s": 17430313,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3939,7 +3921,7 @@
       },
       {
        "id": "France_Ile-de-France_Val-de-Marne",
-       "s": 14000176,
+       "s": 14004303,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3950,7 +3932,7 @@
       },
       {
        "id": "France_Ile-de-France_Yvelines",
-       "s": 23831807,
+       "s": 23951944,
        "affiliations": [
         "France",
         "\u00cele-de-France"
@@ -3966,7 +3948,7 @@
      "g": [
       {
        "id": "France_Languedoc-Roussillon_Aude",
-       "s": 24074108,
+       "s": 24080020,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -3977,7 +3959,7 @@
       },
       {
        "id": "France_Languedoc-Roussillon_Gard",
-       "s": 26878363,
+       "s": 26994235,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -3988,7 +3970,7 @@
       },
       {
        "id": "France_Languedoc-Roussillon_Herault",
-       "s": 39175998,
+       "s": 39415134,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -3999,7 +3981,7 @@
       },
       {
        "id": "France_Languedoc-Roussillon_Lozere",
-       "s": 9356602,
+       "s": 9372170,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4010,7 +3992,7 @@
       },
       {
        "id": "France_Languedoc-Roussillon_Pyrenees-Orientales",
-       "s": 22490974,
+       "s": 22496966,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4023,7 +4005,7 @@
     },
     {
      "id": "France_Limousin",
-     "s": 50458359,
+     "s": 50521911,
      "affiliations": [
       "Aquitaine-Limousin-Poitou-Charentes",
       "France"
@@ -4037,7 +4019,7 @@
      "g": [
       {
        "id": "France_Lorraine_Meurthe-et-Moselle",
-       "s": 22935195,
+       "s": 22983553,
        "affiliations": [
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
@@ -4048,7 +4030,7 @@
       },
       {
        "id": "France_Lorraine_Meuse",
-       "s": 10649178,
+       "s": 10710170,
        "affiliations": [
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
@@ -4059,7 +4041,7 @@
       },
       {
        "id": "France_Lorraine_Moselle",
-       "s": 32794703,
+       "s": 32850743,
        "affiliations": [
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
@@ -4070,7 +4052,7 @@
       },
       {
        "id": "France_Lorraine_Vosges",
-       "s": 22221541,
+       "s": 22298603,
        "affiliations": [
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
@@ -4086,7 +4068,7 @@
      "g": [
       {
        "id": "France_Lower Normandy_Calvados",
-       "s": 25910202,
+       "s": 25985954,
        "affiliations": [
         "France",
         "Normandie"
@@ -4097,7 +4079,7 @@
       },
       {
        "id": "France_Lower Normandy_Manche",
-       "s": 26383345,
+       "s": 26416641,
        "affiliations": [
         "France",
         "Jersey",
@@ -4109,7 +4091,7 @@
       },
       {
        "id": "France_Lower Normandy_Orne",
-       "s": 18301793,
+       "s": 18305225,
        "affiliations": [
         "France",
         "Normandie"
@@ -4125,7 +4107,7 @@
      "g": [
       {
        "id": "France_Midi-Pyrenees_Ariege",
-       "s": 10093107,
+       "s": 10097539,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4136,7 +4118,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Aveyron",
-       "s": 27612975,
+       "s": 27680079,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4147,7 +4129,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Gers",
-       "s": 15683847,
+       "s": 15721951,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4158,7 +4140,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Haute-Garonne",
-       "s": 43761388,
+       "s": 43859940,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4169,7 +4151,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Hautes-Pyrenees",
-       "s": 29330863,
+       "s": 29328439,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4180,7 +4162,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Lot",
-       "s": 14563340,
+       "s": 14576948,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4191,7 +4173,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Tarn",
-       "s": 20251149,
+       "s": 20725637,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4202,7 +4184,7 @@
       },
       {
        "id": "France_Midi-Pyrenees_Tarn-et-Garonne",
-       "s": 13775767,
+       "s": 13828791,
        "affiliations": [
         "France",
         "Languedoc-Roussillon-Midi-Pyr\u00e9n\u00e9es"
@@ -4215,7 +4197,7 @@
     },
     {
      "id": "France_New Caledonia",
-     "s": 5244880,
+     "s": 5436441,
      "affiliations": [
       "France",
       "France, Nouvelle-Cal\u00e9donie, Grande Terre et r\u00e9cifs d'Entrecasteaux (eaux territoriales)",
@@ -4237,7 +4219,7 @@
      "g": [
       {
        "id": "France_Nord-Pas-de-Calais_Nord",
-       "s": 31149428,
+       "s": 31151996,
        "affiliations": [
         "France",
         "Nord-Pas-de-Calais-Picardie"
@@ -4248,7 +4230,7 @@
       },
       {
        "id": "France_Nord-Pas-de-Calais_Lille",
-       "s": 36503472,
+       "s": 36506568,
        "affiliations": [
         "France",
         "Nord-Pas-de-Calais-Picardie"
@@ -4259,7 +4241,7 @@
       },
       {
        "id": "France_Nord-Pas-de-Calais_Pas-de-Calais",
-       "s": 48963622,
+       "s": 48966702,
        "affiliations": [
         "England",
         "France",
@@ -4277,7 +4259,7 @@
      "g": [
       {
        "id": "France_Pays de la Loire_Loire-Atlantique_Nantes",
-       "s": 36056240,
+       "s": 36094712,
        "affiliations": [
         "France",
         "Pays de la Loire"
@@ -4288,7 +4270,7 @@
       },
       {
        "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire",
-       "s": 20334550,
+       "s": 20340102,
        "affiliations": [
         "France",
         "Pays de la Loire"
@@ -4299,7 +4281,7 @@
       },
       {
        "id": "France_Pays de la Loire_Maine-et-Loire",
-       "s": 36425858,
+       "s": 36444618,
        "affiliations": [
         "France",
         "Pays de la Loire"
@@ -4310,7 +4292,7 @@
       },
       {
        "id": "France_Pays de la Loire_Mayenne",
-       "s": 18815511,
+       "s": 18840711,
        "affiliations": [
         "France",
         "Pays de la Loire"
@@ -4321,7 +4303,7 @@
       },
       {
        "id": "France_Pays de la Loire_Sarthe",
-       "s": 31466035,
+       "s": 31568683,
        "affiliations": [
         "France",
         "Pays de la Loire"
@@ -4332,7 +4314,7 @@
       },
       {
        "id": "France_Pays de la Loire_Vendee",
-       "s": 48066069,
+       "s": 48109845,
        "affiliations": [
         "France",
         "Pays de la Loire"
@@ -4348,7 +4330,7 @@
      "g": [
       {
        "id": "France_Picardy_Aisne",
-       "s": 22266737,
+       "s": 22318993,
        "affiliations": [
         "France",
         "Nord-Pas-de-Calais-Picardie"
@@ -4359,7 +4341,7 @@
       },
       {
        "id": "France_Picardy_Oise",
-       "s": 27182214,
+       "s": 27199126,
        "affiliations": [
         "France",
         "Nord-Pas-de-Calais-Picardie"
@@ -4370,7 +4352,7 @@
       },
       {
        "id": "France_Picardy_Somme",
-       "s": 26163517,
+       "s": 26142805,
        "affiliations": [
         "France",
         "Nord-Pas-de-Calais-Picardie"
@@ -4386,7 +4368,7 @@
      "g": [
       {
        "id": "France_Poitou-Charentes_Charente",
-       "s": 22988703,
+       "s": 23005687,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -4397,7 +4379,7 @@
       },
       {
        "id": "France_Poitou-Charentes_Charente-Maritime",
-       "s": 42611878,
+       "s": 42677190,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -4408,7 +4390,7 @@
       },
       {
        "id": "France_Poitou-Charentes_Deux-Sevres",
-       "s": 29562102,
+       "s": 29650247,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -4419,7 +4401,7 @@
       },
       {
        "id": "France_Poitou-Charentes_Vienne",
-       "s": 26074758,
+       "s": 26138071,
        "affiliations": [
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
@@ -4435,7 +4417,7 @@
      "g": [
       {
        "id": "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence",
-       "s": 12841633,
+       "s": 12874673,
        "affiliations": [
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
@@ -4446,7 +4428,7 @@
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone",
-       "s": 44106714,
+       "s": 44151666,
        "affiliations": [
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
@@ -4457,7 +4439,7 @@
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes",
-       "s": 11240478,
+       "s": 11247350,
        "affiliations": [
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
@@ -4468,7 +4450,7 @@
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps",
-       "s": 23919206,
+       "s": 23934078,
        "affiliations": [
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
@@ -4480,7 +4462,7 @@
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Var",
-       "s": 33899438,
+       "s": 33941990,
        "affiliations": [
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
@@ -4491,7 +4473,7 @@
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Vaucluse",
-       "s": 25624079,
+       "s": 25637940,
        "affiliations": [
         "France",
         "Provence-Alpes-C\u00f4te d'Azur"
@@ -4507,7 +4489,7 @@
      "g": [
       {
        "id": "France_Rhone-Alpes_Ain",
-       "s": 30736427,
+       "s": 30832907,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4518,7 +4500,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Ardeche",
-       "s": 19699645,
+       "s": 20404293,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4529,7 +4511,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Drome",
-       "s": 25810501,
+       "s": 25916270,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France",
@@ -4541,7 +4523,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Haute-Savoie",
-       "s": 26900873,
+       "s": 26916809,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4552,7 +4534,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Isere",
-       "s": 40173935,
+       "s": 40193786,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4563,7 +4545,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Loire",
-       "s": 24676778,
+       "s": 24798074,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4574,7 +4556,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Rhone",
-       "s": 38850731,
+       "s": 38888218,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4585,7 +4567,7 @@
       },
       {
        "id": "France_Rhone-Alpes_Savoie",
-       "s": 19642057,
+       "s": 19703673,
        "affiliations": [
         "Auvergne-Rh\u00f4ne-Alpes",
         "France"
@@ -4598,7 +4580,7 @@
     },
     {
      "id": "France_Southern Islands",
-     "s": 20107410,
+     "s": 20135810,
      "affiliations": [
       "France",
       "France, Mayotte (eaux territoriales)",
@@ -4620,7 +4602,7 @@
     },
     {
      "id": "France_Upper Normandy",
-     "s": 49633060,
+     "s": 49848938,
      "affiliations": [
       "France",
       "Normandie"
@@ -4631,7 +4613,7 @@
     },
     {
      "id": "French Polynesia",
-     "s": 2517342,
+     "s": 2530854,
      "affiliations": [
       "France",
       "France, Polyn\u00e9sie fran\u00e7aise, \u00celes Gambier (eaux territoriales)",
@@ -4662,7 +4644,7 @@
   },
   {
    "id": "Gabon",
-   "s": 4416827,
+   "s": 4423091,
    "affiliations": [
     "Estuaire",
     "Gabon",
@@ -4684,7 +4666,7 @@
    "g": [
     {
      "id": "Georgia",
-     "s": 34374178,
+     "s": 34819730,
      "affiliations": [
       "\u10d7\u10d1\u10d8\u10da\u10d8\u10e1\u10d8",
       "\u10d8\u10db\u10d4\u10e0\u10d4\u10d7\u10d8",
@@ -4705,7 +4687,7 @@
     },
     {
      "id": "Abkhazia",
-     "s": 4557239,
+     "s": 4557407,
      "affiliations": [
       "\u0410\u0431\u0445\u0430\u0437\u0438\u044f - \u0410\u04a7\u0441\u043d\u044b",
       "\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",
@@ -4717,7 +4699,7 @@
     },
     {
      "id": "South Ossetia",
-     "s": 1508781,
+     "s": 1510045,
      "affiliations": [
       "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d",
       "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f",
@@ -4737,7 +4719,7 @@
      "g": [
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Freiburg",
-       "s": 75131006,
+       "s": 75501574,
        "affiliations": [
         "Baden-W\u00fcrttemberg",
         "Deutschland",
@@ -4750,7 +4732,7 @@
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe",
-       "s": 78757821,
+       "s": 78956725,
        "affiliations": [
         "Baden-W\u00fcrttemberg",
         "Deutschland"
@@ -4761,7 +4743,7 @@
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn",
-       "s": 25612932,
+       "s": 25663116,
        "affiliations": [
         "Baden-W\u00fcrttemberg",
         "Deutschland"
@@ -4772,7 +4754,7 @@
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart",
-       "s": 73742213,
+       "s": 74092685,
        "affiliations": [
         "Baden-W\u00fcrttemberg",
         "Deutschland"
@@ -4783,7 +4765,7 @@
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen",
-       "s": 55378361,
+       "s": 55505450,
        "affiliations": [
         "Baden-W\u00fcrttemberg",
         "Deutschland"
@@ -4796,7 +4778,7 @@
     },
     {
      "id": "Germany_Berlin",
-     "s": 42398431,
+     "s": 42467142,
      "affiliations": [
       "Berlin",
       "Deutschland"
@@ -4807,7 +4789,7 @@
     },
     {
      "id": "Germany_Brandenburg_North",
-     "s": 39867970,
+     "s": 39966233,
      "affiliations": [
       "Brandenburg",
       "Deutschland"
@@ -4818,7 +4800,7 @@
     },
     {
      "id": "Germany_Brandenburg_South",
-     "s": 41934514,
+     "s": 42085557,
      "affiliations": [
       "Brandenburg",
       "Deutschland"
@@ -4832,7 +4814,7 @@
      "g": [
       {
        "id": "Germany_Free State of Bavaria_Lower Bavaria",
-       "s": 44413889,
+       "s": 44546003,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4843,7 +4825,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Lower Franconia",
-       "s": 39344142,
+       "s": 39566837,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4854,7 +4836,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Middle Franconia",
-       "s": 44957997,
+       "s": 45011933,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4865,7 +4847,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Swabia",
-       "s": 63058197,
+       "s": 63284714,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4876,7 +4858,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_East",
-       "s": 39821491,
+       "s": 39978585,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4887,7 +4869,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt",
-       "s": 20324777,
+       "s": 20346945,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4898,7 +4880,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen",
-       "s": 39105986,
+       "s": 39203242,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4909,7 +4891,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_South",
-       "s": 17754064,
+       "s": 17753688,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4920,7 +4902,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Franconia",
-       "s": 40978019,
+       "s": 41122387,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4931,7 +4913,7 @@
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Palatinate",
-       "s": 40213971,
+       "s": 40339259,
        "affiliations": [
         "Bayern",
         "Deutschland"
@@ -4944,7 +4926,7 @@
     },
     {
      "id": "Germany_Hamburg_main",
-     "s": 23791367,
+     "s": 23843176,
      "affiliations": [
       "Deutschland",
       "Hamburg"
@@ -4958,7 +4940,7 @@
      "g": [
       {
        "id": "Germany_Hesse_Regierungsbezirk Darmstadt",
-       "s": 77484255,
+       "s": 77883431,
        "affiliations": [
         "Deutschland",
         "Hessen"
@@ -4969,7 +4951,7 @@
       },
       {
        "id": "Germany_Hesse_Regierungsbezirk Giessen",
-       "s": 31809157,
+       "s": 31966637,
        "affiliations": [
         "Deutschland",
         "Hessen"
@@ -4980,7 +4962,7 @@
       },
       {
        "id": "Germany_Hesse_Regierungsbezirk Kassel",
-       "s": 44346400,
+       "s": 44612392,
        "affiliations": [
         "Deutschland",
         "Hessen"
@@ -4996,7 +4978,7 @@
      "g": [
       {
        "id": "Germany_Lower Saxony_Bremen_Bremen",
-       "s": 43523314,
+       "s": 43588010,
        "affiliations": [
         "Bremen",
         "Deutschland",
@@ -5010,7 +4992,7 @@
       },
       {
        "id": "Germany_Lower Saxony_Bremen_Munster",
-       "s": 44850245,
+       "s": 44890629,
        "affiliations": [
         "Deutschland",
         "Niedersachsen"
@@ -5021,7 +5003,7 @@
       },
       {
        "id": "Germany_Lower Saxony_Hannover",
-       "s": 38707136,
+       "s": 38804776,
        "affiliations": [
         "Deutschland",
         "Niedersachsen"
@@ -5032,7 +5014,7 @@
       },
       {
        "id": "Germany_Lower Saxony_Braunschweig",
-       "s": 45845564,
+       "s": 45950204,
        "affiliations": [
         "Deutschland",
         "Niedersachsen"
@@ -5043,7 +5025,7 @@
       },
       {
        "id": "Germany_Lower Saxony_Oldenburg",
-       "s": 66979061,
+       "s": 67172766,
        "affiliations": [
         "Bremen",
         "Deutschland",
@@ -5057,7 +5039,7 @@
     },
     {
      "id": "Germany_Mecklenburg-Vorpommern",
-     "s": 62688477,
+     "s": 62894252,
      "affiliations": [
       "Deutschland",
       "Mecklenburg-Vorpommern"
@@ -5071,7 +5053,7 @@
      "g": [
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Arnsberg",
-       "s": 38092687,
+       "s": 38202911,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5082,7 +5064,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund",
-       "s": 65507237,
+       "s": 65569325,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5093,7 +5075,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold",
-       "s": 72315603,
+       "s": 72517123,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5104,7 +5086,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf",
-       "s": 56739943,
+       "s": 56781695,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5115,7 +5097,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim",
-       "s": 47740084,
+       "s": 48008028,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5126,7 +5108,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel",
-       "s": 15805777,
+       "s": 15842897,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5137,7 +5119,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
-       "s": 50853518,
+       "s": 50952758,
        "affiliations": [
         "Deutschland",
         "Deutschland - Belgique / Belgi\u00eb / Belgien",
@@ -5149,7 +5131,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln",
-       "s": 67779492,
+       "s": 67960676,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5160,7 +5142,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster",
-       "s": 38775468,
+       "s": 39196692,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5171,7 +5153,7 @@
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen",
-       "s": 45776370,
+       "s": 45848010,
        "affiliations": [
         "Deutschland",
         "Nordrhein-Westfalen"
@@ -5184,7 +5166,7 @@
     },
     {
      "id": "Germany_Rhineland-Palatinate_Koblenz",
-     "s": 52309316,
+     "s": 52449124,
      "affiliations": [
       "Deutschland",
       "Rheinland-Pfalz"
@@ -5195,7 +5177,7 @@
     },
     {
      "id": "Germany_Rhineland-Palatinate_South",
-     "s": 52895403,
+     "s": 53194123,
      "affiliations": [
       "Deutschland",
       "Rheinland-Pfalz"
@@ -5206,7 +5188,7 @@
     },
     {
      "id": "Germany_Saarland",
-     "s": 24183496,
+     "s": 24289160,
      "affiliations": [
       "Deutschland",
       "Saarland"
@@ -5217,7 +5199,7 @@
     },
     {
      "id": "Germany_Saxony-Anhalt_Magdeburg",
-     "s": 35686955,
+     "s": 35743235,
      "affiliations": [
       "Deutschland",
       "Sachsen-Anhalt"
@@ -5228,7 +5210,7 @@
     },
     {
      "id": "Germany_Saxony-Anhalt_Halle",
-     "s": 32267400,
+     "s": 32398887,
      "affiliations": [
       "Deutschland",
       "Sachsen-Anhalt"
@@ -5239,7 +5221,7 @@
     },
     {
      "id": "Germany_Saxony_Dresden",
-     "s": 44434460,
+     "s": 44576150,
      "affiliations": [
       "Deutschland",
       "Sachsen"
@@ -5250,7 +5232,7 @@
     },
     {
      "id": "Germany_Saxony_Leipzig",
-     "s": 75955162,
+     "s": 76314471,
      "affiliations": [
       "Deutschland",
       "Sachsen"
@@ -5261,7 +5243,7 @@
     },
     {
      "id": "Germany_Schleswig-Holstein_Kiel",
-     "s": 41398652,
+     "s": 41536076,
      "affiliations": [
       "Danmark",
       "Deutschland",
@@ -5273,7 +5255,7 @@
     },
     {
      "id": "Germany_Schleswig-Holstein_Flensburg",
-     "s": 40743529,
+     "s": 40796345,
      "affiliations": [
       "Deutschland",
       "Schleswig-Holstein"
@@ -5284,7 +5266,7 @@
     },
     {
      "id": "Germany_Thuringia",
-     "s": 69665759,
+     "s": 69848079,
      "affiliations": [
       "Deutschland",
       "Th\u00fcringen"
@@ -5297,7 +5279,7 @@
   },
   {
    "id": "Ghana",
-   "s": 13584396,
+   "s": 13604572,
    "affiliations": [
     "Ashanti Region",
     "Brong-Ahafo Region",
@@ -5317,7 +5299,7 @@
   },
   {
    "id": "Gibraltar",
-   "s": 286496,
+   "s": 286584,
    "affiliations": [
     "Espa\u00f1a",
     "Gibraltar"
@@ -5332,7 +5314,7 @@
    "g": [
     {
      "id": "Greece_Decentralized Administration of Crete",
-     "s": 8224127,
+     "s": 8231543,
      "affiliations": [
       "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1",
       "Territorial waters of Greece - Gavdos and Gavdopoula",
@@ -5344,7 +5326,7 @@
     },
     {
      "id": "Greece_Decentralized Administration of West Greece",
-     "s": 23044910,
+     "s": 23112526,
      "affiliations": [
       "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1",
       "Territorial waters of Greece - Strofades",
@@ -5357,7 +5339,7 @@
     },
     {
      "id": "Greece_Decentralized Administration of Aegean",
-     "s": 13955695,
+     "s": 14018303,
      "affiliations": [
       "\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"
@@ -5368,7 +5350,7 @@
     },
     {
      "id": "Greece_Decentralized Administration of Epirus - Western Macedonia",
-     "s": 13843855,
+     "s": 13859839,
      "affiliations": [
       "\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"
@@ -5379,7 +5361,7 @@
     },
     {
      "id": "Greece_Decentralized Administration of Macedonia and Thrace",
-     "s": 30640395,
+     "s": 30723043,
      "affiliations": [
       "\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"
@@ -5390,7 +5372,7 @@
     },
     {
      "id": "Greece_Decentralized Administration of Thessaly - Central Greece",
-     "s": 29978398,
+     "s": 30013606,
      "affiliations": [
       "\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",
@@ -5402,7 +5384,7 @@
     },
     {
      "id": "Greece_Decentralized Administration of Attica",
-     "s": 24799677,
+     "s": 24968941,
      "affiliations": [
       "\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"
@@ -5415,7 +5397,7 @@
   },
   {
    "id": "Greenland",
-   "s": 22590580,
+   "s": 22591524,
    "affiliations": [
     "Kalaallit Nunaat"
    ],
@@ -5425,7 +5407,7 @@
   },
   {
    "id": "Guatemala",
-   "s": 19918382,
+   "s": 20098941,
    "affiliations": [
     "Alta Verapaz",
     "Baja Verapaz",
@@ -5457,7 +5439,7 @@
   },
   {
    "id": "Guernsey",
-   "s": 836693,
+   "s": 837573,
    "affiliations": [
     "Alderney",
     "Brecqhou",
@@ -5490,7 +5472,7 @@
   },
   {
    "id": "Guinea",
-   "s": 30347930,
+   "s": 31410685,
    "affiliations": [
     "Conakry",
     "Faranah",
@@ -5526,7 +5508,7 @@
   },
   {
    "id": "Guyana",
-   "s": 4224640,
+   "s": 4240952,
    "affiliations": [
     "Guyana"
    ],
@@ -5536,7 +5518,7 @@
   },
   {
    "id": "Haiti",
-   "s": 21118903,
+   "s": 21158375,
    "affiliations": [
     "Ayiti",
     "D\u00e9partement de l'Artibonite",
@@ -5556,7 +5538,7 @@
   },
   {
    "id": "Honduras",
-   "s": 17708649,
+   "s": 17967627,
    "affiliations": [
     "Atl\u00e1ntida",
     "Chinandega",
@@ -5588,7 +5570,7 @@
    "g": [
     {
      "id": "Hungary_Northern Great Plain",
-     "s": 43953372,
+     "s": 44192484,
      "affiliations": [
       "Alf\u00f6ld \u00e9s \u00c9szak",
       "Magyarorsz\u00e1g"
@@ -5599,7 +5581,7 @@
     },
     {
      "id": "Hungary_Transdanubia",
-     "s": 49214245,
+     "s": 49422125,
      "affiliations": [
       "Dun\u00e1nt\u00fal",
       "Magyarorsz\u00e1g"
@@ -5610,7 +5592,7 @@
     },
     {
      "id": "Hungary_Kozep-Magyarorszag",
-     "s": 28698706,
+     "s": 28792474,
      "affiliations": [
       "K\u00f6z\u00e9p-Magyarorsz\u00e1g",
       "Magyarorsz\u00e1g"
@@ -5623,7 +5605,7 @@
   },
   {
    "id": "Iceland",
-   "s": 16524007,
+   "s": 16620967,
    "affiliations": [
     "\u00cdsland"
    ],
@@ -5636,7 +5618,7 @@
    "g": [
     {
      "id": "India_Andaman and Nicobar Islands",
-     "s": 1273063,
+     "s": 1356375,
      "affiliations": [
       "Andaman and Nicobar Islands",
       "India"
@@ -5647,7 +5629,7 @@
     },
     {
      "id": "India_Lakshadweep",
-     "s": 272950,
+     "s": 272902,
      "affiliations": [
       "India",
       "Lakshadweep"
@@ -5658,7 +5640,7 @@
     },
     {
      "id": "India_Andhra Pradesh",
-     "s": 22539609,
+     "s": 24748626,
      "affiliations": [
       "Andhra Pradesh",
       "India",
@@ -5670,7 +5652,7 @@
     },
     {
      "id": "India_Gujarat",
-     "s": 22440551,
+     "s": 22570687,
      "affiliations": [
       "Gujarat",
       "India",
@@ -5683,7 +5665,7 @@
     },
     {
      "id": "India_Kerala",
-     "s": 11234214,
+     "s": 11244622,
      "affiliations": [
       "India",
       "Kerala"
@@ -5694,7 +5676,7 @@
     },
     {
      "id": "India_Madhya Pradesh",
-     "s": 19571308,
+     "s": 22420764,
      "affiliations": [
       "India",
       "Madhya Pradesh"
@@ -5705,7 +5687,7 @@
     },
     {
      "id": "India_Rajasthan",
-     "s": 29394774,
+     "s": 29438110,
      "affiliations": [
       "India",
       "Rajasthan"
@@ -5716,7 +5698,7 @@
     },
     {
      "id": "India_Tamil Nadu",
-     "s": 48148467,
+     "s": 48205203,
      "affiliations": [
       "Cuddalore-Puducherry Administrative Boundary",
       "India",
@@ -5733,7 +5715,7 @@
     },
     {
      "id": "India_Haryana",
-     "s": 30285451,
+     "s": 31768000,
      "affiliations": [
       "Haryana",
       "India"
@@ -5744,7 +5726,7 @@
     },
     {
      "id": "India_Goa",
-     "s": 1536083,
+     "s": 1543091,
      "affiliations": [
       "Goa",
       "India"
@@ -5755,7 +5737,7 @@
     },
     {
      "id": "India_Karnataka_North",
-     "s": 21907440,
+     "s": 22012541,
      "affiliations": [
       "India",
       "Karnataka"
@@ -5766,7 +5748,7 @@
     },
     {
      "id": "India_Karnataka_South",
-     "s": 47111634,
+     "s": 47369947,
      "affiliations": [
       "India",
       "Karnataka"
@@ -5777,7 +5759,7 @@
     },
     {
      "id": "India_Maharashtra",
-     "s": 53397258,
+     "s": 55215427,
      "affiliations": [
       "Ankisha",
       "Ganjiramannapeta",
@@ -5793,7 +5775,7 @@
     },
     {
      "id": "India_Telangana",
-     "s": 65250676,
+     "s": 64957788,
      "affiliations": [
       "India",
       "Telangana"
@@ -5804,7 +5786,7 @@
     },
     {
      "id": "India_Delhi",
-     "s": 12677228,
+     "s": 13102708,
      "affiliations": [
       "Delhi",
       "India"
@@ -5815,7 +5797,7 @@
     },
     {
      "id": "India_Uttar Pradesh",
-     "s": 27380463,
+     "s": 27619078,
      "affiliations": [
       "Uttar Pradesh",
       "India"
@@ -5826,7 +5808,7 @@
     },
     {
      "id": "India_Odisha",
-     "s": 8955704,
+     "s": 9076013,
      "affiliations": [
       "India",
       "Odisha"
@@ -5837,7 +5819,7 @@
     },
     {
      "id": "India_Chhattisgarh",
-     "s": 5073493,
+     "s": 5145542,
      "affiliations": [
       "Chhattisgarh",
       "India"
@@ -5848,7 +5830,7 @@
     },
     {
      "id": "India_Jharkhand",
-     "s": 4302138,
+     "s": 4304010,
      "affiliations": [
       "Jharkhand",
       "India"
@@ -5859,7 +5841,7 @@
     },
     {
      "id": "India_Bihar",
-     "s": 7575919,
+     "s": 7587775,
      "affiliations": [
       "Bihar",
       "India"
@@ -5870,7 +5852,7 @@
     },
     {
      "id": "India_Tripura",
-     "s": 567924,
+     "s": 566372,
      "affiliations": [
       "India",
       "Tripura"
@@ -5881,7 +5863,7 @@
     },
     {
      "id": "India_West Bengal",
-     "s": 28654039,
+     "s": 28760873,
      "affiliations": [
       "Border India - Bangladesh",
       "Dist. Judges Court",
@@ -5894,7 +5876,7 @@
     },
     {
      "id": "India_Sikkim",
-     "s": 537597,
+     "s": 547795,
      "affiliations": [
       "India",
       "Sikkim"
@@ -5905,7 +5887,7 @@
     },
     {
      "id": "India_Uttarakhand",
-     "s": 6385410,
+     "s": 6393695,
      "affiliations": [
       "Uttarakhand",
       "India"
@@ -5916,7 +5898,7 @@
     },
     {
      "id": "India_Mizoram",
-     "s": 559541,
+     "s": 565173,
      "affiliations": [
       "India",
       "Mizoram"
@@ -5927,7 +5909,7 @@
     },
     {
      "id": "India_Meghalaya",
-     "s": 868424,
+     "s": 868456,
      "affiliations": [
       "India",
       "Meghalaya"
@@ -5938,7 +5920,7 @@
     },
     {
      "id": "India_Manipur",
-     "s": 635417,
+     "s": 635233,
      "affiliations": [
       "India",
       "Manipur"
@@ -5949,7 +5931,7 @@
     },
     {
      "id": "India_Nagaland",
-     "s": 505089,
+     "s": 505097,
      "affiliations": [
       "India",
       "Nagaland"
@@ -5960,7 +5942,7 @@
     },
     {
      "id": "India_Assam",
-     "s": 2848554,
+     "s": 2860562,
      "affiliations": [
       "Assam",
       "India"
@@ -5971,7 +5953,7 @@
     },
     {
      "id": "India_Arunachal Pradesh",
-     "s": 1496347,
+     "s": 1541571,
      "affiliations": [
       "Arunachal Pradesh",
       "India"
@@ -5982,7 +5964,7 @@
     },
     {
      "id": "India_Himachal Pradesh",
-     "s": 3189745,
+     "s": 3192654,
      "affiliations": [
       "Himachal Pradesh",
       "India"
@@ -5993,7 +5975,7 @@
     },
     {
      "id": "India_Jammu and Kashmir",
-     "s": 5010023,
+     "s": 5018007,
      "affiliations": [
       "India",
       "Jammu and Kashmir"
@@ -6004,7 +5986,7 @@
     },
     {
      "id": "India_Chandigarh",
-     "s": 1107460,
+     "s": 1108004,
      "affiliations": [
       "India",
       "Union Territory of Chand\u012bgarh"
@@ -6015,7 +5997,7 @@
     },
     {
      "id": "India_Punjab",
-     "s": 13022059,
+     "s": 13039152,
      "affiliations": [
       "India",
       "Punjab"
@@ -6031,7 +6013,7 @@
    "g": [
     {
      "id": "Indonesia_Central",
-     "s": 52426529,
+     "s": 52632561,
      "affiliations": [
       "Gorontalo",
       "Indonesia",
@@ -6052,7 +6034,7 @@
     },
     {
      "id": "Indonesia_West",
-     "s": 35922598,
+     "s": 36009718,
      "affiliations": [
       "Aceh",
       "Banten",
@@ -6074,7 +6056,7 @@
     },
     {
      "id": "Indonesia_Jawa Tengah",
-     "s": 28788203,
+     "s": 28864155,
      "affiliations": [
       "Daerah Istimewa Yogyakarta",
       "Indonesia",
@@ -6086,7 +6068,7 @@
     },
     {
      "id": "Indonesia_Jawa Barat",
-     "s": 34331575,
+     "s": 34608047,
      "affiliations": [
       "Banten",
       "Daerah Khusus Ibukota Jakarta",
@@ -6099,7 +6081,7 @@
     },
     {
      "id": "Indonesia_Nusa Tenggara",
-     "s": 35236697,
+     "s": 35387553,
      "affiliations": [
       "Bali",
       "Batas Dusun Muntigunung Induk",
@@ -6114,7 +6096,7 @@
     },
     {
      "id": "Indonesia_Jawa Timur",
-     "s": 33861410,
+     "s": 33953018,
      "affiliations": [
       "Indonesia",
       "Jawa Timur"
@@ -6125,7 +6107,7 @@
     },
     {
      "id": "Indonesia_East",
-     "s": 11657021,
+     "s": 11660325,
      "affiliations": [
       "Indonesia",
       "Maluku",
@@ -6144,7 +6126,7 @@
    "g": [
     {
      "id": "Iran_East",
-     "s": 30396434,
+     "s": 31179570,
      "affiliations": [
       "\u06cc\u0632\u062f\u200e",
       "\u06a9\u0631\u0645\u0627\u0646",
@@ -6160,7 +6142,7 @@
     },
     {
      "id": "Iran_South",
-     "s": 43258380,
+     "s": 44155000,
      "affiliations": [
       "\u0644\u0631\u0633\u062a\u0627\u0646\u200e",
       "\u0641\u0627\u0631\u0633\u200e",
@@ -6183,7 +6165,7 @@
     },
     {
      "id": "Iran_North",
-     "s": 46508580,
+     "s": 47075376,
      "affiliations": [
       "\u0642\u0645\u200e",
       "\u0627\u0644\u0628\u0631\u0632",
@@ -6212,7 +6194,7 @@
    "g": [
     {
      "id": "Iraq_North",
-     "s": 33576327,
+     "s": 33764535,
      "affiliations": [
       "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642",
       "garaki handren",
@@ -6232,7 +6214,7 @@
     },
     {
      "id": "Iraq_South",
-     "s": 26742971,
+     "s": 27455084,
      "affiliations": [
       "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0639\u0631\u0627\u0642",
       "\u0630\u064a \u0642\u0627\u0631",
@@ -6257,7 +6239,7 @@
   },
   {
    "id": "Isle of Man",
-   "s": 1984739,
+   "s": 1995019,
    "affiliations": [
     "Isle of Man",
     "Scotland",
@@ -6272,7 +6254,7 @@
    "g": [
     {
      "id": "Jerusalem",
-     "s": 3631556,
+     "s": 3636013,
      "affiliations": [
       "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd",
       "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc"
@@ -6284,7 +6266,7 @@
     },
     {
      "id": "Israel",
-     "s": 37092095,
+     "s": 37265327,
      "affiliations": [
       "\u05de\u05d7\u05d5\u05d6 \u05d7\u05d9\u05e4\u05d4",
       "\u05de\u05d7\u05d5\u05d6 \u05ea\u05dc \u05d0\u05d1\u05d9\u05d1",
@@ -6306,7 +6288,7 @@
    "g": [
     {
      "id": "Italy_Abruzzo",
-     "s": 13506818,
+     "s": 13562626,
      "affiliations": [
       "Abruzzo",
       "Italia"
@@ -6317,7 +6299,7 @@
     },
     {
      "id": "Italy_Aosta Valley",
-     "s": 7425790,
+     "s": 7455126,
      "affiliations": [
       "Italia",
       "Valle d'Aosta/Vall\u00e9e d'Aoste"
@@ -6328,7 +6310,7 @@
     },
     {
      "id": "Italy_Apulia",
-     "s": 62401371,
+     "s": 63294811,
      "affiliations": [
       "Isola della Chianca",
       "Isola della Malva",
@@ -6344,7 +6326,7 @@
     },
     {
      "id": "Italy_Basilicata",
-     "s": 8815001,
+     "s": 8822849,
      "affiliations": [
       "Basilicata",
       "Italia"
@@ -6355,7 +6337,7 @@
     },
     {
      "id": "Italy_Calabria",
-     "s": 18795069,
+     "s": 18806757,
      "affiliations": [
       "Calabria",
       "Isola di Cirella",
@@ -6368,7 +6350,7 @@
     },
     {
      "id": "Italy_Campania",
-     "s": 28623199,
+     "s": 28947767,
      "affiliations": [
       "Campania",
       "Isola Licosa",
@@ -6388,7 +6370,7 @@
      "g": [
       {
        "id": "Italy_Emilia-Romagna_Bologna",
-       "s": 21045210,
+       "s": 21056754,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6399,7 +6381,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Ferrara",
-       "s": 9492627,
+       "s": 9491979,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6410,7 +6392,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Forli-Cesena",
-       "s": 8910064,
+       "s": 8910712,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6421,7 +6403,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Modena",
-       "s": 18569638,
+       "s": 18578158,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6432,7 +6414,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Parma",
-       "s": 13308908,
+       "s": 13307484,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6443,7 +6425,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Piacenza",
-       "s": 8387585,
+       "s": 8394089,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6454,7 +6436,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Ravenna",
-       "s": 8050400,
+       "s": 8051120,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6465,7 +6447,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Reggio Emilia",
-       "s": 10791667,
+       "s": 10811931,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6476,7 +6458,7 @@
       },
       {
        "id": "Italy_Emilia-Romagna_Rimini",
-       "s": 6245195,
+       "s": 6246747,
        "affiliations": [
         "Emilia-Romagna",
         "Italia"
@@ -6492,7 +6474,7 @@
      "g": [
       {
        "id": "Italy_Friuli-Venezia Giulia_Gorizia",
-       "s": 6105846,
+       "s": 6108470,
        "affiliations": [
         "Friuli Venezia Giulia",
         "Italia"
@@ -6503,7 +6485,7 @@
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Pordenone",
-       "s": 15905994,
+       "s": 15912458,
        "affiliations": [
         "Friuli Venezia Giulia",
         "Italia"
@@ -6514,7 +6496,7 @@
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Trieste",
-       "s": 5523794,
+       "s": 5528130,
        "affiliations": [
         "Friuli Venezia Giulia",
         "Italia"
@@ -6525,7 +6507,7 @@
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Udine",
-       "s": 34530419,
+       "s": 34562563,
        "affiliations": [
         "Friuli Venezia Giulia",
         "Italia"
@@ -6538,7 +6520,7 @@
     },
     {
      "id": "Italy_Lazio",
-     "s": 42088431,
+     "s": 42214374,
      "affiliations": [
       "Civitatis Vatican\u00e6",
       "Gavi",
@@ -6555,7 +6537,7 @@
     },
     {
      "id": "Italy_Liguria",
-     "s": 34230100,
+     "s": 34259900,
      "affiliations": [
       "Italia",
       "Liguria"
@@ -6569,7 +6551,7 @@
      "g": [
       {
        "id": "Italy_Lombardy_Bergamo",
-       "s": 12642758,
+       "s": 12719470,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6580,7 +6562,7 @@
       },
       {
        "id": "Italy_Lombardy_Brescia",
-       "s": 19913446,
+       "s": 19968454,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6591,7 +6573,7 @@
       },
       {
        "id": "Italy_Lombardy_Como",
-       "s": 9278539,
+       "s": 9286219,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6602,7 +6584,7 @@
       },
       {
        "id": "Italy_Lombardy_Cremona",
-       "s": 4609374,
+       "s": 4620062,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6613,7 +6595,7 @@
       },
       {
        "id": "Italy_Lombardy_Lecco",
-       "s": 7123171,
+       "s": 7140339,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6624,7 +6606,7 @@
       },
       {
        "id": "Italy_Lombardy_Lodi",
-       "s": 4326110,
+       "s": 4360046,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6635,7 +6617,7 @@
       },
       {
        "id": "Italy_Lombardy_Mantua",
-       "s": 5235813,
+       "s": 5237253,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6646,7 +6628,7 @@
       },
       {
        "id": "Italy_Lombardy_Milan",
-       "s": 21699247,
+       "s": 21754951,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6657,7 +6639,7 @@
       },
       {
        "id": "Italy_Lombardy_Monza and Brianza",
-       "s": 8261492,
+       "s": 8286660,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6668,7 +6650,7 @@
       },
       {
        "id": "Italy_Lombardy_Pavia",
-       "s": 16258496,
+       "s": 16389720,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6679,7 +6661,7 @@
       },
       {
        "id": "Italy_Lombardy_Sondrio",
-       "s": 6665673,
+       "s": 6675441,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6690,7 +6672,7 @@
       },
       {
        "id": "Italy_Lombardy_Varese",
-       "s": 11790344,
+       "s": 12123208,
        "affiliations": [
         "Italia",
         "Lombardia"
@@ -6703,7 +6685,7 @@
     },
     {
      "id": "Italy_Marche",
-     "s": 18453733,
+     "s": 18518749,
      "affiliations": [
       "Italia",
       "Marche"
@@ -6714,7 +6696,7 @@
     },
     {
      "id": "Italy_Molise",
-     "s": 6341083,
+     "s": 6422320,
      "affiliations": [
       "Italia",
       "Molise"
@@ -6728,7 +6710,7 @@
      "g": [
       {
        "id": "Italy_Piemont_Alessandria",
-       "s": 9698336,
+       "s": 9722952,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6739,7 +6721,7 @@
       },
       {
        "id": "Italy_Piemont_Asti",
-       "s": 2784471,
+       "s": 2795319,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6750,7 +6732,7 @@
       },
       {
        "id": "Italy_Piemont_Biella",
-       "s": 2645444,
+       "s": 2646444,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6761,7 +6743,7 @@
       },
       {
        "id": "Italy_Piemont_Cuneo",
-       "s": 21217380,
+       "s": 21213348,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6772,7 +6754,7 @@
       },
       {
        "id": "Italy_Piemont_Novara",
-       "s": 6199015,
+       "s": 6258671,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6783,7 +6765,7 @@
       },
       {
        "id": "Italy_Piemont_Torino",
-       "s": 20873800,
+       "s": 20925872,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6794,7 +6776,7 @@
       },
       {
        "id": "Italy_Piemont_Verbano-Cusio-Ossola",
-       "s": 4691445,
+       "s": 4704221,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6805,7 +6787,7 @@
       },
       {
        "id": "Italy_Piemont_Vercelli",
-       "s": 6029031,
+       "s": 6032351,
        "affiliations": [
         "Italia",
         "Piemonte"
@@ -6818,7 +6800,7 @@
     },
     {
      "id": "Italy_Sardinia",
-     "s": 41768995,
+     "s": 41795699,
      "affiliations": [
       "Isola Tuaredda",
       "Isola de Sa tonnara",
@@ -6839,7 +6821,7 @@
     },
     {
      "id": "Italy_Sicily",
-     "s": 59703871,
+     "s": 59969239,
      "affiliations": [
       "Isola dei Cani",
       "Isola delle Correnti",
@@ -6887,7 +6869,7 @@
     },
     {
      "id": "Italy_Trentino-Alto Adige Sudtirol",
-     "s": 47558581,
+     "s": 47665077,
      "affiliations": [
       "Italia",
       "Trentino-Alto Adige/S\u00fcdtirol"
@@ -6898,7 +6880,7 @@
     },
     {
      "id": "Italy_Tuscany_Grosseto",
-     "s": 18434517,
+     "s": 18504149,
      "affiliations": [
       "Formica Piccola",
       "Formica Grande",
@@ -6915,7 +6897,7 @@
     },
     {
      "id": "Italy_Tuscany_Massa e Carrara",
-     "s": 42206123,
+     "s": 42274947,
      "affiliations": [
       "Cerboli",
       "Isola della Peraiola",
@@ -6933,7 +6915,7 @@
     },
     {
      "id": "Italy_Umbria",
-     "s": 15098562,
+     "s": 15138986,
      "affiliations": [
       "Italia",
       "Umbria"
@@ -6947,7 +6929,7 @@
      "g": [
       {
        "id": "Italy_Veneto_Belluno",
-       "s": 10210907,
+       "s": 10217907,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -6958,7 +6940,7 @@
       },
       {
        "id": "Italy_Veneto_Padova",
-       "s": 23083202,
+       "s": 23107698,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -6969,7 +6951,7 @@
       },
       {
        "id": "Italy_Veneto_Rovigo",
-       "s": 8086845,
+       "s": 8089773,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -6980,7 +6962,7 @@
       },
       {
        "id": "Italy_Veneto_Treviso",
-       "s": 28118512,
+       "s": 28190768,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -6991,7 +6973,7 @@
       },
       {
        "id": "Italy_Veneto_Venezia",
-       "s": 17152460,
+       "s": 17165612,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -7002,7 +6984,7 @@
       },
       {
        "id": "Italy_Veneto_Verona",
-       "s": 22259427,
+       "s": 22269195,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -7013,7 +6995,7 @@
       },
       {
        "id": "Italy_Veneto_Vicenza",
-       "s": 21927877,
+       "s": 22039773,
        "affiliations": [
         "Italia",
         "Veneto"
@@ -7028,7 +7010,7 @@
   },
   {
    "id": "Jamaica",
-   "s": 6363903,
+   "s": 6377351,
    "affiliations": [
     "Jamaica"
    ],
@@ -7044,7 +7026,7 @@
      "g": [
       {
        "id": "Japan_Chubu Region_Aichi_Nagoya",
-       "s": 62876417,
+       "s": 62921305,
        "affiliations": [
         "\u65e5\u672c",
         "\u4e09\u91cd\u770c",
@@ -7056,7 +7038,7 @@
       },
       {
        "id": "Japan_Chubu Region_Aichi_Toyohashi",
-       "s": 19875537,
+       "s": 19900593,
        "affiliations": [
         "\u65e5\u672c",
         "\u611b\u77e5\u770c"
@@ -7067,7 +7049,7 @@
       },
       {
        "id": "Japan_Chubu Region_Fukui",
-       "s": 14790338,
+       "s": 14784410,
        "affiliations": [
         "\u65e5\u672c",
         "\u798f\u4e95\u770c"
@@ -7078,7 +7060,7 @@
       },
       {
        "id": "Japan_Chubu Region_Gifu",
-       "s": 32324567,
+       "s": 32340439,
        "affiliations": [
         "\u65e5\u672c",
         "\u5c90\u961c\u770c"
@@ -7089,7 +7071,7 @@
       },
       {
        "id": "Japan_Chubu Region_Ishikawa",
-       "s": 16788405,
+       "s": 16809653,
        "affiliations": [
         "\u65e5\u672c",
         "\u77f3\u5ddd\u770c"
@@ -7100,7 +7082,7 @@
       },
       {
        "id": "Japan_Chubu Region_Nagano",
-       "s": 39297229,
+       "s": 39285366,
        "affiliations": [
         "\u9577\u91ce\u770c",
         "\u65e5\u672c"
@@ -7111,7 +7093,7 @@
       },
       {
        "id": "Japan_Chubu Region_Niigata",
-       "s": 42775164,
+       "s": 42872036,
        "affiliations": [
         "\u65e5\u672c",
         "\u65b0\u6f5f\u770c",
@@ -7123,7 +7105,7 @@
       },
       {
        "id": "Japan_Chubu Region_Shizuoka",
-       "s": 55487471,
+       "s": 55732399,
        "affiliations": [
         "\u9759\u5ca1\u770c",
         "\u65e5\u672c"
@@ -7134,7 +7116,7 @@
       },
       {
        "id": "Japan_Chubu Region_Toyama",
-       "s": 16703199,
+       "s": 16758183,
        "affiliations": [
         "\u65e5\u672c",
         "\u5bcc\u5c71\u770c",
@@ -7146,7 +7128,7 @@
       },
       {
        "id": "Japan_Chubu Region_Yamanashi",
-       "s": 17696931,
+       "s": 17683840,
        "affiliations": [
         "\u65e5\u672c",
         "\u5c71\u68a8\u770c"
@@ -7162,7 +7144,7 @@
      "g": [
       {
        "id": "Japan_Chugoku Region_Hiroshima",
-       "s": 37955852,
+       "s": 38267620,
        "affiliations": [
         "\u65e5\u672c",
         "\u5e83\u5cf6\u770c"
@@ -7173,7 +7155,7 @@
       },
       {
        "id": "Japan_Chugoku Region_Okayama",
-       "s": 23290392,
+       "s": 23384576,
        "affiliations": [
         "\u65e5\u672c",
         "\u5ca1\u5c71\u770c"
@@ -7184,7 +7166,7 @@
       },
       {
        "id": "Japan_Chugoku Region_Shimane",
-       "s": 15531588,
+       "s": 15668140,
        "affiliations": [
         "\u65e5\u672c",
         "\u5cf6\u6839\u770c"
@@ -7195,7 +7177,7 @@
       },
       {
        "id": "Japan_Chugoku Region_Tottori",
-       "s": 13571478,
+       "s": 13650398,
        "affiliations": [
         "\u9ce5\u53d6\u770c",
         "\u65e5\u672c"
@@ -7206,7 +7188,7 @@
       },
       {
        "id": "Japan_Chugoku Region_Yamaguchi",
-       "s": 18632365,
+       "s": 18664269,
        "affiliations": [
         "\u65e5\u672c",
         "\u5c71\u53e3\u770c"
@@ -7222,7 +7204,7 @@
      "g": [
       {
        "id": "Japan_Hokkaido Region_East",
-       "s": 22692908,
+       "s": 22682548,
        "affiliations": [
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
@@ -7233,7 +7215,7 @@
       },
       {
        "id": "Japan_Hokkaido Region_North",
-       "s": 28620181,
+       "s": 28626653,
        "affiliations": [
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
@@ -7244,7 +7226,7 @@
       },
       {
        "id": "Japan_Hokkaido Region_West",
-       "s": 16543074,
+       "s": 16702290,
        "affiliations": [
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
@@ -7255,7 +7237,7 @@
       },
       {
        "id": "Japan_Hokkaido Region_Sapporo",
-       "s": 40654976,
+       "s": 40778280,
        "affiliations": [
         "\u65e5\u672c",
         "\u5317\u6d77\u9053"
@@ -7271,7 +7253,7 @@
      "g": [
       {
        "id": "Japan_Kanto_Chiba",
-       "s": 54290271,
+       "s": 54466935,
        "affiliations": [
         "\u65e5\u672c",
         "\u5343\u8449\u770c",
@@ -7284,7 +7266,7 @@
       },
       {
        "id": "Japan_Kanto_Gunma",
-       "s": 33008388,
+       "s": 33074252,
        "affiliations": [
         "\u65e5\u672c",
         "\u7fa4\u99ac\u770c"
@@ -7295,7 +7277,7 @@
       },
       {
        "id": "Japan_Kanto_Ibaraki",
-       "s": 39286202,
+       "s": 39377882,
        "affiliations": [
         "\u8328\u57ce\u770c",
         "\u65e5\u672c",
@@ -7308,7 +7290,7 @@
       },
       {
        "id": "Japan_Kanto_Kanagawa",
-       "s": 57896692,
+       "s": 58017836,
        "affiliations": [
         "\u9759\u5ca1\u770c",
         "\u65e5\u672c",
@@ -7322,7 +7304,7 @@
       },
       {
        "id": "Japan_Kanto_Saitama",
-       "s": 59941878,
+       "s": 59997557,
        "affiliations": [
         "\u65e5\u672c",
         "\u57fc\u7389\u770c"
@@ -7333,7 +7315,7 @@
       },
       {
        "id": "Japan_Kanto_Tochigi",
-       "s": 29864800,
+       "s": 29999736,
        "affiliations": [
         "\u65e5\u672c",
         "\u6803\u6728\u770c"
@@ -7344,7 +7326,7 @@
       },
       {
        "id": "Japan_Kanto_Tokyo",
-       "s": 75583882,
+       "s": 75691873,
        "affiliations": [
         "\u9759\u5ca1\u770c",
         "\u65e5\u672c",
@@ -7361,7 +7343,7 @@
      "g": [
       {
        "id": "Japan_Kinki Region_Mie",
-       "s": 23133412,
+       "s": 22988892,
        "affiliations": [
         "\u65e5\u672c",
         "\u4e09\u91cd\u770c",
@@ -7373,7 +7355,7 @@
       },
       {
        "id": "Japan_Kinki Region_Nara",
-       "s": 14637571,
+       "s": 14462870,
        "affiliations": [
         "\u65e5\u672c",
         "\u5948\u826f\u770c",
@@ -7385,7 +7367,7 @@
       },
       {
        "id": "Japan_Kinki Region_Osaka_Osaka",
-       "s": 49198006,
+       "s": 49478677,
        "affiliations": [
         "\u65e5\u672c",
         "\u5175\u5eab\u770c",
@@ -7397,7 +7379,7 @@
       },
       {
        "id": "Japan_Kinki Region_Osaka_West",
-       "s": 35702922,
+       "s": 35718186,
        "affiliations": [
         "\u65e5\u672c",
         "\u5175\u5eab\u770c"
@@ -7408,7 +7390,7 @@
       },
       {
        "id": "Japan_Kinki Region_Wakayama",
-       "s": 11103246,
+       "s": 11127478,
        "affiliations": [
         "\u65e5\u672c",
         "\u548c\u6b4c\u5c71\u770c"
@@ -7424,7 +7406,7 @@
      "g": [
       {
        "id": "Japan_Kyushu Region_Fukuoka",
-       "s": 38990539,
+       "s": 39055243,
        "affiliations": [
         "\u65e5\u672c",
         "\u798f\u5ca1\u770c"
@@ -7435,7 +7417,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Kagoshima",
-       "s": 30263513,
+       "s": 30358950,
        "affiliations": [
         "\u65e5\u672c",
         "\u9e7f\u5150\u5cf6\u770c"
@@ -7446,7 +7428,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Kumamoto",
-       "s": 29258614,
+       "s": 30906334,
        "affiliations": [
         "\u65e5\u672c",
         "\u718a\u672c\u770c"
@@ -7457,7 +7439,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Miyazaki",
-       "s": 17436443,
+       "s": 17499970,
        "affiliations": [
         "\u65e5\u672c",
         "\u5bae\u5d0e\u770c"
@@ -7468,7 +7450,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Nagasaki",
-       "s": 15943229,
+       "s": 15989621,
        "affiliations": [
         "\u9577\u5d0e\u770c",
         "\u65e5\u672c"
@@ -7479,7 +7461,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Oita",
-       "s": 18372032,
+       "s": 18986192,
        "affiliations": [
         "\u65e5\u672c",
         "\u5927\u5206\u770c"
@@ -7490,7 +7472,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Okinawa",
-       "s": 13882546,
+       "s": 13935378,
        "affiliations": [
         "\u65e5\u672c",
         "\u6c96\u7e04\u770c"
@@ -7501,7 +7483,7 @@
       },
       {
        "id": "Japan_Kyushu Region_Saga",
-       "s": 13230062,
+       "s": 13237094,
        "affiliations": [
         "\u65e5\u672c",
         "\u4f50\u8cc0\u770c"
@@ -7517,7 +7499,7 @@
      "g": [
       {
        "id": "Japan_Shikoku Region_Ehime",
-       "s": 23477285,
+       "s": 23498997,
        "affiliations": [
         "\u65e5\u672c",
         "\u611b\u5a9b\u770c"
@@ -7528,7 +7510,7 @@
       },
       {
        "id": "Japan_Shikoku Region_Kagawa",
-       "s": 9836775,
+       "s": 10166480,
        "affiliations": [
         "\u9999\u5ddd\u770c",
         "\u65e5\u672c"
@@ -7539,7 +7521,7 @@
       },
       {
        "id": "Japan_Shikoku Region_Kochi",
-       "s": 12715632,
+       "s": 12753240,
        "affiliations": [
         "\u9ad8\u77e5\u770c",
         "\u65e5\u672c"
@@ -7550,7 +7532,7 @@
       },
       {
        "id": "Japan_Shikoku Region_Kyoto",
-       "s": 42061236,
+       "s": 42158198,
        "affiliations": [
         "\u65e5\u672c",
         "\u4eac\u90fd\u5e9c",
@@ -7562,7 +7544,7 @@
       },
       {
        "id": "Japan_Shikoku Region_Tokushima",
-       "s": 13540127,
+       "s": 13538687,
        "affiliations": [
         "\u65e5\u672c",
         "\u5fb3\u5cf6\u770c"
@@ -7578,7 +7560,7 @@
      "g": [
       {
        "id": "Japan_Tohoku_Akita",
-       "s": 23070635,
+       "s": 23059571,
        "affiliations": [
         "\u65e5\u672c",
         "\u79cb\u7530\u770c"
@@ -7589,7 +7571,7 @@
       },
       {
        "id": "Japan_Tohoku_Aomori",
-       "s": 21605274,
+       "s": 21601850,
        "affiliations": [
         "\u9752\u68ee\u770c",
         "\u65e5\u672c"
@@ -7600,7 +7582,7 @@
       },
       {
        "id": "Japan_Tohoku_Fukushima",
-       "s": 45975889,
+       "s": 46020491,
        "affiliations": [
         "\u65e5\u672c",
         "\u798f\u5cf6\u770c"
@@ -7611,7 +7593,7 @@
       },
       {
        "id": "Japan_Tohoku_Iwate",
-       "s": 28484396,
+       "s": 28501436,
        "affiliations": [
         "\u65e5\u672c",
         "\u5ca9\u624b\u770c"
@@ -7622,7 +7604,7 @@
       },
       {
        "id": "Japan_Tohoku_Miyagi",
-       "s": 26562959,
+       "s": 26644097,
        "affiliations": [
         "\u65e5\u672c",
         "\u5bae\u57ce\u770c",
@@ -7634,7 +7616,7 @@
       },
       {
        "id": "Japan_Tohoku_Yamagata",
-       "s": 21827860,
+       "s": 21915740,
        "affiliations": [
         "\u65e5\u672c",
         "\u5c71\u5f62\u770c"
@@ -7649,7 +7631,7 @@
   },
   {
    "id": "Jersey",
-   "s": 1366129,
+   "s": 1367361,
    "affiliations": [
     "France",
     "Guernsey",
@@ -7668,7 +7650,7 @@
   },
   {
    "id": "Jordan",
-   "s": 20276685,
+   "s": 20283757,
    "affiliations": [
     "Ajloun",
     "Amman",
@@ -7693,7 +7675,7 @@
    "g": [
     {
      "id": "Kazakhstan_North",
-     "s": 32625990,
+     "s": 32707675,
      "affiliations": [
       "\u0410\u0441\u0442\u0430\u043d\u0430",
       "\u0421\u0435\u0432\u0435\u0440\u043e-\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
@@ -7709,7 +7691,7 @@
     },
     {
      "id": "Kazakhstan_South",
-     "s": 38846703,
+     "s": 39027945,
      "affiliations": [
       "\u0410\u043b\u043c\u0430\u0442\u044b",
       "\u0410\u0442\u044b\u0440\u0430\u0443\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
@@ -7731,7 +7713,7 @@
   },
   {
    "id": "Kenya",
-   "s": 20810705,
+   "s": 21035273,
    "affiliations": [
     "Baringo",
     "Bungoma",
@@ -7788,7 +7770,7 @@
   },
   {
    "id": "Kingdom of Lesotho",
-   "s": 33355906,
+   "s": 34233594,
    "affiliations": [
     "Lesotho"
    ],
@@ -7798,7 +7780,7 @@
   },
   {
    "id": "Kiribati",
-   "s": 918014,
+   "s": 919558,
    "affiliations": [
     "Kiribati"
    ],
@@ -7808,7 +7790,7 @@
   },
   {
    "id": "Kuwait",
-   "s": 4915894,
+   "s": 4919750,
    "affiliations": [
     "\u062d\u0648\u0644\u064a",
     "\u0645\u0628\u0627\u0631\u0643 \u0627\u0644\u0643\u0628\u064a\u0631\u200e",
@@ -7824,7 +7806,7 @@
   },
   {
    "id": "Kyrgyzstan",
-   "s": 23961956,
+   "s": 24057484,
    "affiliations": [
     "\u041d\u0430\u0440\u044b\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
     "\u0422\u0430\u043b\u0430\u0441\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
@@ -7845,7 +7827,7 @@
   },
   {
    "id": "Laos",
-   "s": 9265969,
+   "s": 9366089,
    "affiliations": [
     "\u0e84\u0ecd\u0eb2\u0ea1\u0ec8\u0ea7\u0e99",
     "\u0e88\u0eb3\u0e9b\u0eb2\u0eaa\u0eb1\u0e81",
@@ -7872,7 +7854,7 @@
   },
   {
    "id": "Latvia",
-   "s": 52156900,
+   "s": 52403068,
    "affiliations": [
     "Latgale",
     "Latvija",
@@ -7886,7 +7868,7 @@
   },
   {
    "id": "Lebanon",
-   "s": 13000581,
+   "s": 13013981,
    "affiliations": [
     "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0644\u0628\u0646\u0627\u0646\u064a\u0629",
     "\u0642\u0636\u0627\u0621 \u0632\u063a\u0631\u062a\u0627",
@@ -7921,7 +7903,7 @@
   },
   {
    "id": "Liberia",
-   "s": 14573176,
+   "s": 14585944,
    "affiliations": [
     "Bomi County",
     "Bong County",
@@ -7946,7 +7928,7 @@
   },
   {
    "id": "Libya",
-   "s": 18594893,
+   "s": 18661661,
    "affiliations": [
     "Libya \u2d4d\u2d49\u2d31\u2d62\u2d30 \u0644\u064a\u0628\u064a\u0627",
     "\u0633\u0631\u062a",
@@ -7978,7 +7960,7 @@
   },
   {
    "id": "Liechtenstein",
-   "s": 1079727,
+   "s": 1084183,
    "affiliations": [
     "Liechtenstein"
    ],
@@ -7991,7 +7973,7 @@
    "g": [
     {
      "id": "Lithuania_East",
-     "s": 42212170,
+     "s": 42337802,
      "affiliations": [
       "Alytaus apskritis",
       "Kauno apskritis",
@@ -8005,7 +7987,7 @@
     },
     {
      "id": "Lithuania_West",
-     "s": 41851735,
+     "s": 41999319,
      "affiliations": [
       "Klaip\u0117dos apskritis",
       "Lietuva",
@@ -8023,7 +8005,7 @@
   },
   {
    "id": "Luxembourg",
-   "s": 13788850,
+   "s": 13859018,
    "affiliations": [
     "L\u00ebtzebuerg"
    ],
@@ -8033,7 +8015,7 @@
   },
   {
    "id": "Macedonia",
-   "s": 15952282,
+   "s": 15934658,
    "affiliations": [
     "\u0418\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d",
     "\u041f\u043e\u043b\u043e\u0448\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d",
@@ -8051,7 +8033,7 @@
   },
   {
    "id": "Madagascar",
-   "s": 32385093,
+   "s": 32432437,
    "affiliations": [
     "Madagasikara",
     "Region de Anosy",
@@ -8065,7 +8047,7 @@
   },
   {
    "id": "Malawi",
-   "s": 15946451,
+   "s": 16285746,
    "affiliations": [
     "Border Malawi - Mozambique",
     "Central",
@@ -8081,7 +8063,7 @@
   },
   {
    "id": "Malaysia",
-   "s": 56971771,
+   "s": 57312971,
    "affiliations": [
     "Terengganu / \u062a\u0631\u06a0\u06ac\u0627\u0646\u0648",
     "Johor",
@@ -8127,7 +8109,7 @@
   },
   {
    "id": "Maldives",
-   "s": 1830186,
+   "s": 1833082,
    "affiliations": [
     "Mathi-Dhekunu Province",
     "Mathi-Uthuru Province",
@@ -8146,7 +8128,7 @@
   },
   {
    "id": "Mali",
-   "s": 39025670,
+   "s": 39133563,
    "affiliations": [
     "District de Bamako",
     "Gao",
@@ -8165,7 +8147,7 @@
   },
   {
    "id": "Malta",
-   "s": 3764479,
+   "s": 3771751,
    "affiliations": [
     "Comino",
     "Cominotto",
@@ -8182,7 +8164,7 @@
   },
   {
    "id": "Marshall Islands",
-   "s": 747318,
+   "s": 747038,
    "affiliations": [
     "Aolep\u0101n Aor\u014dkin M\u0327aje\u013c"
    ],
@@ -8192,7 +8174,7 @@
   },
   {
    "id": "Mauritania",
-   "s": 5609467,
+   "s": 5752699,
    "affiliations": [
     "\u0646\u0648\u0627\u0643\u0634\u0648\u0637",
     "Mauritanie \u0645\u0648\u0631\u064a\u062a\u0627\u0646\u064a\u0627",
@@ -8214,7 +8196,7 @@
   },
   {
    "id": "Mauritius",
-   "s": 2280917,
+   "s": 2451102,
    "affiliations": [
     "Black River",
     "Mauritius",
@@ -8252,7 +8234,7 @@
    "g": [
     {
      "id": "Mexico_California",
-     "s": 18282958,
+     "s": 18392967,
      "affiliations": [
       "Baja California",
       "Baja California Sur",
@@ -8268,7 +8250,7 @@
     },
     {
      "id": "Mexico_Central_East",
-     "s": 42599057,
+     "s": 42990945,
      "affiliations": [
       "Coahuila de Zaragoza",
       "Estados Unidos Mexicanos",
@@ -8282,7 +8264,7 @@
     },
     {
      "id": "Mexico_Central_West",
-     "s": 54556179,
+     "s": 54718707,
      "affiliations": [
       "Aguascalientes",
       "Colima",
@@ -8299,7 +8281,7 @@
     },
     {
      "id": "Mexico_East",
-     "s": 39326112,
+     "s": 39686057,
      "affiliations": [
       "Campeche",
       "Chiapas",
@@ -8317,7 +8299,7 @@
     },
     {
      "id": "Mexico_Mexico",
-     "s": 73374355,
+     "s": 73592712,
      "affiliations": [
       "Distrito Federal",
       "Estados Unidos Mexicanos",
@@ -8334,7 +8316,7 @@
     },
     {
      "id": "Mexico_Chihuahua",
-     "s": 33042743,
+     "s": 33176608,
      "affiliations": [
       "Chihuahua",
       "Coahuila de Zaragoza",
@@ -8349,7 +8331,7 @@
     },
     {
      "id": "Mexico_Sonora",
-     "s": 28364652,
+     "s": 28406464,
      "affiliations": [
       "Chihuahua",
       "Durango",
@@ -8363,7 +8345,7 @@
     },
     {
      "id": "Mexico_South",
-     "s": 48234526,
+     "s": 48655879,
      "affiliations": [
       "Estados Unidos Mexicanos",
       "Guerrero",
@@ -8381,7 +8363,7 @@
   },
   {
    "id": "Moldova",
-   "s": 29025644,
+   "s": 29217692,
    "affiliations": [
     "G\u0103g\u0103uzia - Gagauz Yeri - \u0413\u0430\u0433\u0430\u0443\u0437\u0438\u044f",
     "Moldova",
@@ -8393,7 +8375,7 @@
   },
   {
    "id": "Monaco",
-   "s": 215648,
+   "s": 216272,
    "affiliations": [
     "France",
     "Monaco"
@@ -8404,7 +8386,7 @@
   },
   {
    "id": "Mongolia",
-   "s": 13242914,
+   "s": 13339106,
    "affiliations": [
     "Border Darkhan-Uul - Selenge",
     "\u0423\u0432\u0441 \u0430\u0439\u043c\u0430\u0433",
@@ -8439,7 +8421,7 @@
   },
   {
    "id": "Montenegro",
-   "s": 12995134,
+   "s": 13192846,
    "affiliations": [
     "Crna Gora"
    ],
@@ -8452,7 +8434,7 @@
    "g": [
     {
      "id": "Morocco_Western Sahara",
-     "s": 6171963,
+     "s": 6289839,
      "affiliations": [
       "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628",
       "Guelmim-Oued Noun \u2d33\u2d4d\u2d4e\u2d49\u2d4e-\u2d61\u2d30\u2d37 \u2d4f\u2d53\u2d4f \u06af\u0644\u0645\u064a\u0645 - \u0648\u0627\u062f \u0646\u0648\u0646",
@@ -8467,7 +8449,7 @@
     },
     {
      "id": "Morocco_Southern",
-     "s": 31733289,
+     "s": 32045653,
      "affiliations": [
       "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629",
       "Dr\u00e2a-Tafilalet \u2d37\u2d30\u2d54\u2d44\u2d30-\u2d5c\u2d30\u2d3c\u2d49\u2d4d\u2d30\u2d4d\u2d5c \u062f\u0631\u0639\u0629-\u062a\u0627\u0641\u064a\u0644\u0627\u0644\u062a",
@@ -8483,7 +8465,7 @@
     },
     {
      "id": "Morocco_Doukkala-Abda",
-     "s": 23184033,
+     "s": 23704883,
      "affiliations": [
       "B\u00e9ni Mellal-Kh\u00e9nifra \u2d30\u2d62\u2d5c \u2d4e\u2d4d\u2d4d\u2d30\u2d4d-\u2d45\u2d4f\u2d49\u2d3c\u2d55\u2d30 \u0628\u0646\u064a \u0645\u0644\u0627\u0644-\u062e\u0646\u064a\u0641\u0631\u0629",
       "Casablanca-Settat \u2d5c\u2d49\u2d33\u2d4e\u2d49 \u2d5c\u2d53\u2d4e\u2d4d\u2d49\u2d4d\u2d5c-\u2d59\u2d5f\u2d5f\u2d30\u2d5c \u0627\u0644\u062f\u0627\u0631 \u0627\u0644\u0628\u064a\u0636\u0627\u0621-\u0633\u0637\u0627\u062a",
@@ -8496,7 +8478,7 @@
     },
     {
      "id": "Morocco_Rabat-Sale-Zemmour-Zaer",
-     "s": 17597979,
+     "s": 17636515,
      "affiliations": [
       "F\u00e8s-Mekn\u00e8s \u2d3c\u2d30\u2d59-\u2d4e\u2d3d\u2d4f\u2d30\u2d59 \u0641\u0627\u0633-\u0645\u0643\u0646\u0627\u0633",
       "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
@@ -8512,7 +8494,7 @@
   },
   {
    "id": "Mozambique",
-   "s": 55164565,
+   "s": 59416746,
    "affiliations": [
     "Cabo Delgado",
     "Gaza",
@@ -8532,7 +8514,7 @@
   },
   {
    "id": "Myanmar",
-   "s": 41547366,
+   "s": 41830138,
    "affiliations": [
     "Ayeyarwady",
     "Bago Region",
@@ -8557,7 +8539,7 @@
   },
   {
    "id": "Namibia",
-   "s": 12107237,
+   "s": 12226693,
    "affiliations": [
     "Arandis",
     "Aranos7",
@@ -8589,7 +8571,7 @@
   },
   {
    "id": "Nauru",
-   "s": 262456,
+   "s": 263216,
    "affiliations": [
     "Naoero"
    ],
@@ -8602,7 +8584,7 @@
    "g": [
     {
      "id": "Nepal_West",
-     "s": 35554410,
+     "s": 36254962,
      "affiliations": [
       "\u092e\u0927\u094d\u092f-\u092a\u0936\u094d\u091a\u093f\u092e\u093e\u091e\u094d\u091a\u0932 \u0935\u093f\u0915\u093e\u0938 \u0915\u094d\u0937\u0947\u0924\u094d\u0930",
       "\u0928\u0947\u092a\u093e\u0932",
@@ -8615,7 +8597,7 @@
     },
     {
      "id": "Nepal_Kathmandu",
-     "s": 24263597,
+     "s": 24325085,
      "affiliations": [
       "\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"
@@ -8626,7 +8608,7 @@
     },
     {
      "id": "Nepal_Madhyamanchal",
-     "s": 21750627,
+     "s": 21765323,
      "affiliations": [
       "\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"
@@ -8637,7 +8619,7 @@
     },
     {
      "id": "Nepal_Purwanchal",
-     "s": 10329972,
+     "s": 10345804,
      "affiliations": [
       "\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"
@@ -8650,7 +8632,7 @@
   },
   {
    "id": "Nicaragua",
-   "s": 16459880,
+   "s": 16571905,
    "affiliations": [
     "Boaco",
     "Carazo",
@@ -8678,7 +8660,7 @@
   },
   {
    "id": "Niger",
-   "s": 16380115,
+   "s": 16575483,
    "affiliations": [
     "Agadez",
     "Dosso",
@@ -8699,7 +8681,7 @@
    "g": [
     {
      "id": "Nigeria_South",
-     "s": 47769004,
+     "s": 48397176,
      "affiliations": [
       "Abia",
       "Adamawa",
@@ -8737,7 +8719,7 @@
     },
     {
      "id": "Nigeria_North",
-     "s": 31407654,
+     "s": 31473581,
      "affiliations": [
       "Bauchi",
       "Borno",
@@ -8770,7 +8752,7 @@
   },
   {
    "id": "North Korea",
-   "s": 17810979,
+   "s": 17823867,
    "affiliations": [
     "\uac15\uc6d0\ub3c4",
     "\ub7c9\uac15\ub3c4",
@@ -8794,7 +8776,7 @@
    "g": [
     {
      "id": "Norway_Northern",
-     "s": 39276177,
+     "s": 39404617,
      "affiliations": [
       "Finnmark",
       "Norge",
@@ -8806,7 +8788,7 @@
     },
     {
      "id": "Norway_Hordaland",
-     "s": 38232738,
+     "s": 39264778,
      "affiliations": [
       "Hordaland",
       "Norge"
@@ -8817,7 +8799,7 @@
     },
     {
      "id": "Norway_Nordland",
-     "s": 27206147,
+     "s": 27230235,
      "affiliations": [
       "Nordland",
       "Norge",
@@ -8829,7 +8811,7 @@
     },
     {
      "id": "Norway_Svalbard",
-     "s": 1186062,
+     "s": 1188846,
      "affiliations": [
       "Norge",
       "Svalbard"
@@ -8840,7 +8822,7 @@
     },
     {
      "id": "Norway_Oppland",
-     "s": 32124757,
+     "s": 32181346,
      "affiliations": [
       "Norge",
       "Oppland"
@@ -8851,7 +8833,7 @@
     },
     {
      "id": "Norway_Rogaland",
-     "s": 18789877,
+     "s": 18797109,
      "affiliations": [
       "Norge",
       "Rogaland"
@@ -8862,7 +8844,7 @@
     },
     {
      "id": "Norway_Hedmark",
-     "s": 37003407,
+     "s": 37062860,
      "affiliations": [
       "Hedmark",
       "Norge"
@@ -8881,7 +8863,7 @@
     },
     {
      "id": "Norway_North Trondelag",
-     "s": 32257815,
+     "s": 32274623,
      "affiliations": [
       "Nord-Tr\u00f8ndelag",
       "Norge",
@@ -8893,7 +8875,7 @@
     },
     {
      "id": "Norway_South Trondelag",
-     "s": 48520945,
+     "s": 48528041,
      "affiliations": [
       "Norge",
       "S\u00f8r-Tr\u00f8ndelag"
@@ -8904,7 +8886,7 @@
     },
     {
      "id": "Norway_Southern",
-     "s": 54149495,
+     "s": 54691952,
      "affiliations": [
       "Aust-Agder",
       "\u00d8stfold",
@@ -8919,7 +8901,7 @@
     },
     {
      "id": "Norway_Western",
-     "s": 47367485,
+     "s": 47873405,
      "affiliations": [
       "M\u00f8re og Romsdal",
       "Norge",
@@ -8931,7 +8913,7 @@
     },
     {
      "id": "Norway_Central",
-     "s": 50883409,
+     "s": 51007602,
      "affiliations": [
       "Akershus",
       "Buskerud",
@@ -8957,7 +8939,7 @@
   },
   {
    "id": "Oman",
-   "s": 13810661,
+   "s": 13814861,
    "affiliations": [
     "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0638\u0627\u0647\u0631\u0629",
     "\u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u062f\u0627\u062e\u0644\u064a\u0629",
@@ -8977,7 +8959,7 @@
   },
   {
    "id": "Pakistan",
-   "s": 51038063,
+   "s": 51507023,
    "affiliations": [
     "\u0633\u0646\u068c",
     "\u0622\u0632\u0627\u062f \u062c\u0645\u0648\u06ba \u0648 \u06a9\u0634\u0645\u06cc\u0631",
@@ -8995,7 +8977,7 @@
   },
   {
    "id": "Palau",
-   "s": 314322,
+   "s": 314386,
    "affiliations": [
     "Belau"
    ],
@@ -9005,7 +8987,7 @@
   },
   {
    "id": "Panama",
-   "s": 11591412,
+   "s": 11585300,
    "affiliations": [
     "Bocas del Toro",
     "Chiriqu\u00ed",
@@ -9032,7 +9014,7 @@
   },
   {
    "id": "Papua New Guinea",
-   "s": 6137976,
+   "s": 6224024,
    "affiliations": [
     "Border Central-NCD",
     "Bougainville",
@@ -9065,7 +9047,7 @@
   },
   {
    "id": "Paraguay",
-   "s": 27437774,
+   "s": 27512937,
    "affiliations": [
     "Alto Paraguay",
     "Alto Paran\u00e1",
@@ -9098,7 +9080,7 @@
    "g": [
     {
      "id": "China_Anhui",
-     "s": 10480531,
+     "s": 10618385,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5b89\u5fbd\u7701"
@@ -9109,7 +9091,7 @@
     },
     {
      "id": "China_Chongqing",
-     "s": 4494647,
+     "s": 4528705,
      "affiliations": [
       "\u91cd\u5e86\u5e02",
       "\u4e2d\u56fd"
@@ -9120,7 +9102,7 @@
     },
     {
      "id": "China_Fujian",
-     "s": 9417042,
+     "s": 9445658,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u798f\u5efa\u7701"
@@ -9131,7 +9113,7 @@
     },
     {
      "id": "China_Gansu",
-     "s": 7341845,
+     "s": 7702621,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u7518\u8083\u7701"
@@ -9142,7 +9124,7 @@
     },
     {
      "id": "China_Guangdong",
-     "s": 51565597,
+     "s": 51784965,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5e7f\u4e1c\u7701",
@@ -9154,7 +9136,7 @@
     },
     {
      "id": "China_Guangxi",
-     "s": 7235196,
+     "s": 7266654,
      "affiliations": [
       "\u5e7f\u897f\u58ee\u65cf\u81ea\u6cbb\u533a",
       "\u4e2d\u56fd"
@@ -9165,7 +9147,7 @@
     },
     {
      "id": "China_Guizhou",
-     "s": 3952060,
+     "s": 3980012,
      "affiliations": [
       "\u8d35\u5dde\u7701",
       "\u4e2d\u56fd"
@@ -9176,7 +9158,7 @@
     },
     {
      "id": "China_Hebei",
-     "s": 25206811,
+     "s": 25523763,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5317\u4eac\u5e02",
@@ -9189,7 +9171,7 @@
     },
     {
      "id": "China_Heilongjiang",
-     "s": 9230892,
+     "s": 9339732,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u9ed1\u9f99\u6c5f\u7701"
@@ -9200,7 +9182,7 @@
     },
     {
      "id": "China_Henan",
-     "s": 10645794,
+     "s": 10805986,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u6cb3\u5357\u7701"
@@ -9211,7 +9193,7 @@
     },
     {
      "id": "China_Hubei",
-     "s": 9577981,
+     "s": 9598333,
      "affiliations": [
       "Border Henan - Hubei",
       "\u4e2d\u56fd",
@@ -9223,7 +9205,7 @@
     },
     {
      "id": "China_Hunan",
-     "s": 8620548,
+     "s": 8668596,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u6e56\u5357\u7701"
@@ -9234,7 +9216,7 @@
     },
     {
      "id": "China_Inner Mongolia",
-     "s": 13630965,
+     "s": 13729789,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5185\u8499\u53e4\u81ea\u6cbb\u533a / Inner Mongolia"
@@ -9245,7 +9227,7 @@
     },
     {
      "id": "China_Jiangsu",
-     "s": 31265206,
+     "s": 31664202,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u6c5f\u82cf\u7701",
@@ -9257,7 +9239,7 @@
     },
     {
      "id": "China_Jiangxi",
-     "s": 9451312,
+     "s": 9505200,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u6c5f\u897f\u7701"
@@ -9268,7 +9250,7 @@
     },
     {
      "id": "China_Jilin",
-     "s": 9754775,
+     "s": 10000783,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5409\u6797\u7701"
@@ -9279,7 +9261,7 @@
     },
     {
      "id": "China_Liaoning",
-     "s": 10760376,
+     "s": 10817672,
      "affiliations": [
       "\u8fbd\u5b81\u7701",
       "\u4e2d\u56fd"
@@ -9290,7 +9272,7 @@
     },
     {
      "id": "China_Ningxia Hui",
-     "s": 2698758,
+     "s": 2706494,
      "affiliations": [
       "\u5b81\u590f\u56de\u65cf\u81ea\u6cbb\u533a",
       "\u4e2d\u56fd"
@@ -9301,7 +9283,7 @@
     },
     {
      "id": "China_Qinghai",
-     "s": 6153171,
+     "s": 6153131,
      "affiliations": [
       "\u9752\u6d77\u7701",
       "\u4e2d\u56fd"
@@ -9312,7 +9294,7 @@
     },
     {
      "id": "China_Shaanxi",
-     "s": 10428666,
+     "s": 10503530,
      "affiliations": [
       "\u9655\u897f\u7701",
       "\u4e2d\u56fd"
@@ -9323,7 +9305,7 @@
     },
     {
      "id": "China_Shandong",
-     "s": 20146726,
+     "s": 20321854,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5c71\u4e1c\u7701"
@@ -9334,7 +9316,7 @@
     },
     {
      "id": "China_Shanghai",
-     "s": 11473485,
+     "s": 11833903,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u4e0a\u6d77\u5e02",
@@ -9346,7 +9328,7 @@
     },
     {
      "id": "China_Shanxi",
-     "s": 5605680,
+     "s": 5669496,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u5c71\u897f\u7701"
@@ -9357,7 +9339,7 @@
     },
     {
      "id": "China_Sichuan",
-     "s": 13365014,
+     "s": 13504342,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u56db\u5ddd\u7701"
@@ -9368,7 +9350,7 @@
     },
     {
      "id": "China_Tibet Autonomous Region",
-     "s": 12242753,
+     "s": 12338694,
      "affiliations": [
       "\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)"
@@ -9379,7 +9361,7 @@
     },
     {
      "id": "China_Xinjiang",
-     "s": 13014356,
+     "s": 13083419,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u65b0\u7586\u7ef4\u543e\u5c14\u81ea\u6cbb\u533a"
@@ -9390,7 +9372,7 @@
     },
     {
      "id": "China_Yunnan",
-     "s": 13764047,
+     "s": 14041726,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u4e91\u5357\u7701"
@@ -9401,7 +9383,7 @@
     },
     {
      "id": "China_Zhejiang",
-     "s": 19941190,
+     "s": 20311856,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u6d59\u6c5f\u7701"
@@ -9417,7 +9399,7 @@
    "g": [
     {
      "id": "Taiwan_North",
-     "s": 40119020,
+     "s": 40466887,
      "affiliations": [
       "\u4e2d\u56fd",
       "\u65b0\u5317\u5e02",
@@ -9434,7 +9416,7 @@
     },
     {
      "id": "Taiwan_South",
-     "s": 44167794,
+     "s": 44396059,
      "affiliations": [
       "\u9ad8\u96c4\u5e02",
       "\u53f0\u5357\u5e02",
@@ -9452,7 +9434,7 @@
    "g": [
     {
      "id": "Peru_North",
-     "s": 31491006,
+     "s": 31940838,
      "affiliations": [
       "Amazonas",
       "Ancash",
@@ -9474,7 +9456,7 @@
     },
     {
      "id": "Peru_Lima",
-     "s": 28803100,
+     "s": 29200204,
      "affiliations": [
       "Callao",
       "Huancavelica",
@@ -9489,7 +9471,7 @@
     },
     {
      "id": "Peru_South",
-     "s": 27410361,
+     "s": 27913177,
      "affiliations": [
       "Apur\u00edmac",
       "Arequipa",
@@ -9512,7 +9494,7 @@
    "g": [
     {
      "id": "Philippines_Mindanao",
-     "s": 26759428,
+     "s": 26903868,
      "affiliations": [
       "Agusan Del Sur",
       "Agusan del Norte",
@@ -9553,7 +9535,7 @@
     },
     {
      "id": "Philippines_Visayas",
-     "s": 38061438,
+     "s": 38062502,
      "affiliations": [
       "Aklan",
       "Bohol",
@@ -9584,7 +9566,7 @@
     },
     {
      "id": "Philippines_Luzon_South",
-     "s": 6635145,
+     "s": 6633217,
      "affiliations": [
       "Antique",
       "Ban Than (Zhongzhou) Reef",
@@ -9607,7 +9589,7 @@
     },
     {
      "id": "Philippines_Luzon_Manila",
-     "s": 53625537,
+     "s": 54927553,
      "affiliations": [
       "Catanduanes",
       "Cavite",
@@ -9629,7 +9611,7 @@
     },
     {
      "id": "Philippines_Luzon_North",
-     "s": 34626238,
+     "s": 34653886,
      "affiliations": [
       "Abra",
       "Cavite",
@@ -9667,7 +9649,7 @@
   },
   {
    "id": "Pitcairn Islands",
-   "s": 57989,
+   "s": 57981,
    "affiliations": [
     "Pitcairn Islands"
    ],
@@ -9680,7 +9662,7 @@
    "g": [
     {
      "id": "Poland_West Pomeranian Voivodeship",
-     "s": 45805562,
+     "s": 46001906,
      "affiliations": [
       "Polska",
       "Territorial waters of Bornholm",
@@ -9692,7 +9674,7 @@
     },
     {
      "id": "Poland_Pomeranian Voivodeship",
-     "s": 44882427,
+     "s": 44972703,
      "affiliations": [
       "Polska",
       "Territorial waters of Bornholm",
@@ -9704,7 +9686,7 @@
     },
     {
      "id": "Poland_Podlaskie Voivodeship",
-     "s": 25465062,
+     "s": 25536118,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo podlaskie"
@@ -9715,7 +9697,7 @@
     },
     {
      "id": "Poland_Masovian Voivodeship",
-     "s": 86406315,
+     "s": 86989228,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo mazowieckie"
@@ -9726,7 +9708,7 @@
     },
     {
      "id": "Poland_Lubusz Voivodeship",
-     "s": 26120396,
+     "s": 26224340,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo lubuskie"
@@ -9737,7 +9719,7 @@
     },
     {
      "id": "Poland_Lublin Voivodeship",
-     "s": 51946435,
+     "s": 52097147,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo lubelskie"
@@ -9748,7 +9730,7 @@
     },
     {
      "id": "Poland_Lower Silesian Voivodeship",
-     "s": 68708659,
+     "s": 69769492,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo dolno\u015bl\u0105skie"
@@ -9759,7 +9741,7 @@
     },
     {
      "id": "Poland_Warmian-Masurian Voivodeship",
-     "s": 35548267,
+     "s": 35690891,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo warmi\u0144sko-mazurskie"
@@ -9770,7 +9752,7 @@
     },
     {
      "id": "Poland_Lodz Voivodeship",
-     "s": 42760231,
+     "s": 43240760,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo \u0142\u00f3dzkie"
@@ -9781,7 +9763,7 @@
     },
     {
      "id": "Poland_Subcarpathian Voivodeship",
-     "s": 57802031,
+     "s": 59102287,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo podkarpackie"
@@ -9792,7 +9774,7 @@
     },
     {
      "id": "Poland_Lesser Poland Voivodeship",
-     "s": 72840108,
+     "s": 72987965,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo ma\u0142opolskie"
@@ -9803,7 +9785,7 @@
     },
     {
      "id": "Poland_Silesian Voivodeship",
-     "s": 83180435,
+     "s": 83384323,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo \u015bl\u0105skie"
@@ -9814,7 +9796,7 @@
     },
     {
      "id": "Poland_Kuyavian-Pomeranian Voivodeship",
-     "s": 33820647,
+     "s": 34054027,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo kujawsko-pomorskie"
@@ -9825,7 +9807,7 @@
     },
     {
      "id": "Poland_Greater Poland Voivodeship",
-     "s": 56456034,
+     "s": 56834754,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo wielkopolskie"
@@ -9836,7 +9818,7 @@
     },
     {
      "id": "Poland_Opole Voivodeship",
-     "s": 22163600,
+     "s": 22274982,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo opolskie"
@@ -9847,7 +9829,7 @@
     },
     {
      "id": "Poland_Swietokrzyskie Voivodeship",
-     "s": 26607395,
+     "s": 26847404,
      "affiliations": [
       "Polska",
       "wojew\u00f3dztwo \u015bwi\u0119tokrzyskie"
@@ -9863,7 +9845,7 @@
    "g": [
     {
      "id": "Portugal_Porto",
-     "s": 44612561,
+     "s": 44857417,
      "affiliations": [
       "Centro",
       "Norte",
@@ -9875,7 +9857,7 @@
     },
     {
      "id": "Portugal_South",
-     "s": 47715612,
+     "s": 47978340,
      "affiliations": [
       "Centro",
       "Alentejo",
@@ -9889,7 +9871,7 @@
     },
     {
      "id": "Portugal_Islands",
-     "s": 8104100,
+     "s": 8114972,
      "affiliations": [
       "Ilh\u00e9u dos Rosais",
       "Ilh\u00e9us dos Rosais",
@@ -9931,7 +9913,7 @@
     },
     {
      "id": "Portugal_Viseu",
-     "s": 35210556,
+     "s": 35362820,
      "affiliations": [
       "Centro",
       "Norte",
@@ -9945,7 +9927,7 @@
   },
   {
    "id": "Qatar",
-   "s": 5849845,
+   "s": 5886621,
    "affiliations": [
     "Ad Dawhah",
     "Al Ghuwariyah",
@@ -9965,7 +9947,7 @@
   },
   {
    "id": "Republic of Kosovo",
-   "s": 9130327,
+   "s": 9132519,
    "affiliations": [
     "Republika e Kosov\u00ebs"
    ],
@@ -9978,7 +9960,7 @@
    "g": [
     {
      "id": "Romania_South_East",
-     "s": 21501240,
+     "s": 21540640,
      "affiliations": [
       "Br\u0103ila",
       "Buz\u0103u",
@@ -9994,7 +9976,7 @@
     },
     {
      "id": "Romania_Centre",
-     "s": 37084776,
+     "s": 37144480,
      "affiliations": [
       "Alba",
       "Bra\u0219ov",
@@ -10010,7 +9992,7 @@
     },
     {
      "id": "Romania_West",
-     "s": 26469890,
+     "s": 26494034,
      "affiliations": [
       "Arad",
       "Cara\u0219 Severin",
@@ -10024,7 +10006,7 @@
     },
     {
      "id": "Romania_North_West",
-     "s": 34546258,
+     "s": 34671130,
      "affiliations": [
       "Bihor",
       "Bistri\u021ba-N\u0103s\u0103ud",
@@ -10040,7 +10022,7 @@
     },
     {
      "id": "Romania_South_West",
-     "s": 21023103,
+     "s": 21056455,
      "affiliations": [
       "Dolj",
       "Gorj",
@@ -10055,7 +10037,7 @@
     },
     {
      "id": "Romania_North_East",
-     "s": 30991033,
+     "s": 30994289,
      "affiliations": [
       "Bac\u0103u",
       "Boto\u0219ani",
@@ -10071,7 +10053,7 @@
     },
     {
      "id": "Romania_South",
-     "s": 37417045,
+     "s": 37531861,
      "affiliations": [
       "Arge\u0219",
       "Bucure\u0219ti",
@@ -10096,7 +10078,7 @@
    "g": [
     {
      "id": "Crimea",
-     "s": 24839137,
+     "s": 24932257,
      "affiliations": [
       "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10111,7 +10093,7 @@
     },
     {
      "id": "Russia_Altai Krai",
-     "s": 21674892,
+     "s": 21689836,
      "affiliations": [
       "\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",
@@ -10123,7 +10105,7 @@
     },
     {
      "id": "Russia_Altai Republic",
-     "s": 6235839,
+     "s": 6392712,
      "affiliations": [
       "\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",
@@ -10135,7 +10117,7 @@
     },
     {
      "id": "Russia_Amur Oblast",
-     "s": 7405636,
+     "s": 7563244,
      "affiliations": [
       "\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",
@@ -10147,7 +10129,7 @@
     },
     {
      "id": "Russia_Arkhangelsk Oblast_Central",
-     "s": 50206006,
+     "s": 50470694,
      "affiliations": [
       "\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",
@@ -10159,7 +10141,7 @@
     },
     {
      "id": "Russia_Arkhangelsk Oblast_North",
-     "s": 20470824,
+     "s": 20700896,
      "affiliations": [
       "\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",
@@ -10173,7 +10155,7 @@
     },
     {
      "id": "Russia_Astrakhan Oblast",
-     "s": 6572858,
+     "s": 6602066,
      "affiliations": [
       "\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",
@@ -10185,7 +10167,7 @@
     },
     {
      "id": "Russia_Bashkortostan",
-     "s": 31819321,
+     "s": 31886961,
      "affiliations": [
       "\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",
@@ -10197,7 +10179,7 @@
     },
     {
      "id": "Russia_Belgorod Oblast",
-     "s": 16862330,
+     "s": 16940290,
      "affiliations": [
       "\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",
@@ -10209,7 +10191,7 @@
     },
     {
      "id": "Russia_Bryansk Oblast",
-     "s": 14373595,
+     "s": 14388531,
      "affiliations": [
       "\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",
@@ -10221,7 +10203,7 @@
     },
     {
      "id": "Russia_Buryatia",
-     "s": 7699815,
+     "s": 7706319,
      "affiliations": [
       "\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",
@@ -10233,7 +10215,7 @@
     },
     {
      "id": "Russia_Chechen Republic",
-     "s": 4675972,
+     "s": 4679484,
      "affiliations": [
       "\u0427\u0435\u0447\u0435\u043d\u0441\u043a\u0430\u044f \u0440\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10245,7 +10227,7 @@
     },
     {
      "id": "Russia_Chelyabinsk Oblast",
-     "s": 43328142,
+     "s": 43370918,
      "affiliations": [
       "\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",
@@ -10257,7 +10239,7 @@
     },
     {
      "id": "Russia_Chukotka Autonomous Okrug",
-     "s": 7179449,
+     "s": 7217177,
      "affiliations": [
       "\u0427\u0443\u043a\u043e\u0442\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10269,7 +10251,7 @@
     },
     {
      "id": "Russia_Chuvashia",
-     "s": 11483536,
+     "s": 11492216,
      "affiliations": [
       "\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",
@@ -10281,7 +10263,7 @@
     },
     {
      "id": "Russia_Ingushetia",
-     "s": 831050,
+     "s": 831266,
      "affiliations": [
       "\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",
@@ -10293,7 +10275,7 @@
     },
     {
      "id": "Russia_Irkutsk Oblast",
-     "s": 21748566,
+     "s": 21768990,
      "affiliations": [
       "\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",
@@ -10305,7 +10287,7 @@
     },
     {
      "id": "Russia_Ivanovo Oblast",
-     "s": 10112803,
+     "s": 10111179,
      "affiliations": [
       "\u0418\u0432\u0430\u043d\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10317,7 +10299,7 @@
     },
     {
      "id": "Russia_Jewish Autonomous Oblast",
-     "s": 3931706,
+     "s": 3977594,
      "affiliations": [
       "\u0415\u0432\u0440\u0435\u0439\u0441\u043a\u0430\u044f \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10329,7 +10311,7 @@
     },
     {
      "id": "Russia_Kabardino-Balkaria",
-     "s": 3290175,
+     "s": 3318152,
      "affiliations": [
       "\u041a\u0430\u0431\u0430\u0440\u0434\u0438\u043d\u043e-\u0411\u0430\u043b\u043a\u0430\u0440\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10341,7 +10323,7 @@
     },
     {
      "id": "Russia_Kaliningrad Oblast",
-     "s": 7678483,
+     "s": 7718387,
      "affiliations": [
       "\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",
@@ -10353,7 +10335,7 @@
     },
     {
      "id": "Russia_Kaluga Oblast",
-     "s": 21502978,
+     "s": 21613330,
      "affiliations": [
       "\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",
@@ -10365,7 +10347,7 @@
     },
     {
      "id": "Russia_Kamchatka Krai",
-     "s": 9527772,
+     "s": 9709276,
      "affiliations": [
       "\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",
@@ -10377,7 +10359,7 @@
     },
     {
      "id": "Russia_Karachay-Cherkessia",
-     "s": 8027460,
+     "s": 8443603,
      "affiliations": [
       "\u041a\u0430\u0440\u0430\u0447\u0430\u0435\u0432\u043e-\u0427\u0435\u0440\u043a\u0435\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10389,7 +10371,7 @@
     },
     {
      "id": "Russia_Kemerov Oblast",
-     "s": 18142077,
+     "s": 18143221,
      "affiliations": [
       "\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",
@@ -10401,7 +10383,7 @@
     },
     {
      "id": "Russia_Khabarovsk Krai",
-     "s": 42103758,
+     "s": 42335534,
      "affiliations": [
       "\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",
@@ -10413,7 +10395,7 @@
     },
     {
      "id": "Russia_Khakassia",
-     "s": 5422556,
+     "s": 5426276,
      "affiliations": [
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u0425\u0430\u043a\u0430\u0441\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10425,7 +10407,7 @@
     },
     {
      "id": "Russia_Kirov Oblast",
-     "s": 45331527,
+     "s": 45400599,
      "affiliations": [
       "\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",
@@ -10437,7 +10419,7 @@
     },
     {
      "id": "Russia_Komi Republic",
-     "s": 21710378,
+     "s": 21802906,
      "affiliations": [
       "\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",
@@ -10449,7 +10431,7 @@
     },
     {
      "id": "Russia_Kostroma Oblast",
-     "s": 7779360,
+     "s": 7796936,
      "affiliations": [
       "\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",
@@ -10461,7 +10443,7 @@
     },
     {
      "id": "Russia_Krasnodar Krai",
-     "s": 52354939,
+     "s": 52410963,
      "affiliations": [
       "\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",
@@ -10473,7 +10455,7 @@
     },
     {
      "id": "Russia_Krasnodar Krai_Adygeya",
-     "s": 37255287,
+     "s": 37382991,
      "affiliations": [
       "\u0410\u0434\u044b\u0433\u0435\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10486,7 +10468,7 @@
     },
     {
      "id": "Russia_Krasnoyarsk Krai_North",
-     "s": 22900232,
+     "s": 22902176,
      "affiliations": [
       "\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",
@@ -10498,7 +10480,7 @@
     },
     {
      "id": "Russia_Krasnoyarsk Krai_South",
-     "s": 29287709,
+     "s": 29311781,
      "affiliations": [
       "\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",
@@ -10510,7 +10492,7 @@
     },
     {
      "id": "Russia_Kurgan Oblast",
-     "s": 10515522,
+     "s": 10530994,
      "affiliations": [
       "\u041a\u0443\u0440\u0433\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10522,7 +10504,7 @@
     },
     {
      "id": "Russia_Kursk Oblast",
-     "s": 27814579,
+     "s": 27984283,
      "affiliations": [
       "\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",
@@ -10534,7 +10516,7 @@
     },
     {
      "id": "Russia_Leningradskaya Oblast_Karelsky",
-     "s": 24816213,
+     "s": 24898383,
      "affiliations": [
       "\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",
@@ -10546,7 +10528,7 @@
     },
     {
      "id": "Russia_Leningradskaya Oblast_Southeast",
-     "s": 45963969,
+     "s": 46034344,
      "affiliations": [
       "\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",
@@ -10558,7 +10540,7 @@
     },
     {
      "id": "Russia_Lipetsk Oblast",
-     "s": 21790299,
+     "s": 21852579,
      "affiliations": [
       "\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",
@@ -10570,7 +10552,7 @@
     },
     {
      "id": "Russia_Magadan Oblast",
-     "s": 3734440,
+     "s": 3777872,
      "affiliations": [
       "\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",
@@ -10582,7 +10564,7 @@
     },
     {
      "id": "Russia_Mari El",
-     "s": 13515227,
+     "s": 13631952,
      "affiliations": [
       "\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",
@@ -10594,7 +10576,7 @@
     },
     {
      "id": "Russia_Moscow Oblast_East",
-     "s": 50668964,
+     "s": 51078161,
      "affiliations": [
       "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10606,7 +10588,7 @@
     },
     {
      "id": "Russia_Moscow Oblast_West",
-     "s": 28795117,
+     "s": 28964018,
      "affiliations": [
       "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10619,7 +10601,7 @@
     },
     {
      "id": "Russia_Moscow",
-     "s": 37612889,
+     "s": 37710048,
      "affiliations": [
       "\u041c\u043e\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10632,7 +10614,7 @@
     },
     {
      "id": "Russia_Murmansk Oblast",
-     "s": 31608516,
+     "s": 31699996,
      "affiliations": [
       "\u041c\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10644,7 +10626,7 @@
     },
     {
      "id": "Russia_Nenets Autonomous Okrug",
-     "s": 12851621,
+     "s": 12851765,
      "affiliations": [
       "\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",
@@ -10656,7 +10638,7 @@
     },
     {
      "id": "Russia_Nizhny Novgorod Oblast",
-     "s": 37737330,
+     "s": 37936467,
      "affiliations": [
       "\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",
@@ -10668,7 +10650,7 @@
     },
     {
      "id": "Russia_North Ossetia-Alania",
-     "s": 2901801,
+     "s": 2908369,
      "affiliations": [
       "\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",
@@ -10680,7 +10662,7 @@
     },
     {
      "id": "Russia_Novgorod Oblast",
-     "s": 13847368,
+     "s": 13865768,
      "affiliations": [
       "\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",
@@ -10692,7 +10674,7 @@
     },
     {
      "id": "Russia_Novosibirsk Oblast",
-     "s": 40867452,
+     "s": 40936197,
      "affiliations": [
       "\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",
@@ -10704,7 +10686,7 @@
     },
     {
      "id": "Russia_Omsk Oblast",
-     "s": 30307312,
+     "s": 30373000,
      "affiliations": [
       "\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",
@@ -10716,7 +10698,7 @@
     },
     {
      "id": "Russia_Orenburg Oblast",
-     "s": 21914539,
+     "s": 21961675,
      "affiliations": [
       "\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",
@@ -10728,7 +10710,7 @@
     },
     {
      "id": "Russia_Oryol Oblast",
-     "s": 4877342,
+     "s": 4898158,
      "affiliations": [
       "\u041e\u0440\u043b\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10740,7 +10722,7 @@
     },
     {
      "id": "Russia_Penza Oblast",
-     "s": 13960648,
+     "s": 14045472,
      "affiliations": [
       "\u041f\u0435\u043d\u0437\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10752,7 +10734,7 @@
     },
     {
      "id": "Russia_Perm Krai_North",
-     "s": 23678526,
+     "s": 23694270,
      "affiliations": [
       "\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",
@@ -10764,7 +10746,7 @@
     },
     {
      "id": "Russia_Perm Krai_South",
-     "s": 35542379,
+     "s": 35672027,
      "affiliations": [
       "\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",
@@ -10776,7 +10758,7 @@
     },
     {
      "id": "Russia_Primorsky Krai",
-     "s": 17563108,
+     "s": 17784548,
      "affiliations": [
       "\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",
@@ -10788,7 +10770,7 @@
     },
     {
      "id": "Russia_Pskov Oblast",
-     "s": 24727085,
+     "s": 24826293,
      "affiliations": [
       "\u041f\u0441\u043a\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10800,7 +10782,7 @@
     },
     {
      "id": "Russia_Republic of Dagestan",
-     "s": 8014476,
+     "s": 8147988,
      "affiliations": [
       "\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",
@@ -10812,7 +10794,7 @@
     },
     {
      "id": "Russia_Republic of Kalmykia",
-     "s": 3490639,
+     "s": 3493263,
      "affiliations": [
       "\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",
@@ -10825,7 +10807,7 @@
     },
     {
      "id": "Russia_Republic of Karelia_North",
-     "s": 32161506,
+     "s": 32175194,
      "affiliations": [
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10837,7 +10819,7 @@
     },
     {
      "id": "Russia_Republic of Karelia_South",
-     "s": 23853341,
+     "s": 23920365,
      "affiliations": [
       "\u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0430\u0440\u0435\u043b\u0438\u044f",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10849,7 +10831,7 @@
     },
     {
      "id": "Russia_Republic of Mordovia",
-     "s": 11553212,
+     "s": 11642300,
      "affiliations": [
       "\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",
@@ -10861,7 +10843,7 @@
     },
     {
      "id": "Russia_Rostov Oblast",
-     "s": 37043207,
+     "s": 37142151,
      "affiliations": [
       "\u0420\u043e\u0441\u0442\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10873,7 +10855,7 @@
     },
     {
      "id": "Russia_Ryazan Oblast",
-     "s": 16531941,
+     "s": 16568381,
      "affiliations": [
       "\u0420\u044f\u0437\u0430\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10885,7 +10867,7 @@
     },
     {
      "id": "Russia_Saint Petersburg",
-     "s": 28253867,
+     "s": 28371088,
      "affiliations": [
       "\u0421\u0430\u043d\u043a\u0442-\u041f\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10898,7 +10880,7 @@
     },
     {
      "id": "Russia_Sakha Republic",
-     "s": 45071238,
+     "s": 45079318,
      "affiliations": [
       "\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",
@@ -10910,7 +10892,7 @@
     },
     {
      "id": "Russia_Sakhalin Oblast",
-     "s": 23948689,
+     "s": 24120473,
      "affiliations": [
       "\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",
@@ -10922,7 +10904,7 @@
     },
     {
      "id": "Russia_Samara Oblast",
-     "s": 25034174,
+     "s": 25096182,
      "affiliations": [
       "\u0421\u0430\u043c\u0430\u0440\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10934,7 +10916,7 @@
     },
     {
      "id": "Russia_Saratov Oblast",
-     "s": 19002949,
+     "s": 19107653,
      "affiliations": [
       "\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",
@@ -10946,7 +10928,7 @@
     },
     {
      "id": "Russia_Smolensk Oblast",
-     "s": 14793263,
+     "s": 14834247,
      "affiliations": [
       "\u0421\u043c\u043e\u043b\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -10958,7 +10940,7 @@
     },
     {
      "id": "Russia_Stavropol Krai",
-     "s": 19789572,
+     "s": 19820907,
      "affiliations": [
       "\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",
@@ -10970,7 +10952,7 @@
     },
     {
      "id": "Russia_Sverdlovsk Oblast_Ekaterinburg",
-     "s": 32150641,
+     "s": 32264254,
      "affiliations": [
       "\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",
@@ -10982,7 +10964,7 @@
     },
     {
      "id": "Russia_Sverdlovsk Oblast_North",
-     "s": 28793094,
+     "s": 28882123,
      "affiliations": [
       "\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",
@@ -10994,7 +10976,7 @@
     },
     {
      "id": "Russia_Tambov Oblast",
-     "s": 8802461,
+     "s": 8831789,
      "affiliations": [
       "\u0422\u0430\u043c\u0431\u043e\u0432\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -11006,7 +10988,7 @@
     },
     {
      "id": "Russia_Tatarstan",
-     "s": 33813096,
+     "s": 34027072,
      "affiliations": [
       "\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",
@@ -11018,7 +11000,7 @@
     },
     {
      "id": "Russia_Tomsk Oblast",
-     "s": 14912801,
+     "s": 14943329,
      "affiliations": [
       "\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",
@@ -11030,7 +11012,7 @@
     },
     {
      "id": "Russia_Tula Oblast",
-     "s": 14952095,
+     "s": 15025583,
      "affiliations": [
       "\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",
@@ -11042,7 +11024,7 @@
     },
     {
      "id": "Russia_Tuva",
-     "s": 2617587,
+     "s": 2617931,
      "affiliations": [
       "\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",
@@ -11054,7 +11036,7 @@
     },
     {
      "id": "Russia_Tver Oblast",
-     "s": 30556919,
+     "s": 30701175,
      "affiliations": [
       "\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",
@@ -11066,7 +11048,7 @@
     },
     {
      "id": "Russia_Tyumen Oblast",
-     "s": 17853218,
+     "s": 17853586,
      "affiliations": [
       "\u0422\u044e\u043c\u0435\u043d\u0441\u043a\u0430\u044f \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -11078,7 +11060,7 @@
     },
     {
      "id": "Russia_Udmurt Republic",
-     "s": 20201393,
+     "s": 20299929,
      "affiliations": [
       "\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",
@@ -11090,7 +11072,7 @@
     },
     {
      "id": "Russia_Ulyanovsk Oblast",
-     "s": 12577989,
+     "s": 12867653,
      "affiliations": [
       "\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",
@@ -11102,7 +11084,7 @@
     },
     {
      "id": "Russia_Vladimir Oblast",
-     "s": 32671941,
+     "s": 32768205,
      "affiliations": [
       "\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",
@@ -11114,7 +11096,7 @@
     },
     {
      "id": "Russia_Volgograd Oblast",
-     "s": 29354802,
+     "s": 29452018,
      "affiliations": [
       "\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",
@@ -11126,7 +11108,7 @@
     },
     {
      "id": "Russia_Vologda Oblast",
-     "s": 26722526,
+     "s": 26732550,
      "affiliations": [
       "\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",
@@ -11138,7 +11120,7 @@
     },
     {
      "id": "Russia_Voronezh Oblast",
-     "s": 29599992,
+     "s": 29835216,
      "affiliations": [
       "\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",
@@ -11150,7 +11132,7 @@
     },
     {
      "id": "Russia_Yamalo-Nenets Autonomous Okrug",
-     "s": 16627442,
+     "s": 16638162,
      "affiliations": [
       "\u042f\u043c\u0430\u043b\u043e-\u041d\u0435\u043d\u0435\u0446\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -11162,7 +11144,7 @@
     },
     {
      "id": "Russia_Yaroslavl Oblast",
-     "s": 26778004,
+     "s": 26803972,
      "affiliations": [
       "\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",
@@ -11174,7 +11156,7 @@
     },
     {
      "id": "Russia_Yugra_Khanty",
-     "s": 33170107,
+     "s": 33168435,
      "affiliations": [
       "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -11186,7 +11168,7 @@
     },
     {
      "id": "Russia_Yugra_Surgut",
-     "s": 24917769,
+     "s": 25006961,
      "affiliations": [
       "\u0425\u0430\u043d\u0442\u044b-\u041c\u0430\u043d\u0441\u0438\u0439\u0441\u043a\u0438\u0439 \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u044b\u0439 \u043e\u043a\u0440\u0443\u0433 - \u042e\u0433\u0440\u0430",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -11198,7 +11180,7 @@
     },
     {
      "id": "Russia_Zabaykalsky Krai",
-     "s": 13604656,
+     "s": 14077200,
      "affiliations": [
       "\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",
@@ -11212,7 +11194,7 @@
   },
   {
    "id": "Rwanda",
-   "s": 5701857,
+   "s": 5785873,
    "affiliations": [
     "Amajvepfo",
     "Iburasirasuba",
@@ -11227,7 +11209,7 @@
   },
   {
    "id": "Sahrawi Arab Democratic Republic",
-   "s": 248851,
+   "s": 253133,
    "affiliations": [
     "Dakhla-Oued Ed-Dahab \u2d37\u2d30\u2d45\u2d4d\u2d30-\u2d61\u2d30\u2d37 \u2d37\u2d30\u2d40\u2d30\u2d31 \u0627\u0644\u062f\u0627\u062e\u0644\u0629-\u0648\u0627\u062f\u064a \u0627\u0644\u0630\u0647\u0628",
     "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
@@ -11253,7 +11235,7 @@
   },
   {
    "id": "Samoa",
-   "s": 1699579,
+   "s": 1703275,
    "affiliations": [
     "American Samoa",
     "S\u0101moa",
@@ -11266,7 +11248,7 @@
   },
   {
    "id": "San Marino",
-   "s": 326831,
+   "s": 328631,
    "affiliations": [
     "Italia",
     "San Marino"
@@ -11281,7 +11263,7 @@
    "g": [
     {
      "id": "Saudi Arabia_South",
-     "s": 35113262,
+     "s": 35129102,
      "affiliations": [
       "\u0639\u0633\u064a\u0631",
       "\u062c\u0627\u0632\u0627\u0646",
@@ -11296,7 +11278,7 @@
     },
     {
      "id": "Saudi Arabia_North",
-     "s": 28946370,
+     "s": 28964682,
      "affiliations": [
       "\u0645\u0643\u0629 \u0627\u0644\u0645\u0643\u0631\u0645\u0629",
       "\u062a\u0628\u0648\u0643",
@@ -11316,7 +11298,7 @@
   },
   {
    "id": "Senegal",
-   "s": 40844614,
+   "s": 41309391,
    "affiliations": [
     "Basse",
     "Janjanbureh",
@@ -11330,7 +11312,7 @@
   },
   {
    "id": "Serbia",
-   "s": 47432195,
+   "s": 48080875,
    "affiliations": [
     "\u0421\u0440\u0431\u0438\u0458\u0430",
     "\u0412\u043e\u0458\u0432\u043e\u0434\u0438\u043d\u0430",
@@ -11342,7 +11324,7 @@
   },
   {
    "id": "Seychelles",
-   "s": 465927,
+   "s": 466223,
    "affiliations": [
     "Sesel"
    ],
@@ -11352,7 +11334,7 @@
   },
   {
    "id": "Sierra Leone",
-   "s": 21993206,
+   "s": 22082787,
    "affiliations": [
     "Eastern Province",
     "Northern Province",
@@ -11366,7 +11348,7 @@
   },
   {
    "id": "Singapore",
-   "s": 6984219,
+   "s": 7017003,
    "affiliations": [
     "Johor",
     "Malaysia",
@@ -11381,7 +11363,7 @@
    "g": [
     {
      "id": "Slovakia_Region of Presov",
-     "s": 18001563,
+     "s": 18050723,
      "affiliations": [
       "Pre\u0161ovsk\u00fd kraj",
       "Slovensko"
@@ -11392,7 +11374,7 @@
     },
     {
      "id": "Slovakia_Region of Kosice",
-     "s": 16728975,
+     "s": 16800911,
      "affiliations": [
       "Ko\u0161ick\u00fd kraj",
       "Slovensko"
@@ -11403,7 +11385,7 @@
     },
     {
      "id": "Slovakia_Region of Banska Bystrica",
-     "s": 19420847,
+     "s": 19556263,
      "affiliations": [
       "Banskobystrick\u00fd kraj",
       "Slovensko"
@@ -11414,7 +11396,7 @@
     },
     {
      "id": "Slovakia_Region of Trnava",
-     "s": 11824000,
+     "s": 11850781,
      "affiliations": [
       "Slovensko",
       "Trnavsk\u00fd kraj"
@@ -11425,7 +11407,7 @@
     },
     {
      "id": "Slovakia_Region of Trencin",
-     "s": 14641266,
+     "s": 14639991,
      "affiliations": [
       "Slovensko",
       "Tren\u010diansky kraj"
@@ -11436,7 +11418,7 @@
     },
     {
      "id": "Slovakia_Region of Nitra",
-     "s": 14907765,
+     "s": 14919269,
      "affiliations": [
       "Nitriansky kraj",
       "Slovensko"
@@ -11447,7 +11429,7 @@
     },
     {
      "id": "Slovakia_Region of Bratislava",
-     "s": 11458620,
+     "s": 11489460,
      "affiliations": [
       "Bratislavsk\u00fd kraj",
       "Slovensko"
@@ -11458,7 +11440,7 @@
     },
     {
      "id": "Slovakia_Region of Zilina",
-     "s": 18410619,
+     "s": 18443219,
      "affiliations": [
       "Slovensko",
       "\u017dilinsk\u00fd kraj"
@@ -11474,7 +11456,7 @@
    "g": [
     {
      "id": "Slovenia_East",
-     "s": 39720108,
+     "s": 41533833,
      "affiliations": [
       "Border SI-HR",
       "Slovenija"
@@ -11485,7 +11467,7 @@
     },
     {
      "id": "Slovenia_West",
-     "s": 53350109,
+     "s": 54530357,
      "affiliations": [
       "Slovenija"
      ],
@@ -11497,7 +11479,7 @@
   },
   {
    "id": "Solomon Islands",
-   "s": 1439227,
+   "s": 1440091,
    "affiliations": [
     "Capital Territory",
     "Central Province",
@@ -11517,7 +11499,7 @@
   },
   {
    "id": "Somalia",
-   "s": 17709889,
+   "s": 17723905,
    "affiliations": [
     "Awdal",
     "Bakool",
@@ -11548,7 +11530,7 @@
    "g": [
     {
      "id": "South Africa_Western Cape",
-     "s": 25613746,
+     "s": 25636074,
      "affiliations": [
       "Prince Edward Islands",
       "South Africa",
@@ -11560,7 +11542,7 @@
     },
     {
      "id": "South Africa_Gauteng",
-     "s": 28435680,
+     "s": 28523440,
      "affiliations": [
       "Gauteng",
       "South Africa"
@@ -11571,7 +11553,7 @@
     },
     {
      "id": "South Africa_North West",
-     "s": 8827144,
+     "s": 8838888,
      "affiliations": [
       "North West",
       "South Africa"
@@ -11582,7 +11564,7 @@
     },
     {
      "id": "South Africa_Free State",
-     "s": 10634250,
+     "s": 10643058,
      "affiliations": [
       "Free State",
       "South Africa"
@@ -11593,7 +11575,7 @@
     },
     {
      "id": "South Africa_Eastern Cape",
-     "s": 15307435,
+     "s": 15392540,
      "affiliations": [
       "Eastern Cape",
       "South Africa"
@@ -11604,7 +11586,7 @@
     },
     {
      "id": "South Africa_Northern Cape",
-     "s": 7881739,
+     "s": 8148148,
      "affiliations": [
       "Northern Cape",
       "South Africa"
@@ -11615,7 +11597,7 @@
     },
     {
      "id": "South Africa_Mpumalanga",
-     "s": 8919705,
+     "s": 8928609,
      "affiliations": [
       "Mpumalanga",
       "South Africa"
@@ -11626,7 +11608,7 @@
     },
     {
      "id": "South Africa_Limpopo",
-     "s": 13643549,
+     "s": 13645229,
      "affiliations": [
       "Limpopo",
       "South Africa"
@@ -11637,7 +11619,7 @@
     },
     {
      "id": "South Africa_KwaZulu-Natal",
-     "s": 20415775,
+     "s": 20429679,
      "affiliations": [
       "KwaZulu-Natal",
       "South Africa"
@@ -11661,7 +11643,7 @@
   },
   {
    "id": "South Ossetia",
-   "s": 1508781,
+   "s": 1510045,
    "affiliations": [
     "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d",
     "\u0425\u0443\u0441\u0441\u0430\u0440 \u0418\u0440\u044b\u0441\u0442\u043e\u043d - \u042e\u0436\u043d\u0430\u044f \u041e\u0441\u0435\u0442\u0438\u044f",
@@ -11673,7 +11655,7 @@
   },
   {
    "id": "South Sudan",
-   "s": 25495742,
+   "s": 25495646,
    "affiliations": [
     "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan",
     "Central Equatoria",
@@ -11697,7 +11679,7 @@
    "g": [
     {
      "id": "Spain_Andalusia_Granada",
-     "s": 33568894,
+     "s": 33695491,
      "affiliations": [
       "Andaluc\u00eda",
       "Espa\u00f1a (mare territorial)",
@@ -11709,7 +11691,7 @@
     },
     {
      "id": "Spain_Andalusia_Sevilla",
-     "s": 44165834,
+     "s": 44359751,
      "affiliations": [
       "Andaluc\u00eda",
       "Espa\u00f1a"
@@ -11720,7 +11702,7 @@
     },
     {
      "id": "Spain_Aragon",
-     "s": 28245636,
+     "s": 28520193,
      "affiliations": [
       "Arag\u00f3n",
       "Espa\u00f1a"
@@ -11731,7 +11713,7 @@
     },
     {
      "id": "Spain_Balearic Islands",
-     "s": 15823697,
+     "s": 15862985,
      "affiliations": [
       "Illes Balears",
       "Espa\u00f1a"
@@ -11742,7 +11724,7 @@
     },
     {
      "id": "Spain_Basque Country",
-     "s": 26995459,
+     "s": 27111259,
      "affiliations": [
       "Castilla y Le\u00f3n",
       "Espa\u00f1a",
@@ -11754,7 +11736,7 @@
     },
     {
      "id": "Spain_Canary Islands",
-     "s": 24985836,
+     "s": 25071068,
      "affiliations": [
       "Canarias",
       "Espa\u00f1a"
@@ -11765,7 +11747,7 @@
     },
     {
      "id": "Spain_Cantabria",
-     "s": 13638465,
+     "s": 13667777,
      "affiliations": [
       "Cantabria",
       "Espa\u00f1a"
@@ -11776,7 +11758,7 @@
     },
     {
      "id": "Spain_Castile and Leon_West",
-     "s": 45416150,
+     "s": 45508806,
      "affiliations": [
       "Castilla y Le\u00f3n",
       "Espa\u00f1a"
@@ -11787,7 +11769,7 @@
     },
     {
      "id": "Spain_Castile and Leon_East",
-     "s": 33191029,
+     "s": 33313045,
      "affiliations": [
       "Castilla y Le\u00f3n",
       "Espa\u00f1a"
@@ -11798,7 +11780,7 @@
     },
     {
      "id": "Spain_Castile-La Mancha",
-     "s": 47946035,
+     "s": 48114661,
      "affiliations": [
       "Castilla-La Mancha",
       "Espa\u00f1a"
@@ -11809,7 +11791,7 @@
     },
     {
      "id": "Spain_Catalonia_Provincia de Barcelona",
-     "s": 36215607,
+     "s": 36334479,
      "affiliations": [
       "Catalunya",
       "Espa\u00f1a"
@@ -11820,7 +11802,7 @@
     },
     {
      "id": "Spain_Catalonia_Provincia de Girona",
-     "s": 18631977,
+     "s": 18698625,
      "affiliations": [
       "Catalunya",
       "Espa\u00f1a"
@@ -11831,7 +11813,7 @@
     },
     {
      "id": "Spain_Catalonia_Provincia de Lleida",
-     "s": 17943220,
+     "s": 18070220,
      "affiliations": [
       "Catalunya",
       "Espa\u00f1a"
@@ -11842,7 +11824,7 @@
     },
     {
      "id": "Spain_Catalonia_Provincia de Tarragona",
-     "s": 13709272,
+     "s": 13751528,
      "affiliations": [
       "Catalunya",
       "Espa\u00f1a"
@@ -11853,7 +11835,7 @@
     },
     {
      "id": "Spain_Ceuta",
-     "s": 283228,
+     "s": 283972,
      "affiliations": [
       "Ceuta",
       "Espa\u00f1a",
@@ -11865,7 +11847,7 @@
     },
     {
      "id": "Spain_Community of Madrid",
-     "s": 36599941,
+     "s": 36733501,
      "affiliations": [
       "Comunidad de Madrid",
       "Espa\u00f1a"
@@ -11876,7 +11858,7 @@
     },
     {
      "id": "Spain_Comunidad Foral de Navarra",
-     "s": 11631856,
+     "s": 11735240,
      "affiliations": [
       "Comunidad Foral de Navarra",
       "Espa\u00f1a"
@@ -11887,7 +11869,7 @@
     },
     {
      "id": "Spain_Extremadura",
-     "s": 20154402,
+     "s": 20242546,
      "affiliations": [
       "Espa\u00f1a",
       "Extremadura"
@@ -11898,7 +11880,7 @@
     },
     {
      "id": "Spain_Galicia_North",
-     "s": 32792184,
+     "s": 32948464,
      "affiliations": [
       "Espa\u00f1a",
       "Galicia"
@@ -11909,7 +11891,7 @@
     },
     {
      "id": "Spain_Galicia_South",
-     "s": 26832426,
+     "s": 26856306,
      "affiliations": [
       "Espa\u00f1a",
       "Galicia"
@@ -11920,7 +11902,7 @@
     },
     {
      "id": "Spain_La Rioja",
-     "s": 4861058,
+     "s": 4876578,
      "affiliations": [
       "Espa\u00f1a",
       "La Rioja"
@@ -11931,7 +11913,7 @@
     },
     {
      "id": "Spain_Melilla",
-     "s": 633410,
+     "s": 634082,
      "affiliations": [
       "Espa\u00f1a",
       "Maroc \u2d4d\u2d4e\u2d56\u2d54\u2d49\u2d31 \u0627\u0644\u0645\u063a\u0631\u0628",
@@ -11944,7 +11926,7 @@
     },
     {
      "id": "Spain_Principado de Asturias",
-     "s": 17353413,
+     "s": 17388789,
      "affiliations": [
       "Espa\u00f1a",
       "Principado de Asturias"
@@ -11955,7 +11937,7 @@
     },
     {
      "id": "Spain_Region de Murcia",
-     "s": 16474149,
+     "s": 16469302,
      "affiliations": [
       "Espa\u00f1a",
       "Regi\u00f3n de Murcia"
@@ -11966,7 +11948,7 @@
     },
     {
      "id": "Spain_Valencian Community",
-     "s": 50407296,
+     "s": 50647376,
      "affiliations": [
       "Comunitat Valenciana",
       "Espa\u00f1a"
@@ -11982,7 +11964,7 @@
    "g": [
     {
      "id": "Jerusalem",
-     "s": 3631556,
+     "s": 3636013,
      "affiliations": [
       "\u05de\u05d7\u05d5\u05d6 \u05d9\u05e8\u05d5\u05e9\u05dc\u05d9\u05dd",
       "\u05de\u05d3\u05d9\u05e0\u05ea \u05d9\u05e9\u05e8\u05d0\u05dc"
@@ -11994,7 +11976,7 @@
     },
     {
      "id": "Palestine",
-     "s": 17787534,
+     "s": 17811935,
      "affiliations": [
       "Area A",
       "Area B",
@@ -12008,7 +11990,7 @@
   },
   {
    "id": "Sri Lanka",
-   "s": 32926649,
+   "s": 33461881,
    "affiliations": [
     "Central Province",
     "Eastern Province",
@@ -12030,7 +12012,7 @@
    "g": [
     {
      "id": "Sudan_East",
-     "s": 13720889,
+     "s": 13733249,
      "affiliations": [
       "Al Ba\u1e29r al A\u1e29mar",
       "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan",
@@ -12050,7 +12032,7 @@
     },
     {
      "id": "Sudan_West",
-     "s": 55127147,
+     "s": 55400987,
      "affiliations": [
       "\u0627\u0644\u0633\u0648\u062f\u0627\u0646 - Sudan",
       "Gharb Darfur",
@@ -12077,7 +12059,7 @@
   },
   {
    "id": "Suriname",
-   "s": 4508104,
+   "s": 4524496,
    "affiliations": [
     "Brokopondo",
     "Commewijne",
@@ -12097,7 +12079,7 @@
   },
   {
    "id": "Swaziland",
-   "s": 10485874,
+   "s": 10813506,
    "affiliations": [
     "Sifundza seHhohho",
     "Sifundza seLubombo",
@@ -12114,7 +12096,7 @@
    "g": [
     {
      "id": "Sweden_Malardalen",
-     "s": 24574887,
+     "s": 24642706,
      "affiliations": [
       "S\u00f6dermanlands l\u00e4n",
       "Sverige",
@@ -12127,7 +12109,7 @@
     },
     {
      "id": "Sweden_Stockholm",
-     "s": 37178486,
+     "s": 37348873,
      "affiliations": [
       "Stockholms l\u00e4n",
       "Sverige"
@@ -12138,7 +12120,7 @@
     },
     {
      "id": "Sweden_Ostra Gotaland",
-     "s": 46016443,
+     "s": 46244419,
      "affiliations": [
       "Gotlands l\u00e4n",
       "J\u00f6nk\u00f6pings l\u00e4n",
@@ -12155,7 +12137,7 @@
     },
     {
      "id": "Sweden_Norra Sverige",
-     "s": 30840983,
+     "s": 30912287,
      "affiliations": [
       "Norrbottens l\u00e4n",
       "Sverige",
@@ -12167,7 +12149,7 @@
     },
     {
      "id": "Sweden_Mellannorrland",
-     "s": 22859034,
+     "s": 22879002,
      "affiliations": [
       "J\u00e4mtlands l\u00e4n",
       "Sverige",
@@ -12179,7 +12161,7 @@
     },
     {
      "id": "Sweden_Bergslagen",
-     "s": 49426483,
+     "s": 49642107,
      "affiliations": [
       "Dalarnas l\u00e4n",
       "G\u00e4vleborgs l\u00e4n",
@@ -12193,7 +12175,7 @@
     },
     {
      "id": "Sweden_Vastra Gotaland",
-     "s": 52771321,
+     "s": 52905345,
      "affiliations": [
       "Danmark",
       "Hallands l\u00e4n",
@@ -12206,7 +12188,7 @@
     },
     {
      "id": "Sweden_Sodra Gotaland",
-     "s": 37772842,
+     "s": 37990882,
      "affiliations": [
       "Blekinge l\u00e4n",
       "Danmark",
@@ -12225,7 +12207,7 @@
    "g": [
     {
      "id": "Switzerland_Eastern",
-     "s": 36913572,
+     "s": 37195797,
      "affiliations": [
       "Appenzell Ausserrhoden",
       "Appenzell Innerrhoden",
@@ -12242,7 +12224,7 @@
     },
     {
      "id": "Switzerland_Central",
-     "s": 17764716,
+     "s": 17835540,
      "affiliations": [
       "Luzern",
       "Nidwalden",
@@ -12258,7 +12240,7 @@
     },
     {
      "id": "Switzerland_Espace Mittelland_Bern",
-     "s": 38750947,
+     "s": 38816114,
      "affiliations": [
       "Basel-Landschaft",
       "Bern - Berne",
@@ -12275,7 +12257,7 @@
     },
     {
      "id": "Switzerland_Espace Mittelland_East",
-     "s": 15819350,
+     "s": 16080918,
      "affiliations": [
       "Bern - Berne",
       "Schweiz, Suisse, Svizzera, Svizra"
@@ -12286,7 +12268,7 @@
     },
     {
      "id": "Switzerland_Ticino",
-     "s": 8216437,
+     "s": 8268997,
      "affiliations": [
       "Schweiz, Suisse, Svizzera, Svizra",
       "Ticino"
@@ -12297,7 +12279,7 @@
     },
     {
      "id": "Switzerland_Northwestern",
-     "s": 25660399,
+     "s": 25760904,
      "affiliations": [
       "Aargau",
       "Basel-Landschaft",
@@ -12310,7 +12292,7 @@
     },
     {
      "id": "Switzerland_Lake Geneva region",
-     "s": 44307012,
+     "s": 44390172,
      "affiliations": [
       "Fribourg - Freiburg",
       "Gen\u00e8ve",
@@ -12324,7 +12306,7 @@
     },
     {
      "id": "Switzerland_Zurich",
-     "s": 29327669,
+     "s": 29384141,
      "affiliations": [
       "Schweiz, Suisse, Svizzera, Svizra",
       "Z\u00fcrich"
@@ -12337,7 +12319,7 @@
   },
   {
    "id": "Syria",
-   "s": 43564600,
+   "s": 43811304,
    "affiliations": [
     "Al-Hasakah",
     "Aleppo",
@@ -12361,7 +12343,7 @@
   },
   {
    "id": "Sao Tome and Principe",
-   "s": 446503,
+   "s": 446727,
    "affiliations": [
     "Pr\u00edncipe Province",
     "S\u00e3o Tom\u00e9 Province",
@@ -12373,7 +12355,7 @@
   },
   {
    "id": "Tajikistan",
-   "s": 9491159,
+   "s": 9792487,
    "affiliations": [
     "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0421\u0443\u0493\u0434",
     "\u0412\u0438\u043b\u043e\u044f\u0442\u0438 \u0425\u0430\u0442\u043b\u043e\u043d",
@@ -12387,7 +12369,7 @@
   },
   {
    "id": "Tanzania",
-   "s": 44766652,
+   "s": 45753812,
    "affiliations": [
     "Arusha",
     "Dar es Salaam",
@@ -12425,7 +12407,7 @@
    "g": [
     {
      "id": "Thailand_North",
-     "s": 25691613,
+     "s": 25787594,
      "affiliations": [
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e1e\u0e30\u0e40\u0e22\u0e32",
       "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22",
@@ -12448,7 +12430,7 @@
     },
     {
      "id": "Thailand_Central",
-     "s": 46258361,
+     "s": 47056416,
      "affiliations": [
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e2d\u0e48\u0e32\u0e07\u0e17\u0e2d\u0e07",
       "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22",
@@ -12494,7 +12476,7 @@
     },
     {
      "id": "Thailand_South",
-     "s": 45797400,
+     "s": 45902785,
      "affiliations": [
       "\u0e08\u0e31\u0e07\u0e2b\u0e27\u0e31\u0e14\u0e0a\u0e38\u0e21\u0e1e\u0e23",
       "\u0e1b\u0e23\u0e30\u0e40\u0e17\u0e28\u0e44\u0e17\u0e22",
@@ -12538,7 +12520,7 @@
   },
   {
    "id": "The Bahamas",
-   "s": 5849413,
+   "s": 5858253,
    "affiliations": [
     "Ciego de \u00c1vila",
     "The Bahamas"
@@ -12549,7 +12531,7 @@
   },
   {
    "id": "The Gambia",
-   "s": 4269859,
+   "s": 4276571,
    "affiliations": [
     "Brikama",
     "Banjul",
@@ -12571,7 +12553,7 @@
    "g": [
     {
      "id": "Netherlands_Drenthe",
-     "s": 34808516,
+     "s": 34829452,
      "affiliations": [
       "Drenthe",
       "Nederland"
@@ -12582,7 +12564,7 @@
     },
     {
      "id": "Netherlands_Flevoland",
-     "s": 21374894,
+     "s": 21386527,
      "affiliations": [
       "Flevoland",
       "Nederland"
@@ -12593,7 +12575,7 @@
     },
     {
      "id": "Netherlands_Friesland",
-     "s": 46779856,
+     "s": 46786512,
      "affiliations": [
       "Friesland",
       "Nederland"
@@ -12604,7 +12586,7 @@
     },
     {
      "id": "Netherlands_Gelderland_Nijmegen",
-     "s": 33003041,
+     "s": 33029137,
      "affiliations": [
       "Gelderland",
       "Nederland"
@@ -12615,7 +12597,7 @@
     },
     {
      "id": "Netherlands_Gelderland_North",
-     "s": 53792308,
+     "s": 53812628,
      "affiliations": [
       "Gelderland",
       "Nederland"
@@ -12626,7 +12608,7 @@
     },
     {
      "id": "Netherlands_Gelderland_Zutphen",
-     "s": 23170202,
+     "s": 23294634,
      "affiliations": [
       "Gelderland",
       "Nederland"
@@ -12637,7 +12619,7 @@
     },
     {
      "id": "Netherlands_Groningen",
-     "s": 33990192,
+     "s": 33981096,
      "affiliations": [
       "Deutschland",
       "Groningen",
@@ -12650,7 +12632,7 @@
     },
     {
      "id": "Netherlands_Limburg",
-     "s": 59938250,
+     "s": 59973634,
      "affiliations": [
       "Limburg",
       "Nederland"
@@ -12661,7 +12643,7 @@
     },
     {
      "id": "Netherlands_North Brabant_Eindhoven",
-     "s": 51240075,
+     "s": 51272883,
      "affiliations": [
       "Nederland",
       "Noord-Brabant"
@@ -12672,7 +12654,7 @@
     },
     {
      "id": "Netherlands_North Brabant_Roosendaal",
-     "s": 17535169,
+     "s": 17545129,
      "affiliations": [
       "Nederland",
       "Noord-Brabant"
@@ -12683,7 +12665,7 @@
     },
     {
      "id": "Netherlands_North Brabant_Tiburg",
-     "s": 38610240,
+     "s": 38613912,
      "affiliations": [
       "Nederland",
       "Nederland - Belgique / Belgi\u00eb / Belgien",
@@ -12695,7 +12677,7 @@
     },
     {
      "id": "Netherlands_North Brabant_Uden",
-     "s": 18156439,
+     "s": 18171655,
      "affiliations": [
       "Nederland",
       "Noord-Brabant"
@@ -12706,7 +12688,7 @@
     },
     {
      "id": "Netherlands_North Holland_Alkmaar",
-     "s": 29974116,
+     "s": 29983572,
      "affiliations": [
       "Nederland",
       "Noord-Holland"
@@ -12717,7 +12699,7 @@
     },
     {
      "id": "Netherlands_North Holland_Amsterdam",
-     "s": 63971684,
+     "s": 63961892,
      "affiliations": [
       "Nederland",
       "Noord-Holland"
@@ -12728,7 +12710,7 @@
     },
     {
      "id": "Netherlands_North Holland_Zaandam",
-     "s": 23066797,
+     "s": 23090485,
      "affiliations": [
       "Nederland",
       "Noord-Holland"
@@ -12739,7 +12721,7 @@
     },
     {
      "id": "Netherlands_Overijssel_Enschede",
-     "s": 35680112,
+     "s": 35685288,
      "affiliations": [
       "Nederland",
       "Overijssel"
@@ -12750,7 +12732,7 @@
     },
     {
      "id": "Netherlands_Overijssel_Zwolle",
-     "s": 31464998,
+     "s": 31508271,
      "affiliations": [
       "Nederland",
       "Overijssel"
@@ -12761,7 +12743,7 @@
     },
     {
      "id": "Netherlands_South Holland_Brielle",
-     "s": 16842881,
+     "s": 16873945,
      "affiliations": [
       "Nederland",
       "Zuid-Holland"
@@ -12772,7 +12754,7 @@
     },
     {
      "id": "Netherlands_South Holland_Den Haag",
-     "s": 50417524,
+     "s": 50355676,
      "affiliations": [
       "Nederland",
       "Zuid-Holland"
@@ -12783,7 +12765,7 @@
     },
     {
      "id": "Netherlands_South Holland_Leiden",
-     "s": 21116798,
+     "s": 21188926,
      "affiliations": [
       "Nederland",
       "Zuid-Holland"
@@ -12794,7 +12776,7 @@
     },
     {
      "id": "Netherlands_South Holland_Rotterdam",
-     "s": 53161295,
+     "s": 53175279,
      "affiliations": [
       "Nederland",
       "Zuid-Holland"
@@ -12805,7 +12787,7 @@
     },
     {
      "id": "Netherlands_Utrecht_Amersfoort",
-     "s": 25293795,
+     "s": 25308995,
      "affiliations": [
       "Utrecht",
       "Nederland"
@@ -12816,7 +12798,7 @@
     },
     {
      "id": "Netherlands_Utrecht_Utrecht",
-     "s": 29403827,
+     "s": 29420875,
      "affiliations": [
       "Utrecht",
       "Nederland"
@@ -12827,7 +12809,7 @@
     },
     {
      "id": "Netherlands_Zeeland",
-     "s": 27566291,
+     "s": 27602651,
      "affiliations": [
       "Nederland",
       "Zeeland"
@@ -12840,7 +12822,7 @@
   },
   {
    "id": "Togo",
-   "s": 18148099,
+   "s": 18661884,
    "affiliations": [
     "R\u00e9gion Centrale",
     "R\u00e9gion Maritime",
@@ -12855,7 +12837,7 @@
   },
   {
    "id": "Tonga",
-   "s": 2779894,
+   "s": 2779974,
    "affiliations": [
     "Ha\u02bbapai",
     "Ongo Niua",
@@ -12875,7 +12857,7 @@
   },
   {
    "id": "Tunisia",
-   "s": 39036808,
+   "s": 39078240,
    "affiliations": [
     "Tunisie \u2d5c\u2d53\u2d4f\u2d59 \u062a\u0648\u0646\u0633",
     "\u0628\u0627\u062c\u0629",
@@ -12912,7 +12894,7 @@
    "g": [
     {
      "id": "Turkey_Mediterranean Region",
-     "s": 36182962,
+     "s": 36206290,
      "affiliations": [
       "Adana",
       "Antalya",
@@ -12930,7 +12912,7 @@
     },
     {
      "id": "Turkey_Southeastern Anatolia Region",
-     "s": 22881789,
+     "s": 22891213,
      "affiliations": [
       "Ad\u0131yaman",
       "Batman",
@@ -12950,7 +12932,7 @@
     },
     {
      "id": "Turkey_Marmara Region_Istanbul",
-     "s": 44574221,
+     "s": 44644413,
      "affiliations": [
       "Edirne",
       "Kocaeli",
@@ -12967,7 +12949,7 @@
     },
     {
      "id": "Turkey_Marmara Region_Bursa",
-     "s": 32416729,
+     "s": 32437586,
      "affiliations": [
       "Bal\u0131kesir",
       "Bilecik",
@@ -12987,7 +12969,7 @@
     },
     {
      "id": "Turkey_Eastern Anatolia Region",
-     "s": 23187539,
+     "s": 23194899,
      "affiliations": [
       "Ardahan",
       "A\u011fr\u0131",
@@ -13011,7 +12993,7 @@
     },
     {
      "id": "Turkey_Black Sea Region",
-     "s": 29289635,
+     "s": 29387483,
      "affiliations": [
       "Amasya",
       "Bolu",
@@ -13039,7 +13021,7 @@
     },
     {
      "id": "Turkey_Central Anatolia Region_Ankara",
-     "s": 38326373,
+     "s": 38492045,
      "affiliations": [
       "Aksaray",
       "Ankara",
@@ -13057,7 +13039,7 @@
     },
     {
      "id": "Turkey_Central Anatolia Region_Kayseri",
-     "s": 16742527,
+     "s": 16842991,
      "affiliations": [
       "Kayseri",
       "K\u0131r\u015fehir",
@@ -13073,7 +13055,7 @@
     },
     {
      "id": "Turkey_Aegean Region",
-     "s": 42546693,
+     "s": 42568605,
      "affiliations": [
       "Afyonkarahisar",
       "Ayd\u0131n",
@@ -13093,7 +13075,7 @@
   },
   {
    "id": "Turkmenistan",
-   "s": 7917477,
+   "s": 8096594,
    "affiliations": [
     "Ahal",
     "Balkan",
@@ -13108,7 +13090,7 @@
   },
   {
    "id": "Turks and Caicos Islands",
-   "s": 485384,
+   "s": 489256,
    "affiliations": [
     "Rep\u00fablica Dominicana",
     "The Bahamas",
@@ -13120,7 +13102,7 @@
   },
   {
    "id": "Tuvalu",
-   "s": 237880,
+   "s": 238232,
    "affiliations": [
     "Tuvalu"
    ],
@@ -13130,7 +13112,7 @@
   },
   {
    "id": "Uganda",
-   "s": 28417249,
+   "s": 28452905,
    "affiliations": [
     "Abim",
     "Agago",
@@ -13182,7 +13164,7 @@
    "g": [
     {
      "id": "Ukraine_Cherkasy Oblast",
-     "s": 10339825,
+     "s": 10383585,
      "affiliations": [
       "\u0427\u0435\u0440\u043a\u0430\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13193,7 +13175,7 @@
     },
     {
      "id": "Ukraine_Chernihiv Oblast",
-     "s": 12363478,
+     "s": 12373502,
      "affiliations": [
       "\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"
@@ -13204,7 +13186,7 @@
     },
     {
      "id": "Ukraine_Chernivtsi Oblast",
-     "s": 10180378,
+     "s": 10233013,
      "affiliations": [
       "\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"
@@ -13215,7 +13197,7 @@
     },
     {
      "id": "Ukraine_Dnipropetrovsk Oblast",
-     "s": 30124883,
+     "s": 30314435,
      "affiliations": [
       "\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"
@@ -13226,7 +13208,7 @@
     },
     {
      "id": "Ukraine_Donetsk Oblast",
-     "s": 36103805,
+     "s": 36145861,
      "affiliations": [
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0414\u043e\u043d\u0435\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -13237,7 +13219,7 @@
     },
     {
      "id": "Ukraine_Ivano-Frankivsk Oblast",
-     "s": 12389474,
+     "s": 12456381,
      "affiliations": [
       "\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"
@@ -13248,7 +13230,7 @@
     },
     {
      "id": "Ukraine_Kharkiv Oblast",
-     "s": 21903305,
+     "s": 21998529,
      "affiliations": [
       "\u0425\u0430\u0440\u043a\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13259,7 +13241,7 @@
     },
     {
      "id": "Ukraine_Kherson Oblast",
-     "s": 7396113,
+     "s": 7399697,
      "affiliations": [
       "\u0425\u0435\u0440\u0441\u043e\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13270,7 +13252,7 @@
     },
     {
      "id": "Ukraine_Khmelnytskyi Oblast",
-     "s": 10600863,
+     "s": 10652146,
      "affiliations": [
       "\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"
@@ -13281,7 +13263,7 @@
     },
     {
      "id": "Ukraine_Kirovohrad Oblast",
-     "s": 11265969,
+     "s": 11406369,
      "affiliations": [
       "\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"
@@ -13292,7 +13274,7 @@
     },
     {
      "id": "Ukraine_Kyiv Oblast",
-     "s": 29288165,
+     "s": 29474941,
      "affiliations": [
       "\u041a\u0438\u0457\u0432",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
@@ -13304,7 +13286,7 @@
     },
     {
      "id": "Ukraine_Luhansk Oblast",
-     "s": 17485801,
+     "s": 17737929,
      "affiliations": [
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041b\u0443\u0433\u0430\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -13315,7 +13297,7 @@
     },
     {
      "id": "Ukraine_Lviv Oblast",
-     "s": 21506111,
+     "s": 21679119,
      "affiliations": [
       "\u041b\u044c\u0432\u0456\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13326,7 +13308,7 @@
     },
     {
      "id": "Ukraine_Mykolaiv Oblast",
-     "s": 9272170,
+     "s": 9448322,
      "affiliations": [
       "\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"
@@ -13337,7 +13319,7 @@
     },
     {
      "id": "Ukraine_Odessa Oblast",
-     "s": 19879131,
+     "s": 19946971,
      "affiliations": [
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u041e\u0434\u0435\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -13348,7 +13330,7 @@
     },
     {
      "id": "Ukraine_Poltava Oblast",
-     "s": 12149628,
+     "s": 12308020,
      "affiliations": [
       "\u041f\u043e\u043b\u0442\u0430\u0432\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13359,7 +13341,7 @@
     },
     {
      "id": "Ukraine_Rivne Oblast",
-     "s": 7689373,
+     "s": 7694101,
      "affiliations": [
       "\u0420\u0456\u0432\u043d\u0435\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13370,7 +13352,7 @@
     },
     {
      "id": "Ukraine_Sumy Oblast",
-     "s": 13841452,
+     "s": 13983988,
      "affiliations": [
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0421\u0443\u043c\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -13381,7 +13363,7 @@
     },
     {
      "id": "Ukraine_Ternopil Oblast",
-     "s": 13570323,
+     "s": 13650171,
      "affiliations": [
       "\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"
@@ -13392,7 +13374,7 @@
     },
     {
      "id": "Ukraine_Vinnytsia Oblast",
-     "s": 13925184,
+     "s": 13963600,
      "affiliations": [
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0412\u0456\u043d\u043d\u0438\u0446\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -13403,7 +13385,7 @@
     },
     {
      "id": "Ukraine_Volyn Oblast",
-     "s": 10315115,
+     "s": 10344651,
      "affiliations": [
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430",
       "\u0412\u043e\u043b\u0438\u043d\u0441\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c"
@@ -13414,7 +13396,7 @@
     },
     {
      "id": "Ukraine_Zakarpattia Oblast",
-     "s": 10196033,
+     "s": 10204513,
      "affiliations": [
       "\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"
@@ -13425,7 +13407,7 @@
     },
     {
      "id": "Ukraine_Zaporizhia Oblast",
-     "s": 9132893,
+     "s": 9203381,
      "affiliations": [
       "\u0417\u0430\u043f\u043e\u0440\u0456\u0437\u044c\u043a\u0430 \u043e\u0431\u043b\u0430\u0441\u0442\u044c",
       "\u0423\u043a\u0440\u0430\u0457\u043d\u0430"
@@ -13436,7 +13418,7 @@
     },
     {
      "id": "Ukraine_Zhytomyr Oblast",
-     "s": 6828565,
+     "s": 6883588,
      "affiliations": [
       "\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"
@@ -13447,7 +13429,7 @@
     },
     {
      "id": "Crimea",
-     "s": 24839137,
+     "s": 24932257,
      "affiliations": [
       "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430 \u0420\u0435\u0441\u043f\u0443\u0431\u043b\u0456\u043a\u0430 \u041a\u0440\u0438\u043c",
       "\u0420\u043e\u0441\u0441\u0438\u044f",
@@ -13464,7 +13446,7 @@
   },
   {
    "id": "United Arab Emirates",
-   "s": 23984469,
+   "s": 24138213,
    "affiliations": [
     "\u0623\u0628\u0648 \u0638\u0628\u064a",
     "\u200f\u0623\u0645 \u0627\u0644\u0642\u064a\u0648\u064a\u0646\u200e",
@@ -13482,7 +13464,7 @@
   },
   {
    "id": "Falkland Islands",
-   "s": 1416681,
+   "s": 1417242,
    "affiliations": [
     "Falkland Islands"
    ],
@@ -13505,7 +13487,7 @@
     },
     {
      "id": "UK_England_East Midlands",
-     "s": 64319210,
+     "s": 64559634,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13516,7 +13498,7 @@
     },
     {
      "id": "UK_England_East of England_Essex",
-     "s": 40060083,
+     "s": 40132744,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13527,7 +13509,7 @@
     },
     {
      "id": "UK_England_East of England_Norfolk",
-     "s": 46967499,
+     "s": 47148172,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13538,7 +13520,7 @@
     },
     {
      "id": "UK_England_Greater London",
-     "s": 43469340,
+     "s": 43621940,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13549,7 +13531,7 @@
     },
     {
      "id": "UK_England_North East England",
-     "s": 29305894,
+     "s": 29439678,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13560,7 +13542,7 @@
     },
     {
      "id": "UK_England_North West England_Manchester",
-     "s": 55983436,
+     "s": 56097820,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13571,7 +13553,7 @@
     },
     {
      "id": "UK_England_North West England_Lancaster",
-     "s": 17943341,
+     "s": 17978861,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13582,7 +13564,7 @@
     },
     {
      "id": "UK_England_South East_Brighton",
-     "s": 47675287,
+     "s": 47792223,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13593,7 +13575,7 @@
     },
     {
      "id": "UK_England_South East_Oxford",
-     "s": 51630477,
+     "s": 51611613,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13604,7 +13586,7 @@
     },
     {
      "id": "UK_England_South West England_Bristol",
-     "s": 54150870,
+     "s": 54217046,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13615,7 +13597,7 @@
     },
     {
      "id": "UK_England_South West England_Cornwall",
-     "s": 29229897,
+     "s": 29367833,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13626,7 +13608,7 @@
     },
     {
      "id": "UK_England_West Midlands",
-     "s": 76653121,
+     "s": 76945881,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13637,7 +13619,7 @@
     },
     {
      "id": "UK_England_Yorkshire and the Humber",
-     "s": 74145995,
+     "s": 74403003,
      "affiliations": [
       "England",
       "United Kingdom"
@@ -13648,7 +13630,7 @@
     },
     {
      "id": "UK_Northern Ireland",
-     "s": 17806671,
+     "s": 17855079,
      "affiliations": [
       "Northern Ireland",
       "Scotland",
@@ -13660,7 +13642,7 @@
     },
     {
      "id": "UK_Scotland_North",
-     "s": 54575425,
+     "s": 54923969,
      "affiliations": [
       "Scotland",
       "United Kingdom"
@@ -13671,7 +13653,7 @@
     },
     {
      "id": "UK_Scotland_South",
-     "s": 53107896,
+     "s": 53457336,
      "affiliations": [
       "Isle of Man",
       "Scotland",
@@ -13683,7 +13665,7 @@
     },
     {
      "id": "UK_Wales",
-     "s": 51070631,
+     "s": 51135159,
      "affiliations": [
       "United Kingdom",
       "Wales"
@@ -13699,7 +13681,7 @@
    "g": [
     {
      "id": "Ireland_Connacht",
-     "s": 20253144,
+     "s": 20334344,
      "affiliations": [
       "Ireland"
      ],
@@ -13709,7 +13691,7 @@
     },
     {
      "id": "Ireland_Leinster",
-     "s": 36928926,
+     "s": 36958430,
      "affiliations": [
       "Ireland"
      ],
@@ -13719,7 +13701,7 @@
     },
     {
      "id": "Ireland_Munster",
-     "s": 26282077,
+     "s": 26450997,
      "affiliations": [
       "Ireland"
      ],
@@ -13729,7 +13711,7 @@
     },
     {
      "id": "Ireland_Northern Counties",
-     "s": 8562457,
+     "s": 8581249,
      "affiliations": [
       "Ireland"
      ],
@@ -13747,7 +13729,7 @@
      "g": [
       {
        "id": "US_Alabama_Birmingham",
-       "s": 43736214,
+       "s": 43733014,
        "affiliations": [
         "Alabama",
         "United States of America"
@@ -13758,7 +13740,7 @@
       },
       {
        "id": "US_Alabama_Montgomery",
-       "s": 51348862,
+       "s": 51360965,
        "affiliations": [
         "Alabama",
         "United States of America"
@@ -13771,7 +13753,7 @@
     },
     {
      "id": "US_Alaska",
-     "s": 40857400,
+     "s": 40933016,
      "affiliations": [
       "Alaska",
       "United States of America"
@@ -13785,7 +13767,7 @@
      "g": [
       {
        "id": "US_Arizona_Flagstaff",
-       "s": 32244298,
+       "s": 32241954,
        "affiliations": [
         "Arizona",
         "United States of America"
@@ -13796,7 +13778,7 @@
       },
       {
        "id": "US_Arizona_Phoenix",
-       "s": 58068337,
+       "s": 58147529,
        "affiliations": [
         "Arizona",
         "United States of America"
@@ -13807,7 +13789,7 @@
       },
       {
        "id": "US_Arizona_Tucson",
-       "s": 22098218,
+       "s": 22204484,
        "affiliations": [
         "Arizona",
         "United States of America"
@@ -13823,7 +13805,7 @@
      "g": [
       {
        "id": "US_Arkansas_North",
-       "s": 41832306,
+       "s": 41880258,
        "affiliations": [
         "Arkansas",
         "United States of America"
@@ -13834,7 +13816,7 @@
       },
       {
        "id": "US_Arkansas_South",
-       "s": 28613397,
+       "s": 28673445,
        "affiliations": [
         "Arkansas",
         "United States of America"
@@ -13850,7 +13832,7 @@
      "g": [
       {
        "id": "US_California_Chico",
-       "s": 32651762,
+       "s": 32622610,
        "affiliations": [
         "California",
         "United States of America"
@@ -13861,7 +13843,7 @@
       },
       {
        "id": "US_California_Bakersfield_Bakersfield",
-       "s": 34801495,
+       "s": 34758071,
        "affiliations": [
         "California",
         "United States of America"
@@ -13872,7 +13854,7 @@
       },
       {
        "id": "US_California_Bakersfield_Lancaster",
-       "s": 20746440,
+       "s": 20783256,
        "affiliations": [
         "California",
         "United States of America"
@@ -13883,7 +13865,7 @@
       },
       {
        "id": "US_California_LA",
-       "s": 93697106,
+       "s": 95274429,
        "affiliations": [
         "California",
         "United States of America"
@@ -13894,7 +13876,7 @@
       },
       {
        "id": "US_California_LA North",
-       "s": 20122086,
+       "s": 20369613,
        "affiliations": [
         "California",
         "United States of America"
@@ -13905,7 +13887,7 @@
       },
       {
        "id": "US_California_Redding",
-       "s": 39996812,
+       "s": 39998444,
        "affiliations": [
         "California",
         "Hoopa Valley Tribe",
@@ -13917,7 +13899,7 @@
       },
       {
        "id": "US_California_Sacramento_Sacramento",
-       "s": 26570809,
+       "s": 26797801,
        "affiliations": [
         "California",
         "United States of America"
@@ -13928,7 +13910,7 @@
       },
       {
        "id": "US_California_Sacramento_Fresno",
-       "s": 30366387,
+       "s": 30355291,
        "affiliations": [
         "California",
         "United States of America"
@@ -13939,7 +13921,7 @@
       },
       {
        "id": "US_California_Sacramento_Stockton",
-       "s": 34754334,
+       "s": 34617646,
        "affiliations": [
         "California",
         "United States of America"
@@ -13950,7 +13932,7 @@
       },
       {
        "id": "US_California_San Diego",
-       "s": 55694040,
+       "s": 55726112,
        "affiliations": [
         "California",
         "United States of America"
@@ -13961,7 +13943,7 @@
       },
       {
        "id": "US_California_Santa_Clara_Santa Cruz",
-       "s": 17457724,
+       "s": 17426564,
        "affiliations": [
         "California",
         "United States of America"
@@ -13972,7 +13954,7 @@
       },
       {
        "id": "US_California_Santa_Clara_Palo Alto",
-       "s": 75716953,
+       "s": 76388569,
        "affiliations": [
         "California",
         "United States of America"
@@ -13988,7 +13970,7 @@
      "g": [
       {
        "id": "US_Colorado_Aspen",
-       "s": 34923302,
+       "s": 35009862,
        "affiliations": [
         "Colorado",
         "United States of America"
@@ -13999,7 +13981,7 @@
       },
       {
        "id": "US_Colorado_Denver",
-       "s": 67715621,
+       "s": 68108885,
        "affiliations": [
         "Colorado",
         "United States of America"
@@ -14010,7 +13992,7 @@
       },
       {
        "id": "US_Colorado_South",
-       "s": 36360647,
+       "s": 36451127,
        "affiliations": [
         "Colorado",
         "United States of America"
@@ -14023,7 +14005,7 @@
     },
     {
      "id": "US_Connecticut",
-     "s": 31564986,
+     "s": 31612067,
      "affiliations": [
       "Connecticut",
       "United States of America"
@@ -14034,7 +14016,7 @@
     },
     {
      "id": "US_Delaware",
-     "s": 10582454,
+     "s": 10614214,
      "affiliations": [
       "Delaware",
       "United States of America"
@@ -14048,7 +14030,7 @@
      "g": [
       {
        "id": "US_Florida_Jacksonville",
-       "s": 38356038,
+       "s": 38356039,
        "affiliations": [
         "Florida",
         "United States of America"
@@ -14059,7 +14041,7 @@
       },
       {
        "id": "US_Florida_Miami",
-       "s": 57437968,
+       "s": 57666152,
        "affiliations": [
         "Florida",
         "United States of America"
@@ -14070,7 +14052,7 @@
       },
       {
        "id": "US_Florida_Orlando",
-       "s": 24620653,
+       "s": 24524420,
        "affiliations": [
         "Florida",
         "United States of America"
@@ -14081,7 +14063,7 @@
       },
       {
        "id": "US_Florida_Tampa",
-       "s": 53801404,
+       "s": 53821620,
        "affiliations": [
         "Florida",
         "United States of America"
@@ -14092,7 +14074,7 @@
       },
       {
        "id": "US_Florida_Gainesville",
-       "s": 33157392,
+       "s": 33252721,
        "affiliations": [
         "Florida",
         "United States of America"
@@ -14108,7 +14090,7 @@
      "g": [
       {
        "id": "US_Georgia_Atlanta",
-       "s": 62424001,
+       "s": 62527129,
        "affiliations": [
         "Georgia",
         "United States of America"
@@ -14119,7 +14101,7 @@
       },
       {
        "id": "US_Georgia_Macon",
-       "s": 45801198,
+       "s": 45714166,
        "affiliations": [
         "Georgia",
         "United States of America"
@@ -14130,7 +14112,7 @@
       },
       {
        "id": "US_Georgia_North",
-       "s": 28516215,
+       "s": 28534151,
        "affiliations": [
         "Georgia",
         "United States of America"
@@ -14141,7 +14123,7 @@
       },
       {
        "id": "US_Georgia_South",
-       "s": 42672328,
+       "s": 42699955,
        "affiliations": [
         "Georgia",
         "United States of America"
@@ -14154,7 +14136,7 @@
     },
     {
      "id": "US_Guam",
-     "s": 2432613,
+     "s": 2432013,
      "affiliations": [
       "Guam",
       "Northern Mariana Islands",
@@ -14167,7 +14149,7 @@
     },
     {
      "id": "US_Hawaii",
-     "s": 9351202,
+     "s": 9364298,
      "affiliations": [
       "Hawaii",
       "United States of America"
@@ -14181,7 +14163,7 @@
      "g": [
       {
        "id": "US_Idaho_North",
-       "s": 22633364,
+       "s": 22631418,
        "affiliations": [
         "Idaho",
         "United States of America"
@@ -14192,7 +14174,7 @@
       },
       {
        "id": "US_Idaho_South",
-       "s": 35312505,
+       "s": 35316994,
        "affiliations": [
         "Idaho",
         "United States of America"
@@ -14208,7 +14190,7 @@
      "g": [
       {
        "id": "US_Illinois_South",
-       "s": 38982461,
+       "s": 39003501,
        "affiliations": [
         "Illinois",
         "United States of America"
@@ -14219,7 +14201,7 @@
       },
       {
        "id": "US_Illinois_Chickago",
-       "s": 67678809,
+       "s": 67830353,
        "affiliations": [
         "Illinois",
         "United States of America"
@@ -14230,7 +14212,7 @@
       },
       {
        "id": "US_Illinois_Elgin",
-       "s": 27363042,
+       "s": 27405842,
        "affiliations": [
         "Illinois",
         "United States of America"
@@ -14241,7 +14223,7 @@
       },
       {
        "id": "US_Illinois_Rockford",
-       "s": 19883027,
+       "s": 19883635,
        "affiliations": [
         "Illinois",
         "United States of America"
@@ -14252,7 +14234,7 @@
       },
       {
        "id": "US_Illinois_Springfield",
-       "s": 50204239,
+       "s": 50293991,
        "affiliations": [
         "Illinois",
         "United States of America"
@@ -14268,7 +14250,7 @@
      "g": [
       {
        "id": "US_Indiana_North",
-       "s": 46522158,
+       "s": 46580030,
        "affiliations": [
         "Indiana",
         "United States of America"
@@ -14279,7 +14261,7 @@
       },
       {
        "id": "US_Indiana_Evansville",
-       "s": 23734267,
+       "s": 23762947,
        "affiliations": [
         "Indiana",
         "United States of America"
@@ -14290,7 +14272,7 @@
       },
       {
        "id": "US_Indiana_Indianapolis",
-       "s": 38228844,
+       "s": 38249708,
        "affiliations": [
         "Indiana",
         "United States of America"
@@ -14306,7 +14288,7 @@
      "g": [
       {
        "id": "US_Iowa_Des Moines",
-       "s": 33694838,
+       "s": 33745654,
        "affiliations": [
         "Iowa",
         "United States of America"
@@ -14317,7 +14299,7 @@
       },
       {
        "id": "US_Iowa_Waterloo",
-       "s": 29912020,
+       "s": 29917172,
        "affiliations": [
         "Iowa",
         "United States of America"
@@ -14328,7 +14310,7 @@
       },
       {
        "id": "US_Iowa_West",
-       "s": 37408209,
+       "s": 37416425,
        "affiliations": [
         "Iowa",
         "United States of America"
@@ -14344,7 +14326,7 @@
      "g": [
       {
        "id": "US_Kansas_East",
-       "s": 39550837,
+       "s": 39552029,
        "affiliations": [
         "Kansas",
         "United States of America"
@@ -14355,7 +14337,7 @@
       },
       {
        "id": "US_Kansas_West",
-       "s": 22464670,
+       "s": 22502478,
        "affiliations": [
         "Kansas",
         "United States of America"
@@ -14366,7 +14348,7 @@
       },
       {
        "id": "US_Kansas_Wichita",
-       "s": 34988290,
+       "s": 34973683,
        "affiliations": [
         "Kansas",
         "United States of America"
@@ -14382,7 +14364,7 @@
      "g": [
       {
        "id": "US_Kentucky_East",
-       "s": 39305490,
+       "s": 39588906,
        "affiliations": [
         "Kentucky",
         "United States of America"
@@ -14393,7 +14375,7 @@
       },
       {
        "id": "US_Kentucky_West",
-       "s": 27905180,
+       "s": 27930964,
        "affiliations": [
         "Kentucky",
         "United States of America"
@@ -14404,7 +14386,7 @@
       },
       {
        "id": "US_Kentucky_Louisville",
-       "s": 33124131,
+       "s": 33126491,
        "affiliations": [
         "Kentucky",
         "United States of America"
@@ -14420,7 +14402,7 @@
      "g": [
       {
        "id": "US_Louisiana_Central",
-       "s": 46564003,
+       "s": 46574267,
        "affiliations": [
         "Louisiana",
         "United States of America"
@@ -14431,7 +14413,7 @@
       },
       {
        "id": "US_Louisiana_New Orleans",
-       "s": 51178867,
+       "s": 51191931,
        "affiliations": [
         "Louisiana",
         "United States of America"
@@ -14444,7 +14426,7 @@
     },
     {
      "id": "US_Maine",
-     "s": 36382712,
+     "s": 36450152,
      "affiliations": [
       "Maine",
       "United States of America"
@@ -14458,7 +14440,7 @@
      "g": [
       {
        "id": "US_Maryland_Baltimore",
-       "s": 82419364,
+       "s": 82482961,
        "affiliations": [
         "Maryland",
         "United States of America"
@@ -14469,7 +14451,7 @@
       },
       {
        "id": "US_Maryland_and_DC",
-       "s": 45821988,
+       "s": 45971192,
        "affiliations": [
         "District of Columbia",
         "Maryland",
@@ -14487,7 +14469,7 @@
      "g": [
       {
        "id": "US_Massachusetts_Boston",
-       "s": 60528708,
+       "s": 60589188,
        "affiliations": [
         "Massachusetts",
         "United States of America"
@@ -14498,7 +14480,7 @@
       },
       {
        "id": "US_Massachusetts_Central",
-       "s": 28119238,
+       "s": 28132806,
        "affiliations": [
         "Massachusetts",
         "United States of America"
@@ -14509,7 +14491,7 @@
       },
       {
        "id": "US_Massachusetts_Plymouth",
-       "s": 30593581,
+       "s": 30595149,
        "affiliations": [
         "Massachusetts",
         "United States of America"
@@ -14520,7 +14502,7 @@
       },
       {
        "id": "US_Massachusetts_Southeastern",
-       "s": 15333383,
+       "s": 15333223,
        "affiliations": [
         "Massachusetts",
         "United States of America"
@@ -14531,7 +14513,7 @@
       },
       {
        "id": "US_Massachusetts_West",
-       "s": 24232910,
+       "s": 24237406,
        "affiliations": [
         "Massachusetts",
         "United States of America"
@@ -14547,7 +14529,7 @@
      "g": [
       {
        "id": "US_Michigan_Detroit",
-       "s": 42948568,
+       "s": 43201849,
        "affiliations": [
         "Michigan",
         "United States of America"
@@ -14558,7 +14540,7 @@
       },
       {
        "id": "US_Michigan_North",
-       "s": 32384557,
+       "s": 32434248,
        "affiliations": [
         "Michigan",
         "United States of America"
@@ -14569,7 +14551,7 @@
       },
       {
        "id": "US_Michigan_Grand Rapids",
-       "s": 37695023,
+       "s": 37786303,
        "affiliations": [
         "Little Traverse Bay Band of Odawas Reservation",
         "Little Traverse Bay Bands Of Odawa Reservation",
@@ -14586,7 +14568,7 @@
       },
       {
        "id": "US_Michigan_Lansing",
-       "s": 41517265,
+       "s": 41550697,
        "affiliations": [
         "Little Traverse Bay Band of Odawas Reservation",
         "Little Traverse Bay Bands of Odawas Reservation",
@@ -14604,7 +14586,7 @@
      "g": [
       {
        "id": "US_Minnesota_Rochester",
-       "s": 39357617,
+       "s": 39461769,
        "affiliations": [
         "Minnesota",
         "United States of America"
@@ -14615,7 +14597,7 @@
       },
       {
        "id": "US_Minnesota_Minneapolis",
-       "s": 38484605,
+       "s": 38504605,
        "affiliations": [
         "Minnesota",
         "United States of America"
@@ -14626,7 +14608,7 @@
       },
       {
        "id": "US_Minnesota_North",
-       "s": 42987820,
+       "s": 42996596,
        "affiliations": [
         "Minnesota",
         "United States of America"
@@ -14637,7 +14619,7 @@
       },
       {
        "id": "US_Minnesota_Saint Cloud",
-       "s": 32937860,
+       "s": 32957884,
        "affiliations": [
         "Minnesota",
         "United States of America"
@@ -14653,7 +14635,7 @@
      "g": [
       {
        "id": "US_Mississippi_Gulfport",
-       "s": 21046468,
+       "s": 21046540,
        "affiliations": [
         "Mississippi",
         "United States of America"
@@ -14664,7 +14646,7 @@
       },
       {
        "id": "US_Mississippi_North",
-       "s": 46409781,
+       "s": 46406493,
        "affiliations": [
         "Mississippi",
         "United States of America"
@@ -14680,7 +14662,7 @@
      "g": [
       {
        "id": "US_Missouri_East",
-       "s": 15454820,
+       "s": 15453980,
        "affiliations": [
         "Missouri",
         "United States of America"
@@ -14691,7 +14673,7 @@
       },
       {
        "id": "US_Missouri_Springfield",
-       "s": 34818562,
+       "s": 34828442,
        "affiliations": [
         "Missouri",
         "United States of America"
@@ -14702,7 +14684,7 @@
       },
       {
        "id": "US_Missouri_Kansas",
-       "s": 33135284,
+       "s": 33158908,
        "affiliations": [
         "Missouri",
         "United States of America"
@@ -14713,7 +14695,7 @@
       },
       {
        "id": "US_Missouri_St Louis",
-       "s": 38960791,
+       "s": 38988959,
        "affiliations": [
         "Missouri",
         "United States of America"
@@ -14729,7 +14711,7 @@
      "g": [
       {
        "id": "US_Montana_East",
-       "s": 31426715,
+       "s": 31510092,
        "affiliations": [
         "Montana",
         "United States of America"
@@ -14740,7 +14722,7 @@
       },
       {
        "id": "US_Montana_West",
-       "s": 29800162,
+       "s": 29825724,
        "affiliations": [
         "Montana",
         "United States of America"
@@ -14756,7 +14738,7 @@
      "g": [
       {
        "id": "US_Nebraska_East",
-       "s": 34297428,
+       "s": 34338572,
        "affiliations": [
         "Nebraska",
         "United States of America"
@@ -14767,7 +14749,7 @@
       },
       {
        "id": "US_Nebraska_West",
-       "s": 43157696,
+       "s": 43185576,
        "affiliations": [
         "Nebraska",
         "United States of America"
@@ -14780,7 +14762,7 @@
     },
     {
      "id": "US_Nevada",
-     "s": 36854836,
+     "s": 36896124,
      "affiliations": [
       "Nevada",
       "United States of America"
@@ -14791,7 +14773,7 @@
     },
     {
      "id": "US_New Hampshire",
-     "s": 33256169,
+     "s": 33290129,
      "affiliations": [
       "New Hampshire",
       "United States of America"
@@ -14805,7 +14787,7 @@
      "g": [
       {
        "id": "US_New Jersey_North",
-       "s": 36877085,
+       "s": 37000245,
        "affiliations": [
         "New Jersey",
         "United States of America"
@@ -14816,7 +14798,7 @@
       },
       {
        "id": "US_New Jersey_South",
-       "s": 48956180,
+       "s": 48960964,
        "affiliations": [
         "New Jersey",
         "United States of America"
@@ -14832,7 +14814,7 @@
      "g": [
       {
        "id": "US_New Mexico_Albuquerque",
-       "s": 35568006,
+       "s": 35591238,
        "affiliations": [
         "New Mexico",
         "United States of America"
@@ -14843,7 +14825,7 @@
       },
       {
        "id": "US_New Mexico_Roswell",
-       "s": 39149633,
+       "s": 39209209,
        "affiliations": [
         "New Mexico",
         "United States of America"
@@ -14859,7 +14841,7 @@
      "g": [
       {
        "id": "US_New York_East",
-       "s": 33085008,
+       "s": 33059352,
        "affiliations": [
         "Gardiners Island",
         "New York",
@@ -14871,7 +14853,7 @@
       },
       {
        "id": "US_New York_New York",
-       "s": 72094166,
+       "s": 72129950,
        "affiliations": [
         "Ellis Island (historical)",
         "Liberty Island",
@@ -14884,7 +14866,7 @@
       },
       {
        "id": "US_New York_North",
-       "s": 39265358,
+       "s": 39318102,
        "affiliations": [
         "New York",
         "United States of America"
@@ -14895,7 +14877,7 @@
       },
       {
        "id": "US_New York_West",
-       "s": 57415056,
+       "s": 57459608,
        "affiliations": [
         "New York",
         "United States of America"
@@ -14911,7 +14893,7 @@
      "g": [
       {
        "id": "US_North Carolina_Wilson",
-       "s": 30262003,
+       "s": 30281676,
        "affiliations": [
         "North Carolina",
         "United States of America"
@@ -14922,7 +14904,7 @@
       },
       {
        "id": "US_North Carolina_Asheville",
-       "s": 26907335,
+       "s": 26882015,
        "affiliations": [
         "North Carolina",
         "United States of America"
@@ -14933,7 +14915,7 @@
       },
       {
        "id": "US_North Carolina_Charlotte",
-       "s": 37465942,
+       "s": 37606294,
        "affiliations": [
         "North Carolina",
         "United States of America"
@@ -14944,7 +14926,7 @@
       },
       {
        "id": "US_North Carolina_Greensboro",
-       "s": 32424456,
+       "s": 32728224,
        "affiliations": [
         "North Carolina",
         "United States of America"
@@ -14955,7 +14937,7 @@
       },
       {
        "id": "US_North Carolina_Raleigh",
-       "s": 38033037,
+       "s": 38108133,
        "affiliations": [
         "North Carolina",
         "United States of America"
@@ -14966,7 +14948,7 @@
       },
       {
        "id": "US_North Carolina_Wilmington",
-       "s": 29747126,
+       "s": 29710550,
        "affiliations": [
         "North Carolina",
         "United States of America"
@@ -14982,7 +14964,7 @@
      "g": [
       {
        "id": "US_North Dakota_Bismarck",
-       "s": 21398565,
+       "s": 21398698,
        "affiliations": [
         "North Dakota",
         "United States of America"
@@ -14993,7 +14975,7 @@
       },
       {
        "id": "US_North Dakota_East",
-       "s": 33793277,
+       "s": 33800389,
        "affiliations": [
         "North Dakota",
         "United States of America"
@@ -15004,7 +14986,7 @@
       },
       {
        "id": "US_North Dakota_Minot",
-       "s": 21170462,
+       "s": 21168046,
        "affiliations": [
         "North Dakota",
         "United States of America"
@@ -15020,7 +15002,7 @@
      "g": [
       {
        "id": "US_Ohio_Cleveland",
-       "s": 47909050,
+       "s": 47907458,
        "affiliations": [
         "Ohio",
         "United States of America"
@@ -15031,7 +15013,7 @@
       },
       {
        "id": "US_Ohio_Cincinnati",
-       "s": 40718104,
+       "s": 40766656,
        "affiliations": [
         "Ohio",
         "United States of America"
@@ -15042,7 +15024,7 @@
       },
       {
        "id": "US_Ohio_Columbus",
-       "s": 31087362,
+       "s": 31116482,
        "affiliations": [
         "Ohio",
         "United States of America"
@@ -15053,7 +15035,7 @@
       },
       {
        "id": "US_Ohio_Toledo",
-       "s": 26733180,
+       "s": 26769284,
        "affiliations": [
         "Ohio",
         "United States of America"
@@ -15069,7 +15051,7 @@
      "g": [
       {
        "id": "US_Oklahoma_East",
-       "s": 19150818,
+       "s": 19201490,
        "affiliations": [
         "Oklahoma",
         "United States of America"
@@ -15080,7 +15062,7 @@
       },
       {
        "id": "US_Oklahoma_West",
-       "s": 24120823,
+       "s": 24135432,
        "affiliations": [
         "Oklahoma",
         "United States of America"
@@ -15091,7 +15073,7 @@
       },
       {
        "id": "US_Oklahoma_Tulsa",
-       "s": 37803131,
+       "s": 37855467,
        "affiliations": [
         "Oklahoma",
         "United States of America"
@@ -15102,7 +15084,7 @@
       },
       {
        "id": "US_Oklahoma_Oklahoma",
-       "s": 35607626,
+       "s": 35628938,
        "affiliations": [
         "Oklahoma",
         "United States of America"
@@ -15118,7 +15100,7 @@
      "g": [
       {
        "id": "US_Oregon_Eugene",
-       "s": 27869416,
+       "s": 27855135,
        "affiliations": [
         "Oregon",
         "United States of America"
@@ -15129,7 +15111,7 @@
       },
       {
        "id": "US_Oregon_Portland",
-       "s": 73422271,
+       "s": 73532375,
        "affiliations": [
         "Oregon",
         "United States of America"
@@ -15140,7 +15122,7 @@
       },
       {
        "id": "US_Oregon_West",
-       "s": 31379663,
+       "s": 31402598,
        "affiliations": [
         "Oregon",
         "United States of America"
@@ -15156,7 +15138,7 @@
      "g": [
       {
        "id": "US_Pennsylvania_Central",
-       "s": 47645228,
+       "s": 47736464,
        "affiliations": [
         "Pennsylvania",
         "United States of America"
@@ -15167,7 +15149,7 @@
       },
       {
        "id": "US_Pennsylvania_Pittsburgh",
-       "s": 41606143,
+       "s": 41732608,
        "affiliations": [
         "Pennsylvania",
         "United States of America"
@@ -15178,7 +15160,7 @@
       },
       {
        "id": "US_Pennsylvania_Reading",
-       "s": 39465897,
+       "s": 39547337,
        "affiliations": [
         "Pennsylvania",
         "United States of America"
@@ -15189,7 +15171,7 @@
       },
       {
        "id": "US_Pennsylvania_Scranton",
-       "s": 44685535,
+       "s": 44882103,
        "affiliations": [
         "Pennsylvania",
         "United States of America"
@@ -15202,7 +15184,7 @@
     },
     {
      "id": "US_Puerto Rico",
-     "s": 33183710,
+     "s": 33235182,
      "affiliations": [
       "Puerto Rico",
       "Rep\u00fablica Dominicana",
@@ -15214,7 +15196,7 @@
     },
     {
      "id": "US_Rhode Island",
-     "s": 11049968,
+     "s": 11071920,
      "affiliations": [
       "Patience Island",
       "Rhode Island",
@@ -15229,7 +15211,7 @@
      "g": [
       {
        "id": "US_South Carolina_Charleston",
-       "s": 22750478,
+       "s": 22758574,
        "affiliations": [
         "South Carolina",
         "United States of America"
@@ -15240,7 +15222,7 @@
       },
       {
        "id": "US_South Carolina_Columbia",
-       "s": 41948459,
+       "s": 41981867,
        "affiliations": [
         "South Carolina",
         "United States of America"
@@ -15251,7 +15233,7 @@
       },
       {
        "id": "US_South Carolina_Florence",
-       "s": 30545505,
+       "s": 30549889,
        "affiliations": [
         "South Carolina",
         "United States of America"
@@ -15264,7 +15246,7 @@
     },
     {
      "id": "US_South Dakota",
-     "s": 38990447,
+     "s": 38987447,
      "affiliations": [
       "South Dakota",
       "United States of America"
@@ -15278,7 +15260,7 @@
      "g": [
       {
        "id": "US_Tennessee_East",
-       "s": 54181489,
+       "s": 54329017,
        "affiliations": [
         "Tennessee",
         "United States of America"
@@ -15289,7 +15271,7 @@
       },
       {
        "id": "US_Tennessee_West",
-       "s": 40075779,
+       "s": 40104099,
        "affiliations": [
         "Tennessee",
         "United States of America"
@@ -15305,7 +15287,7 @@
      "g": [
       {
        "id": "US_Texas_Austin",
-       "s": 55274585,
+       "s": 55341892,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15316,7 +15298,7 @@
       },
       {
        "id": "US_Texas_Victoria",
-       "s": 17435537,
+       "s": 17452841,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15327,7 +15309,7 @@
       },
       {
        "id": "US_Texas_Dallas",
-       "s": 56789363,
+       "s": 56798883,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15338,7 +15320,7 @@
       },
       {
        "id": "US_Texas_Houston",
-       "s": 60419480,
+       "s": 60533832,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15349,7 +15331,7 @@
       },
       {
        "id": "US_Texas_Amarillo",
-       "s": 24568708,
+       "s": 24543628,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15360,7 +15342,7 @@
       },
       {
        "id": "US_Texas_Lubbock",
-       "s": 29395632,
+       "s": 28939944,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15371,7 +15353,7 @@
       },
       {
        "id": "US_Texas_San Antonio",
-       "s": 39590468,
+       "s": 39618948,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15382,7 +15364,7 @@
       },
       {
        "id": "US_Texas_Southwest",
-       "s": 28652142,
+       "s": 28636534,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15393,7 +15375,7 @@
       },
       {
        "id": "US_Texas_Tyler",
-       "s": 38877478,
+       "s": 38918342,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15404,7 +15386,7 @@
       },
       {
        "id": "US_Texas_Wako",
-       "s": 28151032,
+       "s": 28262136,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15415,7 +15397,7 @@
       },
       {
        "id": "US_Texas_West",
-       "s": 42646521,
+       "s": 42602488,
        "affiliations": [
         "Texas",
         "United States of America"
@@ -15428,7 +15410,7 @@
     },
     {
      "id": "US_United States Minor Outlying Islands",
-     "s": 456218,
+     "s": 456330,
      "affiliations": [
       "Navassa Island",
       "United States Minor Outlying Islands"
@@ -15439,7 +15421,7 @@
      "g": [
       {
        "id": "US_Utah_South",
-       "s": 17782333,
+       "s": 17792581,
        "affiliations": [
         "United States of America",
         "Utah"
@@ -15450,7 +15432,7 @@
       },
       {
        "id": "US_Utah_North",
-       "s": 33809340,
+       "s": 33836113,
        "affiliations": [
         "United States of America",
         "Utah"
@@ -15463,7 +15445,7 @@
     },
     {
      "id": "US_Vermont",
-     "s": 16610581,
+     "s": 16601229,
      "affiliations": [
       "United States of America",
       "Vermont"
@@ -15477,7 +15459,7 @@
      "g": [
       {
        "id": "US_Virginia_Roanoke",
-       "s": 38226086,
+       "s": 38215758,
        "affiliations": [
         "Virginia",
         "United States of America"
@@ -15488,7 +15470,7 @@
       },
       {
        "id": "US_Virginia_Norfolk",
-       "s": 65457990,
+       "s": 65616875,
        "affiliations": [
         "Virginia",
         "United States of America"
@@ -15499,7 +15481,7 @@
       },
       {
        "id": "US_Virginia_Lynchburg",
-       "s": 45892207,
+       "s": 45892119,
        "affiliations": [
         "Virginia",
         "United States of America"
@@ -15510,7 +15492,7 @@
       },
       {
        "id": "US_Virginia_Richmond",
-       "s": 24739414,
+       "s": 24700942,
        "affiliations": [
         "Virginia",
         "United States of America"
@@ -15521,7 +15503,7 @@
       },
       {
        "id": "US_Virginia_Alexandria",
-       "s": 36137140,
+       "s": 36168324,
        "affiliations": [
         "Virginia",
         "United States of America"
@@ -15537,7 +15519,7 @@
      "g": [
       {
        "id": "US_Washington_Coast",
-       "s": 50733123,
+       "s": 50765371,
        "affiliations": [
         "Puyallup Tribe",
         "Puyallup Tribe Reservation",
@@ -15550,7 +15532,7 @@
       },
       {
        "id": "US_Washington_Seattle",
-       "s": 45870627,
+       "s": 45959987,
        "affiliations": [
         "United States of America",
         "Washington"
@@ -15561,7 +15543,7 @@
       },
       {
        "id": "US_Washington_Yakima",
-       "s": 37705978,
+       "s": 37709378,
        "affiliations": [
         "United States of America",
         "Washington"
@@ -15574,7 +15556,7 @@
     },
     {
      "id": "US_West Virginia",
-     "s": 37715549,
+     "s": 37794661,
      "affiliations": [
       "United States of America",
       "West Virginia"
@@ -15588,7 +15570,7 @@
      "g": [
       {
        "id": "US_Wisconsin_Milwaukee",
-       "s": 40636171,
+       "s": 40693244,
        "affiliations": [
         "United States of America",
         "Wisconsin"
@@ -15599,7 +15581,7 @@
       },
       {
        "id": "US_Wisconsin_North",
-       "s": 27193116,
+       "s": 27223789,
        "affiliations": [
         "United States of America",
         "Wisconsin"
@@ -15610,7 +15592,7 @@
       },
       {
        "id": "US_Wisconsin_Madison",
-       "s": 28342761,
+       "s": 28556401,
        "affiliations": [
         "United States of America",
         "Wisconsin"
@@ -15621,7 +15603,7 @@
       },
       {
        "id": "US_Wisconsin_Eau Claire",
-       "s": 27745211,
+       "s": 27779587,
        "affiliations": [
         "United States of America",
         "Wisconsin"
@@ -15634,7 +15616,7 @@
     },
     {
      "id": "US_Wyoming",
-     "s": 38343471,
+     "s": 38463511,
      "affiliations": [
       "United States of America",
       "Wyoming"
@@ -15647,7 +15629,7 @@
   },
   {
    "id": "Uruguay",
-   "s": 28857742,
+   "s": 28875222,
    "affiliations": [
     "Cerro Largo",
     "Artigas",
@@ -15676,7 +15658,7 @@
   },
   {
    "id": "Uzbekistan",
-   "s": 42148993,
+   "s": 42379172,
    "affiliations": [
     "Andijon Viloyati",
     "Border Kyrgyzstan - Uzbekistan",
@@ -15701,7 +15683,7 @@
   },
   {
    "id": "Vanuatu",
-   "s": 3313485,
+   "s": 3313557,
    "affiliations": [
     "Malampa",
     "Penama",
@@ -15720,7 +15702,7 @@
    "g": [
     {
      "id": "Venezuela_North",
-     "s": 27887561,
+     "s": 28137192,
      "affiliations": [
       "Barinas",
       "Carabobo",
@@ -15752,7 +15734,7 @@
     },
     {
      "id": "Venezuela_South",
-     "s": 24313004,
+     "s": 24869851,
      "affiliations": [
       "Amazonas",
       "Apure",
@@ -15775,7 +15757,7 @@
   },
   {
    "id": "Vietnam",
-   "s": 44483429,
+   "s": 44582045,
    "affiliations": [
     "T\u1ec9nh H\u00e0 Nam",
     "T\u1ec9nh H\u00e0 T\u0129nh",
@@ -15848,7 +15830,7 @@
   },
   {
    "id": "Yemen",
-   "s": 18398823,
+   "s": 18404039,
    "affiliations": [
     "Abyan",
     "Ad Dali'",
@@ -15879,7 +15861,7 @@
   },
   {
    "id": "Zambia",
-   "s": 21907162,
+   "s": 21975931,
    "affiliations": [
     "Central Province",
     "Copperbelt Province",
@@ -15899,7 +15881,7 @@
   },
   {
    "id": "Zimbabwe",
-   "s": 21003848,
+   "s": 21463800,
    "affiliations": [
     "Bulawayo Province",
     "Mashonaland Central",
@@ -15919,7 +15901,7 @@
   },
   {
    "id": "Antarctica",
-   "s": 14619299,
+   "s": 14623035,
    "affiliations": [
     "South Georgia and South Sandwich Islands"
    ]
@@ -15939,7 +15921,7 @@
     },
     {
      "id": "New Zealand North_Auckland",
-     "s": 50486957,
+     "s": 50526445,
      "affiliations": [
       "Auckland",
       "Bay of Plenty",
@@ -15953,7 +15935,7 @@
     },
     {
      "id": "New Zealand North_Wellington",
-     "s": 39462693,
+     "s": 39464661,
      "affiliations": [
       "Gisborne",
       "Hawke's Bay",
@@ -15968,7 +15950,7 @@
     },
     {
      "id": "New Zealand South_Canterbury",
-     "s": 40458233,
+     "s": 40491033,
      "affiliations": [
       "Canterbury",
       "Chatham Islands",
@@ -15984,7 +15966,7 @@
     },
     {
      "id": "New Zealand South_Southland",
-     "s": 28834640,
+     "s": 28896832,
      "affiliations": [
       "New Zealand/Aotearoa",
       "Otago",
@@ -16002,7 +15984,7 @@
    "g": [
     {
      "id": "South Korea_North",
-     "s": 63686125,
+     "s": 64284277,
      "affiliations": [
       "\uac15\uc6d0\ub3c4",
       "\uacbd\uae30\ub3c4",
@@ -16021,7 +16003,7 @@
     },
     {
      "id": "South Korea_South",
-     "s": 53619437,
+     "s": 53904141,
      "affiliations": [
       "\uc81c\uc8fc\ub3c4",
       "Gyeongnam-Busan Border",
@@ -16042,4 +16024,4 @@
    ]
   }
  ]
-}
\ No newline at end of file
+}
diff --git a/data/external_resources.txt b/data/external_resources.txt
index bd719ee4bc..75594144cd 100644
--- a/data/external_resources.txt
+++ b/data/external_resources.txt
@@ -1,6 +1,6 @@
-WorldCoasts.mwm 4594516
+WorldCoasts.mwm 4600053
 WorldCoasts_obsolete.mwm 4513802
-World.mwm 26189185
+World.mwm 26231017
 01_dejavusans.ttf 633604
 02_droidsans-fallback.ttf 4033420
 03_jomolhari-id-a3d.ttf 1817160
diff --git a/data/hierarchy.txt b/data/hierarchy.txt
index 06aabe8de7..a4b8fa4cc2 100644
--- a/data/hierarchy.txt
+++ b/data/hierarchy.txt
@@ -59,7 +59,6 @@ Australia;Q408;au;en
  Australia_Western Australia;Q3206
  Australia_Brisbane;Q34932
  Australia_Sydney;Q3130
-Nagorno-Karabakh;Q44302
 Azerbaijan Region;Q227;az;az
  Nagorno-Karabakh;Q44302
  Azerbaijan;Q227;;az
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index f408fe990e..11534db317 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 0e42843a64..360144d7a9 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -1,523 +1,523 @@
 <!DOCTYPE skin>
 <root>
  <file width="2048" height="1024">
-  <symbol minX="0" maxX="167" minY="0" maxY="244" name="route_to"/>
-  <symbol minX="167" maxX="243" minY="0" maxY="206" name="route_from"/>
-  <symbol minX="243" maxX="566" minY="0" maxY="158" name="route-arrow"/>
-  <symbol minX="566" maxX="704" minY="0" maxY="138" name="compass-image"/>
-  <symbol minX="704" maxX="799" minY="0" maxY="95" name="cross_geoposition"/>
-  <symbol minX="799" maxX="870" minY="0" maxY="88" name="current-position-compas"/>
-  <symbol minX="870" maxX="941" minY="0" maxY="88" name="current-position-obsolete"/>
-  <symbol minX="941" maxX="1022" minY="0" maxY="81" name="search-result-active"/>
-  <symbol minX="1022" maxX="1057" minY="0" maxY="69" name="placemark-green"/>
-  <symbol minX="1057" maxX="1092" minY="0" maxY="69" name="placemark-orange"/>
-  <symbol minX="1092" maxX="1127" minY="0" maxY="69" name="placemark-pink"/>
-  <symbol minX="1127" maxX="1162" minY="0" maxY="69" name="placemark-brown"/>
-  <symbol minX="1162" maxX="1197" minY="0" maxY="69" name="placemark-purple"/>
-  <symbol minX="1197" maxX="1232" minY="0" maxY="69" name="placemark-red"/>
-  <symbol minX="1232" maxX="1267" minY="0" maxY="69" name="placemark-blue"/>
-  <symbol minX="1267" maxX="1302" minY="0" maxY="69" name="placemark-yellow"/>
-  <symbol minX="1302" maxX="1360" minY="0" maxY="58" name="gallery-l"/>
-  <symbol minX="1360" maxX="1418" minY="0" maxY="58" name="atm-l"/>
-  <symbol minX="1418" maxX="1476" minY="0" maxY="58" name="shop-bicycle-l"/>
-  <symbol minX="1476" maxX="1534" minY="0" maxY="58" name="archery-l"/>
-  <symbol minX="1534" maxX="1592" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1592" maxX="1650" minY="0" maxY="58" name="shoes-l"/>
-  <symbol minX="1650" maxX="1708" minY="0" maxY="58" name="ship-l"/>
-  <symbol minX="1708" maxX="1766" minY="0" maxY="58" name="bakery-l"/>
-  <symbol minX="1766" maxX="1824" minY="0" maxY="58" name="seafood-shop-l"/>
-  <symbol minX="1824" maxX="1881" minY="0" maxY="58" name="bank-l"/>
-  <symbol minX="1881" maxX="1937" minY="0" maxY="58" name="bank-m"/>
-  <symbol minX="1937" maxX="1994" minY="0" maxY="58" name="banknote-l"/>
-  <symbol minX="0" maxX="58" minY="244" maxY="302" name="shop-l"/>
-  <symbol minX="58" maxX="116" minY="244" maxY="302" name="bar-l"/>
-  <symbol minX="116" maxX="174" minY="244" maxY="302" name="school-l"/>
-  <symbol minX="174" maxX="232" minY="244" maxY="302" name="america-football-l"/>
-  <symbol minX="232" maxX="290" minY="244" maxY="302" name="baseball-l"/>
-  <symbol minX="290" maxX="348" minY="244" maxY="302" name="sauna-l"/>
-  <symbol minX="348" maxX="406" minY="244" maxY="302" name="skiing-l"/>
-  <symbol minX="406" maxX="464" minY="244" maxY="302" name="basketball-l"/>
-  <symbol minX="464" maxX="522" minY="244" maxY="302" name="restaurant-l"/>
-  <symbol minX="522" maxX="580" minY="244" maxY="302" name="alpine_hut-l"/>
-  <symbol minX="580" maxX="638" minY="244" maxY="302" name="bbq-l"/>
-  <symbol minX="638" maxX="694" minY="244" maxY="302" name="remains-m"/>
-  <symbol minX="694" maxX="751" minY="244" maxY="302" name="bcontrol-l"/>
-  <symbol minX="751" maxX="807" minY="244" maxY="302" name="bcontrol-m"/>
-  <symbol minX="807" maxX="864" minY="244" maxY="302" name="remains-l"/>
-  <symbol minX="864" maxX="922" minY="244" maxY="302" name="beach-l"/>
-  <symbol minX="922" maxX="980" minY="244" maxY="302" name="recycling-l"/>
-  <symbol minX="980" maxX="1038" minY="244" maxY="302" name="soccer-l"/>
-  <symbol minX="1038" maxX="1096" minY="244" maxY="302" name="beauty-l"/>
-  <symbol minX="1096" maxX="1154" minY="244" maxY="302" name="pub-l"/>
-  <symbol minX="1154" maxX="1211" minY="244" maxY="302" name="beer-l"/>
-  <symbol minX="1211" maxX="1267" minY="244" maxY="302" name="beer-m"/>
-  <symbol minX="1267" maxX="1325" minY="244" maxY="302" name="power-m"/>
-  <symbol minX="1325" maxX="1383" minY="244" maxY="302" name="power-l"/>
-  <symbol minX="1383" maxX="1441" minY="244" maxY="302" name="bicycle-l"/>
-  <symbol minX="1441" maxX="1499" minY="244" maxY="302" name="postbox-l"/>
-  <symbol minX="1499" maxX="1557" minY="244" maxY="302" name="alcohol-l"/>
-  <symbol minX="1557" maxX="1615" minY="244" maxY="302" name="pool-l"/>
-  <symbol minX="1615" maxX="1673" minY="244" maxY="302" name="book-shop-l"/>
-  <symbol minX="1673" maxX="1731" minY="244" maxY="302" name="sports-l"/>
-  <symbol minX="1731" maxX="1789" minY="244" maxY="302" name="police-l"/>
-  <symbol minX="1789" maxX="1847" minY="244" maxY="302" name="bookmaker-l"/>
-  <symbol minX="1847" maxX="1905" minY="244" maxY="302" name="boundary_stone-l"/>
-  <symbol minX="1905" maxX="1963" minY="244" maxY="302" name="place-of-worship-l"/>
-  <symbol minX="1963" maxX="2021" minY="244" maxY="302" name="bowls-l"/>
-  <symbol minX="0" maxX="58" minY="302" maxY="360" name="pitch-l"/>
-  <symbol minX="58" maxX="116" minY="302" maxY="360" name="airport-m"/>
-  <symbol minX="116" maxX="174" minY="302" maxY="360" name="bus-l"/>
-  <symbol minX="174" maxX="230" minY="302" maxY="360" name="picnic-m"/>
-  <symbol minX="230" maxX="288" minY="302" maxY="360" name="airport-l"/>
-  <symbol minX="288" maxX="346" minY="302" maxY="360" name="butcher-l"/>
-  <symbol minX="346" maxX="403" minY="302" maxY="360" name="picnic-l"/>
-  <symbol minX="403" maxX="461" minY="302" maxY="360" name="cable-car-l"/>
-  <symbol minX="461" maxX="519" minY="302" maxY="360" name="photo-shop-l"/>
-  <symbol minX="519" maxX="577" minY="302" maxY="360" name="phone-l"/>
-  <symbol minX="577" maxX="635" minY="302" maxY="360" name="cafe-l"/>
-  <symbol minX="635" maxX="693" minY="302" maxY="360" name="pharmacy-l"/>
-  <symbol minX="693" maxX="751" minY="302" maxY="360" name="zoo-l"/>
-  <symbol minX="751" maxX="809" minY="302" maxY="360" name="campsite-l"/>
-  <symbol minX="809" maxX="867" minY="302" maxY="360" name="petshop-l"/>
-  <symbol minX="867" maxX="925" minY="302" maxY="360" name="subway-entrance-l"/>
-  <symbol minX="925" maxX="983" minY="302" maxY="360" name="car-part-l"/>
-  <symbol minX="983" maxX="1041" minY="302" maxY="360" name="subway-l"/>
-  <symbol minX="1041" maxX="1098" minY="302" maxY="360" name="car-repair-l"/>
-  <symbol minX="1098" maxX="1154" minY="302" maxY="360" name="car-repair-m"/>
-  <symbol minX="1154" maxX="1212" minY="302" maxY="360" name="windmill-l"/>
-  <symbol minX="1212" maxX="1269" minY="302" maxY="360" name="car-wash-l"/>
-  <symbol minX="1269" maxX="1325" minY="302" maxY="360" name="car-wash-m"/>
-  <symbol minX="1325" maxX="1383" minY="302" maxY="360" name="car_sharing-l"/>
-  <symbol minX="1383" maxX="1441" minY="302" maxY="360" name="parking-meter-l"/>
-  <symbol minX="1441" maxX="1499" minY="302" maxY="360" name="caravan_site-l"/>
-  <symbol minX="1499" maxX="1557" minY="302" maxY="360" name="subway-newyork-l"/>
-  <symbol minX="1557" maxX="1615" minY="302" maxY="360" name="casino-l"/>
-  <symbol minX="1615" maxX="1673" minY="302" maxY="360" name="park-l"/>
-  <symbol minX="1673" maxX="1731" minY="302" maxY="360" name="optician-l"/>
-  <symbol minX="1731" maxX="1789" minY="302" maxY="360" name="cave-l"/>
-  <symbol minX="1789" maxX="1845" minY="302" maxY="360" name="office-m"/>
-  <symbol minX="1845" maxX="1903" minY="302" maxY="360" name="wayside_shrine-l"/>
-  <symbol minX="1903" maxX="1961" minY="302" maxY="360" name="cemetery-l"/>
-  <symbol minX="1961" maxX="2018" minY="302" maxY="360" name="office-l"/>
-  <symbol minX="0" maxX="58" minY="360" maxY="418" name="subway-paris-l"/>
-  <symbol minX="58" maxX="116" minY="360" maxY="418" name="charging-station-l"/>
-  <symbol minX="116" maxX="174" minY="360" maxY="418" name="nparkf-l"/>
-  <symbol minX="174" maxX="232" minY="360" maxY="418" name="wayside_cross-l"/>
-  <symbol minX="232" maxX="290" minY="360" maxY="418" name="chemist-l"/>
-  <symbol minX="290" maxX="348" minY="360" maxY="418" name="npark-l"/>
-  <symbol minX="348" maxX="406" minY="360" maxY="418" name="childcare-l"/>
-  <symbol minX="406" maxX="464" minY="360" maxY="418" name="chimney-l"/>
-  <symbol minX="464" maxX="522" minY="360" maxY="418" name="museum-l"/>
-  <symbol minX="522" maxX="580" minY="360" maxY="418" name="cinema-l"/>
-  <symbol minX="580" maxX="638" minY="360" maxY="418" name="moto-sharing-l"/>
-  <symbol minX="638" maxX="696" minY="360" maxY="418" name="subway-spb-l"/>
-  <symbol minX="696" maxX="754" minY="360" maxY="418" name="climbing-l"/>
-  <symbol minX="754" maxX="812" minY="360" maxY="418" name="motel-l"/>
-  <symbol minX="812" maxX="868" minY="360" maxY="418" name="waterfall-m"/>
-  <symbol minX="868" maxX="926" minY="360" maxY="418" name="clothes-l"/>
-  <symbol minX="926" maxX="984" minY="360" maxY="418" name="monument-l"/>
-  <symbol minX="984" maxX="1042" minY="360" maxY="418" name="college-l"/>
-  <symbol minX="1042" maxX="1100" minY="360" maxY="418" name="mobile_phone-l"/>
-  <symbol minX="1100" maxX="1157" minY="360" maxY="418" name="waterfall-l"/>
-  <symbol minX="1157" maxX="1215" minY="360" maxY="418" name="computer-l"/>
-  <symbol minX="1215" maxX="1273" minY="360" maxY="418" name="sweets-l"/>
-  <symbol minX="1273" maxX="1331" minY="360" maxY="418" name="convenience-l"/>
-  <symbol minX="1331" maxX="1389" minY="360" maxY="418" name="military-l"/>
-  <symbol minX="1389" maxX="1447" minY="360" maxY="418" name="copyshop-l"/>
-  <symbol minX="1447" maxX="1505" minY="360" maxY="418" name="swimming-l"/>
-  <symbol minX="1505" maxX="1563" minY="360" maxY="418" name="courthouse-l"/>
-  <symbol minX="1563" maxX="1621" minY="360" maxY="418" name="cricket-l"/>
-  <symbol minX="1621" maxX="1679" minY="360" maxY="418" name="marketplace-l"/>
-  <symbol minX="1679" maxX="1737" minY="360" maxY="418" name="taxi-l"/>
-  <symbol minX="1737" maxX="1795" minY="360" maxY="418" name="mail-l"/>
-  <symbol minX="1795" maxX="1853" minY="360" maxY="418" name="volcano-l"/>
-  <symbol minX="1853" maxX="1911" minY="360" maxY="418" name="viewpoint-m"/>
-  <symbol minX="1911" maxX="1969" minY="360" maxY="418" name="curling-l"/>
-  <symbol minX="1969" maxX="2027" minY="360" maxY="418" name="lightrail-berlin-l"/>
-  <symbol minX="0" maxX="58" minY="418" maxY="476" name="viewpoint-l"/>
-  <symbol minX="58" maxX="116" minY="418" maxY="476" name="dentist-l"/>
-  <symbol minX="116" maxX="174" minY="418" maxY="476" name="dentist-m"/>
-  <symbol minX="174" maxX="232" minY="418" maxY="476" name="tennis-l"/>
-  <symbol minX="232" maxX="290" minY="418" maxY="476" name="department_store-l"/>
-  <symbol minX="290" maxX="348" minY="418" maxY="476" name="lighthouse-l"/>
-  <symbol minX="348" maxX="406" minY="418" maxY="476" name="diving-l"/>
-  <symbol minX="406" maxX="464" minY="418" maxY="476" name="lift_gate-l"/>
-  <symbol minX="464" maxX="522" minY="418" maxY="476" name="veterinary-l"/>
-  <symbol minX="522" maxX="580" minY="418" maxY="476" name="dog_park-l"/>
-  <symbol minX="580" maxX="638" minY="418" maxY="476" name="library-l"/>
-  <symbol minX="638" maxX="696" minY="418" maxY="476" name="doityourself-l"/>
-  <symbol minX="696" maxX="754" minY="418" maxY="476" name="lawyer-l"/>
-  <symbol minX="754" maxX="810" minY="418" maxY="476" name="laundry-m"/>
-  <symbol minX="810" maxX="868" minY="418" maxY="476" name="vending-l"/>
-  <symbol minX="868" maxX="925" minY="418" maxY="476" name="laundry-l"/>
-  <symbol minX="925" maxX="983" minY="418" maxY="476" name="drinking-water-l"/>
-  <symbol minX="983" maxX="1041" minY="418" maxY="476" name="kiosk-l"/>
-  <symbol minX="1041" maxX="1099" minY="418" maxY="476" name="tram-l"/>
-  <symbol minX="1099" maxX="1157" minY="418" maxY="476" name="theatre-l"/>
-  <symbol minX="1157" maxX="1215" minY="418" maxY="476" name="electronics-l"/>
-  <symbol minX="1215" maxX="1273" minY="418" maxY="476" name="kindergarten-m"/>
-  <symbol minX="1273" maxX="1331" minY="418" maxY="476" name="embassy-l"/>
-  <symbol minX="1331" maxX="1389" minY="418" maxY="476" name="kindergarten-l"/>
-  <symbol minX="1389" maxX="1447" minY="418" maxY="476" name="jewelry-l"/>
-  <symbol minX="1447" maxX="1505" minY="418" maxY="476" name="train-l"/>
-  <symbol minX="1505" maxX="1563" minY="418" maxY="476" name="information-l"/>
-  <symbol minX="1563" maxX="1621" minY="418" maxY="476" name="equestrian-l"/>
-  <symbol minX="1621" maxX="1679" minY="418" maxY="476" name="equestrian-m"/>
-  <symbol minX="1679" maxX="1737" minY="418" maxY="476" name="toys-l"/>
-  <symbol minX="1737" maxX="1795" minY="418" maxY="476" name="fastfood-l"/>
-  <symbol minX="1795" maxX="1851" minY="418" maxY="476" name="hunting-tower-m"/>
-  <symbol minX="1851" maxX="1908" minY="418" maxY="476" name="hunting-tower-l"/>
-  <symbol minX="1908" maxX="1966" minY="418" maxY="476" name="fire_station-l"/>
-  <symbol minX="1966" maxX="2024" minY="418" maxY="476" name="ticket-shop-l"/>
-  <symbol minX="0" maxX="58" minY="476" maxY="534" name="townhall-l"/>
-  <symbol minX="58" maxX="116" minY="476" maxY="534" name="hotel-l"/>
-  <symbol minX="116" maxX="174" minY="476" maxY="534" name="florist-l"/>
-  <symbol minX="174" maxX="232" minY="476" maxY="534" name="hospital-l"/>
-  <symbol minX="232" maxX="290" minY="476" maxY="534" name="fountain-l"/>
-  <symbol minX="290" maxX="348" minY="476" maxY="534" name="historic-ship-l"/>
-  <symbol minX="348" maxX="406" minY="476" maxY="534" name="tourist-shop-l"/>
-  <symbol minX="406" maxX="464" minY="476" maxY="534" name="fuel-l"/>
-  <symbol minX="464" maxX="520" minY="476" maxY="534" name="heliport-m"/>
-  <symbol minX="520" maxX="578" minY="476" maxY="534" name="tourist-office-l"/>
-  <symbol minX="578" maxX="636" minY="476" maxY="534" name="funicular-l"/>
-  <symbol minX="636" maxX="693" minY="476" maxY="534" name="heliport-l"/>
-  <symbol minX="693" maxX="751" minY="476" maxY="534" name="toilets-l"/>
-  <symbol minX="751" maxX="809" minY="476" maxY="534" name="furniture-l"/>
-  <symbol minX="809" maxX="867" minY="476" maxY="534" name="helipad-l"/>
-  <symbol minX="867" maxX="925" minY="476" maxY="534" name="hardware-l"/>
-  <symbol minX="925" maxX="983" minY="476" maxY="534" name="hand-m"/>
-  <symbol minX="983" maxX="1041" minY="476" maxY="534" name="tourism-l"/>
-  <symbol minX="1041" maxX="1099" minY="476" maxY="534" name="garden-l"/>
-  <symbol minX="1099" maxX="1157" minY="476" maxY="534" name="hand-l"/>
-  <symbol minX="1157" maxX="1215" minY="476" maxY="534" name="hairdresser-l"/>
-  <symbol minX="1215" maxX="1273" minY="476" maxY="534" name="garden_center-l"/>
-  <symbol minX="1273" maxX="1331" minY="476" maxY="534" name="toll_booth-l"/>
-  <symbol minX="1331" maxX="1389" minY="476" maxY="534" name="gate-l"/>
-  <symbol minX="1389" maxX="1447" minY="476" maxY="534" name="gym-l"/>
-  <symbol minX="1447" maxX="1505" minY="476" maxY="534" name="gift-l"/>
-  <symbol minX="1505" maxX="1563" minY="476" maxY="534" name="grocery-l"/>
-  <symbol minX="1563" maxX="1621" minY="476" maxY="534" name="golf-l"/>
-  <symbol minX="1621" maxX="1679" minY="476" maxY="534" name="greengrocer-l"/>
-  <symbol minX="1679" maxX="1737" minY="476" maxY="534" name="tomb-l"/>
-  <symbol minX="1737" maxX="1793" minY="476" maxY="532" name="golf-m"/>
-  <symbol minX="1793" maxX="1849" minY="476" maxY="532" name="greengrocer-m"/>
-  <symbol minX="1849" maxX="1905" minY="476" maxY="532" name="gift-m"/>
-  <symbol minX="1905" maxX="1961" minY="476" maxY="532" name="grocery-m"/>
-  <symbol minX="1961" maxX="2017" minY="476" maxY="532" name="toll_booth-m"/>
-  <symbol minX="0" maxX="56" minY="534" maxY="590" name="gate-m"/>
-  <symbol minX="56" maxX="112" minY="534" maxY="590" name="gym-m"/>
-  <symbol minX="112" maxX="168" minY="534" maxY="590" name="garden_center-m"/>
-  <symbol minX="168" maxX="224" minY="534" maxY="590" name="tomb-m"/>
-  <symbol minX="224" maxX="280" minY="534" maxY="590" name="hairdresser-m"/>
-  <symbol minX="280" maxX="336" minY="534" maxY="590" name="garden-m"/>
-  <symbol minX="336" maxX="392" minY="534" maxY="590" name="gallery-m"/>
-  <symbol minX="392" maxX="448" minY="534" maxY="590" name="toilets-m"/>
-  <symbol minX="448" maxX="504" minY="534" maxY="590" name="archery-m"/>
-  <symbol minX="504" maxX="560" minY="534" maxY="590" name="hardware-m"/>
-  <symbol minX="560" maxX="616" minY="534" maxY="590" name="furniture-m"/>
-  <symbol minX="616" maxX="672" minY="534" maxY="590" name="helipad-m"/>
-  <symbol minX="672" maxX="728" minY="534" maxY="590" name="tourism-m"/>
-  <symbol minX="728" maxX="784" minY="534" maxY="590" name="funicular-m"/>
-  <symbol minX="784" maxX="840" minY="534" maxY="590" name="fuel-m"/>
-  <symbol minX="840" maxX="896" minY="534" maxY="590" name="shoes-m"/>
-  <symbol minX="896" maxX="952" minY="534" maxY="590" name="fountain-m"/>
-  <symbol minX="952" maxX="1008" minY="534" maxY="590" name="historic-ship-m"/>
-  <symbol minX="1008" maxX="1064" minY="534" maxY="590" name="florist-m"/>
-  <symbol minX="1064" maxX="1120" minY="534" maxY="590" name="hospital-m"/>
-  <symbol minX="1120" maxX="1176" minY="534" maxY="590" name="ticket-shop-m"/>
-  <symbol minX="1176" maxX="1232" minY="534" maxY="590" name="australian-football-m"/>
-  <symbol minX="1232" maxX="1288" minY="534" maxY="590" name="hotel-m"/>
-  <symbol minX="1288" maxX="1344" minY="534" maxY="590" name="fire_station-m"/>
-  <symbol minX="1344" maxX="1400" minY="534" maxY="590" name="townhall-m"/>
-  <symbol minX="1400" maxX="1456" minY="534" maxY="590" name="fastfood-m"/>
-  <symbol minX="1456" maxX="1512" minY="534" maxY="590" name="shop-bicycle-m"/>
-  <symbol minX="1512" maxX="1568" minY="534" maxY="590" name="toys-m"/>
-  <symbol minX="1568" maxX="1624" minY="534" maxY="590" name="information-m"/>
-  <symbol minX="1624" maxX="1680" minY="534" maxY="590" name="theatre-m"/>
-  <symbol minX="1680" maxX="1736" minY="534" maxY="590" name="train-m"/>
-  <symbol minX="1736" maxX="1792" minY="534" maxY="590" name="jewelry-m"/>
-  <symbol minX="1792" maxX="1848" minY="534" maxY="590" name="embassy-m"/>
-  <symbol minX="1848" maxX="1904" minY="534" maxY="590" name="electronics-m"/>
-  <symbol minX="1904" maxX="1960" minY="534" maxY="590" name="drugs"/>
-  <symbol minX="1960" maxX="2016" minY="534" maxY="590" name="drinking-water-m"/>
-  <symbol minX="0" maxX="56" minY="590" maxY="646" name="kiosk-m"/>
-  <symbol minX="56" maxX="112" minY="590" maxY="646" name="tram-m"/>
-  <symbol minX="112" maxX="168" minY="590" maxY="646" name="vending-m"/>
-  <symbol minX="168" maxX="224" minY="590" maxY="646" name="doityourself-m"/>
-  <symbol minX="224" maxX="280" minY="590" maxY="646" name="dog_park-m"/>
-  <symbol minX="280" maxX="336" minY="590" maxY="646" name="library-m"/>
-  <symbol minX="336" maxX="392" minY="590" maxY="646" name="tennis-m"/>
-  <symbol minX="392" maxX="448" minY="590" maxY="646" name="diving-m"/>
-  <symbol minX="448" maxX="504" minY="590" maxY="646" name="lift_gate-m"/>
-  <symbol minX="504" maxX="560" minY="590" maxY="646" name="department_store-m"/>
-  <symbol minX="560" maxX="616" minY="590" maxY="646" name="lighthouse-m"/>
-  <symbol minX="616" maxX="672" minY="590" maxY="646" name="veterinary-m"/>
-  <symbol minX="672" maxX="728" minY="590" maxY="646" name="curling-m"/>
-  <symbol minX="728" maxX="784" minY="590" maxY="646" name="ship-m"/>
-  <symbol minX="784" maxX="840" minY="590" maxY="646" name="taxi-m"/>
-  <symbol minX="840" maxX="896" minY="590" maxY="646" name="volcano-m"/>
-  <symbol minX="896" maxX="952" minY="590" maxY="646" name="mail-m"/>
-  <symbol minX="952" maxX="1008" minY="590" maxY="646" name="america-football-m"/>
-  <symbol minX="1008" maxX="1064" minY="590" maxY="646" name="cricket-m"/>
-  <symbol minX="1064" maxX="1120" minY="590" maxY="646" name="marketplace-m"/>
-  <symbol minX="1120" maxX="1176" minY="590" maxY="646" name="swimming-m"/>
-  <symbol minX="1176" maxX="1232" minY="590" maxY="646" name="copyshop-m"/>
-  <symbol minX="1232" maxX="1288" minY="590" maxY="646" name="sweets-m"/>
-  <symbol minX="1288" maxX="1344" minY="590" maxY="646" name="convenience-m"/>
-  <symbol minX="1344" maxX="1400" minY="590" maxY="646" name="military-m"/>
-  <symbol minX="1400" maxX="1456" minY="590" maxY="646" name="computer-m"/>
-  <symbol minX="1456" maxX="1512" minY="590" maxY="646" name="college-m"/>
-  <symbol minX="1512" maxX="1568" minY="590" maxY="646" name="mobile_phone-m"/>
-  <symbol minX="1568" maxX="1624" minY="590" maxY="646" name="clothes-m"/>
-  <symbol minX="1624" maxX="1680" minY="590" maxY="646" name="monument-m"/>
-  <symbol minX="1680" maxX="1736" minY="590" maxY="646" name="subway-spb-m"/>
-  <symbol minX="1736" maxX="1792" minY="590" maxY="646" name="climbing-m"/>
-  <symbol minX="1792" maxX="1848" minY="590" maxY="646" name="motel-m"/>
-  <symbol minX="1848" maxX="1904" minY="590" maxY="646" name="seafood-shop-m"/>
-  <symbol minX="1904" maxX="1960" minY="590" maxY="646" name="cinema-m"/>
-  <symbol minX="1960" maxX="2016" minY="590" maxY="646" name="chimney-m"/>
-  <symbol minX="0" maxX="56" minY="646" maxY="702" name="museum-m"/>
-  <symbol minX="56" maxX="112" minY="646" maxY="702" name="bakery-m"/>
-  <symbol minX="112" maxX="168" minY="646" maxY="702" name="banknote-m"/>
-  <symbol minX="168" maxX="224" minY="646" maxY="702" name="school-m"/>
-  <symbol minX="224" maxX="280" minY="646" maxY="702" name="bar-m"/>
-  <symbol minX="280" maxX="336" minY="646" maxY="702" name="sauna-m"/>
-  <symbol minX="336" maxX="392" minY="646" maxY="702" name="baseball-m"/>
-  <symbol minX="392" maxX="448" minY="646" maxY="702" name="atm-m"/>
-  <symbol minX="448" maxX="504" minY="646" maxY="702" name="chemist-m"/>
-  <symbol minX="504" maxX="560" minY="646" maxY="702" name="npark-m"/>
-  <symbol minX="560" maxX="616" minY="646" maxY="702" name="shop-m"/>
-  <symbol minX="616" maxX="672" minY="646" maxY="702" name="charging-station-m"/>
-  <symbol minX="672" maxX="728" minY="646" maxY="702" name="nparkf-m "/>
-  <symbol minX="728" maxX="784" minY="646" maxY="702" name="nparkf-m"/>
-  <symbol minX="784" maxX="840" minY="646" maxY="702" name="wayside_cross-m"/>
-  <symbol minX="840" maxX="896" minY="646" maxY="702" name="cemetery-m"/>
-  <symbol minX="896" maxX="952" minY="646" maxY="702" name="cave-m"/>
-  <symbol minX="952" maxX="1008" minY="646" maxY="702" name="alpine_hut-m"/>
-  <symbol minX="1008" maxX="1064" minY="646" maxY="702" name="wayside_shrine-m"/>
-  <symbol minX="1064" maxX="1120" minY="646" maxY="702" name="optician-m"/>
-  <symbol minX="1120" maxX="1176" minY="646" maxY="702" name="casino-m"/>
-  <symbol minX="1176" maxX="1232" minY="646" maxY="702" name="park-m"/>
-  <symbol minX="1232" maxX="1288" minY="646" maxY="702" name="subway-newyork-m"/>
-  <symbol minX="1288" maxX="1344" minY="646" maxY="702" name="restaurant-m"/>
-  <symbol minX="1344" maxX="1400" minY="646" maxY="702" name="caravan_site-m"/>
-  <symbol minX="1400" maxX="1456" minY="646" maxY="702" name="car_sharing-m"/>
-  <symbol minX="1456" maxX="1512" minY="646" maxY="702" name="parking-meter-m"/>
-  <symbol minX="1512" maxX="1568" minY="646" maxY="702" name="basketball-m"/>
-  <symbol minX="1568" maxX="1624" minY="646" maxY="702" name="bbq-m"/>
-  <symbol minX="1624" maxX="1680" minY="646" maxY="702" name="skiing-m"/>
-  <symbol minX="1680" maxX="1736" minY="646" maxY="702" name="subway-m"/>
-  <symbol minX="1736" maxX="1792" minY="646" maxY="702" name="recycling-m"/>
-  <symbol minX="1792" maxX="1848" minY="646" maxY="702" name="car-part-m"/>
-  <symbol minX="1848" maxX="1904" minY="646" maxY="702" name="subway-entrance-m"/>
-  <symbol minX="1904" maxX="1960" minY="646" maxY="702" name="windmill-m"/>
-  <symbol minX="1960" maxX="2016" minY="646" maxY="702" name="campsite-m"/>
-  <symbol minX="0" maxX="56" minY="702" maxY="758" name="petshop-m"/>
-  <symbol minX="56" maxX="112" minY="702" maxY="758" name="pharmacy-2-m"/>
-  <symbol minX="112" maxX="168" minY="702" maxY="758" name="cafe-m"/>
-  <symbol minX="168" maxX="224" minY="702" maxY="758" name="pharmacy-m"/>
-  <symbol minX="224" maxX="280" minY="702" maxY="758" name="subway-entrance-2-m"/>
-  <symbol minX="280" maxX="336" minY="702" maxY="758" name="zoo-m"/>
-  <symbol minX="336" maxX="392" minY="702" maxY="758" name="phone-m"/>
-  <symbol minX="392" maxX="448" minY="702" maxY="758" name="beach-m"/>
-  <symbol minX="448" maxX="504" minY="702" maxY="758" name="cable-car-m"/>
-  <symbol minX="504" maxX="560" minY="702" maxY="758" name="photo-shop-m"/>
-  <symbol minX="560" maxX="616" minY="702" maxY="758" name="butcher-m"/>
-  <symbol minX="616" maxX="672" minY="702" maxY="758" name="bus-m"/>
-  <symbol minX="672" maxX="728" minY="702" maxY="758" name="alcohol-m"/>
-  <symbol minX="728" maxX="784" minY="702" maxY="758" name="bowls-m"/>
-  <symbol minX="784" maxX="840" minY="702" maxY="758" name="pitch-m"/>
-  <symbol minX="840" maxX="896" minY="702" maxY="758" name="soccer-m"/>
-  <symbol minX="896" maxX="952" minY="702" maxY="758" name="boundary_stone-m"/>
-  <symbol minX="952" maxX="1008" minY="702" maxY="758" name="place-of-worship-m"/>
-  <symbol minX="1008" maxX="1064" minY="702" maxY="758" name="sports-m"/>
-  <symbol minX="1064" maxX="1120" minY="702" maxY="758" name="pub-m"/>
-  <symbol minX="1120" maxX="1176" minY="702" maxY="758" name="police-m"/>
-  <symbol minX="1176" maxX="1232" minY="702" maxY="758" name="book-shop-m"/>
-  <symbol minX="1232" maxX="1288" minY="702" maxY="758" name="beauty-m"/>
-  <symbol minX="1288" maxX="1344" minY="702" maxY="758" name="bicycle-m"/>
-  <symbol minX="1344" maxX="1400" minY="702" maxY="758" name="postbox-m"/>
-  <symbol minX="1400" maxX="1452" minY="702" maxY="754" name="current-position"/>
-  <symbol minX="1452" maxX="1503" minY="702" maxY="753" name="subway-rome-l"/>
-  <symbol minX="1503" maxX="1554" minY="702" maxY="753" name="speedcam-l"/>
-  <symbol minX="1554" maxX="1605" minY="702" maxY="753" name="bike-parking-l"/>
-  <symbol minX="1605" maxX="1656" minY="702" maxY="753" name="firehydrant-l"/>
-  <symbol minX="1656" maxX="1707" minY="702" maxY="753" name="subway-berlin-l"/>
-  <symbol minX="1707" maxX="1758" minY="702" maxY="753" name="lightrail-berlin-m"/>
-  <symbol minX="1758" maxX="1809" minY="702" maxY="753" name="waste-basket-l"/>
-  <symbol minX="1809" maxX="1860" minY="702" maxY="753" name="parking-l"/>
-  <symbol minX="1860" maxX="1918" minY="702" maxY="753" name="subway-moscow-l"/>
-  <symbol minX="1918" maxX="1969" minY="702" maxY="753" name="parking-ticket-l"/>
-  <symbol minX="1969" maxX="2016" minY="702" maxY="749" name="subway-paris-m"/>
-  <symbol minX="0" maxX="47" minY="758" maxY="805" name="no-icon-amenity"/>
-  <symbol minX="47" maxX="101" minY="758" maxY="805" name="subway-moscow-m"/>
-  <symbol minX="101" maxX="148" minY="758" maxY="805" name="subway-berlin-m"/>
-  <symbol minX="148" maxX="195" minY="758" maxY="805" name="subway-rome-m"/>
-  <symbol minX="195" maxX="242" minY="758" maxY="805" name="no-icon-leisure"/>
-  <symbol minX="242" maxX="289" minY="758" maxY="805" name="no-icon"/>
-  <symbol minX="289" maxX="336" minY="758" maxY="805" name="no-icon-tourism"/>
-  <symbol minX="336" maxX="383" minY="758" maxY="805" name="no-icon-shop"/>
-  <symbol minX="383" maxX="425" minY="758" maxY="803" name="bcontrol-s"/>
-  <symbol minX="425" maxX="467" minY="758" maxY="803" name="remains-s"/>
-  <symbol minX="467" maxX="509" minY="758" maxY="803" name="beer-s"/>
-  <symbol minX="509" maxX="551" minY="758" maxY="803" name="waterfall-s"/>
-  <symbol minX="551" maxX="609" minY="758" maxY="803" name="subway-london-l"/>
-  <symbol minX="609" maxX="651" minY="758" maxY="803" name="picnic-s"/>
-  <symbol minX="651" maxX="693" minY="758" maxY="803" name="hunting-tower-s"/>
-  <symbol minX="693" maxX="738" minY="758" maxY="803" name="airport-s"/>
-  <symbol minX="738" maxX="780" minY="758" maxY="803" name="heliport-s"/>
-  <symbol minX="780" maxX="822" minY="758" maxY="803" name="office-s"/>
-  <symbol minX="822" maxX="864" minY="758" maxY="800" name="ship-s"/>
-  <symbol minX="864" maxX="906" minY="758" maxY="800" name="school-s"/>
-  <symbol minX="906" maxX="948" minY="758" maxY="800" name="alcohol-s"/>
-  <symbol minX="948" maxX="990" minY="758" maxY="800" name="shop-s"/>
-  <symbol minX="990" maxX="1032" minY="758" maxY="800" name="restaurant-s"/>
-  <symbol minX="1032" maxX="1074" minY="758" maxY="800" name="recycling-s"/>
-  <symbol minX="1074" maxX="1116" minY="758" maxY="800" name="skiing-s"/>
-  <symbol minX="1116" maxX="1158" minY="758" maxY="800" name="alpine_hut-s"/>
-  <symbol minX="1158" maxX="1200" minY="758" maxY="800" name="pub-s"/>
-  <symbol minX="1200" maxX="1242" minY="758" maxY="800" name="soccer-s"/>
-  <symbol minX="1242" maxX="1284" minY="758" maxY="800" name="power-s"/>
-  <symbol minX="1284" maxX="1326" minY="758" maxY="800" name="speedcam-m"/>
-  <symbol minX="1326" maxX="1368" minY="758" maxY="800" name="america-football-s"/>
-  <symbol minX="1368" maxX="1410" minY="758" maxY="800" name="police-s"/>
-  <symbol minX="1410" maxX="1452" minY="758" maxY="800" name="place-of-worship-s"/>
-  <symbol minX="1452" maxX="1494" minY="758" maxY="800" name="archery-s"/>
-  <symbol minX="1494" maxX="1536" minY="758" maxY="800" name="atm-s"/>
-  <symbol minX="1536" maxX="1578" minY="758" maxY="800" name="australian-football-s"/>
-  <symbol minX="1578" maxX="1620" minY="758" maxY="800" name="bar-s"/>
-  <symbol minX="1620" maxX="1678" minY="758" maxY="800" name="subway-barcelona-m"/>
-  <symbol minX="1678" maxX="1729" minY="758" maxY="800" name="subway-barcelona-s"/>
-  <symbol minX="1729" maxX="1771" minY="758" maxY="800" name="pitch-s"/>
-  <symbol minX="1771" maxX="1813" minY="758" maxY="800" name="phone-s"/>
-  <symbol minX="1813" maxX="1855" minY="758" maxY="800" name="baseball-s"/>
-  <symbol minX="1855" maxX="1897" minY="758" maxY="800" name="pharmacy-s"/>
-  <symbol minX="1897" maxX="1939" minY="758" maxY="800" name="subway-entrance-2-s"/>
-  <symbol minX="1939" maxX="1981" minY="758" maxY="800" name="subway-entrance-arrow"/>
-  <symbol minX="1981" maxX="2023" minY="758" maxY="800" name="basketball-s"/>
-  <symbol minX="0" maxX="42" minY="805" maxY="847" name="beach-s"/>
-  <symbol minX="42" maxX="84" minY="805" maxY="847" name="subway-entrance-s"/>
-  <symbol minX="84" maxX="126" minY="805" maxY="847" name="bicycle-s"/>
-  <symbol minX="126" maxX="168" minY="805" maxY="847" name="book-shop-s"/>
-  <symbol minX="168" maxX="210" minY="805" maxY="847" name="bowls-s"/>
-  <symbol minX="210" maxX="252" minY="805" maxY="847" name="bus-s"/>
-  <symbol minX="252" maxX="294" minY="805" maxY="847" name="zoo-s"/>
-  <symbol minX="294" maxX="350" minY="805" maxY="847" name="subway-london-m"/>
-  <symbol minX="350" maxX="392" minY="805" maxY="847" name="cable-car-s"/>
-  <symbol minX="392" maxX="434" minY="805" maxY="847" name="cafe-s"/>
-  <symbol minX="434" maxX="476" minY="805" maxY="847" name="windmill-s"/>
-  <symbol minX="476" maxX="534" minY="805" maxY="847" name="subway-madrid-m"/>
-  <symbol minX="534" maxX="576" minY="805" maxY="847" name="campsite-s"/>
-  <symbol minX="576" maxX="618" minY="805" maxY="847" name="car-repair-s"/>
-  <symbol minX="618" maxX="660" minY="805" maxY="847" name="casino-s"/>
-  <symbol minX="660" maxX="702" minY="805" maxY="847" name="cave-s"/>
-  <symbol minX="702" maxX="744" minY="805" maxY="847" name="cemetery-s"/>
-  <symbol minX="744" maxX="786" minY="805" maxY="847" name="charging-station-s"/>
-  <symbol minX="786" maxX="828" minY="805" maxY="847" name="cinema-s"/>
-  <symbol minX="828" maxX="870" minY="805" maxY="847" name="climbing-s"/>
-  <symbol minX="870" maxX="912" minY="805" maxY="847" name="park-s"/>
-  <symbol minX="912" maxX="954" minY="805" maxY="847" name="subway-newyork-s"/>
-  <symbol minX="954" maxX="996" minY="805" maxY="847" name="college-s"/>
-  <symbol minX="996" maxX="1038" minY="805" maxY="847" name="nparkf-s"/>
-  <symbol minX="1038" maxX="1080" minY="805" maxY="847" name="npark-s"/>
-  <symbol minX="1080" maxX="1122" minY="805" maxY="847" name="cricket-s"/>
-  <symbol minX="1122" maxX="1164" minY="805" maxY="847" name="volcano-s"/>
-  <symbol minX="1164" maxX="1206" minY="805" maxY="847" name="museum-s"/>
-  <symbol minX="1206" maxX="1248" minY="805" maxY="847" name="viewpoint-s"/>
-  <symbol minX="1248" maxX="1290" minY="805" maxY="847" name="subway-s"/>
-  <symbol minX="1290" maxX="1332" minY="805" maxY="847" name="motel-s"/>
-  <symbol minX="1332" maxX="1374" minY="805" maxY="847" name="monument-s"/>
-  <symbol minX="1374" maxX="1416" minY="805" maxY="847" name="subway-spb-s"/>
-  <symbol minX="1416" maxX="1458" minY="805" maxY="847" name="curling-s"/>
-  <symbol minX="1458" maxX="1500" minY="805" maxY="847" name="dentist-s"/>
-  <symbol minX="1500" maxX="1542" minY="805" maxY="847" name="diving-s"/>
-  <symbol minX="1542" maxX="1584" minY="805" maxY="847" name="tram-s"/>
-  <symbol minX="1584" maxX="1626" minY="805" maxY="847" name="military-s"/>
-  <symbol minX="1626" maxX="1668" minY="805" maxY="847" name="drinking-water-s"/>
-  <symbol minX="1668" maxX="1726" minY="805" maxY="847" name="metro-barcelona-m"/>
-  <symbol minX="1726" maxX="1768" minY="805" maxY="847" name="marketplace-s"/>
-  <symbol minX="1768" maxX="1810" minY="805" maxY="847" name="swimming-s"/>
-  <symbol minX="1810" maxX="1852" minY="805" maxY="847" name="mail-s"/>
-  <symbol minX="1852" maxX="1894" minY="805" maxY="847" name="train-s"/>
-  <symbol minX="1894" maxX="1936" minY="805" maxY="847" name="lighthouse-s"/>
-  <symbol minX="1936" maxX="1978" minY="805" maxY="847" name="library-s"/>
-  <symbol minX="1978" maxX="2020" minY="805" maxY="847" name="tennis-s"/>
-  <symbol minX="0" maxX="42" minY="847" maxY="889" name="kindergarten-s"/>
-  <symbol minX="42" maxX="84" minY="847" maxY="889" name="information-s"/>
-  <symbol minX="84" maxX="126" minY="847" maxY="889" name="theatre-s"/>
-  <symbol minX="126" maxX="168" minY="847" maxY="889" name="hotel-s"/>
-  <symbol minX="168" maxX="210" minY="847" maxY="889" name="hospital-s"/>
-  <symbol minX="210" maxX="252" minY="847" maxY="889" name="helipad-s"/>
-  <symbol minX="252" maxX="294" minY="847" maxY="889" name="hand-s"/>
-  <symbol minX="294" maxX="336" minY="847" maxY="889" name="toilets-s"/>
-  <symbol minX="336" maxX="378" minY="847" maxY="889" name="gym-s"/>
-  <symbol minX="378" maxX="420" minY="847" maxY="889" name="grocery-s"/>
-  <symbol minX="420" maxX="462" minY="847" maxY="889" name="toll_booth-s"/>
-  <symbol minX="462" maxX="504" minY="847" maxY="889" name="golf-s"/>
-  <symbol minX="504" maxX="546" minY="847" maxY="889" name="garden-s"/>
-  <symbol minX="546" maxX="588" minY="847" maxY="889" name="gallery-s"/>
-  <symbol minX="588" maxX="630" minY="847" maxY="889" name="funicular-s"/>
-  <symbol minX="630" maxX="672" minY="847" maxY="889" name="tourism-s"/>
-  <symbol minX="672" maxX="714" minY="847" maxY="889" name="fuel-s"/>
-  <symbol minX="714" maxX="756" minY="847" maxY="889" name="fountain-s"/>
-  <symbol minX="756" maxX="798" minY="847" maxY="889" name="fire_station-s"/>
-  <symbol minX="798" maxX="840" minY="847" maxY="889" name="fastfood-s"/>
-  <symbol minX="840" maxX="882" minY="847" maxY="889" name="townhall-s"/>
-  <symbol minX="882" maxX="924" minY="847" maxY="889" name="equestrian-s"/>
-  <symbol minX="924" maxX="966" minY="847" maxY="889" name="embassy-s"/>
-  <symbol minX="966" maxX="1024" minY="847" maxY="888" name="subway-madrid-l"/>
-  <symbol minX="1024" maxX="1082" minY="847" maxY="888" name="subway-barcelona-l"/>
-  <symbol minX="1082" maxX="1120" minY="847" maxY="887" name="s-arrow"/>
-  <symbol minX="1120" maxX="1160" minY="847" maxY="887" name="parking-m"/>
-  <symbol minX="1160" maxX="1216" minY="847" maxY="885" name="subway-kiev-l"/>
-  <symbol minX="1216" maxX="1254" minY="847" maxY="885" name="peak-l"/>
-  <symbol minX="1254" maxX="1292" minY="847" maxY="885" name="waste-basket-s"/>
-  <symbol minX="1292" maxX="1343" minY="847" maxY="885" name="metro-barcelona-s"/>
-  <symbol minX="1343" maxX="1381" minY="847" maxY="885" name="subway-paris-s"/>
-  <symbol minX="1381" maxX="1419" minY="847" maxY="885" name="search-result"/>
-  <symbol minX="1419" maxX="1457" minY="847" maxY="885" name="api-result"/>
-  <symbol minX="1457" maxX="1513" minY="847" maxY="885" name="subway-kiev-m"/>
-  <symbol minX="1513" maxX="1564" minY="847" maxY="885" name="subway-madrid-s"/>
-  <symbol minX="1564" maxX="1602" minY="847" maxY="885" name="lightrail-berlin-s"/>
-  <symbol minX="1602" maxX="1638" minY="847" maxY="883" name="subway-moscow-s"/>
-  <symbol minX="1638" maxX="1671" minY="847" maxY="880" name="subway-rome-s"/>
-  <symbol minX="1671" maxX="1704" minY="847" maxY="880" name="speedcam-s"/>
-  <symbol minX="1704" maxX="1746" minY="847" maxY="880" name="subway-london-s"/>
-  <symbol minX="1746" maxX="1784" minY="847" maxY="880" name="bench"/>
-  <symbol minX="1784" maxX="1817" minY="847" maxY="880" name="subway-berlin-s"/>
-  <symbol minX="1817" maxX="1850" minY="847" maxY="880" name="parking-s"/>
-  <symbol minX="1850" maxX="1883" minY="847" maxY="878" name="peakt-l"/>
-  <symbol minX="1883" maxX="1939" minY="847" maxY="878" name="subway-minsk-l"/>
-  <symbol minX="1939" maxX="1970" minY="847" maxY="878" name="survey_point-l"/>
-  <symbol minX="1970" maxX="2001" minY="847" maxY="878" name="star-l"/>
-  <symbol minX="2001" maxX="2030" minY="847" maxY="876" name="star-m"/>
-  <symbol minX="0" maxX="47" minY="889" maxY="918" name="subway-kiev-s"/>
-  <symbol minX="47" maxX="94" minY="889" maxY="916" name="subway-minsk-m"/>
-  <symbol minX="94" maxX="123" minY="889" maxY="916" name="peak-m"/>
-  <symbol minX="123" maxX="150" minY="889" maxY="916" name="subway-newyork-xs"/>
-  <symbol minX="150" maxX="192" minY="889" maxY="916" name="railway-crossing"/>
-  <symbol minX="192" maxX="219" minY="889" maxY="916" name="survey_point-m"/>
-  <symbol minX="219" maxX="246" minY="889" maxY="916" name="subway-xs"/>
-  <symbol minX="246" maxX="270" minY="889" maxY="913" name="crossing-l"/>
-  <symbol minX="270" maxX="294" minY="889" maxY="913" name="star-s"/>
-  <symbol minX="294" maxX="336" minY="889" maxY="913" name="subway-minsk-s"/>
-  <symbol minX="336" maxX="360" minY="889" maxY="911" name="peakt-m"/>
-  <symbol minX="360" maxX="382" minY="889" maxY="911" name="survey_point-s"/>
-  <symbol minX="382" maxX="406" minY="889" maxY="911" name="peak-s"/>
-  <symbol minX="406" maxX="457" minY="889" maxY="911" name="arrow-m"/>
-  <symbol minX="457" maxX="477" minY="889" maxY="909" name="entrance-s"/>
-  <symbol minX="477" maxX="497" minY="889" maxY="909" name="crossing-m"/>
-  <symbol minX="497" maxX="517" minY="889" maxY="907" name="peakt-s"/>
-  <symbol minX="517" maxX="555" minY="889" maxY="904" name="arrow-s"/>
-  <symbol minX="555" maxX="570" minY="889" maxY="904" name="crossing-s"/>
-  <symbol minX="570" maxX="585" minY="889" maxY="904" name="none"/>
-  <symbol minX="585" maxX="600" minY="889" maxY="904" name="tree-l"/>
-  <symbol minX="600" maxX="615" minY="889" maxY="904" name="dot-m"/>
-  <symbol minX="615" maxX="628" minY="889" maxY="902" name="tree-m"/>
-  <symbol minX="628" maxX="641" minY="889" maxY="902" name="entrance-xs"/>
-  <symbol minX="641" maxX="652" minY="889" maxY="900" name="tree-s"/>
-  <symbol minX="652" maxX="663" minY="889" maxY="900" name="dot-s"/>
-  <symbol minX="663" maxX="674" minY="889" maxY="900" name="dot-s-light"/>
-  <symbol minX="674" maxX="685" minY="889" maxY="900" name="zero-icon"/>
+  <symbol minY="0" maxY="244" name="route_to" minX="0" maxX="167"/>
+  <symbol minY="0" maxY="206" name="route_from" minX="167" maxX="243"/>
+  <symbol minY="0" maxY="158" name="route-arrow" minX="243" maxX="566"/>
+  <symbol minY="0" maxY="138" name="compass-image" minX="566" maxX="704"/>
+  <symbol minY="0" maxY="95" name="cross_geoposition" minX="704" maxX="799"/>
+  <symbol minY="0" maxY="88" name="current-position-compas" minX="799" maxX="870"/>
+  <symbol minY="0" maxY="88" name="current-position-obsolete" minX="870" maxX="941"/>
+  <symbol minY="0" maxY="81" name="search-result-active" minX="941" maxX="1022"/>
+  <symbol minY="0" maxY="69" name="placemark-green" minX="1022" maxX="1057"/>
+  <symbol minY="0" maxY="69" name="placemark-orange" minX="1057" maxX="1092"/>
+  <symbol minY="0" maxY="69" name="placemark-pink" minX="1092" maxX="1127"/>
+  <symbol minY="0" maxY="69" name="placemark-brown" minX="1127" maxX="1162"/>
+  <symbol minY="0" maxY="69" name="placemark-purple" minX="1162" maxX="1197"/>
+  <symbol minY="0" maxY="69" name="placemark-red" minX="1197" maxX="1232"/>
+  <symbol minY="0" maxY="69" name="placemark-blue" minX="1232" maxX="1267"/>
+  <symbol minY="0" maxY="69" name="placemark-yellow" minX="1267" maxX="1302"/>
+  <symbol minY="0" maxY="58" name="gallery-l" minX="1302" maxX="1360"/>
+  <symbol minY="0" maxY="58" name="atm-l" minX="1360" maxX="1418"/>
+  <symbol minY="0" maxY="58" name="shop-bicycle-l" minX="1418" maxX="1476"/>
+  <symbol minY="0" maxY="58" name="archery-l" minX="1476" maxX="1534"/>
+  <symbol minY="0" maxY="58" name="australian-football-l" minX="1534" maxX="1592"/>
+  <symbol minY="0" maxY="58" name="shoes-l" minX="1592" maxX="1650"/>
+  <symbol minY="0" maxY="58" name="ship-l" minX="1650" maxX="1708"/>
+  <symbol minY="0" maxY="58" name="bakery-l" minX="1708" maxX="1766"/>
+  <symbol minY="0" maxY="58" name="seafood-shop-l" minX="1766" maxX="1824"/>
+  <symbol minY="0" maxY="58" name="bank-l" minX="1824" maxX="1881"/>
+  <symbol minY="0" maxY="58" name="bank-m" minX="1881" maxX="1937"/>
+  <symbol minY="0" maxY="58" name="banknote-l" minX="1937" maxX="1994"/>
+  <symbol minY="244" maxY="302" name="shop-l" minX="0" maxX="58"/>
+  <symbol minY="244" maxY="302" name="bar-l" minX="58" maxX="116"/>
+  <symbol minY="244" maxY="302" name="school-l" minX="116" maxX="174"/>
+  <symbol minY="244" maxY="302" name="america-football-l" minX="174" maxX="232"/>
+  <symbol minY="244" maxY="302" name="baseball-l" minX="232" maxX="290"/>
+  <symbol minY="244" maxY="302" name="sauna-l" minX="290" maxX="348"/>
+  <symbol minY="244" maxY="302" name="skiing-l" minX="348" maxX="406"/>
+  <symbol minY="244" maxY="302" name="basketball-l" minX="406" maxX="464"/>
+  <symbol minY="244" maxY="302" name="restaurant-l" minX="464" maxX="522"/>
+  <symbol minY="244" maxY="302" name="alpine_hut-l" minX="522" maxX="580"/>
+  <symbol minY="244" maxY="302" name="bbq-l" minX="580" maxX="638"/>
+  <symbol minY="244" maxY="302" name="remains-m" minX="638" maxX="694"/>
+  <symbol minY="244" maxY="302" name="bcontrol-l" minX="694" maxX="751"/>
+  <symbol minY="244" maxY="302" name="bcontrol-m" minX="751" maxX="807"/>
+  <symbol minY="244" maxY="302" name="remains-l" minX="807" maxX="864"/>
+  <symbol minY="244" maxY="302" name="beach-l" minX="864" maxX="922"/>
+  <symbol minY="244" maxY="302" name="recycling-l" minX="922" maxX="980"/>
+  <symbol minY="244" maxY="302" name="soccer-l" minX="980" maxX="1038"/>
+  <symbol minY="244" maxY="302" name="beauty-l" minX="1038" maxX="1096"/>
+  <symbol minY="244" maxY="302" name="pub-l" minX="1096" maxX="1154"/>
+  <symbol minY="244" maxY="302" name="beer-l" minX="1154" maxX="1211"/>
+  <symbol minY="244" maxY="302" name="beer-m" minX="1211" maxX="1267"/>
+  <symbol minY="244" maxY="302" name="power-m" minX="1267" maxX="1325"/>
+  <symbol minY="244" maxY="302" name="power-l" minX="1325" maxX="1383"/>
+  <symbol minY="244" maxY="302" name="bicycle-l" minX="1383" maxX="1441"/>
+  <symbol minY="244" maxY="302" name="postbox-l" minX="1441" maxX="1499"/>
+  <symbol minY="244" maxY="302" name="alcohol-l" minX="1499" maxX="1557"/>
+  <symbol minY="244" maxY="302" name="pool-l" minX="1557" maxX="1615"/>
+  <symbol minY="244" maxY="302" name="book-shop-l" minX="1615" maxX="1673"/>
+  <symbol minY="244" maxY="302" name="sports-l" minX="1673" maxX="1731"/>
+  <symbol minY="244" maxY="302" name="police-l" minX="1731" maxX="1789"/>
+  <symbol minY="244" maxY="302" name="bookmaker-l" minX="1789" maxX="1847"/>
+  <symbol minY="244" maxY="302" name="boundary_stone-l" minX="1847" maxX="1905"/>
+  <symbol minY="244" maxY="302" name="place-of-worship-l" minX="1905" maxX="1963"/>
+  <symbol minY="244" maxY="302" name="bowls-l" minX="1963" maxX="2021"/>
+  <symbol minY="302" maxY="360" name="pitch-l" minX="0" maxX="58"/>
+  <symbol minY="302" maxY="360" name="airport-m" minX="58" maxX="116"/>
+  <symbol minY="302" maxY="360" name="bus-l" minX="116" maxX="174"/>
+  <symbol minY="302" maxY="360" name="picnic-m" minX="174" maxX="230"/>
+  <symbol minY="302" maxY="360" name="airport-l" minX="230" maxX="288"/>
+  <symbol minY="302" maxY="360" name="butcher-l" minX="288" maxX="346"/>
+  <symbol minY="302" maxY="360" name="picnic-l" minX="346" maxX="403"/>
+  <symbol minY="302" maxY="360" name="cable-car-l" minX="403" maxX="461"/>
+  <symbol minY="302" maxY="360" name="photo-shop-l" minX="461" maxX="519"/>
+  <symbol minY="302" maxY="360" name="phone-l" minX="519" maxX="577"/>
+  <symbol minY="302" maxY="360" name="cafe-l" minX="577" maxX="635"/>
+  <symbol minY="302" maxY="360" name="pharmacy-l" minX="635" maxX="693"/>
+  <symbol minY="302" maxY="360" name="zoo-l" minX="693" maxX="751"/>
+  <symbol minY="302" maxY="360" name="campsite-l" minX="751" maxX="809"/>
+  <symbol minY="302" maxY="360" name="petshop-l" minX="809" maxX="867"/>
+  <symbol minY="302" maxY="360" name="subway-entrance-l" minX="867" maxX="925"/>
+  <symbol minY="302" maxY="360" name="car-part-l" minX="925" maxX="983"/>
+  <symbol minY="302" maxY="360" name="subway-l" minX="983" maxX="1041"/>
+  <symbol minY="302" maxY="360" name="car-repair-l" minX="1041" maxX="1098"/>
+  <symbol minY="302" maxY="360" name="car-repair-m" minX="1098" maxX="1154"/>
+  <symbol minY="302" maxY="360" name="windmill-l" minX="1154" maxX="1212"/>
+  <symbol minY="302" maxY="360" name="car-wash-l" minX="1212" maxX="1269"/>
+  <symbol minY="302" maxY="360" name="car-wash-m" minX="1269" maxX="1325"/>
+  <symbol minY="302" maxY="360" name="car_sharing-l" minX="1325" maxX="1383"/>
+  <symbol minY="302" maxY="360" name="subway-newyork-l" minX="1383" maxX="1441"/>
+  <symbol minY="302" maxY="360" name="caravan_site-l" minX="1441" maxX="1499"/>
+  <symbol minY="302" maxY="360" name="parking-meter-l" minX="1499" maxX="1557"/>
+  <symbol minY="302" maxY="360" name="casino-l" minX="1557" maxX="1615"/>
+  <symbol minY="302" maxY="360" name="subway-paris-l" minX="1615" maxX="1673"/>
+  <symbol minY="302" maxY="360" name="park-l" minX="1673" maxX="1731"/>
+  <symbol minY="302" maxY="360" name="cave-l" minX="1731" maxX="1789"/>
+  <symbol minY="302" maxY="360" name="optician-l" minX="1789" maxX="1847"/>
+  <symbol minY="302" maxY="360" name="wayside_shrine-l" minX="1847" maxX="1905"/>
+  <symbol minY="302" maxY="360" name="cemetery-l" minX="1905" maxX="1963"/>
+  <symbol minY="302" maxY="360" name="office-m" minX="1963" maxX="2019"/>
+  <symbol minY="360" maxY="418" name="office-l" minX="0" maxX="57"/>
+  <symbol minY="360" maxY="418" name="charging-station-l" minX="57" maxX="115"/>
+  <symbol minY="360" maxY="418" name="nparkf-l" minX="115" maxX="173"/>
+  <symbol minY="360" maxY="418" name="wayside_cross-l" minX="173" maxX="231"/>
+  <symbol minY="360" maxY="418" name="chemist-l" minX="231" maxX="289"/>
+  <symbol minY="360" maxY="418" name="npark-l" minX="289" maxX="347"/>
+  <symbol minY="360" maxY="418" name="childcare-l" minX="347" maxX="405"/>
+  <symbol minY="360" maxY="418" name="chimney-l" minX="405" maxX="463"/>
+  <symbol minY="360" maxY="418" name="subway-spb-l" minX="463" maxX="521"/>
+  <symbol minY="360" maxY="418" name="cinema-l" minX="521" maxX="579"/>
+  <symbol minY="360" maxY="418" name="museum-l" minX="579" maxX="637"/>
+  <symbol minY="360" maxY="418" name="moto-sharing-l" minX="637" maxX="695"/>
+  <symbol minY="360" maxY="418" name="climbing-l" minX="695" maxX="753"/>
+  <symbol minY="360" maxY="418" name="motel-l" minX="753" maxX="811"/>
+  <symbol minY="360" maxY="418" name="waterfall-m" minX="811" maxX="867"/>
+  <symbol minY="360" maxY="418" name="clothes-l" minX="867" maxX="925"/>
+  <symbol minY="360" maxY="418" name="sweets-l" minX="925" maxX="983"/>
+  <symbol minY="360" maxY="418" name="college-l" minX="983" maxX="1041"/>
+  <symbol minY="360" maxY="418" name="monument-l" minX="1041" maxX="1099"/>
+  <symbol minY="360" maxY="418" name="waterfall-l" minX="1099" maxX="1156"/>
+  <symbol minY="360" maxY="418" name="computer-l" minX="1156" maxX="1214"/>
+  <symbol minY="360" maxY="418" name="mobile_phone-l" minX="1214" maxX="1272"/>
+  <symbol minY="360" maxY="418" name="convenience-l" minX="1272" maxX="1330"/>
+  <symbol minY="360" maxY="418" name="military-l" minX="1330" maxX="1388"/>
+  <symbol minY="360" maxY="418" name="copyshop-l" minX="1388" maxX="1446"/>
+  <symbol minY="360" maxY="418" name="swimming-l" minX="1446" maxX="1504"/>
+  <symbol minY="360" maxY="418" name="courthouse-l" minX="1504" maxX="1562"/>
+  <symbol minY="360" maxY="418" name="cricket-l" minX="1562" maxX="1620"/>
+  <symbol minY="360" maxY="418" name="taxi-l" minX="1620" maxX="1678"/>
+  <symbol minY="360" maxY="418" name="marketplace-l" minX="1678" maxX="1736"/>
+  <symbol minY="360" maxY="418" name="mail-l" minX="1736" maxX="1794"/>
+  <symbol minY="360" maxY="418" name="tennis-l" minX="1794" maxX="1852"/>
+  <symbol minY="360" maxY="418" name="volcano-l" minX="1852" maxX="1910"/>
+  <symbol minY="360" maxY="418" name="curling-l" minX="1910" maxX="1968"/>
+  <symbol minY="360" maxY="418" name="lightrail-berlin-l" minX="1968" maxX="2026"/>
+  <symbol minY="418" maxY="476" name="viewpoint-m" minX="0" maxX="58"/>
+  <symbol minY="418" maxY="476" name="dentist-l" minX="58" maxX="116"/>
+  <symbol minY="418" maxY="476" name="dentist-m" minX="116" maxX="174"/>
+  <symbol minY="418" maxY="476" name="viewpoint-l" minX="174" maxX="232"/>
+  <symbol minY="418" maxY="476" name="department_store-l" minX="232" maxX="290"/>
+  <symbol minY="418" maxY="476" name="lighthouse-l" minX="290" maxX="348"/>
+  <symbol minY="418" maxY="476" name="diving-l" minX="348" maxX="406"/>
+  <symbol minY="418" maxY="476" name="lift_gate-l" minX="406" maxX="464"/>
+  <symbol minY="418" maxY="476" name="theatre-l" minX="464" maxX="522"/>
+  <symbol minY="418" maxY="476" name="dog_park-l" minX="522" maxX="580"/>
+  <symbol minY="418" maxY="476" name="library-l" minX="580" maxX="638"/>
+  <symbol minY="418" maxY="476" name="doityourself-l" minX="638" maxX="696"/>
+  <symbol minY="418" maxY="476" name="lawyer-l" minX="696" maxX="754"/>
+  <symbol minY="418" maxY="476" name="veterinary-l" minX="754" maxX="812"/>
+  <symbol minY="418" maxY="476" name="laundry-m" minX="812" maxX="868"/>
+  <symbol minY="418" maxY="476" name="vending-l" minX="868" maxX="926"/>
+  <symbol minY="418" maxY="476" name="drinking-water-l" minX="926" maxX="984"/>
+  <symbol minY="418" maxY="476" name="laundry-l" minX="984" maxX="1041"/>
+  <symbol minY="418" maxY="476" name="kiosk-l" minX="1041" maxX="1099"/>
+  <symbol minY="418" maxY="476" name="kindergarten-m" minX="1099" maxX="1157"/>
+  <symbol minY="418" maxY="476" name="electronics-l" minX="1157" maxX="1215"/>
+  <symbol minY="418" maxY="476" name="kindergarten-l" minX="1215" maxX="1273"/>
+  <symbol minY="418" maxY="476" name="embassy-l" minX="1273" maxX="1331"/>
+  <symbol minY="418" maxY="476" name="jewelry-l" minX="1331" maxX="1389"/>
+  <symbol minY="418" maxY="476" name="tram-l" minX="1389" maxX="1447"/>
+  <symbol minY="418" maxY="476" name="ticket-shop-l" minX="1447" maxX="1505"/>
+  <symbol minY="418" maxY="476" name="train-l" minX="1505" maxX="1563"/>
+  <symbol minY="418" maxY="476" name="equestrian-l" minX="1563" maxX="1621"/>
+  <symbol minY="418" maxY="476" name="equestrian-m" minX="1621" maxX="1679"/>
+  <symbol minY="418" maxY="476" name="information-l" minX="1679" maxX="1737"/>
+  <symbol minY="418" maxY="476" name="fastfood-l" minX="1737" maxX="1795"/>
+  <symbol minY="418" maxY="476" name="hunting-tower-m" minX="1795" maxX="1851"/>
+  <symbol minY="418" maxY="476" name="toys-l" minX="1851" maxX="1909"/>
+  <symbol minY="418" maxY="476" name="fire_station-l" minX="1909" maxX="1967"/>
+  <symbol minY="418" maxY="476" name="hunting-tower-l" minX="1967" maxX="2024"/>
+  <symbol minY="476" maxY="534" name="hotel-l" minX="0" maxX="58"/>
+  <symbol minY="476" maxY="534" name="toilets-l" minX="58" maxX="116"/>
+  <symbol minY="476" maxY="534" name="florist-l" minX="116" maxX="174"/>
+  <symbol minY="476" maxY="534" name="hospital-l" minX="174" maxX="232"/>
+  <symbol minY="476" maxY="534" name="fountain-l" minX="232" maxX="290"/>
+  <symbol minY="476" maxY="534" name="historic-ship-l" minX="290" maxX="348"/>
+  <symbol minY="476" maxY="534" name="townhall-l" minX="348" maxX="406"/>
+  <symbol minY="476" maxY="534" name="fuel-l" minX="406" maxX="464"/>
+  <symbol minY="476" maxY="534" name="heliport-m" minX="464" maxX="520"/>
+  <symbol minY="476" maxY="534" name="tourist-shop-l" minX="520" maxX="578"/>
+  <symbol minY="476" maxY="534" name="funicular-l" minX="578" maxX="636"/>
+  <symbol minY="476" maxY="534" name="heliport-l" minX="636" maxX="693"/>
+  <symbol minY="476" maxY="534" name="tourist-office-l" minX="693" maxX="751"/>
+  <symbol minY="476" maxY="534" name="furniture-l" minX="751" maxX="809"/>
+  <symbol minY="476" maxY="534" name="helipad-l" minX="809" maxX="867"/>
+  <symbol minY="476" maxY="534" name="hardware-l" minX="867" maxX="925"/>
+  <symbol minY="476" maxY="534" name="toll_booth-l" minX="925" maxX="983"/>
+  <symbol minY="476" maxY="534" name="hand-m" minX="983" maxX="1041"/>
+  <symbol minY="476" maxY="534" name="garden-l" minX="1041" maxX="1099"/>
+  <symbol minY="476" maxY="534" name="hand-l" minX="1099" maxX="1157"/>
+  <symbol minY="476" maxY="534" name="tourism-l" minX="1157" maxX="1215"/>
+  <symbol minY="476" maxY="534" name="garden_center-l" minX="1215" maxX="1273"/>
+  <symbol minY="476" maxY="534" name="hairdresser-l" minX="1273" maxX="1331"/>
+  <symbol minY="476" maxY="534" name="gate-l" minX="1331" maxX="1389"/>
+  <symbol minY="476" maxY="534" name="gym-l" minX="1389" maxX="1447"/>
+  <symbol minY="476" maxY="534" name="gift-l" minX="1447" maxX="1505"/>
+  <symbol minY="476" maxY="534" name="tomb-l" minX="1505" maxX="1563"/>
+  <symbol minY="476" maxY="534" name="golf-l" minX="1563" maxX="1621"/>
+  <symbol minY="476" maxY="534" name="grocery-l" minX="1621" maxX="1679"/>
+  <symbol minY="476" maxY="534" name="greengrocer-l" minX="1679" maxX="1737"/>
+  <symbol minY="476" maxY="532" name="tomb-m" minX="1737" maxX="1793"/>
+  <symbol minY="476" maxY="532" name="greengrocer-m" minX="1793" maxX="1849"/>
+  <symbol minY="476" maxY="532" name="golf-m" minX="1849" maxX="1905"/>
+  <symbol minY="476" maxY="532" name="grocery-m" minX="1905" maxX="1961"/>
+  <symbol minY="476" maxY="532" name="gift-m" minX="1961" maxX="2017"/>
+  <symbol minY="534" maxY="590" name="gate-m" minX="0" maxX="56"/>
+  <symbol minY="534" maxY="590" name="gym-m" minX="56" maxX="112"/>
+  <symbol minY="534" maxY="590" name="toll_booth-m" minX="112" maxX="168"/>
+  <symbol minY="534" maxY="590" name="garden_center-m" minX="168" maxX="224"/>
+  <symbol minY="534" maxY="590" name="hairdresser-m" minX="224" maxX="280"/>
+  <symbol minY="534" maxY="590" name="garden-m" minX="280" maxX="336"/>
+  <symbol minY="534" maxY="590" name="tourism-m" minX="336" maxX="392"/>
+  <symbol minY="534" maxY="590" name="gallery-m" minX="392" maxX="448"/>
+  <symbol minY="534" maxY="590" name="archery-m" minX="448" maxX="504"/>
+  <symbol minY="534" maxY="590" name="hardware-m" minX="504" maxX="560"/>
+  <symbol minY="534" maxY="590" name="furniture-m" minX="560" maxX="616"/>
+  <symbol minY="534" maxY="590" name="helipad-m" minX="616" maxX="672"/>
+  <symbol minY="534" maxY="590" name="toilets-m" minX="672" maxX="728"/>
+  <symbol minY="534" maxY="590" name="funicular-m" minX="728" maxX="784"/>
+  <symbol minY="534" maxY="590" name="fuel-m" minX="784" maxX="840"/>
+  <symbol minY="534" maxY="590" name="shoes-m" minX="840" maxX="896"/>
+  <symbol minY="534" maxY="590" name="fountain-m" minX="896" maxX="952"/>
+  <symbol minY="534" maxY="590" name="historic-ship-m" minX="952" maxX="1008"/>
+  <symbol minY="534" maxY="590" name="florist-m" minX="1008" maxX="1064"/>
+  <symbol minY="534" maxY="590" name="hospital-m" minX="1064" maxX="1120"/>
+  <symbol minY="534" maxY="590" name="australian-football-m" minX="1120" maxX="1176"/>
+  <symbol minY="534" maxY="590" name="townhall-m" minX="1176" maxX="1232"/>
+  <symbol minY="534" maxY="590" name="hotel-m" minX="1232" maxX="1288"/>
+  <symbol minY="534" maxY="590" name="ticket-shop-m" minX="1288" maxX="1344"/>
+  <symbol minY="534" maxY="590" name="fire_station-m" minX="1344" maxX="1400"/>
+  <symbol minY="534" maxY="590" name="fastfood-m" minX="1400" maxX="1456"/>
+  <symbol minY="534" maxY="590" name="shop-bicycle-m" minX="1456" maxX="1512"/>
+  <symbol minY="534" maxY="590" name="toys-m" minX="1512" maxX="1568"/>
+  <symbol minY="534" maxY="590" name="information-m" minX="1568" maxX="1624"/>
+  <symbol minY="534" maxY="590" name="train-m" minX="1624" maxX="1680"/>
+  <symbol minY="534" maxY="590" name="embassy-m" minX="1680" maxX="1736"/>
+  <symbol minY="534" maxY="590" name="jewelry-m" minX="1736" maxX="1792"/>
+  <symbol minY="534" maxY="590" name="electronics-m" minX="1792" maxX="1848"/>
+  <symbol minY="534" maxY="590" name="drugs" minX="1848" maxX="1904"/>
+  <symbol minY="534" maxY="590" name="theatre-m" minX="1904" maxX="1960"/>
+  <symbol minY="534" maxY="590" name="tram-m" minX="1960" maxX="2016"/>
+  <symbol minY="590" maxY="646" name="kiosk-m" minX="0" maxX="56"/>
+  <symbol minY="590" maxY="646" name="drinking-water-m" minX="56" maxX="112"/>
+  <symbol minY="590" maxY="646" name="vending-m" minX="112" maxX="168"/>
+  <symbol minY="590" maxY="646" name="doityourself-m" minX="168" maxX="224"/>
+  <symbol minY="590" maxY="646" name="dog_park-m" minX="224" maxX="280"/>
+  <symbol minY="590" maxY="646" name="library-m" minX="280" maxX="336"/>
+  <symbol minY="590" maxY="646" name="veterinary-m" minX="336" maxX="392"/>
+  <symbol minY="590" maxY="646" name="diving-m" minX="392" maxX="448"/>
+  <symbol minY="590" maxY="646" name="lift_gate-m" minX="448" maxX="504"/>
+  <symbol minY="590" maxY="646" name="department_store-m" minX="504" maxX="560"/>
+  <symbol minY="590" maxY="646" name="lighthouse-m" minX="560" maxX="616"/>
+  <symbol minY="590" maxY="646" name="tennis-m" minX="616" maxX="672"/>
+  <symbol minY="590" maxY="646" name="curling-m" minX="672" maxX="728"/>
+  <symbol minY="590" maxY="646" name="ship-m" minX="728" maxX="784"/>
+  <symbol minY="590" maxY="646" name="volcano-m" minX="784" maxX="840"/>
+  <symbol minY="590" maxY="646" name="america-football-m" minX="840" maxX="896"/>
+  <symbol minY="590" maxY="646" name="mail-m" minX="896" maxX="952"/>
+  <symbol minY="590" maxY="646" name="taxi-m" minX="952" maxX="1008"/>
+  <symbol minY="590" maxY="646" name="seafood-shop-m" minX="1008" maxX="1064"/>
+  <symbol minY="590" maxY="646" name="marketplace-m" minX="1064" maxX="1120"/>
+  <symbol minY="590" maxY="646" name="cricket-m" minX="1120" maxX="1176"/>
+  <symbol minY="590" maxY="646" name="swimming-m" minX="1176" maxX="1232"/>
+  <symbol minY="590" maxY="646" name="copyshop-m" minX="1232" maxX="1288"/>
+  <symbol minY="590" maxY="646" name="convenience-m" minX="1288" maxX="1344"/>
+  <symbol minY="590" maxY="646" name="military-m" minX="1344" maxX="1400"/>
+  <symbol minY="590" maxY="646" name="sweets-m" minX="1400" maxX="1456"/>
+  <symbol minY="590" maxY="646" name="computer-m" minX="1456" maxX="1512"/>
+  <symbol minY="590" maxY="646" name="mobile_phone-m" minX="1512" maxX="1568"/>
+  <symbol minY="590" maxY="646" name="college-m" minX="1568" maxX="1624"/>
+  <symbol minY="590" maxY="646" name="monument-m" minX="1624" maxX="1680"/>
+  <symbol minY="590" maxY="646" name="clothes-m" minX="1680" maxX="1736"/>
+  <symbol minY="590" maxY="646" name="climbing-m" minX="1736" maxX="1792"/>
+  <symbol minY="590" maxY="646" name="motel-m" minX="1792" maxX="1848"/>
+  <symbol minY="590" maxY="646" name="subway-spb-m" minX="1848" maxX="1904"/>
+  <symbol minY="590" maxY="646" name="bakery-m" minX="1904" maxX="1960"/>
+  <symbol minY="590" maxY="646" name="cinema-m" minX="1960" maxX="2016"/>
+  <symbol minY="646" maxY="702" name="museum-m" minX="0" maxX="56"/>
+  <symbol minY="646" maxY="702" name="chimney-m" minX="56" maxX="112"/>
+  <symbol minY="646" maxY="702" name="banknote-m" minX="112" maxX="168"/>
+  <symbol minY="646" maxY="702" name="school-m" minX="168" maxX="224"/>
+  <symbol minY="646" maxY="702" name="bar-m" minX="224" maxX="280"/>
+  <symbol minY="646" maxY="702" name="sauna-m" minX="280" maxX="336"/>
+  <symbol minY="646" maxY="702" name="baseball-m" minX="336" maxX="392"/>
+  <symbol minY="646" maxY="702" name="atm-m" minX="392" maxX="448"/>
+  <symbol minY="646" maxY="702" name="chemist-m" minX="448" maxX="504"/>
+  <symbol minY="646" maxY="702" name="npark-m" minX="504" maxX="560"/>
+  <symbol minY="646" maxY="702" name="shop-m" minX="560" maxX="616"/>
+  <symbol minY="646" maxY="702" name="charging-station-m" minX="616" maxX="672"/>
+  <symbol minY="646" maxY="702" name="nparkf-m " minX="672" maxX="728"/>
+  <symbol minY="646" maxY="702" name="nparkf-m" minX="728" maxX="784"/>
+  <symbol minY="646" maxY="702" name="alpine_hut-m" minX="784" maxX="840"/>
+  <symbol minY="646" maxY="702" name="wayside_cross-m" minX="840" maxX="896"/>
+  <symbol minY="646" maxY="702" name="cemetery-m" minX="896" maxX="952"/>
+  <symbol minY="646" maxY="702" name="restaurant-m" minX="952" maxX="1008"/>
+  <symbol minY="646" maxY="702" name="cave-m" minX="1008" maxX="1064"/>
+  <symbol minY="646" maxY="702" name="optician-m" minX="1064" maxX="1120"/>
+  <symbol minY="646" maxY="702" name="wayside_shrine-m" minX="1120" maxX="1176"/>
+  <symbol minY="646" maxY="702" name="park-m" minX="1176" maxX="1232"/>
+  <symbol minY="646" maxY="702" name="casino-m" minX="1232" maxX="1288"/>
+  <symbol minY="646" maxY="702" name="basketball-m" minX="1288" maxX="1344"/>
+  <symbol minY="646" maxY="702" name="subway-newyork-m" minX="1344" maxX="1400"/>
+  <symbol minY="646" maxY="702" name="caravan_site-m" minX="1400" maxX="1456"/>
+  <symbol minY="646" maxY="702" name="parking-meter-m" minX="1456" maxX="1512"/>
+  <symbol minY="646" maxY="702" name="car_sharing-m" minX="1512" maxX="1568"/>
+  <symbol minY="646" maxY="702" name="bbq-m" minX="1568" maxX="1624"/>
+  <symbol minY="646" maxY="702" name="skiing-m" minX="1624" maxX="1680"/>
+  <symbol minY="646" maxY="702" name="subway-m" minX="1680" maxX="1736"/>
+  <symbol minY="646" maxY="702" name="recycling-m" minX="1736" maxX="1792"/>
+  <symbol minY="646" maxY="702" name="car-part-m" minX="1792" maxX="1848"/>
+  <symbol minY="646" maxY="702" name="subway-entrance-m" minX="1848" maxX="1904"/>
+  <symbol minY="646" maxY="702" name="windmill-m" minX="1904" maxX="1960"/>
+  <symbol minY="646" maxY="702" name="campsite-m" minX="1960" maxX="2016"/>
+  <symbol minY="702" maxY="758" name="petshop-m" minX="0" maxX="56"/>
+  <symbol minY="702" maxY="758" name="pharmacy-2-m" minX="56" maxX="112"/>
+  <symbol minY="702" maxY="758" name="cafe-m" minX="112" maxX="168"/>
+  <symbol minY="702" maxY="758" name="pharmacy-m" minX="168" maxX="224"/>
+  <symbol minY="702" maxY="758" name="subway-entrance-2-m" minX="224" maxX="280"/>
+  <symbol minY="702" maxY="758" name="zoo-m" minX="280" maxX="336"/>
+  <symbol minY="702" maxY="758" name="phone-m" minX="336" maxX="392"/>
+  <symbol minY="702" maxY="758" name="beach-m" minX="392" maxX="448"/>
+  <symbol minY="702" maxY="758" name="cable-car-m" minX="448" maxX="504"/>
+  <symbol minY="702" maxY="758" name="photo-shop-m" minX="504" maxX="560"/>
+  <symbol minY="702" maxY="758" name="butcher-m" minX="560" maxX="616"/>
+  <symbol minY="702" maxY="758" name="bus-m" minX="616" maxX="672"/>
+  <symbol minY="702" maxY="758" name="alcohol-m" minX="672" maxX="728"/>
+  <symbol minY="702" maxY="758" name="bowls-m" minX="728" maxX="784"/>
+  <symbol minY="702" maxY="758" name="pitch-m" minX="784" maxX="840"/>
+  <symbol minY="702" maxY="758" name="soccer-m" minX="840" maxX="896"/>
+  <symbol minY="702" maxY="758" name="boundary_stone-m" minX="896" maxX="952"/>
+  <symbol minY="702" maxY="758" name="place-of-worship-m" minX="952" maxX="1008"/>
+  <symbol minY="702" maxY="758" name="sports-m" minX="1008" maxX="1064"/>
+  <symbol minY="702" maxY="758" name="pub-m" minX="1064" maxX="1120"/>
+  <symbol minY="702" maxY="758" name="police-m" minX="1120" maxX="1176"/>
+  <symbol minY="702" maxY="758" name="book-shop-m" minX="1176" maxX="1232"/>
+  <symbol minY="702" maxY="758" name="beauty-m" minX="1232" maxX="1288"/>
+  <symbol minY="702" maxY="758" name="bicycle-m" minX="1288" maxX="1344"/>
+  <symbol minY="702" maxY="758" name="postbox-m" minX="1344" maxX="1400"/>
+  <symbol minY="702" maxY="754" name="current-position" minX="1400" maxX="1452"/>
+  <symbol minY="702" maxY="753" name="subway-berlin-l" minX="1452" maxX="1503"/>
+  <symbol minY="702" maxY="753" name="speedcam-l" minX="1503" maxX="1554"/>
+  <symbol minY="702" maxY="753" name="bike-parking-l" minX="1554" maxX="1605"/>
+  <symbol minY="702" maxY="753" name="lightrail-berlin-m" minX="1605" maxX="1656"/>
+  <symbol minY="702" maxY="753" name="subway-moscow-l" minX="1656" maxX="1714"/>
+  <symbol minY="702" maxY="753" name="waste-basket-l" minX="1714" maxX="1765"/>
+  <symbol minY="702" maxY="753" name="subway-rome-l" minX="1765" maxX="1816"/>
+  <symbol minY="702" maxY="753" name="parking-l" minX="1816" maxX="1867"/>
+  <symbol minY="702" maxY="751" name="firehydrant-l" minX="1867" maxX="1907"/>
+  <symbol minY="702" maxY="749" name="subway-paris-m" minX="1907" maxX="1954"/>
+  <symbol minY="702" maxY="749" name="subway-moscow-m" minX="1954" maxX="2008"/>
+  <symbol minY="758" maxY="805" name="subway-rome-m" minX="0" maxX="47"/>
+  <symbol minY="758" maxY="805" name="waste-basket-s" minX="47" maxX="94"/>
+  <symbol minY="758" maxY="805" name="no-icon-amenity" minX="94" maxX="141"/>
+  <symbol minY="758" maxY="805" name="no-icon-leisure" minX="141" maxX="188"/>
+  <symbol minY="758" maxY="805" name="subway-berlin-m" minX="188" maxX="235"/>
+  <symbol minY="758" maxY="805" name="no-icon" minX="235" maxX="282"/>
+  <symbol minY="758" maxY="805" name="no-icon-tourism" minX="282" maxX="329"/>
+  <symbol minY="758" maxY="805" name="no-icon-shop" minX="329" maxX="376"/>
+  <symbol minY="758" maxY="803" name="bcontrol-s" minX="376" maxX="418"/>
+  <symbol minY="758" maxY="803" name="office-s" minX="418" maxX="460"/>
+  <symbol minY="758" maxY="803" name="waterfall-s" minX="460" maxX="502"/>
+  <symbol minY="758" maxY="803" name="subway-london-l" minX="502" maxX="560"/>
+  <symbol minY="758" maxY="803" name="picnic-s" minX="560" maxX="602"/>
+  <symbol minY="758" maxY="803" name="airport-s" minX="602" maxX="647"/>
+  <symbol minY="758" maxY="803" name="hunting-tower-s" minX="647" maxX="689"/>
+  <symbol minY="758" maxY="803" name="beer-s" minX="689" maxX="731"/>
+  <symbol minY="758" maxY="803" name="heliport-s" minX="731" maxX="773"/>
+  <symbol minY="758" maxY="803" name="remains-s" minX="773" maxX="815"/>
+  <symbol minY="758" maxY="800" name="ship-s" minX="815" maxX="857"/>
+  <symbol minY="758" maxY="800" name="school-s" minX="857" maxX="899"/>
+  <symbol minY="758" maxY="800" name="alcohol-s" minX="899" maxX="941"/>
+  <symbol minY="758" maxY="800" name="shop-s" minX="941" maxX="983"/>
+  <symbol minY="758" maxY="800" name="restaurant-s" minX="983" maxX="1025"/>
+  <symbol minY="758" maxY="800" name="recycling-s" minX="1025" maxX="1067"/>
+  <symbol minY="758" maxY="800" name="skiing-s" minX="1067" maxX="1109"/>
+  <symbol minY="758" maxY="800" name="alpine_hut-s" minX="1109" maxX="1151"/>
+  <symbol minY="758" maxY="800" name="pub-s" minX="1151" maxX="1193"/>
+  <symbol minY="758" maxY="800" name="soccer-s" minX="1193" maxX="1235"/>
+  <symbol minY="758" maxY="800" name="power-s" minX="1235" maxX="1277"/>
+  <symbol minY="758" maxY="800" name="speedcam-m" minX="1277" maxX="1319"/>
+  <symbol minY="758" maxY="800" name="america-football-s" minX="1319" maxX="1361"/>
+  <symbol minY="758" maxY="800" name="police-s" minX="1361" maxX="1403"/>
+  <symbol minY="758" maxY="800" name="place-of-worship-s" minX="1403" maxX="1445"/>
+  <symbol minY="758" maxY="800" name="archery-s" minX="1445" maxX="1487"/>
+  <symbol minY="758" maxY="800" name="atm-s" minX="1487" maxX="1529"/>
+  <symbol minY="758" maxY="800" name="australian-football-s" minX="1529" maxX="1571"/>
+  <symbol minY="758" maxY="800" name="bar-s" minX="1571" maxX="1613"/>
+  <symbol minY="758" maxY="800" name="subway-barcelona-m" minX="1613" maxX="1671"/>
+  <symbol minY="758" maxY="800" name="subway-barcelona-s" minX="1671" maxX="1722"/>
+  <symbol minY="758" maxY="800" name="pitch-s" minX="1722" maxX="1764"/>
+  <symbol minY="758" maxY="800" name="phone-s" minX="1764" maxX="1806"/>
+  <symbol minY="758" maxY="800" name="baseball-s" minX="1806" maxX="1848"/>
+  <symbol minY="758" maxY="800" name="pharmacy-s" minX="1848" maxX="1890"/>
+  <symbol minY="758" maxY="800" name="subway-entrance-2-s" minX="1890" maxX="1932"/>
+  <symbol minY="758" maxY="800" name="subway-entrance-arrow" minX="1932" maxX="1974"/>
+  <symbol minY="758" maxY="800" name="basketball-s" minX="1974" maxX="2016"/>
+  <symbol minY="805" maxY="847" name="beach-s" minX="0" maxX="42"/>
+  <symbol minY="805" maxY="847" name="subway-entrance-s" minX="42" maxX="84"/>
+  <symbol minY="805" maxY="847" name="bicycle-s" minX="84" maxX="126"/>
+  <symbol minY="805" maxY="847" name="book-shop-s" minX="126" maxX="168"/>
+  <symbol minY="805" maxY="847" name="bowls-s" minX="168" maxX="210"/>
+  <symbol minY="805" maxY="847" name="bus-s" minX="210" maxX="252"/>
+  <symbol minY="805" maxY="847" name="zoo-s" minX="252" maxX="294"/>
+  <symbol minY="805" maxY="847" name="subway-london-m" minX="294" maxX="350"/>
+  <symbol minY="805" maxY="847" name="cable-car-s" minX="350" maxX="392"/>
+  <symbol minY="805" maxY="847" name="cafe-s" minX="392" maxX="434"/>
+  <symbol minY="805" maxY="847" name="windmill-s" minX="434" maxX="476"/>
+  <symbol minY="805" maxY="847" name="subway-madrid-m" minX="476" maxX="534"/>
+  <symbol minY="805" maxY="847" name="campsite-s" minX="534" maxX="576"/>
+  <symbol minY="805" maxY="847" name="car-repair-s" minX="576" maxX="618"/>
+  <symbol minY="805" maxY="847" name="casino-s" minX="618" maxX="660"/>
+  <symbol minY="805" maxY="847" name="cave-s" minX="660" maxX="702"/>
+  <symbol minY="805" maxY="847" name="cemetery-s" minX="702" maxX="744"/>
+  <symbol minY="805" maxY="847" name="parking-ticket-l" minX="744" maxX="768"/>
+  <symbol minY="805" maxY="847" name="charging-station-s" minX="768" maxX="810"/>
+  <symbol minY="805" maxY="847" name="cinema-s" minX="810" maxX="852"/>
+  <symbol minY="805" maxY="847" name="climbing-s" minX="852" maxX="894"/>
+  <symbol minY="805" maxY="847" name="subway-newyork-s" minX="894" maxX="936"/>
+  <symbol minY="805" maxY="847" name="college-s" minX="936" maxX="978"/>
+  <symbol minY="805" maxY="847" name="park-s" minX="978" maxX="1020"/>
+  <symbol minY="805" maxY="847" name="nparkf-s" minX="1020" maxX="1062"/>
+  <symbol minY="805" maxY="847" name="cricket-s" minX="1062" maxX="1104"/>
+  <symbol minY="805" maxY="847" name="npark-s" minX="1104" maxX="1146"/>
+  <symbol minY="805" maxY="847" name="volcano-s" minX="1146" maxX="1188"/>
+  <symbol minY="805" maxY="847" name="viewpoint-s" minX="1188" maxX="1230"/>
+  <symbol minY="805" maxY="847" name="subway-s" minX="1230" maxX="1272"/>
+  <symbol minY="805" maxY="847" name="museum-s" minX="1272" maxX="1314"/>
+  <symbol minY="805" maxY="847" name="motel-s" minX="1314" maxX="1356"/>
+  <symbol minY="805" maxY="847" name="subway-spb-s" minX="1356" maxX="1398"/>
+  <symbol minY="805" maxY="847" name="curling-s" minX="1398" maxX="1440"/>
+  <symbol minY="805" maxY="847" name="dentist-s" minX="1440" maxX="1482"/>
+  <symbol minY="805" maxY="847" name="diving-s" minX="1482" maxX="1524"/>
+  <symbol minY="805" maxY="847" name="tram-s" minX="1524" maxX="1566"/>
+  <symbol minY="805" maxY="847" name="monument-s" minX="1566" maxX="1608"/>
+  <symbol minY="805" maxY="847" name="military-s" minX="1608" maxX="1650"/>
+  <symbol minY="805" maxY="847" name="drinking-water-s" minX="1650" maxX="1692"/>
+  <symbol minY="805" maxY="847" name="metro-barcelona-m" minX="1692" maxX="1750"/>
+  <symbol minY="805" maxY="847" name="swimming-s" minX="1750" maxX="1792"/>
+  <symbol minY="805" maxY="847" name="marketplace-s" minX="1792" maxX="1834"/>
+  <symbol minY="805" maxY="847" name="mail-s" minX="1834" maxX="1876"/>
+  <symbol minY="805" maxY="847" name="embassy-s" minX="1876" maxX="1918"/>
+  <symbol minY="805" maxY="847" name="lighthouse-s" minX="1918" maxX="1960"/>
+  <symbol minY="805" maxY="847" name="tennis-s" minX="1960" maxX="2002"/>
+  <symbol minY="805" maxY="847" name="library-s" minX="2002" maxX="2044"/>
+  <symbol minY="847" maxY="889" name="kindergarten-s" minX="0" maxX="42"/>
+  <symbol minY="847" maxY="889" name="theatre-s" minX="42" maxX="84"/>
+  <symbol minY="847" maxY="889" name="information-s" minX="84" maxX="126"/>
+  <symbol minY="847" maxY="889" name="hotel-s" minX="126" maxX="168"/>
+  <symbol minY="847" maxY="889" name="hospital-s" minX="168" maxX="210"/>
+  <symbol minY="847" maxY="889" name="helipad-s" minX="210" maxX="252"/>
+  <symbol minY="847" maxY="889" name="toilets-s" minX="252" maxX="294"/>
+  <symbol minY="847" maxY="889" name="hand-s" minX="294" maxX="336"/>
+  <symbol minY="847" maxY="889" name="gym-s" minX="336" maxX="378"/>
+  <symbol minY="847" maxY="889" name="toll_booth-s" minX="378" maxX="420"/>
+  <symbol minY="847" maxY="889" name="grocery-s" minX="420" maxX="462"/>
+  <symbol minY="847" maxY="889" name="golf-s" minX="462" maxX="504"/>
+  <symbol minY="847" maxY="889" name="garden-s" minX="504" maxX="546"/>
+  <symbol minY="847" maxY="889" name="gallery-s" minX="546" maxX="588"/>
+  <symbol minY="847" maxY="889" name="tourism-s" minX="588" maxX="630"/>
+  <symbol minY="847" maxY="889" name="funicular-s" minX="630" maxX="672"/>
+  <symbol minY="847" maxY="889" name="fuel-s" minX="672" maxX="714"/>
+  <symbol minY="847" maxY="889" name="fountain-s" minX="714" maxX="756"/>
+  <symbol minY="847" maxY="889" name="fire_station-s" minX="756" maxX="798"/>
+  <symbol minY="847" maxY="889" name="townhall-s" minX="798" maxX="840"/>
+  <symbol minY="847" maxY="889" name="fastfood-s" minX="840" maxX="882"/>
+  <symbol minY="847" maxY="889" name="equestrian-s" minX="882" maxX="924"/>
+  <symbol minY="847" maxY="889" name="train-s" minX="924" maxX="966"/>
+  <symbol minY="847" maxY="888" name="subway-madrid-l" minX="966" maxX="1024"/>
+  <symbol minY="847" maxY="888" name="subway-barcelona-l" minX="1024" maxX="1082"/>
+  <symbol minY="847" maxY="887" name="s-arrow" minX="1082" maxX="1120"/>
+  <symbol minY="847" maxY="887" name="parking-m" minX="1120" maxX="1160"/>
+  <symbol minY="847" maxY="885" name="subway-kiev-l" minX="1160" maxX="1216"/>
+  <symbol minY="847" maxY="885" name="peak-l" minX="1216" maxX="1254"/>
+  <symbol minY="847" maxY="885" name="search-result" minX="1254" maxX="1292"/>
+  <symbol minY="847" maxY="885" name="metro-barcelona-s" minX="1292" maxX="1343"/>
+  <symbol minY="847" maxY="885" name="api-result" minX="1343" maxX="1381"/>
+  <symbol minY="847" maxY="885" name="subway-madrid-s" minX="1381" maxX="1432"/>
+  <symbol minY="847" maxY="885" name="lightrail-berlin-s" minX="1432" maxX="1470"/>
+  <symbol minY="847" maxY="885" name="subway-kiev-m" minX="1470" maxX="1526"/>
+  <symbol minY="847" maxY="885" name="subway-paris-s" minX="1526" maxX="1564"/>
+  <symbol minY="847" maxY="883" name="subway-moscow-s" minX="1564" maxX="1600"/>
+  <symbol minY="847" maxY="880" name="subway-rome-s" minX="1600" maxX="1633"/>
+  <symbol minY="847" maxY="880" name="bench" minX="1633" maxX="1671"/>
+  <symbol minY="847" maxY="880" name="subway-berlin-s" minX="1671" maxX="1704"/>
+  <symbol minY="847" maxY="880" name="subway-london-s" minX="1704" maxX="1746"/>
+  <symbol minY="847" maxY="880" name="speedcam-s" minX="1746" maxX="1779"/>
+  <symbol minY="847" maxY="880" name="parking-s" minX="1779" maxX="1812"/>
+  <symbol minY="847" maxY="878" name="peakt-l" minX="1812" maxX="1845"/>
+  <symbol minY="847" maxY="878" name="subway-minsk-l" minX="1845" maxX="1901"/>
+  <symbol minY="847" maxY="878" name="survey_point-l" minX="1901" maxX="1932"/>
+  <symbol minY="847" maxY="878" name="star-l" minX="1932" maxX="1963"/>
+  <symbol minY="847" maxY="876" name="star-m" minX="1963" maxX="1992"/>
+  <symbol minY="847" maxY="876" name="subway-kiev-s" minX="1992" maxX="2039"/>
+  <symbol minY="889" maxY="916" name="subway-minsk-m" minX="0" maxX="47"/>
+  <symbol minY="889" maxY="916" name="peak-m" minX="47" maxX="76"/>
+  <symbol minY="889" maxY="916" name="subway-newyork-xs" minX="76" maxX="103"/>
+  <symbol minY="889" maxY="916" name="survey_point-m" minX="103" maxX="130"/>
+  <symbol minY="889" maxY="916" name="railway-crossing" minX="130" maxX="172"/>
+  <symbol minY="889" maxY="916" name="subway-xs" minX="172" maxX="199"/>
+  <symbol minY="889" maxY="913" name="star-s" minX="199" maxX="223"/>
+  <symbol minY="889" maxY="913" name="crossing-l" minX="223" maxX="247"/>
+  <symbol minY="889" maxY="913" name="subway-minsk-s" minX="247" maxX="289"/>
+  <symbol minY="889" maxY="911" name="peakt-m" minX="289" maxX="313"/>
+  <symbol minY="889" maxY="911" name="survey_point-s" minX="313" maxX="335"/>
+  <symbol minY="889" maxY="911" name="peak-s" minX="335" maxX="359"/>
+  <symbol minY="889" maxY="911" name="arrow-m" minX="359" maxX="410"/>
+  <symbol minY="889" maxY="909" name="entrance-s" minX="410" maxX="430"/>
+  <symbol minY="889" maxY="909" name="crossing-m" minX="430" maxX="450"/>
+  <symbol minY="889" maxY="907" name="peakt-s" minX="450" maxX="470"/>
+  <symbol minY="889" maxY="904" name="arrow-s" minX="470" maxX="508"/>
+  <symbol minY="889" maxY="904" name="tree-l" minX="508" maxX="523"/>
+  <symbol minY="889" maxY="904" name="crossing-s" minX="523" maxX="538"/>
+  <symbol minY="889" maxY="904" name="none" minX="538" maxX="553"/>
+  <symbol minY="889" maxY="904" name="dot-m" minX="553" maxX="568"/>
+  <symbol minY="889" maxY="902" name="tree-m" minX="568" maxX="581"/>
+  <symbol minY="889" maxY="902" name="entrance-xs" minX="581" maxX="594"/>
+  <symbol minY="889" maxY="900" name="dot-s" minX="594" maxX="605"/>
+  <symbol minY="889" maxY="900" name="dot-s-light" minX="605" maxX="616"/>
+  <symbol minY="889" maxY="900" name="zero-icon" minX="616" maxX="627"/>
+  <symbol minY="889" maxY="900" name="tree-s" minX="627" maxX="638"/>
  </file>
 </root>
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 066082b657..ba3aa2adf3 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 6cf180898b..6e007f2169 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -1,521 +1,521 @@
 <!DOCTYPE skin>
 <root>
- <file width="2048" height="1024">
-  <symbol minX="0" maxX="167" minY="0" maxY="244" name="route_to"/>
-  <symbol minX="167" maxX="243" minY="0" maxY="206" name="route_from"/>
-  <symbol minX="243" maxX="566" minY="0" maxY="158" name="route-arrow"/>
-  <symbol minX="566" maxX="704" minY="0" maxY="138" name="compass-image"/>
-  <symbol minX="704" maxX="799" minY="0" maxY="95" name="cross_geoposition"/>
-  <symbol minX="799" maxX="870" minY="0" maxY="88" name="current-position-compas"/>
-  <symbol minX="870" maxX="941" minY="0" maxY="88" name="current-position-obsolete"/>
-  <symbol minX="941" maxX="1022" minY="0" maxY="81" name="search-result-active"/>
-  <symbol minX="1022" maxX="1057" minY="0" maxY="69" name="placemark-orange"/>
-  <symbol minX="1057" maxX="1092" minY="0" maxY="69" name="placemark-purple"/>
-  <symbol minX="1092" maxX="1127" minY="0" maxY="69" name="placemark-red"/>
-  <symbol minX="1127" maxX="1162" minY="0" maxY="69" name="placemark-yellow"/>
-  <symbol minX="1162" maxX="1197" minY="0" maxY="69" name="placemark-green"/>
-  <symbol minX="1197" maxX="1232" minY="0" maxY="69" name="placemark-brown"/>
-  <symbol minX="1232" maxX="1267" minY="0" maxY="69" name="placemark-blue"/>
-  <symbol minX="1267" maxX="1302" minY="0" maxY="69" name="placemark-pink"/>
-  <symbol minX="1302" maxX="1360" minY="0" maxY="58" name="kiosk-l"/>
-  <symbol minX="1360" maxX="1418" minY="0" maxY="58" name="atm-l"/>
-  <symbol minX="1418" maxX="1476" minY="0" maxY="58" name="veterinary-l"/>
-  <symbol minX="1476" maxX="1534" minY="0" maxY="58" name="tram-l"/>
-  <symbol minX="1534" maxX="1592" minY="0" maxY="58" name="train-l"/>
-  <symbol minX="1592" maxX="1650" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1650" maxX="1708" minY="0" maxY="58" name="toys-l"/>
-  <symbol minX="1708" maxX="1766" minY="0" maxY="58" name="townhall-l"/>
-  <symbol minX="1766" maxX="1824" minY="0" maxY="58" name="bakery-l"/>
-  <symbol minX="1824" maxX="1882" minY="0" maxY="58" name="tourist-shop-l"/>
-  <symbol minX="1882" maxX="1940" minY="0" maxY="58" name="tourist-office-l"/>
-  <symbol minX="1940" maxX="1997" minY="0" maxY="58" name="bank-l"/>
-  <symbol minX="0" maxX="56" minY="244" maxY="302" name="bank-m"/>
-  <symbol minX="56" maxX="113" minY="244" maxY="302" name="banknote-l"/>
-  <symbol minX="113" maxX="171" minY="244" maxY="302" name="tourism-l"/>
-  <symbol minX="171" maxX="229" minY="244" maxY="302" name="bar-l"/>
-  <symbol minX="229" maxX="287" minY="244" maxY="302" name="tomb-l"/>
-  <symbol minX="287" maxX="345" minY="244" maxY="302" name="toll_booth-l"/>
-  <symbol minX="345" maxX="403" minY="244" maxY="302" name="baseball-l"/>
-  <symbol minX="403" maxX="461" minY="244" maxY="302" name="toilets-l"/>
-  <symbol minX="461" maxX="519" minY="244" maxY="302" name="ticket-shop-l"/>
-  <symbol minX="519" maxX="577" minY="244" maxY="302" name="basketball-l"/>
-  <symbol minX="577" maxX="635" minY="244" maxY="302" name="theatre-l"/>
-  <symbol minX="635" maxX="693" minY="244" maxY="302" name="tennis-l"/>
-  <symbol minX="693" maxX="751" minY="244" maxY="302" name="bbq-l"/>
-  <symbol minX="751" maxX="809" minY="244" maxY="302" name="taxi-l"/>
-  <symbol minX="809" maxX="867" minY="244" maxY="302" name="bcontrol-l"/>
-  <symbol minX="867" maxX="925" minY="244" maxY="302" name="swimming-l"/>
-  <symbol minX="925" maxX="983" minY="244" maxY="302" name="sweets-l"/>
-  <symbol minX="983" maxX="1041" minY="244" maxY="302" name="beach-l"/>
-  <symbol minX="1041" maxX="1099" minY="244" maxY="302" name="viewpoint-l"/>
-  <symbol minX="1099" maxX="1157" minY="244" maxY="302" name="viewpoint-m"/>
-  <symbol minX="1157" maxX="1215" minY="244" maxY="302" name="beauty-l"/>
-  <symbol minX="1215" maxX="1273" minY="244" maxY="302" name="volcano-l"/>
-  <symbol minX="1273" maxX="1331" minY="244" maxY="302" name="beer-l"/>
-  <symbol minX="1331" maxX="1389" minY="244" maxY="302" name="subway-spb-l"/>
-  <symbol minX="1389" maxX="1447" minY="244" maxY="302" name="subway-paris-l"/>
-  <symbol minX="1447" maxX="1505" minY="244" maxY="302" name="subway-newyork-l"/>
-  <symbol minX="1505" maxX="1563" minY="244" maxY="302" name="bicycle-l"/>
-  <symbol minX="1563" maxX="1621" minY="244" maxY="302" name="waterfall-l"/>
-  <symbol minX="1621" maxX="1679" minY="244" maxY="302" name="wayside_cross-l"/>
-  <symbol minX="1679" maxX="1737" minY="244" maxY="302" name="wayside_shrine-l"/>
-  <symbol minX="1737" maxX="1795" minY="244" maxY="302" name="book-shop-l"/>
-  <symbol minX="1795" maxX="1853" minY="244" maxY="302" name="subway-l"/>
-  <symbol minX="1853" maxX="1911" minY="244" maxY="302" name="windmill-l"/>
-  <symbol minX="1911" maxX="1969" minY="244" maxY="302" name="bookmaker-l"/>
-  <symbol minX="1969" maxX="2027" minY="244" maxY="302" name="boundary_stone-l"/>
-  <symbol minX="0" maxX="58" minY="302" maxY="360" name="subway-entrance-l"/>
-  <symbol minX="58" maxX="116" minY="302" maxY="360" name="bowls-l"/>
-  <symbol minX="116" maxX="174" minY="302" maxY="360" name="zoo-l"/>
-  <symbol minX="174" maxX="232" minY="302" maxY="360" name="sports-l"/>
-  <symbol minX="232" maxX="290" minY="302" maxY="360" name="bus-l"/>
-  <symbol minX="290" maxX="348" minY="302" maxY="360" name="airport-l"/>
-  <symbol minX="348" maxX="406" minY="302" maxY="360" name="soccer-l"/>
-  <symbol minX="406" maxX="464" minY="302" maxY="360" name="butcher-l"/>
-  <symbol minX="464" maxX="522" minY="302" maxY="360" name="skiing-l"/>
-  <symbol minX="522" maxX="580" minY="302" maxY="360" name="cable-car-l"/>
-  <symbol minX="580" maxX="638" minY="302" maxY="360" name="shop-l"/>
-  <symbol minX="638" maxX="696" minY="302" maxY="360" name="shop-l copy"/>
-  <symbol minX="696" maxX="754" minY="302" maxY="360" name="cafe-l"/>
-  <symbol minX="754" maxX="812" minY="302" maxY="360" name="shop-bicycle-l"/>
-  <symbol minX="812" maxX="870" minY="302" maxY="360" name="shoes-l"/>
-  <symbol minX="870" maxX="928" minY="302" maxY="360" name="campsite-l"/>
-  <symbol minX="928" maxX="986" minY="302" maxY="360" name="ship-l"/>
-  <symbol minX="986" maxX="1044" minY="302" maxY="360" name="seafood-shop-l"/>
-  <symbol minX="1044" maxX="1102" minY="302" maxY="360" name="car-part-l"/>
-  <symbol minX="1102" maxX="1160" minY="302" maxY="360" name="school-l"/>
-  <symbol minX="1160" maxX="1218" minY="302" maxY="360" name="car-repair-l"/>
-  <symbol minX="1218" maxX="1276" minY="302" maxY="360" name="sauna-l"/>
-  <symbol minX="1276" maxX="1334" minY="302" maxY="360" name="restaurant-l"/>
-  <symbol minX="1334" maxX="1392" minY="302" maxY="360" name="car-wash-l"/>
-  <symbol minX="1392" maxX="1450" minY="302" maxY="360" name="remains-l"/>
-  <symbol minX="1450" maxX="1508" minY="302" maxY="360" name="car_sharing-l"/>
-  <symbol minX="1508" maxX="1566" minY="302" maxY="360" name="recycling-l"/>
-  <symbol minX="1566" maxX="1624" minY="302" maxY="360" name="caravan_site-l"/>
-  <symbol minX="1624" maxX="1682" minY="302" maxY="360" name="airport-m"/>
-  <symbol minX="1682" maxX="1740" minY="302" maxY="360" name="casino-l"/>
-  <symbol minX="1740" maxX="1798" minY="302" maxY="360" name="pub-l"/>
-  <symbol minX="1798" maxX="1856" minY="302" maxY="360" name="power-m"/>
-  <symbol minX="1856" maxX="1914" minY="302" maxY="360" name="cave-l"/>
-  <symbol minX="1914" maxX="1972" minY="302" maxY="360" name="power-l"/>
-  <symbol minX="1972" maxX="2030" minY="302" maxY="360" name="postbox-l"/>
-  <symbol minX="0" maxX="58" minY="360" maxY="418" name="cemetery-l"/>
-  <symbol minX="58" maxX="116" minY="360" maxY="418" name="pool-l"/>
-  <symbol minX="116" maxX="174" minY="360" maxY="418" name="police-l"/>
-  <symbol minX="174" maxX="232" minY="360" maxY="418" name="charging-station-l"/>
-  <symbol minX="232" maxX="290" minY="360" maxY="418" name="place-of-worship-l"/>
-  <symbol minX="290" maxX="348" minY="360" maxY="418" name="pitch-l"/>
-  <symbol minX="348" maxX="406" minY="360" maxY="418" name="chemist-l"/>
-  <symbol minX="406" maxX="464" minY="360" maxY="418" name="picnic-l"/>
-  <symbol minX="464" maxX="522" minY="360" maxY="418" name="childcare-l"/>
-  <symbol minX="522" maxX="580" minY="360" maxY="418" name="chimney-l"/>
-  <symbol minX="580" maxX="638" minY="360" maxY="418" name="photo-shop-l"/>
-  <symbol minX="638" maxX="696" minY="360" maxY="418" name="cinema-l"/>
-  <symbol minX="696" maxX="754" minY="360" maxY="418" name="phone-l"/>
-  <symbol minX="754" maxX="812" minY="360" maxY="418" name="pharmacy-l"/>
-  <symbol minX="812" maxX="870" minY="360" maxY="418" name="climbing-l"/>
-  <symbol minX="870" maxX="928" minY="360" maxY="418" name="petshop-l"/>
-  <symbol minX="928" maxX="986" minY="360" maxY="418" name="alcohol-l"/>
-  <symbol minX="986" maxX="1044" minY="360" maxY="418" name="clothes-l"/>
-  <symbol minX="1044" maxX="1102" minY="360" maxY="418" name="peak-l"/>
-  <symbol minX="1102" maxX="1160" minY="360" maxY="418" name="college-l"/>
-  <symbol minX="1160" maxX="1218" minY="360" maxY="418" name="parking-meter-l"/>
-  <symbol minX="1218" maxX="1276" minY="360" maxY="418" name="park-l"/>
-  <symbol minX="1276" maxX="1334" minY="360" maxY="418" name="computer-l"/>
-  <symbol minX="1334" maxX="1392" minY="360" maxY="418" name="optician-l"/>
-  <symbol minX="1392" maxX="1450" minY="360" maxY="418" name="convenience-l"/>
-  <symbol minX="1450" maxX="1508" minY="360" maxY="418" name="office-l"/>
-  <symbol minX="1508" maxX="1566" minY="360" maxY="418" name="copyshop-l"/>
-  <symbol minX="1566" maxX="1624" minY="360" maxY="418" name="nparkf-l"/>
-  <symbol minX="1624" maxX="1682" minY="360" maxY="418" name="courthouse-l"/>
-  <symbol minX="1682" maxX="1740" minY="360" maxY="418" name="cricket-l"/>
-  <symbol minX="1740" maxX="1798" minY="360" maxY="418" name="npark-l"/>
-  <symbol minX="1798" maxX="1856" minY="360" maxY="418" name="museum-l"/>
-  <symbol minX="1856" maxX="1914" minY="360" maxY="418" name="curling-l"/>
-  <symbol minX="1914" maxX="1972" minY="360" maxY="418" name="moto-sharing-l"/>
-  <symbol minX="1972" maxX="2030" minY="360" maxY="418" name="motel-l"/>
-  <symbol minX="0" maxX="58" minY="418" maxY="476" name="dentist-l"/>
-  <symbol minX="58" maxX="116" minY="418" maxY="476" name="dentist-m"/>
-  <symbol minX="116" maxX="174" minY="418" maxY="476" name="monument-l"/>
-  <symbol minX="174" maxX="232" minY="418" maxY="476" name="department_store-l"/>
-  <symbol minX="232" maxX="290" minY="418" maxY="476" name="mobile_phone-l"/>
-  <symbol minX="290" maxX="348" minY="418" maxY="476" name="diving-l"/>
-  <symbol minX="348" maxX="406" minY="418" maxY="476" name="military-l"/>
-  <symbol minX="406" maxX="464" minY="418" maxY="476" name="alpine_hut-l"/>
-  <symbol minX="464" maxX="522" minY="418" maxY="476" name="dog_park-l"/>
-  <symbol minX="522" maxX="580" minY="418" maxY="476" name="marketplace-l"/>
-  <symbol minX="580" maxX="638" minY="418" maxY="476" name="doityourself-l"/>
-  <symbol minX="638" maxX="696" minY="418" maxY="476" name="mail-l"/>
-  <symbol minX="696" maxX="754" minY="418" maxY="476" name="archery-l"/>
-  <symbol minX="754" maxX="812" minY="418" maxY="476" name="lightrail-berlin-l"/>
-  <symbol minX="812" maxX="870" minY="418" maxY="476" name="lighthouse-l"/>
-  <symbol minX="870" maxX="928" minY="418" maxY="476" name="drinking-water-l"/>
-  <symbol minX="928" maxX="986" minY="418" maxY="476" name="vending-l"/>
-  <symbol minX="986" maxX="1044" minY="418" maxY="476" name="lift_gate-l"/>
-  <symbol minX="1044" maxX="1102" minY="418" maxY="476" name="library-l"/>
-  <symbol minX="1102" maxX="1160" minY="418" maxY="476" name="electronics-l"/>
-  <symbol minX="1160" maxX="1218" minY="418" maxY="476" name="lawyer-l"/>
-  <symbol minX="1218" maxX="1276" minY="418" maxY="476" name="embassy-l"/>
-  <symbol minX="1276" maxX="1334" minY="418" maxY="476" name="laundry-l"/>
-  <symbol minX="1334" maxX="1392" minY="418" maxY="476" name="kindergarten-m"/>
-  <symbol minX="1392" maxX="1450" minY="418" maxY="476" name="america-football-l"/>
-  <symbol minX="1450" maxX="1508" minY="418" maxY="476" name="kindergarten-l"/>
-  <symbol minX="1508" maxX="1566" minY="418" maxY="476" name="equestrian-l"/>
-  <symbol minX="1566" maxX="1624" minY="418" maxY="476" name="equestrian-m"/>
-  <symbol minX="1624" maxX="1682" minY="418" maxY="476" name="fastfood-l"/>
-  <symbol minX="1682" maxX="1740" minY="418" maxY="476" name="jewelry-l"/>
-  <symbol minX="1740" maxX="1798" minY="418" maxY="476" name="information-l"/>
-  <symbol minX="1798" maxX="1856" minY="418" maxY="476" name="fire_station-l"/>
-  <symbol minX="1856" maxX="1914" minY="418" maxY="476" name="hunting-tower-l"/>
-  <symbol minX="1914" maxX="1972" minY="418" maxY="476" name="hotel-l"/>
-  <symbol minX="1972" maxX="2030" minY="418" maxY="476" name="hospital-l"/>
-  <symbol minX="0" maxX="58" minY="476" maxY="534" name="florist-l"/>
-  <symbol minX="58" maxX="116" minY="476" maxY="534" name="historic-ship-l"/>
-  <symbol minX="116" maxX="174" minY="476" maxY="534" name="fountain-l"/>
-  <symbol minX="174" maxX="232" minY="476" maxY="534" name="heliport-l"/>
-  <symbol minX="232" maxX="290" minY="476" maxY="534" name="helipad-l"/>
-  <symbol minX="290" maxX="348" minY="476" maxY="534" name="fuel-l copy"/>
-  <symbol minX="348" maxX="406" minY="476" maxY="534" name="fuel-l"/>
-  <symbol minX="406" maxX="464" minY="476" maxY="534" name="hardware-l"/>
-  <symbol minX="464" maxX="522" minY="476" maxY="534" name="hand-m"/>
-  <symbol minX="522" maxX="580" minY="476" maxY="534" name="funicular-l"/>
-  <symbol minX="580" maxX="638" minY="476" maxY="534" name="hand-l"/>
-  <symbol minX="638" maxX="696" minY="476" maxY="534" name="hairdresser-l"/>
-  <symbol minX="696" maxX="754" minY="476" maxY="534" name="furniture-l"/>
-  <symbol minX="754" maxX="812" minY="476" maxY="534" name="gym-l"/>
-  <symbol minX="812" maxX="870" minY="476" maxY="534" name="gallery-l"/>
-  <symbol minX="870" maxX="928" minY="476" maxY="534" name="grocery-l"/>
-  <symbol minX="928" maxX="986" minY="476" maxY="534" name="greengrocer-l"/>
-  <symbol minX="986" maxX="1044" minY="476" maxY="534" name="garden-l"/>
-  <symbol minX="1044" maxX="1102" minY="476" maxY="534" name="golf-l"/>
-  <symbol minX="1102" maxX="1160" minY="476" maxY="534" name="gift-l"/>
-  <symbol minX="1160" maxX="1218" minY="476" maxY="534" name="garden_center-l"/>
-  <symbol minX="1218" maxX="1276" minY="476" maxY="534" name="gate-l"/>
-  <symbol minX="1276" maxX="1332" minY="476" maxY="532" name="garden_center-m"/>
-  <symbol minX="1332" maxX="1388" minY="476" maxY="532" name="gate-m"/>
-  <symbol minX="1388" maxX="1444" minY="476" maxY="532" name="lift_gate-m"/>
-  <symbol minX="1444" maxX="1500" minY="476" maxY="532" name="gift-m"/>
-  <symbol minX="1500" maxX="1556" minY="476" maxY="532" name="garden-m"/>
-  <symbol minX="1556" maxX="1612" minY="476" maxY="532" name="golf-m"/>
-  <symbol minX="1612" maxX="1668" minY="476" maxY="532" name="vending-m"/>
-  <symbol minX="1668" maxX="1724" minY="476" maxY="532" name="atm-m"/>
-  <symbol minX="1724" maxX="1780" minY="476" maxY="532" name="greengrocer-m"/>
-  <symbol minX="1780" maxX="1836" minY="476" maxY="532" name="gallery-m"/>
-  <symbol minX="1836" maxX="1892" minY="476" maxY="532" name="grocery-m"/>
-  <symbol minX="1892" maxX="1948" minY="476" maxY="532" name="tram-m"/>
-  <symbol minX="1948" maxX="2004" minY="476" maxY="532" name="furniture-m"/>
-  <symbol minX="0" maxX="56" minY="534" maxY="590" name="gym-m"/>
-  <symbol minX="56" maxX="112" minY="534" maxY="590" name="train-m"/>
-  <symbol minX="112" maxX="168" minY="534" maxY="590" name="toys-m"/>
-  <symbol minX="168" maxX="224" minY="534" maxY="590" name="hairdresser-m"/>
-  <symbol minX="224" maxX="280" minY="534" maxY="590" name="funicular-m"/>
-  <symbol minX="280" maxX="336" minY="534" maxY="590" name="australian-football-m"/>
-  <symbol minX="336" maxX="392" minY="534" maxY="590" name="fuel-m"/>
-  <symbol minX="392" maxX="448" minY="534" maxY="590" name="hardware-m"/>
-  <symbol minX="448" maxX="504" minY="534" maxY="590" name="townhall-m"/>
-  <symbol minX="504" maxX="560" minY="534" maxY="590" name="helipad-m"/>
-  <symbol minX="560" maxX="616" minY="534" maxY="590" name="bakery-m"/>
-  <symbol minX="616" maxX="672" minY="534" maxY="590" name="fountain-m"/>
-  <symbol minX="672" maxX="728" minY="534" maxY="590" name="heliport-m"/>
-  <symbol minX="728" maxX="784" minY="534" maxY="590" name="bank-2-m"/>
-  <symbol minX="784" maxX="840" minY="534" maxY="590" name="florist-m"/>
-  <symbol minX="840" maxX="896" minY="534" maxY="590" name="historic-ship-m"/>
-  <symbol minX="896" maxX="952" minY="534" maxY="590" name="tourism-m"/>
-  <symbol minX="952" maxX="1008" minY="534" maxY="590" name="hospital-m"/>
-  <symbol minX="1008" maxX="1064" minY="534" maxY="590" name="banknote-m"/>
-  <symbol minX="1064" maxX="1120" minY="534" maxY="590" name="tomb-m"/>
-  <symbol minX="1120" maxX="1176" minY="534" maxY="590" name="hotel-m"/>
-  <symbol minX="1176" maxX="1232" minY="534" maxY="590" name="bar-m"/>
-  <symbol minX="1232" maxX="1288" minY="534" maxY="590" name="fire_station-m"/>
-  <symbol minX="1288" maxX="1344" minY="534" maxY="590" name="hunting-tower-m"/>
-  <symbol minX="1344" maxX="1400" minY="534" maxY="590" name="toll_booth-m"/>
-  <symbol minX="1400" maxX="1456" minY="534" maxY="590" name="information-m"/>
-  <symbol minX="1456" maxX="1512" minY="534" maxY="590" name="toilets-m"/>
-  <symbol minX="1512" maxX="1568" minY="534" maxY="590" name="fastfood-m"/>
-  <symbol minX="1568" maxX="1624" minY="534" maxY="590" name="jewelry-m"/>
-  <symbol minX="1624" maxX="1680" minY="534" maxY="590" name="baseball-m"/>
-  <symbol minX="1680" maxX="1736" minY="534" maxY="590" name="ticket-shop-m"/>
-  <symbol minX="1736" maxX="1792" minY="534" maxY="590" name="theatre-m"/>
-  <symbol minX="1792" maxX="1848" minY="534" maxY="590" name="basketball-m"/>
-  <symbol minX="1848" maxX="1904" minY="534" maxY="590" name="kiosk-m"/>
-  <symbol minX="1904" maxX="1960" minY="534" maxY="590" name="embassy-m"/>
-  <symbol minX="1960" maxX="2016" minY="534" maxY="590" name="laundry-m"/>
-  <symbol minX="0" maxX="56" minY="590" maxY="646" name="electronics-m"/>
-  <symbol minX="56" maxX="112" minY="590" maxY="646" name="drugs"/>
-  <symbol minX="112" maxX="168" minY="590" maxY="646" name="library-m"/>
-  <symbol minX="168" maxX="224" minY="590" maxY="646" name="tennis-m"/>
-  <symbol minX="224" maxX="280" minY="590" maxY="646" name="taxi-m"/>
-  <symbol minX="280" maxX="336" minY="590" maxY="646" name="drinking-water-m"/>
-  <symbol minX="336" maxX="392" minY="590" maxY="646" name="america-football-m"/>
-  <symbol minX="392" maxX="448" minY="590" maxY="646" name="lighthouse-m"/>
-  <symbol minX="448" maxX="504" minY="590" maxY="646" name="bbq-m"/>
-  <symbol minX="504" maxX="560" minY="590" maxY="646" name="swimming-m"/>
-  <symbol minX="560" maxX="616" minY="590" maxY="646" name="bcontrol-m"/>
-  <symbol minX="616" maxX="672" minY="590" maxY="646" name="alpine_hut-m"/>
-  <symbol minX="672" maxX="728" minY="590" maxY="646" name="doityourself-m"/>
-  <symbol minX="728" maxX="784" minY="590" maxY="646" name="mail-m"/>
-  <symbol minX="784" maxX="840" minY="590" maxY="646" name="sweets-m"/>
-  <symbol minX="840" maxX="896" minY="590" maxY="646" name="dog_park-m"/>
-  <symbol minX="896" maxX="952" minY="590" maxY="646" name="marketplace-m"/>
-  <symbol minX="952" maxX="1008" minY="590" maxY="646" name="veterinary-m"/>
-  <symbol minX="1008" maxX="1064" minY="590" maxY="646" name="beach-m"/>
-  <symbol minX="1064" maxX="1120" minY="590" maxY="646" name="beauty-m"/>
-  <symbol minX="1120" maxX="1176" minY="590" maxY="646" name="diving-m"/>
-  <symbol minX="1176" maxX="1232" minY="590" maxY="646" name="military-m"/>
-  <symbol minX="1232" maxX="1288" minY="590" maxY="646" name="subway-spb-m"/>
-  <symbol minX="1288" maxX="1344" minY="590" maxY="646" name="department_store-m"/>
-  <symbol minX="1344" maxX="1400" minY="590" maxY="646" name="mobile_phone-m"/>
-  <symbol minX="1400" maxX="1456" minY="590" maxY="646" name="beer-m"/>
-  <symbol minX="1456" maxX="1512" minY="590" maxY="646" name="monument-m"/>
-  <symbol minX="1512" maxX="1568" minY="590" maxY="646" name="volcano-m"/>
-  <symbol minX="1568" maxX="1624" minY="590" maxY="646" name="subway-newyork-m"/>
-  <symbol minX="1624" maxX="1680" minY="590" maxY="646" name="motel-m"/>
-  <symbol minX="1680" maxX="1736" minY="590" maxY="646" name="archery-m"/>
-  <symbol minX="1736" maxX="1792" minY="590" maxY="646" name="curling-m"/>
-  <symbol minX="1792" maxX="1848" minY="590" maxY="646" name="bicycle-m"/>
-  <symbol minX="1848" maxX="1904" minY="590" maxY="646" name="museum-m"/>
-  <symbol minX="1904" maxX="1960" minY="590" maxY="646" name="waterfall-m"/>
-  <symbol minX="1960" maxX="2016" minY="590" maxY="646" name="wayside_cross-m"/>
-  <symbol minX="0" maxX="56" minY="646" maxY="702" name="subway-m"/>
-  <symbol minX="56" maxX="112" minY="646" maxY="702" name="book-shop-m"/>
-  <symbol minX="112" maxX="168" minY="646" maxY="702" name="wayside_shrine-m"/>
-  <symbol minX="168" maxX="224" minY="646" maxY="702" name="windmill-m"/>
-  <symbol minX="224" maxX="280" minY="646" maxY="702" name="subway-entrance-m"/>
-  <symbol minX="280" maxX="336" minY="646" maxY="702" name="cricket-m"/>
-  <symbol minX="336" maxX="392" minY="646" maxY="702" name="npark-m"/>
-  <symbol minX="392" maxX="448" minY="646" maxY="702" name="boundary_stone-m"/>
-  <symbol minX="448" maxX="504" minY="646" maxY="702" name="copyshop-m"/>
-  <symbol minX="504" maxX="560" minY="646" maxY="702" name="nparkf-m"/>
-  <symbol minX="560" maxX="616" minY="646" maxY="702" name="subway-entrance-2-m"/>
-  <symbol minX="616" maxX="672" minY="646" maxY="702" name="convenience-m"/>
-  <symbol minX="672" maxX="728" minY="646" maxY="702" name="office-m"/>
-  <symbol minX="728" maxX="784" minY="646" maxY="702" name="bowls-m"/>
-  <symbol minX="784" maxX="840" minY="646" maxY="702" name="computer-m"/>
-  <symbol minX="840" maxX="896" minY="646" maxY="702" name="optician-m"/>
-  <symbol minX="896" maxX="952" minY="646" maxY="702" name="zoo-m"/>
-  <symbol minX="952" maxX="1008" minY="646" maxY="702" name="park-m"/>
-  <symbol minX="1008" maxX="1064" minY="646" maxY="702" name="sports-m"/>
-  <symbol minX="1064" maxX="1120" minY="646" maxY="702" name="bus-m"/>
-  <symbol minX="1120" maxX="1176" minY="646" maxY="702" name="soccer-m"/>
-  <symbol minX="1176" maxX="1232" minY="646" maxY="702" name="college-m"/>
-  <symbol minX="1232" maxX="1288" minY="646" maxY="702" name="parking-meter-m"/>
-  <symbol minX="1288" maxX="1344" minY="646" maxY="702" name="alcohol-m"/>
-  <symbol minX="1344" maxX="1400" minY="646" maxY="702" name="skiing-m"/>
-  <symbol minX="1400" maxX="1456" minY="646" maxY="702" name="clothes-m"/>
-  <symbol minX="1456" maxX="1512" minY="646" maxY="702" name="peak-m"/>
-  <symbol minX="1512" maxX="1568" minY="646" maxY="702" name="butcher-m"/>
-  <symbol minX="1568" maxX="1624" minY="646" maxY="702" name="shop-m"/>
-  <symbol minX="1624" maxX="1680" minY="646" maxY="702" name="shop-m copy"/>
-  <symbol minX="1680" maxX="1736" minY="646" maxY="702" name="cable-car-m"/>
-  <symbol minX="1736" maxX="1792" minY="646" maxY="702" name="climbing-m"/>
-  <symbol minX="1792" maxX="1848" minY="646" maxY="702" name="petshop-m"/>
-  <symbol minX="1848" maxX="1904" minY="646" maxY="702" name="shop-bicycle-m"/>
-  <symbol minX="1904" maxX="1960" minY="646" maxY="702" name="pharmacy-m"/>
-  <symbol minX="1960" maxX="2016" minY="646" maxY="702" name="cafe-m"/>
-  <symbol minX="0" maxX="56" minY="702" maxY="758" name="cinema-m"/>
-  <symbol minX="56" maxX="112" minY="702" maxY="758" name="phone-m"/>
-  <symbol minX="112" maxX="168" minY="702" maxY="758" name="shoes-m"/>
-  <symbol minX="168" maxX="224" minY="702" maxY="758" name="chimney-m"/>
-  <symbol minX="224" maxX="280" minY="702" maxY="758" name="photo-shop-m"/>
-  <symbol minX="280" maxX="336" minY="702" maxY="758" name="chemist-m"/>
-  <symbol minX="336" maxX="392" minY="702" maxY="758" name="picnic-m"/>
-  <symbol minX="392" maxX="448" minY="702" maxY="758" name="ship-m"/>
-  <symbol minX="448" maxX="504" minY="702" maxY="758" name="campsite-m"/>
-  <symbol minX="504" maxX="560" minY="702" maxY="758" name="pitch-m"/>
-  <symbol minX="560" maxX="616" minY="702" maxY="758" name="seafood-shop-m"/>
-  <symbol minX="616" maxX="672" minY="702" maxY="758" name="charging-station-m"/>
-  <symbol minX="672" maxX="728" minY="702" maxY="758" name="place-of-worship-m"/>
-  <symbol minX="728" maxX="784" minY="702" maxY="758" name="school-m"/>
-  <symbol minX="784" maxX="840" minY="702" maxY="758" name="car-part-m"/>
-  <symbol minX="840" maxX="896" minY="702" maxY="758" name="police-m"/>
-  <symbol minX="896" maxX="952" minY="702" maxY="758" name="sauna-m"/>
-  <symbol minX="952" maxX="1008" minY="702" maxY="758" name="cemetery-m"/>
-  <symbol minX="1008" maxX="1064" minY="702" maxY="758" name="car-repair-m"/>
-  <symbol minX="1064" maxX="1120" minY="702" maxY="758" name="postbox-m"/>
-  <symbol minX="1120" maxX="1176" minY="702" maxY="758" name="cave-m"/>
-  <symbol minX="1176" maxX="1232" minY="702" maxY="758" name="restaurant-m"/>
-  <symbol minX="1232" maxX="1288" minY="702" maxY="758" name="casino-m"/>
-  <symbol minX="1288" maxX="1344" minY="702" maxY="758" name="pub-m"/>
-  <symbol minX="1344" maxX="1400" minY="702" maxY="758" name="remains-m"/>
-  <symbol minX="1400" maxX="1456" minY="702" maxY="758" name="caravan_site-m"/>
-  <symbol minX="1456" maxX="1512" minY="702" maxY="758" name="car_sharing-m"/>
-  <symbol minX="1512" maxX="1568" minY="702" maxY="758" name="recycling-m"/>
-  <symbol minX="1568" maxX="1624" minY="702" maxY="758" name="car-wash-m"/>
-  <symbol minX="1624" maxX="1676" minY="702" maxY="754" name="current-position"/>
-  <symbol minX="1676" maxX="1727" minY="702" maxY="753" name="lightrail-berlin-m"/>
-  <symbol minX="1727" maxX="1778" minY="702" maxY="753" name="firehydrant-l"/>
-  <symbol minX="1778" maxX="1829" minY="702" maxY="753" name="subway-rome-l"/>
-  <symbol minX="1829" maxX="1880" minY="702" maxY="753" name="speedcam-l"/>
-  <symbol minX="1880" maxX="1931" minY="702" maxY="753" name="waste-basket-l"/>
-  <symbol minX="1931" maxX="1982" minY="702" maxY="753" name="parking-l"/>
-  <symbol minX="1982" maxX="2040" minY="702" maxY="753" name="subway-moscow-l"/>
-  <symbol minX="0" maxX="51" minY="758" maxY="809" name="subway-berlin-l"/>
-  <symbol minX="51" maxX="102" minY="758" maxY="809" name="parking-ticket-l"/>
-  <symbol minX="102" maxX="153" minY="758" maxY="809" name="bike-parking-l"/>
-  <symbol minX="153" maxX="200" minY="758" maxY="805" name="no-icon-leisure"/>
-  <symbol minX="200" maxX="247" minY="758" maxY="805" name="no-icon-shop"/>
-  <symbol minX="247" maxX="294" minY="758" maxY="805" name="no-icon-tourism"/>
-  <symbol minX="294" maxX="341" minY="758" maxY="805" name="no-icon"/>
-  <symbol minX="341" maxX="388" minY="758" maxY="805" name="subway-berlin-m"/>
-  <symbol minX="388" maxX="435" minY="758" maxY="805" name="no-icon-amenity"/>
-  <symbol minX="435" maxX="489" minY="758" maxY="805" name="subway-moscow-m"/>
-  <symbol minX="489" maxX="536" minY="758" maxY="805" name="subway-paris-m"/>
-  <symbol minX="536" maxX="583" minY="758" maxY="805" name="subway-rome-m"/>
-  <symbol minX="583" maxX="641" minY="758" maxY="803" name="subway-london-l"/>
-  <symbol minX="641" maxX="686" minY="758" maxY="803" name="airport-s"/>
-  <symbol minX="686" maxX="728" minY="758" maxY="800" name="cable-car-s"/>
-  <symbol minX="728" maxX="770" minY="758" maxY="800" name="climbing-s"/>
-  <symbol minX="770" maxX="812" minY="758" maxY="800" name="cinema-s"/>
-  <symbol minX="812" maxX="854" minY="758" maxY="800" name="shop-s copy"/>
-  <symbol minX="854" maxX="896" minY="758" maxY="800" name="shop-s"/>
-  <symbol minX="896" maxX="938" minY="758" maxY="800" name="peak-s"/>
-  <symbol minX="938" maxX="980" minY="758" maxY="800" name="pharmacy-s"/>
-  <symbol minX="980" maxX="1022" minY="758" maxY="800" name="skiing-s"/>
-  <symbol minX="1022" maxX="1064" minY="758" maxY="800" name="bus-s"/>
-  <symbol minX="1064" maxX="1106" minY="758" maxY="800" name="garden-s"/>
-  <symbol minX="1106" maxX="1148" minY="758" maxY="800" name="soccer-s"/>
-  <symbol minX="1148" maxX="1190" minY="758" maxY="800" name="phone-s"/>
-  <symbol minX="1190" maxX="1232" minY="758" maxY="800" name="speedcam-m"/>
-  <symbol minX="1232" maxX="1274" minY="758" maxY="800" name="cafe-s"/>
-  <symbol minX="1274" maxX="1316" minY="758" maxY="800" name="bowls-s"/>
-  <symbol minX="1316" maxX="1358" minY="758" maxY="800" name="park-s"/>
-  <symbol minX="1358" maxX="1400" minY="758" maxY="800" name="zoo-s"/>
-  <symbol minX="1400" maxX="1442" minY="758" maxY="800" name="college-s"/>
-  <symbol minX="1442" maxX="1484" minY="758" maxY="800" name="office-s"/>
-  <symbol minX="1484" maxX="1526" minY="758" maxY="800" name="golf-s"/>
-  <symbol minX="1526" maxX="1584" minY="758" maxY="800" name="subway-barcelona-m"/>
-  <symbol minX="1584" maxX="1635" minY="758" maxY="800" name="subway-barcelona-s"/>
-  <symbol minX="1635" maxX="1677" minY="758" maxY="800" name="ship-s"/>
-  <symbol minX="1677" maxX="1719" minY="758" maxY="800" name="picnic-s"/>
-  <symbol minX="1719" maxX="1761" minY="758" maxY="800" name="windmill-s"/>
-  <symbol minX="1761" maxX="1803" minY="758" maxY="800" name="nparkf-s"/>
-  <symbol minX="1803" maxX="1845" minY="758" maxY="800" name="subway-entrance-2-s"/>
-  <symbol minX="1845" maxX="1887" minY="758" maxY="800" name="subway-entrance-arrow"/>
-  <symbol minX="1887" maxX="1929" minY="758" maxY="800" name="npark-s"/>
-  <symbol minX="1929" maxX="1971" minY="758" maxY="800" name="alcohol-s"/>
-  <symbol minX="1971" maxX="2013" minY="758" maxY="800" name="subway-entrance-s"/>
-  <symbol minX="0" maxX="42" minY="809" maxY="851" name="charging-station-s"/>
-  <symbol minX="42" maxX="84" minY="809" maxY="851" name="book-shop-s"/>
-  <symbol minX="84" maxX="126" minY="809" maxY="851" name="pitch-s"/>
-  <symbol minX="126" maxX="168" minY="809" maxY="851" name="campsite-s"/>
-  <symbol minX="168" maxX="210" minY="809" maxY="851" name="school-s"/>
-  <symbol minX="210" maxX="266" minY="809" maxY="851" name="subway-london-m"/>
-  <symbol minX="266" maxX="308" minY="809" maxY="851" name="place-of-worship-s"/>
-  <symbol minX="308" maxX="350" minY="809" maxY="851" name="cemetery-s"/>
-  <symbol minX="350" maxX="392" minY="809" maxY="851" name="gallery-s"/>
-  <symbol minX="392" maxX="450" minY="809" maxY="851" name="subway-madrid-m"/>
-  <symbol minX="450" maxX="492" minY="809" maxY="851" name="police-s"/>
-  <symbol minX="492" maxX="534" minY="809" maxY="851" name="bicycle-s"/>
-  <symbol minX="534" maxX="576" minY="809" maxY="851" name="waterfall-s"/>
-  <symbol minX="576" maxX="618" minY="809" maxY="851" name="museum-s"/>
-  <symbol minX="618" maxX="660" minY="809" maxY="851" name="cave-s"/>
-  <symbol minX="660" maxX="702" minY="809" maxY="851" name="tram-s"/>
-  <symbol minX="702" maxX="744" minY="809" maxY="851" name="cricket-s"/>
-  <symbol minX="744" maxX="786" minY="809" maxY="851" name="motel-s"/>
-  <symbol minX="786" maxX="828" minY="809" maxY="851" name="curling-s"/>
-  <symbol minX="828" maxX="870" minY="809" maxY="851" name="subway-newyork-s"/>
-  <symbol minX="870" maxX="912" minY="809" maxY="851" name="restaurant-s"/>
-  <symbol minX="912" maxX="954" minY="809" maxY="851" name="beer-s"/>
-  <symbol minX="954" maxX="996" minY="809" maxY="851" name="casino-s"/>
-  <symbol minX="996" maxX="1038" minY="809" maxY="851" name="volcano-s"/>
-  <symbol minX="1038" maxX="1080" minY="809" maxY="851" name="car-repair-s"/>
-  <symbol minX="1080" maxX="1122" minY="809" maxY="851" name="remains-s"/>
-  <symbol minX="1122" maxX="1164" minY="809" maxY="851" name="monument-s"/>
-  <symbol minX="1164" maxX="1206" minY="809" maxY="851" name="subway-s"/>
-  <symbol minX="1206" maxX="1248" minY="809" maxY="851" name="dentist-s"/>
-  <symbol minX="1248" maxX="1290" minY="809" maxY="851" name="military-s"/>
-  <symbol minX="1290" maxX="1332" minY="809" maxY="851" name="subway-spb-s"/>
-  <symbol minX="1332" maxX="1374" minY="809" maxY="851" name="diving-s"/>
-  <symbol minX="1374" maxX="1416" minY="809" maxY="851" name="viewpoint-s"/>
-  <symbol minX="1416" maxX="1458" minY="809" maxY="851" name="beach-s"/>
-  <symbol minX="1458" maxX="1516" minY="809" maxY="851" name="metro-barcelona-m"/>
-  <symbol minX="1516" maxX="1558" minY="809" maxY="851" name="marketplace-s"/>
-  <symbol minX="1558" maxX="1600" minY="809" maxY="851" name="bcontrol-s"/>
-  <symbol minX="1600" maxX="1642" minY="809" maxY="851" name="mail-s"/>
-  <symbol minX="1642" maxX="1684" minY="809" maxY="851" name="pub-s"/>
-  <symbol minX="1684" maxX="1726" minY="809" maxY="851" name="america-football-s"/>
-  <symbol minX="1726" maxX="1768" minY="809" maxY="851" name="swimming-s"/>
-  <symbol minX="1768" maxX="1810" minY="809" maxY="851" name="lighthouse-s"/>
-  <symbol minX="1810" maxX="1852" minY="809" maxY="851" name="drinking-water-s"/>
-  <symbol minX="1852" maxX="1894" minY="809" maxY="851" name="basketball-s"/>
-  <symbol minX="1894" maxX="1936" minY="809" maxY="851" name="library-s"/>
-  <symbol minX="1936" maxX="1978" minY="809" maxY="851" name="tennis-s"/>
-  <symbol minX="1978" maxX="2020" minY="809" maxY="851" name="archery-s"/>
-  <symbol minX="0" maxX="42" minY="851" maxY="893" name="kindergarten-s"/>
-  <symbol minX="42" maxX="84" minY="851" maxY="893" name="theatre-s"/>
-  <symbol minX="84" maxX="126" minY="851" maxY="893" name="baseball-s"/>
-  <symbol minX="126" maxX="168" minY="851" maxY="893" name="embassy-s"/>
-  <symbol minX="168" maxX="210" minY="851" maxY="893" name="alpine_hut-s"/>
-  <symbol minX="210" maxX="252" minY="851" maxY="893" name="information-s"/>
-  <symbol minX="252" maxX="294" minY="851" maxY="893" name="toilets-s"/>
-  <symbol minX="294" maxX="336" minY="851" maxY="893" name="bar-s"/>
-  <symbol minX="336" maxX="378" minY="851" maxY="893" name="fastfood-s"/>
-  <symbol minX="378" maxX="420" minY="851" maxY="893" name="toll_booth-s"/>
-  <symbol minX="420" maxX="462" minY="851" maxY="893" name="hotel-s"/>
-  <symbol minX="462" maxX="504" minY="851" maxY="893" name="fire_station-s"/>
-  <symbol minX="504" maxX="546" minY="851" maxY="893" name="hospital-s"/>
-  <symbol minX="546" maxX="588" minY="851" maxY="893" name="recycling-s"/>
-  <symbol minX="588" maxX="630" minY="851" maxY="893" name="tourism-s"/>
-  <symbol minX="630" maxX="672" minY="851" maxY="893" name="heliport-s"/>
-  <symbol minX="672" maxX="714" minY="851" maxY="893" name="helipad-s"/>
-  <symbol minX="714" maxX="756" minY="851" maxY="893" name="australian-football-s"/>
-  <symbol minX="756" maxX="798" minY="851" maxY="893" name="fountain-s"/>
-  <symbol minX="798" maxX="840" minY="851" maxY="893" name="townhall-s"/>
-  <symbol minX="840" maxX="882" minY="851" maxY="893" name="fuel-s"/>
-  <symbol minX="882" maxX="924" minY="851" maxY="893" name="funicular-s"/>
-  <symbol minX="924" maxX="966" minY="851" maxY="893" name="atm-s"/>
-  <symbol minX="966" maxX="1008" minY="851" maxY="893" name="gym-s"/>
-  <symbol minX="1008" maxX="1050" minY="851" maxY="893" name="train-s"/>
-  <symbol minX="1050" maxX="1092" minY="851" maxY="893" name="atm-s copy 2"/>
-  <symbol minX="1092" maxX="1134" minY="851" maxY="893" name="grocery-s"/>
-  <symbol minX="1134" maxX="1192" minY="851" maxY="892" name="subway-madrid-l"/>
-  <symbol minX="1192" maxX="1250" minY="851" maxY="892" name="subway-barcelona-l"/>
-  <symbol minX="1250" maxX="1288" minY="851" maxY="891" name="s-arrow"/>
-  <symbol minX="1288" maxX="1328" minY="851" maxY="891" name="parking-m"/>
-  <symbol minX="1328" maxX="1379" minY="851" maxY="889" name="metro-barcelona-s"/>
-  <symbol minX="1379" maxX="1417" minY="851" maxY="889" name="search-result"/>
-  <symbol minX="1417" maxX="1473" minY="851" maxY="889" name="subway-kiev-l"/>
-  <symbol minX="1473" maxX="1511" minY="851" maxY="889" name="lightrail-berlin-s"/>
-  <symbol minX="1511" maxX="1567" minY="851" maxY="889" name="subway-kiev-m"/>
-  <symbol minX="1567" maxX="1618" minY="851" maxY="889" name="subway-madrid-s"/>
-  <symbol minX="1618" maxX="1656" minY="851" maxY="889" name="waste-basket-s"/>
-  <symbol minX="1656" maxX="1694" minY="851" maxY="889" name="api-result"/>
-  <symbol minX="1694" maxX="1732" minY="851" maxY="889" name="subway-paris-s"/>
-  <symbol minX="1732" maxX="1768" minY="851" maxY="887" name="subway-moscow-s"/>
-  <symbol minX="1768" maxX="1801" minY="851" maxY="884" name="speedcam-s"/>
-  <symbol minX="1801" maxX="1839" minY="851" maxY="884" name="bench"/>
-  <symbol minX="1839" maxX="1872" minY="851" maxY="884" name="subway-rome-s"/>
-  <symbol minX="1872" maxX="1905" minY="851" maxY="884" name="star-l"/>
-  <symbol minX="1905" maxX="1938" minY="851" maxY="884" name="parking-s"/>
-  <symbol minX="1938" maxX="1971" minY="851" maxY="884" name="subway-berlin-s"/>
-  <symbol minX="1971" maxX="2013" minY="851" maxY="884" name="subway-london-s"/>
-  <symbol minX="2013" maxX="2044" minY="851" maxY="882" name="survey_point-l"/>
-  <symbol minX="0" maxX="31" minY="893" maxY="924" name="star-m"/>
-  <symbol minX="31" maxX="64" minY="893" maxY="924" name="peakt-l"/>
-  <symbol minX="64" maxX="120" minY="893" maxY="924" name="subway-minsk-l"/>
-  <symbol minX="120" maxX="167" minY="893" maxY="922" name="subway-kiev-s"/>
-  <symbol minX="167" maxX="194" minY="893" maxY="920" name="star-s"/>
-  <symbol minX="194" maxX="236" minY="893" maxY="920" name="railway-crossing"/>
-  <symbol minX="236" maxX="283" minY="893" maxY="920" name="subway-minsk-m"/>
-  <symbol minX="283" maxX="310" minY="893" maxY="920" name="subway-xs"/>
-  <symbol minX="310" maxX="337" minY="893" maxY="920" name="subway-newyork-xs"/>
-  <symbol minX="337" maxX="364" minY="893" maxY="920" name="survey_point-m"/>
-  <symbol minX="364" maxX="388" minY="893" maxY="917" name="subway-xs copy"/>
-  <symbol minX="388" maxX="430" minY="893" maxY="917" name="subway-minsk-s"/>
-  <symbol minX="430" maxX="454" minY="893" maxY="915" name="peakt-m"/>
-  <symbol minX="454" maxX="505" minY="893" maxY="915" name="arrow-m"/>
-  <symbol minX="505" maxX="527" minY="893" maxY="915" name="survey_point-s"/>
-  <symbol minX="527" maxX="547" minY="893" maxY="913" name="entrance-s"/>
-  <symbol minX="547" maxX="565" minY="893" maxY="911" name="dot-m"/>
-  <symbol minX="565" maxX="585" minY="893" maxY="911" name="peakt-s"/>
-  <symbol minX="585" maxX="623" minY="893" maxY="908" name="arrow-s"/>
-  <symbol minX="623" maxX="638" minY="893" maxY="908" name="none"/>
-  <symbol minX="638" maxX="653" minY="893" maxY="908" name="tree-l"/>
-  <symbol minX="653" maxX="666" minY="893" maxY="906" name="entrance-xs"/>
-  <symbol minX="666" maxX="679" minY="893" maxY="906" name="dot-s"/>
-  <symbol minX="679" maxX="692" minY="893" maxY="906" name="dot-s-light"/>
-  <symbol minX="692" maxX="705" minY="893" maxY="906" name="tree-m"/>
-  <symbol minX="705" maxX="716" minY="893" maxY="904" name="zero-icon"/>
-  <symbol minX="716" maxX="727" minY="893" maxY="904" name="tree-s"/>
+ <file height="1024" width="2048">
+  <symbol minY="0" maxY="244" name="route_to" minX="0" maxX="167"/>
+  <symbol minY="0" maxY="206" name="route_from" minX="167" maxX="243"/>
+  <symbol minY="0" maxY="158" name="route-arrow" minX="243" maxX="566"/>
+  <symbol minY="0" maxY="138" name="compass-image" minX="566" maxX="704"/>
+  <symbol minY="0" maxY="95" name="cross_geoposition" minX="704" maxX="799"/>
+  <symbol minY="0" maxY="88" name="current-position-compas" minX="799" maxX="870"/>
+  <symbol minY="0" maxY="88" name="current-position-obsolete" minX="870" maxX="941"/>
+  <symbol minY="0" maxY="81" name="search-result-active" minX="941" maxX="1022"/>
+  <symbol minY="0" maxY="69" name="placemark-orange" minX="1022" maxX="1057"/>
+  <symbol minY="0" maxY="69" name="placemark-purple" minX="1057" maxX="1092"/>
+  <symbol minY="0" maxY="69" name="placemark-red" minX="1092" maxX="1127"/>
+  <symbol minY="0" maxY="69" name="placemark-yellow" minX="1127" maxX="1162"/>
+  <symbol minY="0" maxY="69" name="placemark-green" minX="1162" maxX="1197"/>
+  <symbol minY="0" maxY="69" name="placemark-brown" minX="1197" maxX="1232"/>
+  <symbol minY="0" maxY="69" name="placemark-blue" minX="1232" maxX="1267"/>
+  <symbol minY="0" maxY="69" name="placemark-pink" minX="1267" maxX="1302"/>
+  <symbol minY="0" maxY="58" name="vending-l" minX="1302" maxX="1360"/>
+  <symbol minY="0" maxY="58" name="atm-l" minX="1360" maxX="1418"/>
+  <symbol minY="0" maxY="58" name="veterinary-l" minX="1418" maxX="1476"/>
+  <symbol minY="0" maxY="58" name="tram-l" minX="1476" maxX="1534"/>
+  <symbol minY="0" maxY="58" name="train-l" minX="1534" maxX="1592"/>
+  <symbol minY="0" maxY="58" name="australian-football-l" minX="1592" maxX="1650"/>
+  <symbol minY="0" maxY="58" name="toys-l" minX="1650" maxX="1708"/>
+  <symbol minY="0" maxY="58" name="townhall-l" minX="1708" maxX="1766"/>
+  <symbol minY="0" maxY="58" name="bakery-l" minX="1766" maxX="1824"/>
+  <symbol minY="0" maxY="58" name="tourist-shop-l" minX="1824" maxX="1882"/>
+  <symbol minY="0" maxY="58" name="tourist-office-l" minX="1882" maxX="1940"/>
+  <symbol minY="0" maxY="58" name="bank-l" minX="1940" maxX="1997"/>
+  <symbol minY="244" maxY="302" name="bank-m" minX="0" maxX="56"/>
+  <symbol minY="244" maxY="302" name="banknote-l" minX="56" maxX="113"/>
+  <symbol minY="244" maxY="302" name="tourism-l" minX="113" maxX="171"/>
+  <symbol minY="244" maxY="302" name="bar-l" minX="171" maxX="229"/>
+  <symbol minY="244" maxY="302" name="tomb-l" minX="229" maxX="287"/>
+  <symbol minY="244" maxY="302" name="toll_booth-l" minX="287" maxX="345"/>
+  <symbol minY="244" maxY="302" name="baseball-l" minX="345" maxX="403"/>
+  <symbol minY="244" maxY="302" name="toilets-l" minX="403" maxX="461"/>
+  <symbol minY="244" maxY="302" name="ticket-shop-l" minX="461" maxX="519"/>
+  <symbol minY="244" maxY="302" name="basketball-l" minX="519" maxX="577"/>
+  <symbol minY="244" maxY="302" name="theatre-l" minX="577" maxX="635"/>
+  <symbol minY="244" maxY="302" name="tennis-l" minX="635" maxX="693"/>
+  <symbol minY="244" maxY="302" name="bbq-l" minX="693" maxX="751"/>
+  <symbol minY="244" maxY="302" name="taxi-l" minX="751" maxX="809"/>
+  <symbol minY="244" maxY="302" name="bcontrol-l" minX="809" maxX="867"/>
+  <symbol minY="244" maxY="302" name="swimming-l" minX="867" maxX="925"/>
+  <symbol minY="244" maxY="302" name="sweets-l" minX="925" maxX="983"/>
+  <symbol minY="244" maxY="302" name="beach-l" minX="983" maxX="1041"/>
+  <symbol minY="244" maxY="302" name="viewpoint-l" minX="1041" maxX="1099"/>
+  <symbol minY="244" maxY="302" name="viewpoint-m" minX="1099" maxX="1157"/>
+  <symbol minY="244" maxY="302" name="beauty-l" minX="1157" maxX="1215"/>
+  <symbol minY="244" maxY="302" name="volcano-l" minX="1215" maxX="1273"/>
+  <symbol minY="244" maxY="302" name="beer-l" minX="1273" maxX="1331"/>
+  <symbol minY="244" maxY="302" name="subway-spb-l" minX="1331" maxX="1389"/>
+  <symbol minY="244" maxY="302" name="subway-paris-l" minX="1389" maxX="1447"/>
+  <symbol minY="244" maxY="302" name="subway-newyork-l" minX="1447" maxX="1505"/>
+  <symbol minY="244" maxY="302" name="bicycle-l" minX="1505" maxX="1563"/>
+  <symbol minY="244" maxY="302" name="waterfall-l" minX="1563" maxX="1621"/>
+  <symbol minY="244" maxY="302" name="wayside_cross-l" minX="1621" maxX="1679"/>
+  <symbol minY="244" maxY="302" name="wayside_shrine-l" minX="1679" maxX="1737"/>
+  <symbol minY="244" maxY="302" name="book-shop-l" minX="1737" maxX="1795"/>
+  <symbol minY="244" maxY="302" name="subway-l" minX="1795" maxX="1853"/>
+  <symbol minY="244" maxY="302" name="windmill-l" minX="1853" maxX="1911"/>
+  <symbol minY="244" maxY="302" name="bookmaker-l" minX="1911" maxX="1969"/>
+  <symbol minY="244" maxY="302" name="boundary_stone-l" minX="1969" maxX="2027"/>
+  <symbol minY="302" maxY="360" name="subway-entrance-l" minX="0" maxX="58"/>
+  <symbol minY="302" maxY="360" name="bowls-l" minX="58" maxX="116"/>
+  <symbol minY="302" maxY="360" name="zoo-l" minX="116" maxX="174"/>
+  <symbol minY="302" maxY="360" name="sports-l" minX="174" maxX="232"/>
+  <symbol minY="302" maxY="360" name="bus-l" minX="232" maxX="290"/>
+  <symbol minY="302" maxY="360" name="airport-l" minX="290" maxX="348"/>
+  <symbol minY="302" maxY="360" name="soccer-l" minX="348" maxX="406"/>
+  <symbol minY="302" maxY="360" name="butcher-l" minX="406" maxX="464"/>
+  <symbol minY="302" maxY="360" name="skiing-l" minX="464" maxX="522"/>
+  <symbol minY="302" maxY="360" name="cable-car-l" minX="522" maxX="580"/>
+  <symbol minY="302" maxY="360" name="shop-l" minX="580" maxX="638"/>
+  <symbol minY="302" maxY="360" name="shop-l copy" minX="638" maxX="696"/>
+  <symbol minY="302" maxY="360" name="cafe-l" minX="696" maxX="754"/>
+  <symbol minY="302" maxY="360" name="shop-bicycle-l" minX="754" maxX="812"/>
+  <symbol minY="302" maxY="360" name="shoes-l" minX="812" maxX="870"/>
+  <symbol minY="302" maxY="360" name="campsite-l" minX="870" maxX="928"/>
+  <symbol minY="302" maxY="360" name="ship-l" minX="928" maxX="986"/>
+  <symbol minY="302" maxY="360" name="seafood-shop-l" minX="986" maxX="1044"/>
+  <symbol minY="302" maxY="360" name="car-part-l" minX="1044" maxX="1102"/>
+  <symbol minY="302" maxY="360" name="school-l" minX="1102" maxX="1160"/>
+  <symbol minY="302" maxY="360" name="car-repair-l" minX="1160" maxX="1218"/>
+  <symbol minY="302" maxY="360" name="sauna-l" minX="1218" maxX="1276"/>
+  <symbol minY="302" maxY="360" name="restaurant-l" minX="1276" maxX="1334"/>
+  <symbol minY="302" maxY="360" name="car-wash-l" minX="1334" maxX="1392"/>
+  <symbol minY="302" maxY="360" name="remains-l" minX="1392" maxX="1450"/>
+  <symbol minY="302" maxY="360" name="car_sharing-l" minX="1450" maxX="1508"/>
+  <symbol minY="302" maxY="360" name="recycling-l" minX="1508" maxX="1566"/>
+  <symbol minY="302" maxY="360" name="caravan_site-l" minX="1566" maxX="1624"/>
+  <symbol minY="302" maxY="360" name="airport-m" minX="1624" maxX="1682"/>
+  <symbol minY="302" maxY="360" name="casino-l" minX="1682" maxX="1740"/>
+  <symbol minY="302" maxY="360" name="pub-l" minX="1740" maxX="1798"/>
+  <symbol minY="302" maxY="360" name="power-m" minX="1798" maxX="1856"/>
+  <symbol minY="302" maxY="360" name="cave-l" minX="1856" maxX="1914"/>
+  <symbol minY="302" maxY="360" name="power-l" minX="1914" maxX="1972"/>
+  <symbol minY="302" maxY="360" name="postbox-l" minX="1972" maxX="2030"/>
+  <symbol minY="360" maxY="418" name="cemetery-l" minX="0" maxX="58"/>
+  <symbol minY="360" maxY="418" name="pool-l" minX="58" maxX="116"/>
+  <symbol minY="360" maxY="418" name="police-l" minX="116" maxX="174"/>
+  <symbol minY="360" maxY="418" name="charging-station-l" minX="174" maxX="232"/>
+  <symbol minY="360" maxY="418" name="place-of-worship-l" minX="232" maxX="290"/>
+  <symbol minY="360" maxY="418" name="pitch-l" minX="290" maxX="348"/>
+  <symbol minY="360" maxY="418" name="chemist-l" minX="348" maxX="406"/>
+  <symbol minY="360" maxY="418" name="picnic-l" minX="406" maxX="464"/>
+  <symbol minY="360" maxY="418" name="childcare-l" minX="464" maxX="522"/>
+  <symbol minY="360" maxY="418" name="chimney-l" minX="522" maxX="580"/>
+  <symbol minY="360" maxY="418" name="photo-shop-l" minX="580" maxX="638"/>
+  <symbol minY="360" maxY="418" name="cinema-l" minX="638" maxX="696"/>
+  <symbol minY="360" maxY="418" name="phone-l" minX="696" maxX="754"/>
+  <symbol minY="360" maxY="418" name="pharmacy-l" minX="754" maxX="812"/>
+  <symbol minY="360" maxY="418" name="climbing-l" minX="812" maxX="870"/>
+  <symbol minY="360" maxY="418" name="petshop-l" minX="870" maxX="928"/>
+  <symbol minY="360" maxY="418" name="alcohol-l" minX="928" maxX="986"/>
+  <symbol minY="360" maxY="418" name="clothes-l" minX="986" maxX="1044"/>
+  <symbol minY="360" maxY="418" name="peak-l" minX="1044" maxX="1102"/>
+  <symbol minY="360" maxY="418" name="college-l" minX="1102" maxX="1160"/>
+  <symbol minY="360" maxY="418" name="parking-meter-l" minX="1160" maxX="1218"/>
+  <symbol minY="360" maxY="418" name="park-l" minX="1218" maxX="1276"/>
+  <symbol minY="360" maxY="418" name="computer-l" minX="1276" maxX="1334"/>
+  <symbol minY="360" maxY="418" name="optician-l" minX="1334" maxX="1392"/>
+  <symbol minY="360" maxY="418" name="convenience-l" minX="1392" maxX="1450"/>
+  <symbol minY="360" maxY="418" name="office-l" minX="1450" maxX="1508"/>
+  <symbol minY="360" maxY="418" name="copyshop-l" minX="1508" maxX="1566"/>
+  <symbol minY="360" maxY="418" name="nparkf-l" minX="1566" maxX="1624"/>
+  <symbol minY="360" maxY="418" name="courthouse-l" minX="1624" maxX="1682"/>
+  <symbol minY="360" maxY="418" name="cricket-l" minX="1682" maxX="1740"/>
+  <symbol minY="360" maxY="418" name="npark-l" minX="1740" maxX="1798"/>
+  <symbol minY="360" maxY="418" name="museum-l" minX="1798" maxX="1856"/>
+  <symbol minY="360" maxY="418" name="curling-l" minX="1856" maxX="1914"/>
+  <symbol minY="360" maxY="418" name="moto-sharing-l" minX="1914" maxX="1972"/>
+  <symbol minY="360" maxY="418" name="motel-l" minX="1972" maxX="2030"/>
+  <symbol minY="418" maxY="476" name="dentist-l" minX="0" maxX="58"/>
+  <symbol minY="418" maxY="476" name="dentist-m" minX="58" maxX="116"/>
+  <symbol minY="418" maxY="476" name="monument-l" minX="116" maxX="174"/>
+  <symbol minY="418" maxY="476" name="department_store-l" minX="174" maxX="232"/>
+  <symbol minY="418" maxY="476" name="mobile_phone-l" minX="232" maxX="290"/>
+  <symbol minY="418" maxY="476" name="diving-l" minX="290" maxX="348"/>
+  <symbol minY="418" maxY="476" name="military-l" minX="348" maxX="406"/>
+  <symbol minY="418" maxY="476" name="alpine_hut-l" minX="406" maxX="464"/>
+  <symbol minY="418" maxY="476" name="dog_park-l" minX="464" maxX="522"/>
+  <symbol minY="418" maxY="476" name="marketplace-l" minX="522" maxX="580"/>
+  <symbol minY="418" maxY="476" name="doityourself-l" minX="580" maxX="638"/>
+  <symbol minY="418" maxY="476" name="mail-l" minX="638" maxX="696"/>
+  <symbol minY="418" maxY="476" name="archery-l" minX="696" maxX="754"/>
+  <symbol minY="418" maxY="476" name="lightrail-berlin-l" minX="754" maxX="812"/>
+  <symbol minY="418" maxY="476" name="lighthouse-l" minX="812" maxX="870"/>
+  <symbol minY="418" maxY="476" name="drinking-water-l" minX="870" maxX="928"/>
+  <symbol minY="418" maxY="476" name="lift_gate-l" minX="928" maxX="986"/>
+  <symbol minY="418" maxY="476" name="library-l" minX="986" maxX="1044"/>
+  <symbol minY="418" maxY="476" name="lawyer-l" minX="1044" maxX="1102"/>
+  <symbol minY="418" maxY="476" name="electronics-l" minX="1102" maxX="1160"/>
+  <symbol minY="418" maxY="476" name="laundry-l" minX="1160" maxX="1218"/>
+  <symbol minY="418" maxY="476" name="embassy-l" minX="1218" maxX="1276"/>
+  <symbol minY="418" maxY="476" name="kiosk-l" minX="1276" maxX="1334"/>
+  <symbol minY="418" maxY="476" name="kindergarten-m" minX="1334" maxX="1392"/>
+  <symbol minY="418" maxY="476" name="america-football-l" minX="1392" maxX="1450"/>
+  <symbol minY="418" maxY="476" name="kindergarten-l" minX="1450" maxX="1508"/>
+  <symbol minY="418" maxY="476" name="equestrian-l" minX="1508" maxX="1566"/>
+  <symbol minY="418" maxY="476" name="equestrian-m" minX="1566" maxX="1624"/>
+  <symbol minY="418" maxY="476" name="fastfood-l" minX="1624" maxX="1682"/>
+  <symbol minY="418" maxY="476" name="jewelry-l" minX="1682" maxX="1740"/>
+  <symbol minY="418" maxY="476" name="information-l" minX="1740" maxX="1798"/>
+  <symbol minY="418" maxY="476" name="fire_station-l" minX="1798" maxX="1856"/>
+  <symbol minY="418" maxY="476" name="hunting-tower-l" minX="1856" maxX="1914"/>
+  <symbol minY="418" maxY="476" name="hotel-l" minX="1914" maxX="1972"/>
+  <symbol minY="418" maxY="476" name="hospital-l" minX="1972" maxX="2030"/>
+  <symbol minY="476" maxY="534" name="florist-l" minX="0" maxX="58"/>
+  <symbol minY="476" maxY="534" name="historic-ship-l" minX="58" maxX="116"/>
+  <symbol minY="476" maxY="534" name="fountain-l" minX="116" maxX="174"/>
+  <symbol minY="476" maxY="534" name="heliport-l" minX="174" maxX="232"/>
+  <symbol minY="476" maxY="534" name="helipad-l" minX="232" maxX="290"/>
+  <symbol minY="476" maxY="534" name="fuel-l copy" minX="290" maxX="348"/>
+  <symbol minY="476" maxY="534" name="fuel-l" minX="348" maxX="406"/>
+  <symbol minY="476" maxY="534" name="hardware-l" minX="406" maxX="464"/>
+  <symbol minY="476" maxY="534" name="hand-m" minX="464" maxX="522"/>
+  <symbol minY="476" maxY="534" name="funicular-l" minX="522" maxX="580"/>
+  <symbol minY="476" maxY="534" name="hand-l" minX="580" maxX="638"/>
+  <symbol minY="476" maxY="534" name="hairdresser-l" minX="638" maxX="696"/>
+  <symbol minY="476" maxY="534" name="furniture-l" minX="696" maxX="754"/>
+  <symbol minY="476" maxY="534" name="gym-l" minX="754" maxX="812"/>
+  <symbol minY="476" maxY="534" name="gallery-l" minX="812" maxX="870"/>
+  <symbol minY="476" maxY="534" name="grocery-l" minX="870" maxX="928"/>
+  <symbol minY="476" maxY="534" name="greengrocer-l" minX="928" maxX="986"/>
+  <symbol minY="476" maxY="534" name="garden-l" minX="986" maxX="1044"/>
+  <symbol minY="476" maxY="534" name="golf-l" minX="1044" maxX="1102"/>
+  <symbol minY="476" maxY="534" name="gift-l" minX="1102" maxX="1160"/>
+  <symbol minY="476" maxY="534" name="garden_center-l" minX="1160" maxX="1218"/>
+  <symbol minY="476" maxY="534" name="gate-l" minX="1218" maxX="1276"/>
+  <symbol minY="476" maxY="532" name="garden_center-m" minX="1276" maxX="1332"/>
+  <symbol minY="476" maxY="532" name="gate-m" minX="1332" maxX="1388"/>
+  <symbol minY="476" maxY="532" name="kiosk-m" minX="1388" maxX="1444"/>
+  <symbol minY="476" maxY="532" name="gift-m" minX="1444" maxX="1500"/>
+  <symbol minY="476" maxY="532" name="garden-m" minX="1500" maxX="1556"/>
+  <symbol minY="476" maxY="532" name="golf-m" minX="1556" maxX="1612"/>
+  <symbol minY="476" maxY="532" name="vending-m" minX="1612" maxX="1668"/>
+  <symbol minY="476" maxY="532" name="atm-m" minX="1668" maxX="1724"/>
+  <symbol minY="476" maxY="532" name="greengrocer-m" minX="1724" maxX="1780"/>
+  <symbol minY="476" maxY="532" name="gallery-m" minX="1780" maxX="1836"/>
+  <symbol minY="476" maxY="532" name="grocery-m" minX="1836" maxX="1892"/>
+  <symbol minY="476" maxY="532" name="veterinary-m" minX="1892" maxX="1948"/>
+  <symbol minY="476" maxY="532" name="furniture-m" minX="1948" maxX="2004"/>
+  <symbol minY="534" maxY="590" name="gym-m" minX="0" maxX="56"/>
+  <symbol minY="534" maxY="590" name="tram-m" minX="56" maxX="112"/>
+  <symbol minY="534" maxY="590" name="train-m" minX="112" maxX="168"/>
+  <symbol minY="534" maxY="590" name="hairdresser-m" minX="168" maxX="224"/>
+  <symbol minY="534" maxY="590" name="funicular-m" minX="224" maxX="280"/>
+  <symbol minY="534" maxY="590" name="toys-m" minX="280" maxX="336"/>
+  <symbol minY="534" maxY="590" name="fuel-m" minX="336" maxX="392"/>
+  <symbol minY="534" maxY="590" name="hardware-m" minX="392" maxX="448"/>
+  <symbol minY="534" maxY="590" name="australian-football-m" minX="448" maxX="504"/>
+  <symbol minY="534" maxY="590" name="helipad-m" minX="504" maxX="560"/>
+  <symbol minY="534" maxY="590" name="townhall-m" minX="560" maxX="616"/>
+  <symbol minY="534" maxY="590" name="fountain-m" minX="616" maxX="672"/>
+  <symbol minY="534" maxY="590" name="heliport-m" minX="672" maxX="728"/>
+  <symbol minY="534" maxY="590" name="bakery-m" minX="728" maxX="784"/>
+  <symbol minY="534" maxY="590" name="florist-m" minX="784" maxX="840"/>
+  <symbol minY="534" maxY="590" name="historic-ship-m" minX="840" maxX="896"/>
+  <symbol minY="534" maxY="590" name="bank-2-m" minX="896" maxX="952"/>
+  <symbol minY="534" maxY="590" name="hospital-m" minX="952" maxX="1008"/>
+  <symbol minY="534" maxY="590" name="tourism-m" minX="1008" maxX="1064"/>
+  <symbol minY="534" maxY="590" name="banknote-m" minX="1064" maxX="1120"/>
+  <symbol minY="534" maxY="590" name="hotel-m" minX="1120" maxX="1176"/>
+  <symbol minY="534" maxY="590" name="tomb-m" minX="1176" maxX="1232"/>
+  <symbol minY="534" maxY="590" name="fire_station-m" minX="1232" maxX="1288"/>
+  <symbol minY="534" maxY="590" name="hunting-tower-m" minX="1288" maxX="1344"/>
+  <symbol minY="534" maxY="590" name="bar-m" minX="1344" maxX="1400"/>
+  <symbol minY="534" maxY="590" name="information-m" minX="1400" maxX="1456"/>
+  <symbol minY="534" maxY="590" name="toll_booth-m" minX="1456" maxX="1512"/>
+  <symbol minY="534" maxY="590" name="fastfood-m" minX="1512" maxX="1568"/>
+  <symbol minY="534" maxY="590" name="jewelry-m" minX="1568" maxX="1624"/>
+  <symbol minY="534" maxY="590" name="toilets-m" minX="1624" maxX="1680"/>
+  <symbol minY="534" maxY="590" name="baseball-m" minX="1680" maxX="1736"/>
+  <symbol minY="534" maxY="590" name="ticket-shop-m" minX="1736" maxX="1792"/>
+  <symbol minY="534" maxY="590" name="embassy-m" minX="1792" maxX="1848"/>
+  <symbol minY="534" maxY="590" name="theatre-m" minX="1848" maxX="1904"/>
+  <symbol minY="534" maxY="590" name="electronics-m" minX="1904" maxX="1960"/>
+  <symbol minY="534" maxY="590" name="laundry-m" minX="1960" maxX="2016"/>
+  <symbol minY="590" maxY="646" name="drugs" minX="0" maxX="56"/>
+  <symbol minY="590" maxY="646" name="basketball-m" minX="56" maxX="112"/>
+  <symbol minY="590" maxY="646" name="library-m" minX="112" maxX="168"/>
+  <symbol minY="590" maxY="646" name="tennis-m" minX="168" maxX="224"/>
+  <symbol minY="590" maxY="646" name="drinking-water-m" minX="224" maxX="280"/>
+  <symbol minY="590" maxY="646" name="lift_gate-m" minX="280" maxX="336"/>
+  <symbol minY="590" maxY="646" name="america-football-m" minX="336" maxX="392"/>
+  <symbol minY="590" maxY="646" name="lighthouse-m" minX="392" maxX="448"/>
+  <symbol minY="590" maxY="646" name="taxi-m" minX="448" maxX="504"/>
+  <symbol minY="590" maxY="646" name="bbq-m" minX="504" maxX="560"/>
+  <symbol minY="590" maxY="646" name="swimming-m" minX="560" maxX="616"/>
+  <symbol minY="590" maxY="646" name="alpine_hut-m" minX="616" maxX="672"/>
+  <symbol minY="590" maxY="646" name="doityourself-m" minX="672" maxX="728"/>
+  <symbol minY="590" maxY="646" name="mail-m" minX="728" maxX="784"/>
+  <symbol minY="590" maxY="646" name="bcontrol-m" minX="784" maxX="840"/>
+  <symbol minY="590" maxY="646" name="dog_park-m" minX="840" maxX="896"/>
+  <symbol minY="590" maxY="646" name="marketplace-m" minX="896" maxX="952"/>
+  <symbol minY="590" maxY="646" name="sweets-m" minX="952" maxX="1008"/>
+  <symbol minY="590" maxY="646" name="beach-m" minX="1008" maxX="1064"/>
+  <symbol minY="590" maxY="646" name="beauty-m" minX="1064" maxX="1120"/>
+  <symbol minY="590" maxY="646" name="diving-m" minX="1120" maxX="1176"/>
+  <symbol minY="590" maxY="646" name="military-m" minX="1176" maxX="1232"/>
+  <symbol minY="590" maxY="646" name="volcano-m" minX="1232" maxX="1288"/>
+  <symbol minY="590" maxY="646" name="department_store-m" minX="1288" maxX="1344"/>
+  <symbol minY="590" maxY="646" name="mobile_phone-m" minX="1344" maxX="1400"/>
+  <symbol minY="590" maxY="646" name="subway-spb-m" minX="1400" maxX="1456"/>
+  <symbol minY="590" maxY="646" name="monument-m" minX="1456" maxX="1512"/>
+  <symbol minY="590" maxY="646" name="beer-m" minX="1512" maxX="1568"/>
+  <symbol minY="590" maxY="646" name="subway-newyork-m" minX="1568" maxX="1624"/>
+  <symbol minY="590" maxY="646" name="motel-m" minX="1624" maxX="1680"/>
+  <symbol minY="590" maxY="646" name="archery-m" minX="1680" maxX="1736"/>
+  <symbol minY="590" maxY="646" name="curling-m" minX="1736" maxX="1792"/>
+  <symbol minY="590" maxY="646" name="bicycle-m" minX="1792" maxX="1848"/>
+  <symbol minY="590" maxY="646" name="museum-m" minX="1848" maxX="1904"/>
+  <symbol minY="590" maxY="646" name="waterfall-m" minX="1904" maxX="1960"/>
+  <symbol minY="590" maxY="646" name="wayside_cross-m" minX="1960" maxX="2016"/>
+  <symbol minY="646" maxY="702" name="subway-m" minX="0" maxX="56"/>
+  <symbol minY="646" maxY="702" name="book-shop-m" minX="56" maxX="112"/>
+  <symbol minY="646" maxY="702" name="wayside_shrine-m" minX="112" maxX="168"/>
+  <symbol minY="646" maxY="702" name="windmill-m" minX="168" maxX="224"/>
+  <symbol minY="646" maxY="702" name="subway-entrance-m" minX="224" maxX="280"/>
+  <symbol minY="646" maxY="702" name="cricket-m" minX="280" maxX="336"/>
+  <symbol minY="646" maxY="702" name="npark-m" minX="336" maxX="392"/>
+  <symbol minY="646" maxY="702" name="boundary_stone-m" minX="392" maxX="448"/>
+  <symbol minY="646" maxY="702" name="copyshop-m" minX="448" maxX="504"/>
+  <symbol minY="646" maxY="702" name="nparkf-m" minX="504" maxX="560"/>
+  <symbol minY="646" maxY="702" name="subway-entrance-2-m" minX="560" maxX="616"/>
+  <symbol minY="646" maxY="702" name="convenience-m" minX="616" maxX="672"/>
+  <symbol minY="646" maxY="702" name="office-m" minX="672" maxX="728"/>
+  <symbol minY="646" maxY="702" name="bowls-m" minX="728" maxX="784"/>
+  <symbol minY="646" maxY="702" name="computer-m" minX="784" maxX="840"/>
+  <symbol minY="646" maxY="702" name="optician-m" minX="840" maxX="896"/>
+  <symbol minY="646" maxY="702" name="zoo-m" minX="896" maxX="952"/>
+  <symbol minY="646" maxY="702" name="park-m" minX="952" maxX="1008"/>
+  <symbol minY="646" maxY="702" name="sports-m" minX="1008" maxX="1064"/>
+  <symbol minY="646" maxY="702" name="bus-m" minX="1064" maxX="1120"/>
+  <symbol minY="646" maxY="702" name="soccer-m" minX="1120" maxX="1176"/>
+  <symbol minY="646" maxY="702" name="college-m" minX="1176" maxX="1232"/>
+  <symbol minY="646" maxY="702" name="parking-meter-m" minX="1232" maxX="1288"/>
+  <symbol minY="646" maxY="702" name="alcohol-m" minX="1288" maxX="1344"/>
+  <symbol minY="646" maxY="702" name="skiing-m" minX="1344" maxX="1400"/>
+  <symbol minY="646" maxY="702" name="clothes-m" minX="1400" maxX="1456"/>
+  <symbol minY="646" maxY="702" name="peak-m" minX="1456" maxX="1512"/>
+  <symbol minY="646" maxY="702" name="butcher-m" minX="1512" maxX="1568"/>
+  <symbol minY="646" maxY="702" name="shop-m" minX="1568" maxX="1624"/>
+  <symbol minY="646" maxY="702" name="shop-m copy" minX="1624" maxX="1680"/>
+  <symbol minY="646" maxY="702" name="cable-car-m" minX="1680" maxX="1736"/>
+  <symbol minY="646" maxY="702" name="climbing-m" minX="1736" maxX="1792"/>
+  <symbol minY="646" maxY="702" name="petshop-m" minX="1792" maxX="1848"/>
+  <symbol minY="646" maxY="702" name="shop-bicycle-m" minX="1848" maxX="1904"/>
+  <symbol minY="646" maxY="702" name="pharmacy-m" minX="1904" maxX="1960"/>
+  <symbol minY="646" maxY="702" name="cafe-m" minX="1960" maxX="2016"/>
+  <symbol minY="702" maxY="758" name="cinema-m" minX="0" maxX="56"/>
+  <symbol minY="702" maxY="758" name="phone-m" minX="56" maxX="112"/>
+  <symbol minY="702" maxY="758" name="shoes-m" minX="112" maxX="168"/>
+  <symbol minY="702" maxY="758" name="chimney-m" minX="168" maxX="224"/>
+  <symbol minY="702" maxY="758" name="photo-shop-m" minX="224" maxX="280"/>
+  <symbol minY="702" maxY="758" name="chemist-m" minX="280" maxX="336"/>
+  <symbol minY="702" maxY="758" name="picnic-m" minX="336" maxX="392"/>
+  <symbol minY="702" maxY="758" name="ship-m" minX="392" maxX="448"/>
+  <symbol minY="702" maxY="758" name="campsite-m" minX="448" maxX="504"/>
+  <symbol minY="702" maxY="758" name="pitch-m" minX="504" maxX="560"/>
+  <symbol minY="702" maxY="758" name="seafood-shop-m" minX="560" maxX="616"/>
+  <symbol minY="702" maxY="758" name="charging-station-m" minX="616" maxX="672"/>
+  <symbol minY="702" maxY="758" name="place-of-worship-m" minX="672" maxX="728"/>
+  <symbol minY="702" maxY="758" name="school-m" minX="728" maxX="784"/>
+  <symbol minY="702" maxY="758" name="car-part-m" minX="784" maxX="840"/>
+  <symbol minY="702" maxY="758" name="police-m" minX="840" maxX="896"/>
+  <symbol minY="702" maxY="758" name="sauna-m" minX="896" maxX="952"/>
+  <symbol minY="702" maxY="758" name="cemetery-m" minX="952" maxX="1008"/>
+  <symbol minY="702" maxY="758" name="car-repair-m" minX="1008" maxX="1064"/>
+  <symbol minY="702" maxY="758" name="postbox-m" minX="1064" maxX="1120"/>
+  <symbol minY="702" maxY="758" name="cave-m" minX="1120" maxX="1176"/>
+  <symbol minY="702" maxY="758" name="restaurant-m" minX="1176" maxX="1232"/>
+  <symbol minY="702" maxY="758" name="casino-m" minX="1232" maxX="1288"/>
+  <symbol minY="702" maxY="758" name="pub-m" minX="1288" maxX="1344"/>
+  <symbol minY="702" maxY="758" name="remains-m" minX="1344" maxX="1400"/>
+  <symbol minY="702" maxY="758" name="caravan_site-m" minX="1400" maxX="1456"/>
+  <symbol minY="702" maxY="758" name="car_sharing-m" minX="1456" maxX="1512"/>
+  <symbol minY="702" maxY="758" name="recycling-m" minX="1512" maxX="1568"/>
+  <symbol minY="702" maxY="758" name="car-wash-m" minX="1568" maxX="1624"/>
+  <symbol minY="702" maxY="754" name="current-position" minX="1624" maxX="1676"/>
+  <symbol minY="702" maxY="753" name="lightrail-berlin-m" minX="1676" maxX="1727"/>
+  <symbol minY="702" maxY="753" name="bike-parking-l" minX="1727" maxX="1778"/>
+  <symbol minY="702" maxY="753" name="subway-rome-l" minX="1778" maxX="1829"/>
+  <symbol minY="702" maxY="753" name="waste-basket-l" minX="1829" maxX="1880"/>
+  <symbol minY="702" maxY="753" name="speedcam-l" minX="1880" maxX="1931"/>
+  <symbol minY="702" maxY="753" name="parking-l" minX="1931" maxX="1982"/>
+  <symbol minY="702" maxY="753" name="subway-berlin-l" minX="1982" maxX="2033"/>
+  <symbol minY="758" maxY="809" name="subway-moscow-l" minX="0" maxX="58"/>
+  <symbol minY="758" maxY="807" name="firehydrant-l" minX="58" maxX="98"/>
+  <symbol minY="758" maxY="805" name="no-icon-leisure" minX="98" maxX="145"/>
+  <symbol minY="758" maxY="805" name="no-icon-amenity" minX="145" maxX="192"/>
+  <symbol minY="758" maxY="805" name="subway-rome-m" minX="192" maxX="239"/>
+  <symbol minY="758" maxY="805" name="no-icon-shop" minX="239" maxX="286"/>
+  <symbol minY="758" maxY="805" name="no-icon-tourism" minX="286" maxX="333"/>
+  <symbol minY="758" maxY="805" name="no-icon" minX="333" maxX="380"/>
+  <symbol minY="758" maxY="805" name="subway-berlin-m" minX="380" maxX="427"/>
+  <symbol minY="758" maxY="805" name="subway-moscow-m" minX="427" maxX="481"/>
+  <symbol minY="758" maxY="805" name="waste-basket-s" minX="481" maxX="528"/>
+  <symbol minY="758" maxY="805" name="subway-paris-m" minX="528" maxX="575"/>
+  <symbol minY="758" maxY="803" name="subway-london-l" minX="575" maxX="633"/>
+  <symbol minY="758" maxY="803" name="airport-s" minX="633" maxX="678"/>
+  <symbol minY="758" maxY="800" name="cable-car-s" minX="678" maxX="720"/>
+  <symbol minY="758" maxY="800" name="climbing-s" minX="720" maxX="762"/>
+  <symbol minY="758" maxY="800" name="cinema-s" minX="762" maxX="804"/>
+  <symbol minY="758" maxY="800" name="shop-s copy" minX="804" maxX="846"/>
+  <symbol minY="758" maxY="800" name="shop-s" minX="846" maxX="888"/>
+  <symbol minY="758" maxY="800" name="peak-s" minX="888" maxX="930"/>
+  <symbol minY="758" maxY="800" name="parking-ticket-l" minX="930" maxX="954"/>
+  <symbol minY="758" maxY="800" name="skiing-s" minX="954" maxX="996"/>
+  <symbol minY="758" maxY="800" name="bus-s" minX="996" maxX="1038"/>
+  <symbol minY="758" maxY="800" name="garden-s" minX="1038" maxX="1080"/>
+  <symbol minY="758" maxY="800" name="soccer-s" minX="1080" maxX="1122"/>
+  <symbol minY="758" maxY="800" name="pharmacy-s" minX="1122" maxX="1164"/>
+  <symbol minY="758" maxY="800" name="speedcam-m" minX="1164" maxX="1206"/>
+  <symbol minY="758" maxY="800" name="phone-s" minX="1206" maxX="1248"/>
+  <symbol minY="758" maxY="800" name="bowls-s" minX="1248" maxX="1290"/>
+  <symbol minY="758" maxY="800" name="park-s" minX="1290" maxX="1332"/>
+  <symbol minY="758" maxY="800" name="zoo-s" minX="1332" maxX="1374"/>
+  <symbol minY="758" maxY="800" name="college-s" minX="1374" maxX="1416"/>
+  <symbol minY="758" maxY="800" name="office-s" minX="1416" maxX="1458"/>
+  <symbol minY="758" maxY="800" name="golf-s" minX="1458" maxX="1500"/>
+  <symbol minY="758" maxY="800" name="subway-barcelona-m" minX="1500" maxX="1558"/>
+  <symbol minY="758" maxY="800" name="subway-barcelona-s" minX="1558" maxX="1609"/>
+  <symbol minY="758" maxY="800" name="cafe-s" minX="1609" maxX="1651"/>
+  <symbol minY="758" maxY="800" name="ship-s" minX="1651" maxX="1693"/>
+  <symbol minY="758" maxY="800" name="windmill-s" minX="1693" maxX="1735"/>
+  <symbol minY="758" maxY="800" name="nparkf-s" minX="1735" maxX="1777"/>
+  <symbol minY="758" maxY="800" name="subway-entrance-2-s" minX="1777" maxX="1819"/>
+  <symbol minY="758" maxY="800" name="subway-entrance-arrow" minX="1819" maxX="1861"/>
+  <symbol minY="758" maxY="800" name="npark-s" minX="1861" maxX="1903"/>
+  <symbol minY="758" maxY="800" name="alcohol-s" minX="1903" maxX="1945"/>
+  <symbol minY="758" maxY="800" name="subway-entrance-s" minX="1945" maxX="1987"/>
+  <symbol minY="758" maxY="800" name="picnic-s" minX="1987" maxX="2029"/>
+  <symbol minY="809" maxY="851" name="book-shop-s" minX="0" maxX="42"/>
+  <symbol minY="809" maxY="851" name="charging-station-s" minX="42" maxX="84"/>
+  <symbol minY="809" maxY="851" name="pitch-s" minX="84" maxX="126"/>
+  <symbol minY="809" maxY="851" name="campsite-s" minX="126" maxX="168"/>
+  <symbol minY="809" maxY="851" name="subway-london-m" minX="168" maxX="224"/>
+  <symbol minY="809" maxY="851" name="school-s" minX="224" maxX="266"/>
+  <symbol minY="809" maxY="851" name="place-of-worship-s" minX="266" maxX="308"/>
+  <symbol minY="809" maxY="851" name="gallery-s" minX="308" maxX="350"/>
+  <symbol minY="809" maxY="851" name="subway-madrid-m" minX="350" maxX="408"/>
+  <symbol minY="809" maxY="851" name="cemetery-s" minX="408" maxX="450"/>
+  <symbol minY="809" maxY="851" name="bicycle-s" minX="450" maxX="492"/>
+  <symbol minY="809" maxY="851" name="waterfall-s" minX="492" maxX="534"/>
+  <symbol minY="809" maxY="851" name="museum-s" minX="534" maxX="576"/>
+  <symbol minY="809" maxY="851" name="police-s" minX="576" maxX="618"/>
+  <symbol minY="809" maxY="851" name="cave-s" minX="618" maxX="660"/>
+  <symbol minY="809" maxY="851" name="cricket-s" minX="660" maxX="702"/>
+  <symbol minY="809" maxY="851" name="motel-s" minX="702" maxX="744"/>
+  <symbol minY="809" maxY="851" name="curling-s" minX="744" maxX="786"/>
+  <symbol minY="809" maxY="851" name="subway-newyork-s" minX="786" maxX="828"/>
+  <symbol minY="809" maxY="851" name="grocery-s" minX="828" maxX="870"/>
+  <symbol minY="809" maxY="851" name="beer-s" minX="870" maxX="912"/>
+  <symbol minY="809" maxY="851" name="restaurant-s" minX="912" maxX="954"/>
+  <symbol minY="809" maxY="851" name="casino-s" minX="954" maxX="996"/>
+  <symbol minY="809" maxY="851" name="car-repair-s" minX="996" maxX="1038"/>
+  <symbol minY="809" maxY="851" name="remains-s" minX="1038" maxX="1080"/>
+  <symbol minY="809" maxY="851" name="volcano-s" minX="1080" maxX="1122"/>
+  <symbol minY="809" maxY="851" name="subway-s" minX="1122" maxX="1164"/>
+  <symbol minY="809" maxY="851" name="monument-s" minX="1164" maxX="1206"/>
+  <symbol minY="809" maxY="851" name="dentist-s" minX="1206" maxX="1248"/>
+  <symbol minY="809" maxY="851" name="subway-spb-s" minX="1248" maxX="1290"/>
+  <symbol minY="809" maxY="851" name="military-s" minX="1290" maxX="1332"/>
+  <symbol minY="809" maxY="851" name="diving-s" minX="1332" maxX="1374"/>
+  <symbol minY="809" maxY="851" name="viewpoint-s" minX="1374" maxX="1416"/>
+  <symbol minY="809" maxY="851" name="beach-s" minX="1416" maxX="1458"/>
+  <symbol minY="809" maxY="851" name="metro-barcelona-m" minX="1458" maxX="1516"/>
+  <symbol minY="809" maxY="851" name="bcontrol-s" minX="1516" maxX="1558"/>
+  <symbol minY="809" maxY="851" name="marketplace-s" minX="1558" maxX="1600"/>
+  <symbol minY="809" maxY="851" name="mail-s" minX="1600" maxX="1642"/>
+  <symbol minY="809" maxY="851" name="pub-s" minX="1642" maxX="1684"/>
+  <symbol minY="809" maxY="851" name="swimming-s" minX="1684" maxX="1726"/>
+  <symbol minY="809" maxY="851" name="america-football-s" minX="1726" maxX="1768"/>
+  <symbol minY="809" maxY="851" name="lighthouse-s" minX="1768" maxX="1810"/>
+  <symbol minY="809" maxY="851" name="basketball-s" minX="1810" maxX="1852"/>
+  <symbol minY="809" maxY="851" name="library-s" minX="1852" maxX="1894"/>
+  <symbol minY="809" maxY="851" name="tennis-s" minX="1894" maxX="1936"/>
+  <symbol minY="809" maxY="851" name="drinking-water-s" minX="1936" maxX="1978"/>
+  <symbol minY="809" maxY="851" name="archery-s" minX="1978" maxX="2020"/>
+  <symbol minY="851" maxY="893" name="theatre-s" minX="0" maxX="42"/>
+  <symbol minY="851" maxY="893" name="baseball-s" minX="42" maxX="84"/>
+  <symbol minY="851" maxY="893" name="kindergarten-s" minX="84" maxX="126"/>
+  <symbol minY="851" maxY="893" name="embassy-s" minX="126" maxX="168"/>
+  <symbol minY="851" maxY="893" name="alpine_hut-s" minX="168" maxX="210"/>
+  <symbol minY="851" maxY="893" name="toilets-s" minX="210" maxX="252"/>
+  <symbol minY="851" maxY="893" name="bar-s" minX="252" maxX="294"/>
+  <symbol minY="851" maxY="893" name="information-s" minX="294" maxX="336"/>
+  <symbol minY="851" maxY="893" name="toll_booth-s" minX="336" maxX="378"/>
+  <symbol minY="851" maxY="893" name="fastfood-s" minX="378" maxX="420"/>
+  <symbol minY="851" maxY="893" name="hotel-s" minX="420" maxX="462"/>
+  <symbol minY="851" maxY="893" name="fire_station-s" minX="462" maxX="504"/>
+  <symbol minY="851" maxY="893" name="hospital-s" minX="504" maxX="546"/>
+  <symbol minY="851" maxY="893" name="tourism-s" minX="546" maxX="588"/>
+  <symbol minY="851" maxY="893" name="recycling-s" minX="588" maxX="630"/>
+  <symbol minY="851" maxY="893" name="heliport-s" minX="630" maxX="672"/>
+  <symbol minY="851" maxY="893" name="australian-football-s" minX="672" maxX="714"/>
+  <symbol minY="851" maxY="893" name="helipad-s" minX="714" maxX="756"/>
+  <symbol minY="851" maxY="893" name="townhall-s" minX="756" maxX="798"/>
+  <symbol minY="851" maxY="893" name="fountain-s" minX="798" maxX="840"/>
+  <symbol minY="851" maxY="893" name="fuel-s" minX="840" maxX="882"/>
+  <symbol minY="851" maxY="893" name="atm-s" minX="882" maxX="924"/>
+  <symbol minY="851" maxY="893" name="funicular-s" minX="924" maxX="966"/>
+  <symbol minY="851" maxY="893" name="train-s" minX="966" maxX="1008"/>
+  <symbol minY="851" maxY="893" name="atm-s copy 2" minX="1008" maxX="1050"/>
+  <symbol minY="851" maxY="893" name="gym-s" minX="1050" maxX="1092"/>
+  <symbol minY="851" maxY="893" name="tram-s" minX="1092" maxX="1134"/>
+  <symbol minY="851" maxY="892" name="subway-madrid-l" minX="1134" maxX="1192"/>
+  <symbol minY="851" maxY="892" name="subway-barcelona-l" minX="1192" maxX="1250"/>
+  <symbol minY="851" maxY="891" name="s-arrow" minX="1250" maxX="1288"/>
+  <symbol minY="851" maxY="891" name="parking-m" minX="1288" maxX="1328"/>
+  <symbol minY="851" maxY="889" name="metro-barcelona-s" minX="1328" maxX="1379"/>
+  <symbol minY="851" maxY="889" name="search-result" minX="1379" maxX="1417"/>
+  <symbol minY="851" maxY="889" name="subway-kiev-l" minX="1417" maxX="1473"/>
+  <symbol minY="851" maxY="889" name="lightrail-berlin-s" minX="1473" maxX="1511"/>
+  <symbol minY="851" maxY="889" name="subway-kiev-m" minX="1511" maxX="1567"/>
+  <symbol minY="851" maxY="889" name="subway-madrid-s" minX="1567" maxX="1618"/>
+  <symbol minY="851" maxY="889" name="api-result" minX="1618" maxX="1656"/>
+  <symbol minY="851" maxY="889" name="subway-paris-s" minX="1656" maxX="1694"/>
+  <symbol minY="851" maxY="887" name="subway-moscow-s" minX="1694" maxX="1730"/>
+  <symbol minY="851" maxY="884" name="speedcam-s" minX="1730" maxX="1763"/>
+  <symbol minY="851" maxY="884" name="bench" minX="1763" maxX="1801"/>
+  <symbol minY="851" maxY="884" name="subway-rome-s" minX="1801" maxX="1834"/>
+  <symbol minY="851" maxY="884" name="star-l" minX="1834" maxX="1867"/>
+  <symbol minY="851" maxY="884" name="parking-s" minX="1867" maxX="1900"/>
+  <symbol minY="851" maxY="884" name="subway-london-s" minX="1900" maxX="1942"/>
+  <symbol minY="851" maxY="884" name="subway-berlin-s" minX="1942" maxX="1975"/>
+  <symbol minY="851" maxY="882" name="subway-minsk-l" minX="1975" maxX="2031"/>
+  <symbol minY="893" maxY="924" name="star-m" minX="0" maxX="31"/>
+  <symbol minY="893" maxY="924" name="peakt-l" minX="31" maxX="64"/>
+  <symbol minY="893" maxY="924" name="survey_point-l" minX="64" maxX="95"/>
+  <symbol minY="893" maxY="922" name="subway-kiev-s" minX="95" maxX="142"/>
+  <symbol minY="893" maxY="920" name="star-s" minX="142" maxX="169"/>
+  <symbol minY="893" maxY="920" name="railway-crossing" minX="169" maxX="211"/>
+  <symbol minY="893" maxY="920" name="subway-minsk-m" minX="211" maxX="258"/>
+  <symbol minY="893" maxY="920" name="subway-xs" minX="258" maxX="285"/>
+  <symbol minY="893" maxY="920" name="subway-newyork-xs" minX="285" maxX="312"/>
+  <symbol minY="893" maxY="920" name="survey_point-m" minX="312" maxX="339"/>
+  <symbol minY="893" maxY="917" name="subway-xs copy" minX="339" maxX="363"/>
+  <symbol minY="893" maxY="917" name="subway-minsk-s" minX="363" maxX="405"/>
+  <symbol minY="893" maxY="915" name="peakt-m" minX="405" maxX="429"/>
+  <symbol minY="893" maxY="915" name="arrow-m" minX="429" maxX="480"/>
+  <symbol minY="893" maxY="915" name="survey_point-s" minX="480" maxX="502"/>
+  <symbol minY="893" maxY="913" name="entrance-s" minX="502" maxX="522"/>
+  <symbol minY="893" maxY="911" name="dot-m" minX="522" maxX="540"/>
+  <symbol minY="893" maxY="911" name="peakt-s" minX="540" maxX="560"/>
+  <symbol minY="893" maxY="908" name="arrow-s" minX="560" maxX="598"/>
+  <symbol minY="893" maxY="908" name="none" minX="598" maxX="613"/>
+  <symbol minY="893" maxY="908" name="tree-l" minX="613" maxX="628"/>
+  <symbol minY="893" maxY="906" name="entrance-xs" minX="628" maxX="641"/>
+  <symbol minY="893" maxY="906" name="dot-s" minX="641" maxX="654"/>
+  <symbol minY="893" maxY="906" name="dot-s-light" minX="654" maxX="667"/>
+  <symbol minY="893" maxY="906" name="tree-m" minX="667" maxX="680"/>
+  <symbol minY="893" maxY="904" name="zero-icon" minX="680" maxX="691"/>
+  <symbol minY="893" maxY="904" name="tree-s" minX="691" maxX="702"/>
  </file>
 </root>
diff --git a/data/resources-6plus_legacy/symbols.png b/data/resources-6plus_legacy/symbols.png
index 3b42b7de41..de9c39e104 100644
Binary files a/data/resources-6plus_legacy/symbols.png and b/data/resources-6plus_legacy/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 8b37e58268..6460d3ba3e 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 ebad555240..ab5dc8816a 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -19,8 +19,8 @@
   <symbol minX="820" maxX="844" minY="0" maxY="45" name="placemark-red"/>
   <symbol minX="844" maxX="878" minY="0" maxY="34" name="current-position"/>
   <symbol minX="878" maxX="909" minY="0" maxY="31" name="atm-l"/>
-  <symbol minX="909" maxX="939" minY="0" maxY="31" name="remains-m"/>
-  <symbol minX="939" maxX="970" minY="0" maxY="31" name="recycling-l"/>
+  <symbol minX="909" maxX="940" minY="0" maxY="31" name="recycling-l"/>
+  <symbol minX="940" maxX="970" minY="0" maxY="31" name="remains-m"/>
   <symbol minX="970" maxX="1001" minY="0" maxY="31" name="australian-football-l"/>
   <symbol minX="0" maxX="31" minY="154" maxY="185" name="restaurant-l"/>
   <symbol minX="31" maxX="62" minY="154" maxY="185" name="archery-l"/>
@@ -29,65 +29,65 @@
   <symbol minX="124" maxX="154" minY="154" maxY="185" name="bank-l"/>
   <symbol minX="154" maxX="184" minY="154" maxY="185" name="bank-m"/>
   <symbol minX="184" maxX="214" minY="154" maxY="185" name="banknote-l"/>
-  <symbol minX="214" maxX="245" minY="154" maxY="185" name="sauna-l"/>
+  <symbol minX="214" maxX="245" minY="154" maxY="185" name="power-m"/>
   <symbol minX="245" maxX="276" minY="154" maxY="185" name="bar-l"/>
-  <symbol minX="276" maxX="307" minY="154" maxY="185" name="power-m"/>
-  <symbol minX="307" maxX="338" minY="154" maxY="185" name="power-l"/>
+  <symbol minX="276" maxX="307" minY="154" maxY="185" name="power-l"/>
+  <symbol minX="307" maxX="338" minY="154" maxY="185" name="postbox-l"/>
   <symbol minX="338" maxX="369" minY="154" maxY="185" name="baseball-l"/>
-  <symbol minX="369" maxX="400" minY="154" maxY="185" name="postbox-l"/>
+  <symbol minX="369" maxX="400" minY="154" maxY="185" name="pool-l"/>
   <symbol minX="400" maxX="431" minY="154" maxY="185" name="america-football-l"/>
   <symbol minX="431" maxX="462" minY="154" maxY="185" name="basketball-l"/>
-  <symbol minX="462" maxX="493" minY="154" maxY="185" name="pool-l"/>
+  <symbol minX="462" maxX="493" minY="154" maxY="185" name="sauna-l"/>
   <symbol minX="493" maxX="524" minY="154" maxY="185" name="police-l"/>
   <symbol minX="524" maxX="555" minY="154" maxY="185" name="bbq-l"/>
-  <symbol minX="555" maxX="586" minY="154" maxY="185" name="school-l"/>
+  <symbol minX="555" maxX="586" minY="154" maxY="185" name="place-of-worship-l"/>
   <symbol minX="586" maxX="616" minY="154" maxY="185" name="bcontrol-l"/>
   <symbol minX="616" maxX="646" minY="154" maxY="185" name="bcontrol-m"/>
   <symbol minX="646" maxX="677" minY="154" maxY="185" name="alpine_hut-l"/>
   <symbol minX="677" maxX="708" minY="154" maxY="185" name="beach-l"/>
-  <symbol minX="708" maxX="739" minY="154" maxY="185" name="place-of-worship-l"/>
+  <symbol minX="708" maxX="739" minY="154" maxY="185" name="school-l"/>
   <symbol minX="739" maxX="770" minY="154" maxY="185" name="pitch-l"/>
   <symbol minX="770" maxX="801" minY="154" maxY="185" name="beauty-l"/>
-  <symbol minX="801" maxX="832" minY="154" maxY="185" name="seafood-shop-l"/>
-  <symbol minX="832" maxX="862" minY="154" maxY="185" name="beer-l"/>
-  <symbol minX="862" maxX="892" minY="154" maxY="185" name="beer-m"/>
-  <symbol minX="892" maxX="923" minY="154" maxY="185" name="alcohol-l"/>
-  <symbol minX="923" maxX="954" minY="154" maxY="185" name="airport-m"/>
-  <symbol minX="954" maxX="985" minY="154" maxY="185" name="bicycle-l"/>
-  <symbol minX="985" maxX="1015" minY="154" maxY="185" name="picnic-m"/>
+  <symbol minX="801" maxX="831" minY="154" maxY="185" name="picnic-m"/>
+  <symbol minX="831" maxX="861" minY="154" maxY="185" name="beer-l"/>
+  <symbol minX="861" maxX="891" minY="154" maxY="185" name="beer-m"/>
+  <symbol minX="891" maxX="922" minY="154" maxY="185" name="alcohol-l"/>
+  <symbol minX="922" maxX="953" minY="154" maxY="185" name="airport-m"/>
+  <symbol minX="953" maxX="984" minY="154" maxY="185" name="bicycle-l"/>
+  <symbol minX="984" maxX="1014" minY="154" maxY="185" name="picnic-l"/>
   <symbol minX="0" maxX="31" minY="185" maxY="216" name="airport-l"/>
-  <symbol minX="31" maxX="61" minY="185" maxY="216" name="picnic-l"/>
-  <symbol minX="61" maxX="92" minY="185" maxY="216" name="book-shop-l"/>
-  <symbol minX="92" maxX="123" minY="185" maxY="216" name="photo-shop-l"/>
-  <symbol minX="123" maxX="154" minY="185" maxY="216" name="phone-l"/>
-  <symbol minX="154" maxX="185" minY="185" maxY="216" name="bookmaker-l"/>
-  <symbol minX="185" maxX="216" minY="185" maxY="216" name="boundary_stone-l"/>
-  <symbol minX="216" maxX="247" minY="185" maxY="216" name="ship-l"/>
-  <symbol minX="247" maxX="278" minY="185" maxY="216" name="bowls-l"/>
-  <symbol minX="278" maxX="309" minY="185" maxY="216" name="pharmacy-l"/>
-  <symbol minX="309" maxX="340" minY="185" maxY="216" name="zoo-l"/>
-  <symbol minX="340" maxX="371" minY="185" maxY="216" name="bus-l"/>
-  <symbol minX="371" maxX="402" minY="185" maxY="216" name="petshop-l"/>
-  <symbol minX="402" maxX="433" minY="185" maxY="216" name="shoes-l"/>
-  <symbol minX="433" maxX="464" minY="185" maxY="216" name="butcher-l"/>
-  <symbol minX="464" maxX="495" minY="185" maxY="216" name="shop-bicycle-l"/>
-  <symbol minX="495" maxX="526" minY="185" maxY="216" name="cable-car-l"/>
-  <symbol minX="526" maxX="557" minY="185" maxY="216" name="shop-l"/>
-  <symbol minX="557" maxX="588" minY="185" maxY="216" name="windmill-l"/>
-  <symbol minX="588" maxX="619" minY="185" maxY="216" name="cafe-l"/>
-  <symbol minX="619" maxX="650" minY="185" maxY="216" name="parking-meter-l"/>
-  <symbol minX="650" maxX="681" minY="185" maxY="216" name="skiing-l"/>
-  <symbol minX="681" maxX="712" minY="185" maxY="216" name="campsite-l"/>
-  <symbol minX="712" maxX="743" minY="185" maxY="216" name="park-l"/>
-  <symbol minX="743" maxX="774" minY="185" maxY="216" name="wayside_shrine-l"/>
-  <symbol minX="774" maxX="805" minY="185" maxY="216" name="car-part-l"/>
-  <symbol minX="805" maxX="836" minY="185" maxY="216" name="optician-l"/>
-  <symbol minX="836" maxX="866" minY="185" maxY="216" name="car-repair-l"/>
-  <symbol minX="866" maxX="896" minY="185" maxY="216" name="car-repair-m"/>
-  <symbol minX="896" maxX="927" minY="185" maxY="216" name="soccer-l"/>
-  <symbol minX="927" maxX="957" minY="185" maxY="216" name="car-wash-l"/>
-  <symbol minX="957" maxX="987" minY="185" maxY="216" name="car-wash-m"/>
-  <symbol minX="987" maxX="1018" minY="185" maxY="216" name="car_sharing-l"/>
+  <symbol minX="31" maxX="62" minY="185" maxY="216" name="photo-shop-l"/>
+  <symbol minX="62" maxX="93" minY="185" maxY="216" name="book-shop-l"/>
+  <symbol minX="93" maxX="124" minY="185" maxY="216" name="seafood-shop-l"/>
+  <symbol minX="124" maxX="155" minY="185" maxY="216" name="phone-l"/>
+  <symbol minX="155" maxX="186" minY="185" maxY="216" name="bookmaker-l"/>
+  <symbol minX="186" maxX="217" minY="185" maxY="216" name="boundary_stone-l"/>
+  <symbol minX="217" maxX="248" minY="185" maxY="216" name="pharmacy-l"/>
+  <symbol minX="248" maxX="279" minY="185" maxY="216" name="bowls-l"/>
+  <symbol minX="279" maxX="310" minY="185" maxY="216" name="petshop-l"/>
+  <symbol minX="310" maxX="341" minY="185" maxY="216" name="zoo-l"/>
+  <symbol minX="341" maxX="372" minY="185" maxY="216" name="bus-l"/>
+  <symbol minX="372" maxX="403" minY="185" maxY="216" name="ship-l"/>
+  <symbol minX="403" maxX="434" minY="185" maxY="216" name="shoes-l"/>
+  <symbol minX="434" maxX="465" minY="185" maxY="216" name="butcher-l"/>
+  <symbol minX="465" maxX="496" minY="185" maxY="216" name="shop-bicycle-l"/>
+  <symbol minX="496" maxX="527" minY="185" maxY="216" name="cable-car-l"/>
+  <symbol minX="527" maxX="558" minY="185" maxY="216" name="shop-l"/>
+  <symbol minX="558" maxX="589" minY="185" maxY="216" name="windmill-l"/>
+  <symbol minX="589" maxX="620" minY="185" maxY="216" name="cafe-l"/>
+  <symbol minX="620" maxX="651" minY="185" maxY="216" name="parking-meter-l"/>
+  <symbol minX="651" maxX="682" minY="185" maxY="216" name="skiing-l"/>
+  <symbol minX="682" maxX="713" minY="185" maxY="216" name="campsite-l"/>
+  <symbol minX="713" maxX="744" minY="185" maxY="216" name="park-l"/>
+  <symbol minX="744" maxX="775" minY="185" maxY="216" name="wayside_shrine-l"/>
+  <symbol minX="775" maxX="806" minY="185" maxY="216" name="car-part-l"/>
+  <symbol minX="806" maxX="837" minY="185" maxY="216" name="optician-l"/>
+  <symbol minX="837" maxX="867" minY="185" maxY="216" name="car-repair-l"/>
+  <symbol minX="867" maxX="897" minY="185" maxY="216" name="car-repair-m"/>
+  <symbol minX="897" maxX="928" minY="185" maxY="216" name="soccer-l"/>
+  <symbol minX="928" maxX="958" minY="185" maxY="216" name="car-wash-l"/>
+  <symbol minX="958" maxX="988" minY="185" maxY="216" name="car-wash-m"/>
+  <symbol minX="988" maxX="1019" minY="185" maxY="216" name="car_sharing-l"/>
   <symbol minX="0" maxX="30" minY="216" maxY="247" name="office-m"/>
   <symbol minX="30" maxX="61" minY="216" maxY="247" name="caravan_site-l"/>
   <symbol minX="61" maxX="91" minY="216" maxY="247" name="office-l"/>
@@ -253,14 +253,14 @@
   <symbol minX="900" maxX="930" minY="340" maxY="370" name="lighthouse-m"/>
   <symbol minX="930" maxX="960" minY="340" maxY="370" name="vending-m"/>
   <symbol minX="960" maxX="990" minY="340" maxY="370" name="veterinary-m"/>
-  <symbol minX="990" maxX="1020" minY="340" maxY="370" name="atm-m"/>
+  <symbol minX="990" maxX="1020" minY="340" maxY="370" name="recycling-m"/>
   <symbol minX="0" maxX="30" minY="370" maxY="400" name="subway-spb-m"/>
   <symbol minX="30" maxX="60" minY="370" maxY="400" name="cricket-m"/>
   <symbol minX="60" maxX="90" minY="370" maxY="400" name="mail-m"/>
   <symbol minX="90" maxX="120" minY="370" maxY="400" name="copyshop-m"/>
   <symbol minX="120" maxX="150" minY="370" maxY="400" name="convenience-m"/>
   <symbol minX="150" maxX="180" minY="370" maxY="400" name="marketplace-m"/>
-  <symbol minX="180" maxX="210" minY="370" maxY="400" name="recycling-m"/>
+  <symbol minX="180" maxX="210" minY="370" maxY="400" name="atm-m"/>
   <symbol minX="210" maxX="240" minY="370" maxY="400" name="computer-m"/>
   <symbol minX="240" maxX="270" minY="370" maxY="400" name="subway-newyork-m"/>
   <symbol minX="270" maxX="300" minY="370" maxY="400" name="college-m"/>
@@ -281,12 +281,12 @@
   <symbol minX="720" maxX="750" minY="370" maxY="400" name="subway-entrance-m"/>
   <symbol minX="750" maxX="780" minY="370" maxY="400" name="charging-station-m"/>
   <symbol minX="780" maxX="810" minY="370" maxY="400" name="subway-entrance-2-m"/>
-  <symbol minX="810" maxX="840" minY="370" maxY="400" name="restaurant-m"/>
+  <symbol minX="810" maxX="840" minY="370" maxY="400" name="pub-m"/>
   <symbol minX="840" maxX="870" minY="370" maxY="400" name="sports-m"/>
   <symbol minX="870" maxX="900" minY="370" maxY="400" name="cemetery-m"/>
   <symbol minX="900" maxX="930" minY="370" maxY="400" name="cave-m"/>
   <symbol minX="930" maxX="960" minY="370" maxY="400" name="npark-m"/>
-  <symbol minX="960" maxX="990" minY="370" maxY="400" name="pub-m"/>
+  <symbol minX="960" maxX="990" minY="370" maxY="400" name="bakery-m"/>
   <symbol minX="990" maxX="1020" minY="370" maxY="400" name="casino-m"/>
   <symbol minX="0" maxX="30" minY="400" maxY="430" name="nparkf-m "/>
   <symbol minX="30" maxX="60" minY="400" maxY="430" name="nparkf-m"/>
@@ -299,225 +299,225 @@
   <symbol minX="240" maxX="270" minY="400" maxY="430" name="campsite-m"/>
   <symbol minX="270" maxX="300" minY="400" maxY="430" name="park-m"/>
   <symbol minX="300" maxX="330" minY="400" maxY="430" name="skiing-m"/>
-  <symbol minX="330" maxX="360" minY="400" maxY="430" name="bakery-m"/>
+  <symbol minX="330" maxX="360" minY="400" maxY="430" name="restaurant-m"/>
   <symbol minX="360" maxX="390" minY="400" maxY="430" name="wayside_shrine-m"/>
   <symbol minX="390" maxX="420" minY="400" maxY="430" name="cafe-m"/>
   <symbol minX="420" maxX="450" minY="400" maxY="430" name="parking-meter-m"/>
   <symbol minX="450" maxX="480" minY="400" maxY="430" name="shop-m"/>
-  <symbol minX="480" maxX="510" minY="400" maxY="430" name="banknote-m"/>
-  <symbol minX="510" maxX="540" minY="400" maxY="430" name="cable-car-m"/>
-  <symbol minX="540" maxX="570" minY="400" maxY="430" name="shop-bicycle-m"/>
-  <symbol minX="570" maxX="600" minY="400" maxY="430" name="butcher-m"/>
-  <symbol minX="600" maxX="630" minY="400" maxY="430" name="shoes-m"/>
-  <symbol minX="630" maxX="660" minY="400" maxY="430" name="windmill-m"/>
-  <symbol minX="660" maxX="690" minY="400" maxY="430" name="ship-m"/>
-  <symbol minX="690" maxX="720" minY="400" maxY="430" name="bus-m"/>
+  <symbol minX="480" maxX="510" minY="400" maxY="430" name="cable-car-m"/>
+  <symbol minX="510" maxX="540" minY="400" maxY="430" name="shop-bicycle-m"/>
+  <symbol minX="540" maxX="570" minY="400" maxY="430" name="butcher-m"/>
+  <symbol minX="570" maxX="600" minY="400" maxY="430" name="shoes-m"/>
+  <symbol minX="600" maxX="630" minY="400" maxY="430" name="windmill-m"/>
+  <symbol minX="630" maxX="660" minY="400" maxY="430" name="ship-m"/>
+  <symbol minX="660" maxX="690" minY="400" maxY="430" name="bus-m"/>
+  <symbol minX="690" maxX="720" minY="400" maxY="430" name="bowls-m"/>
   <symbol minX="720" maxX="750" minY="400" maxY="430" name="petshop-m"/>
   <symbol minX="750" maxX="780" minY="400" maxY="430" name="pharmacy-2-m"/>
-  <symbol minX="780" maxX="810" minY="400" maxY="430" name="bowls-m"/>
+  <symbol minX="780" maxX="810" minY="400" maxY="430" name="boundary_stone-m"/>
   <symbol minX="810" maxX="840" minY="400" maxY="430" name="pharmacy-m"/>
-  <symbol minX="840" maxX="870" minY="400" maxY="430" name="boundary_stone-m"/>
+  <symbol minX="840" maxX="870" minY="400" maxY="430" name="seafood-shop-m"/>
   <symbol minX="870" maxX="900" minY="400" maxY="430" name="zoo-m"/>
   <symbol minX="900" maxX="930" minY="400" maxY="430" name="phone-m"/>
-  <symbol minX="930" maxX="960" minY="400" maxY="430" name="seafood-shop-m"/>
-  <symbol minX="960" maxX="990" minY="400" maxY="430" name="book-shop-m"/>
+  <symbol minX="930" maxX="960" minY="400" maxY="430" name="book-shop-m"/>
+  <symbol minX="960" maxX="990" minY="400" maxY="430" name="banknote-m"/>
   <symbol minX="990" maxX="1020" minY="400" maxY="430" name="photo-shop-m"/>
-  <symbol minX="0" maxX="30" minY="430" maxY="460" name="bar-m"/>
-  <symbol minX="30" maxX="60" minY="430" maxY="460" name="bicycle-m"/>
-  <symbol minX="60" maxX="90" minY="430" maxY="460" name="beauty-m"/>
+  <symbol minX="0" maxX="30" minY="430" maxY="460" name="bicycle-m"/>
+  <symbol minX="30" maxX="60" minY="430" maxY="460" name="beauty-m"/>
+  <symbol minX="60" maxX="90" minY="430" maxY="460" name="school-m"/>
   <symbol minX="90" maxX="120" minY="430" maxY="460" name="alcohol-m"/>
   <symbol minX="120" maxX="150" minY="430" maxY="460" name="pitch-m"/>
-  <symbol minX="150" maxX="180" minY="430" maxY="460" name="school-m"/>
-  <symbol minX="180" maxX="210" minY="430" maxY="460" name="beach-m"/>
+  <symbol minX="150" maxX="180" minY="430" maxY="460" name="beach-m"/>
+  <symbol minX="180" maxX="210" minY="430" maxY="460" name="bbq-m"/>
   <symbol minX="210" maxX="240" minY="430" maxY="460" name="place-of-worship-m"/>
-  <symbol minX="240" maxX="270" minY="430" maxY="460" name="bbq-m"/>
+  <symbol minX="240" maxX="270" minY="430" maxY="460" name="sauna-m"/>
   <symbol minX="270" maxX="300" minY="430" maxY="460" name="alpine_hut-m"/>
   <symbol minX="300" maxX="330" minY="430" maxY="460" name="police-m"/>
-  <symbol minX="330" maxX="360" minY="430" maxY="460" name="sauna-m"/>
-  <symbol minX="360" maxX="390" minY="430" maxY="460" name="basketball-m"/>
-  <symbol minX="390" maxX="420" minY="430" maxY="460" name="baseball-m"/>
+  <symbol minX="330" maxX="360" minY="430" maxY="460" name="basketball-m"/>
+  <symbol minX="360" maxX="390" minY="430" maxY="460" name="baseball-m"/>
+  <symbol minX="390" maxX="420" minY="430" maxY="460" name="america-football-m"/>
   <symbol minX="420" maxX="450" minY="430" maxY="460" name="postbox-m"/>
-  <symbol minX="450" maxX="480" minY="430" maxY="460" name="america-football-m"/>
+  <symbol minX="450" maxX="480" minY="430" maxY="460" name="bar-m"/>
   <symbol minX="480" maxX="508" minY="430" maxY="458" name="bike-parking-l"/>
-  <symbol minX="508" maxX="536" minY="430" maxY="458" name="parking-ticket-l"/>
-  <symbol minX="536" maxX="564" minY="430" maxY="458" name="parking-l"/>
-  <symbol minX="564" maxX="592" minY="430" maxY="458" name="speedcam-l"/>
-  <symbol minX="592" maxX="620" minY="430" maxY="458" name="subway-berlin-l"/>
-  <symbol minX="620" maxX="648" minY="430" maxY="458" name="waste-basket-l"/>
-  <symbol minX="648" maxX="679" minY="430" maxY="458" name="subway-moscow-l"/>
-  <symbol minX="679" maxX="707" minY="430" maxY="458" name="subway-rome-l"/>
-  <symbol minX="707" maxX="735" minY="430" maxY="458" name="lightrail-berlin-m"/>
-  <symbol minX="735" maxX="763" minY="430" maxY="458" name="firehydrant-l"/>
-  <symbol minX="763" maxX="788" minY="430" maxY="455" name="search-result"/>
-  <symbol minX="788" maxX="813" minY="430" maxY="455" name="no-icon"/>
-  <symbol minX="813" maxX="838" minY="430" maxY="455" name="no-icon-tourism"/>
-  <symbol minX="838" maxX="863" minY="430" maxY="455" name="subway-berlin-m"/>
-  <symbol minX="863" maxX="888" minY="430" maxY="455" name="no-icon-shop"/>
-  <symbol minX="888" maxX="913" minY="430" maxY="455" name="api-result"/>
-  <symbol minX="913" maxX="938" minY="430" maxY="455" name="no-icon-leisure"/>
-  <symbol minX="938" maxX="963" minY="430" maxY="455" name="no-icon-amenity"/>
-  <symbol minX="963" maxX="994" minY="430" maxY="455" name="subway-london-l"/>
-  <symbol minX="994" maxX="1019" minY="430" maxY="455" name="subway-rome-m"/>
-  <symbol minX="0" maxX="25" minY="460" maxY="485" name="subway-paris-m"/>
-  <symbol minX="25" maxX="54" minY="460" maxY="485" name="subway-moscow-m"/>
-  <symbol minX="54" maxX="77" minY="460" maxY="484" name="picnic-s"/>
-  <symbol minX="77" maxX="100" minY="460" maxY="484" name="hunting-tower-s"/>
-  <symbol minX="100" maxX="123" minY="460" maxY="484" name="heliport-s"/>
-  <symbol minX="123" maxX="146" minY="460" maxY="484" name="waterfall-s"/>
-  <symbol minX="146" maxX="169" minY="460" maxY="484" name="beer-s"/>
-  <symbol minX="169" maxX="192" minY="460" maxY="484" name="bcontrol-s"/>
-  <symbol minX="192" maxX="216" minY="460" maxY="484" name="airport-s"/>
+  <symbol minX="508" maxX="536" minY="430" maxY="458" name="parking-l"/>
+  <symbol minX="536" maxX="564" minY="430" maxY="458" name="speedcam-l"/>
+  <symbol minX="564" maxX="592" minY="430" maxY="458" name="subway-berlin-l"/>
+  <symbol minX="592" maxX="620" minY="430" maxY="458" name="waste-basket-l"/>
+  <symbol minX="620" maxX="651" minY="430" maxY="458" name="subway-moscow-l"/>
+  <symbol minX="651" maxX="679" minY="430" maxY="458" name="subway-rome-l"/>
+  <symbol minX="679" maxX="707" minY="430" maxY="458" name="lightrail-berlin-m"/>
+  <symbol minX="707" maxX="729" minY="430" maxY="457" name="firehydrant-l"/>
+  <symbol minX="729" maxX="754" minY="430" maxY="455" name="search-result"/>
+  <symbol minX="754" maxX="779" minY="430" maxY="455" name="subway-rome-m"/>
+  <symbol minX="779" maxX="804" minY="430" maxY="455" name="no-icon"/>
+  <symbol minX="804" maxX="829" minY="430" maxY="455" name="no-icon-tourism"/>
+  <symbol minX="829" maxX="854" minY="430" maxY="455" name="subway-berlin-m"/>
+  <symbol minX="854" maxX="879" minY="430" maxY="455" name="api-result"/>
+  <symbol minX="879" maxX="904" minY="430" maxY="455" name="no-icon-shop"/>
+  <symbol minX="904" maxX="929" minY="430" maxY="455" name="waste-basket-s"/>
+  <symbol minX="929" maxX="954" minY="430" maxY="455" name="no-icon-leisure"/>
+  <symbol minX="954" maxX="979" minY="430" maxY="455" name="no-icon-amenity"/>
+  <symbol minX="979" maxX="1010" minY="430" maxY="455" name="subway-london-l"/>
+  <symbol minX="0" maxX="29" minY="460" maxY="485" name="subway-moscow-m"/>
+  <symbol minX="29" maxX="54" minY="460" maxY="485" name="subway-paris-m"/>
+  <symbol minX="54" maxX="78" minY="460" maxY="484" name="airport-s"/>
+  <symbol minX="78" maxX="101" minY="460" maxY="484" name="picnic-s"/>
+  <symbol minX="101" maxX="124" minY="460" maxY="484" name="hunting-tower-s"/>
+  <symbol minX="124" maxX="147" minY="460" maxY="484" name="heliport-s"/>
+  <symbol minX="147" maxX="170" minY="460" maxY="484" name="waterfall-s"/>
+  <symbol minX="170" maxX="193" minY="460" maxY="484" name="beer-s"/>
+  <symbol minX="193" maxX="216" minY="460" maxY="484" name="bcontrol-s"/>
   <symbol minX="216" maxX="239" minY="460" maxY="484" name="remains-s"/>
   <symbol minX="239" maxX="262" minY="460" maxY="484" name="office-s"/>
-  <symbol minX="262" maxX="285" minY="460" maxY="483" name="kindergarten-s"/>
+  <symbol minX="262" maxX="285" minY="460" maxY="483" name="marketplace-s"/>
   <symbol minX="285" maxX="308" minY="460" maxY="483" name="shop-s"/>
-  <symbol minX="308" maxX="331" minY="460" maxY="483" name="marketplace-s"/>
+  <symbol minX="308" maxX="331" minY="460" maxY="483" name="library-s"/>
   <symbol minX="331" maxX="354" minY="460" maxY="483" name="park-s"/>
   <symbol minX="354" maxX="377" minY="460" maxY="483" name="skiing-s"/>
-  <symbol minX="377" maxX="400" minY="460" maxY="483" name="alcohol-s"/>
-  <symbol minX="400" maxX="423" minY="460" maxY="483" name="nparkf-s"/>
-  <symbol minX="423" maxX="446" minY="460" maxY="483" name="soccer-s"/>
-  <symbol minX="446" maxX="469" minY="460" maxY="483" name="npark-s"/>
-  <symbol minX="469" maxX="492" minY="460" maxY="483" name="speedcam-m"/>
-  <symbol minX="492" maxX="515" minY="460" maxY="483" name="alpine_hut-s"/>
-  <symbol minX="515" maxX="538" minY="460" maxY="483" name="america-football-s"/>
-  <symbol minX="538" maxX="561" minY="460" maxY="483" name="archery-s"/>
-  <symbol minX="561" maxX="584" minY="460" maxY="483" name="atm-s"/>
-  <symbol minX="584" maxX="607" minY="460" maxY="483" name="australian-football-s"/>
-  <symbol minX="607" maxX="630" minY="460" maxY="483" name="bar-s"/>
-  <symbol minX="630" maxX="653" minY="460" maxY="483" name="baseball-s"/>
-  <symbol minX="653" maxX="676" minY="460" maxY="483" name="basketball-s"/>
-  <symbol minX="676" maxX="704" minY="460" maxY="483" name="subway-barcelona-s"/>
-  <symbol minX="704" maxX="727" minY="460" maxY="483" name="pub-s"/>
-  <symbol minX="727" maxX="750" minY="460" maxY="483" name="beach-s"/>
-  <symbol minX="750" maxX="773" minY="460" maxY="483" name="restaurant-s"/>
-  <symbol minX="773" maxX="796" minY="460" maxY="483" name="bicycle-s"/>
-  <symbol minX="796" maxX="819" minY="460" maxY="483" name="subway-entrance-2-s"/>
-  <symbol minX="819" maxX="842" minY="460" maxY="483" name="subway-entrance-arrow"/>
-  <symbol minX="842" maxX="865" minY="460" maxY="483" name="ship-s"/>
-  <symbol minX="865" maxX="888" minY="460" maxY="483" name="zoo-s"/>
-  <symbol minX="888" maxX="911" minY="460" maxY="483" name="subway-entrance-s"/>
-  <symbol minX="911" maxX="934" minY="460" maxY="483" name="book-shop-s"/>
-  <symbol minX="934" maxX="957" minY="460" maxY="483" name="bowls-s"/>
-  <symbol minX="957" maxX="980" minY="460" maxY="483" name="windmill-s"/>
-  <symbol minX="980" maxX="1003" minY="460" maxY="483" name="museum-s"/>
-  <symbol minX="0" maxX="23" minY="485" maxY="508" name="pharmacy-s"/>
-  <symbol minX="23" maxX="53" minY="485" maxY="508" name="subway-london-m"/>
-  <symbol minX="53" maxX="76" minY="485" maxY="508" name="bus-s"/>
-  <symbol minX="76" maxX="99" minY="485" maxY="508" name="motel-s"/>
+  <symbol minX="377" maxX="391" minY="460" maxY="483" name="parking-ticket-l"/>
+  <symbol minX="391" maxX="414" minY="460" maxY="483" name="nparkf-s"/>
+  <symbol minX="414" maxX="437" minY="460" maxY="483" name="soccer-s"/>
+  <symbol minX="437" maxX="460" minY="460" maxY="483" name="npark-s"/>
+  <symbol minX="460" maxX="483" minY="460" maxY="483" name="speedcam-m"/>
+  <symbol minX="483" maxX="506" minY="460" maxY="483" name="alcohol-s"/>
+  <symbol minX="506" maxX="529" minY="460" maxY="483" name="alpine_hut-s"/>
+  <symbol minX="529" maxX="552" minY="460" maxY="483" name="america-football-s"/>
+  <symbol minX="552" maxX="575" minY="460" maxY="483" name="archery-s"/>
+  <symbol minX="575" maxX="598" minY="460" maxY="483" name="atm-s"/>
+  <symbol minX="598" maxX="621" minY="460" maxY="483" name="australian-football-s"/>
+  <symbol minX="621" maxX="644" minY="460" maxY="483" name="bar-s"/>
+  <symbol minX="644" maxX="667" minY="460" maxY="483" name="baseball-s"/>
+  <symbol minX="667" maxX="695" minY="460" maxY="483" name="subway-barcelona-s"/>
+  <symbol minX="695" maxX="718" minY="460" maxY="483" name="basketball-s"/>
+  <symbol minX="718" maxX="741" minY="460" maxY="483" name="pub-s"/>
+  <symbol minX="741" maxX="764" minY="460" maxY="483" name="beach-s"/>
+  <symbol minX="764" maxX="787" minY="460" maxY="483" name="power-s"/>
+  <symbol minX="787" maxX="810" minY="460" maxY="483" name="subway-entrance-2-s"/>
+  <symbol minX="810" maxX="833" minY="460" maxY="483" name="subway-entrance-arrow"/>
+  <symbol minX="833" maxX="856" minY="460" maxY="483" name="ship-s"/>
+  <symbol minX="856" maxX="879" minY="460" maxY="483" name="bicycle-s"/>
+  <symbol minX="879" maxX="902" minY="460" maxY="483" name="subway-entrance-s"/>
+  <symbol minX="902" maxX="925" minY="460" maxY="483" name="restaurant-s"/>
+  <symbol minX="925" maxX="948" minY="460" maxY="483" name="zoo-s"/>
+  <symbol minX="948" maxX="971" minY="460" maxY="483" name="book-shop-s"/>
+  <symbol minX="971" maxX="994" minY="460" maxY="483" name="museum-s"/>
+  <symbol minX="994" maxX="1017" minY="460" maxY="483" name="bowls-s"/>
+  <symbol minX="0" maxX="30" minY="485" maxY="508" name="subway-london-m"/>
+  <symbol minX="30" maxX="53" minY="485" maxY="508" name="windmill-s"/>
+  <symbol minX="53" maxX="76" minY="485" maxY="508" name="motel-s"/>
+  <symbol minX="76" maxX="99" minY="485" maxY="508" name="bus-s"/>
   <symbol minX="99" maxX="122" minY="485" maxY="508" name="cable-car-s"/>
   <symbol minX="122" maxX="145" minY="485" maxY="508" name="cafe-s"/>
   <symbol minX="145" maxX="168" minY="485" maxY="508" name="campsite-s"/>
   <symbol minX="168" maxX="191" minY="485" maxY="508" name="car-repair-s"/>
   <symbol minX="191" maxX="214" minY="485" maxY="508" name="casino-s"/>
-  <symbol minX="214" maxX="237" minY="485" maxY="508" name="power-s"/>
-  <symbol minX="237" maxX="260" minY="485" maxY="508" name="monument-s"/>
-  <symbol minX="260" maxX="283" minY="485" maxY="508" name="phone-s"/>
-  <symbol minX="283" maxX="306" minY="485" maxY="508" name="cave-s"/>
-  <symbol minX="306" maxX="329" minY="485" maxY="508" name="military-s"/>
-  <symbol minX="329" maxX="352" minY="485" maxY="508" name="cemetery-s"/>
-  <symbol minX="352" maxX="375" minY="485" maxY="508" name="subway-newyork-s"/>
+  <symbol minX="214" maxX="237" minY="485" maxY="508" name="monument-s"/>
+  <symbol minX="237" maxX="260" minY="485" maxY="508" name="pharmacy-s"/>
+  <symbol minX="260" maxX="283" minY="485" maxY="508" name="cave-s"/>
+  <symbol minX="283" maxX="306" minY="485" maxY="508" name="military-s"/>
+  <symbol minX="306" maxX="329" minY="485" maxY="508" name="cemetery-s"/>
+  <symbol minX="329" maxX="352" minY="485" maxY="508" name="subway-newyork-s"/>
+  <symbol minX="352" maxX="375" minY="485" maxY="508" name="police-s"/>
   <symbol minX="375" maxX="398" minY="485" maxY="508" name="charging-station-s"/>
-  <symbol minX="398" maxX="421" minY="485" maxY="508" name="volcano-s"/>
-  <symbol minX="421" maxX="444" minY="485" maxY="508" name="school-s"/>
-  <symbol minX="444" maxX="467" minY="485" maxY="508" name="cinema-s"/>
-  <symbol minX="467" maxX="490" minY="485" maxY="508" name="recycling-s"/>
-  <symbol minX="490" maxX="513" minY="485" maxY="508" name="pitch-s"/>
-  <symbol minX="513" maxX="536" minY="485" maxY="508" name="climbing-s"/>
-  <symbol minX="536" maxX="559" minY="485" maxY="508" name="subway-s"/>
-  <symbol minX="559" maxX="582" minY="485" maxY="508" name="mail-s"/>
-  <symbol minX="582" maxX="605" minY="485" maxY="508" name="viewpoint-s"/>
-  <symbol minX="605" maxX="628" minY="485" maxY="508" name="subway-spb-s"/>
+  <symbol minX="398" maxX="421" minY="485" maxY="508" name="phone-s"/>
+  <symbol minX="421" maxX="444" minY="485" maxY="508" name="volcano-s"/>
+  <symbol minX="444" maxX="467" minY="485" maxY="508" name="recycling-s"/>
+  <symbol minX="467" maxX="490" minY="485" maxY="508" name="school-s"/>
+  <symbol minX="490" maxX="513" minY="485" maxY="508" name="cinema-s"/>
+  <symbol minX="513" maxX="536" minY="485" maxY="508" name="subway-s"/>
+  <symbol minX="536" maxX="559" minY="485" maxY="508" name="mail-s"/>
+  <symbol minX="559" maxX="582" minY="485" maxY="508" name="climbing-s"/>
+  <symbol minX="582" maxX="605" minY="485" maxY="508" name="subway-spb-s"/>
+  <symbol minX="605" maxX="628" minY="485" maxY="508" name="viewpoint-s"/>
   <symbol minX="628" maxX="651" minY="485" maxY="508" name="college-s"/>
   <symbol minX="651" maxX="674" minY="485" maxY="508" name="cricket-s"/>
   <symbol minX="674" maxX="697" minY="485" maxY="508" name="curling-s"/>
-  <symbol minX="697" maxX="720" minY="485" maxY="508" name="tram-s"/>
-  <symbol minX="720" maxX="743" minY="485" maxY="508" name="lighthouse-s"/>
-  <symbol minX="743" maxX="766" minY="485" maxY="508" name="library-s"/>
-  <symbol minX="766" maxX="789" minY="485" maxY="508" name="dentist-s"/>
-  <symbol minX="789" maxX="812" minY="485" maxY="508" name="information-s"/>
-  <symbol minX="812" maxX="835" minY="485" maxY="508" name="swimming-s"/>
-  <symbol minX="835" maxX="858" minY="485" maxY="508" name="place-of-worship-s"/>
-  <symbol minX="858" maxX="881" minY="485" maxY="508" name="hotel-s"/>
-  <symbol minX="881" maxX="904" minY="485" maxY="508" name="hospital-s"/>
-  <symbol minX="904" maxX="927" minY="485" maxY="508" name="police-s"/>
-  <symbol minX="927" maxX="950" minY="485" maxY="508" name="tennis-s"/>
-  <symbol minX="950" maxX="973" minY="485" maxY="508" name="helipad-s"/>
-  <symbol minX="973" maxX="996" minY="485" maxY="508" name="hand-s"/>
-  <symbol minX="996" maxX="1019" minY="485" maxY="508" name="theatre-s"/>
-  <symbol minX="0" maxX="23" minY="508" maxY="531" name="gym-s"/>
-  <symbol minX="23" maxX="46" minY="508" maxY="531" name="grocery-s"/>
-  <symbol minX="46" maxX="69" minY="508" maxY="531" name="golf-s"/>
-  <symbol minX="69" maxX="92" minY="508" maxY="531" name="garden-s"/>
-  <symbol minX="92" maxX="115" minY="508" maxY="531" name="toilets-s"/>
-  <symbol minX="115" maxX="138" minY="508" maxY="531" name="gallery-s"/>
-  <symbol minX="138" maxX="161" minY="508" maxY="531" name="funicular-s"/>
-  <symbol minX="161" maxX="184" minY="508" maxY="531" name="toll_booth-s"/>
-  <symbol minX="184" maxX="207" minY="508" maxY="531" name="fuel-s"/>
-  <symbol minX="207" maxX="230" minY="508" maxY="531" name="fountain-s"/>
-  <symbol minX="230" maxX="253" minY="508" maxY="531" name="fire_station-s"/>
-  <symbol minX="253" maxX="276" minY="508" maxY="531" name="fastfood-s"/>
-  <symbol minX="276" maxX="299" minY="508" maxY="531" name="tourism-s"/>
-  <symbol minX="299" maxX="322" minY="508" maxY="531" name="equestrian-s"/>
+  <symbol minX="697" maxX="720" minY="485" maxY="508" name="lighthouse-s"/>
+  <symbol minX="720" maxX="743" minY="485" maxY="508" name="tram-s"/>
+  <symbol minX="743" maxX="766" minY="485" maxY="508" name="kindergarten-s"/>
+  <symbol minX="766" maxX="789" minY="485" maxY="508" name="information-s"/>
+  <symbol minX="789" maxX="812" minY="485" maxY="508" name="swimming-s"/>
+  <symbol minX="812" maxX="835" minY="485" maxY="508" name="pitch-s"/>
+  <symbol minX="835" maxX="858" minY="485" maxY="508" name="hotel-s"/>
+  <symbol minX="858" maxX="881" minY="485" maxY="508" name="hospital-s"/>
+  <symbol minX="881" maxX="904" minY="485" maxY="508" name="place-of-worship-s"/>
+  <symbol minX="904" maxX="927" minY="485" maxY="508" name="tennis-s"/>
+  <symbol minX="927" maxX="950" minY="485" maxY="508" name="helipad-s"/>
+  <symbol minX="950" maxX="973" minY="485" maxY="508" name="hand-s"/>
+  <symbol minX="973" maxX="996" minY="485" maxY="508" name="theatre-s"/>
+  <symbol minX="996" maxX="1019" minY="485" maxY="508" name="gym-s"/>
+  <symbol minX="0" maxX="23" minY="508" maxY="531" name="grocery-s"/>
+  <symbol minX="23" maxX="46" minY="508" maxY="531" name="golf-s"/>
+  <symbol minX="46" maxX="69" minY="508" maxY="531" name="garden-s"/>
+  <symbol minX="69" maxX="92" minY="508" maxY="531" name="toilets-s"/>
+  <symbol minX="92" maxX="115" minY="508" maxY="531" name="gallery-s"/>
+  <symbol minX="115" maxX="138" minY="508" maxY="531" name="funicular-s"/>
+  <symbol minX="138" maxX="161" minY="508" maxY="531" name="toll_booth-s"/>
+  <symbol minX="161" maxX="184" minY="508" maxY="531" name="fuel-s"/>
+  <symbol minX="184" maxX="207" minY="508" maxY="531" name="fountain-s"/>
+  <symbol minX="207" maxX="230" minY="508" maxY="531" name="fire_station-s"/>
+  <symbol minX="230" maxX="253" minY="508" maxY="531" name="fastfood-s"/>
+  <symbol minX="253" maxX="276" minY="508" maxY="531" name="tourism-s"/>
+  <symbol minX="276" maxX="299" minY="508" maxY="531" name="equestrian-s"/>
+  <symbol minX="299" maxX="322" minY="508" maxY="531" name="dentist-s"/>
   <symbol minX="322" maxX="345" minY="508" maxY="531" name="diving-s"/>
-  <symbol minX="345" maxX="368" minY="508" maxY="531" name="train-s"/>
-  <symbol minX="368" maxX="391" minY="508" maxY="531" name="embassy-s"/>
-  <symbol minX="391" maxX="414" minY="508" maxY="531" name="townhall-s"/>
-  <symbol minX="414" maxX="437" minY="508" maxY="531" name="drinking-water-s"/>
-  <symbol minX="437" maxX="459" minY="508" maxY="530" name="parking-m"/>
-  <symbol minX="459" maxX="490" minY="508" maxY="530" name="subway-barcelona-l"/>
-  <symbol minX="490" maxX="521" minY="508" maxY="530" name="subway-barcelona-m"/>
+  <symbol minX="345" maxX="368" minY="508" maxY="531" name="embassy-s"/>
+  <symbol minX="368" maxX="391" minY="508" maxY="531" name="townhall-s"/>
+  <symbol minX="391" maxX="414" minY="508" maxY="531" name="drinking-water-s"/>
+  <symbol minX="414" maxX="437" minY="508" maxY="531" name="train-s"/>
+  <symbol minX="437" maxX="468" minY="508" maxY="530" name="subway-madrid-m"/>
+  <symbol minX="468" maxX="490" minY="508" maxY="530" name="parking-m"/>
+  <symbol minX="490" maxX="521" minY="508" maxY="530" name="subway-madrid-l"/>
   <symbol minX="521" maxX="542" minY="508" maxY="530" name="s-arrow"/>
-  <symbol minX="542" maxX="573" minY="508" maxY="530" name="subway-madrid-l"/>
-  <symbol minX="573" maxX="604" minY="508" maxY="530" name="subway-madrid-m"/>
-  <symbol minX="604" maxX="635" minY="508" maxY="530" name="metro-barcelona-m"/>
-  <symbol minX="635" maxX="663" minY="508" maxY="529" name="subway-madrid-s"/>
-  <symbol minX="663" maxX="684" minY="508" maxY="529" name="peak-l"/>
-  <symbol minX="684" maxX="714" minY="508" maxY="529" name="subway-kiev-m"/>
-  <symbol minX="714" maxX="742" minY="508" maxY="529" name="metro-barcelona-s"/>
-  <symbol minX="742" maxX="763" minY="508" maxY="529" name="waste-basket-s"/>
-  <symbol minX="763" maxX="784" minY="508" maxY="529" name="subway-paris-s"/>
-  <symbol minX="784" maxX="814" minY="508" maxY="529" name="subway-kiev-l"/>
-  <symbol minX="814" maxX="835" minY="508" maxY="529" name="lightrail-berlin-s"/>
-  <symbol minX="835" maxX="855" minY="508" maxY="528" name="subway-moscow-s"/>
-  <symbol minX="855" maxX="874" minY="508" maxY="527" name="subway-rome-s"/>
-  <symbol minX="874" maxX="893" minY="508" maxY="527" name="subway-berlin-s"/>
-  <symbol minX="893" maxX="914" minY="508" maxY="527" name="bench"/>
-  <symbol minX="914" maxX="933" minY="508" maxY="527" name="speedcam-s"/>
-  <symbol minX="933" maxX="956" minY="508" maxY="527" name="subway-london-s"/>
-  <symbol minX="956" maxX="975" minY="508" maxY="527" name="parking-s"/>
-  <symbol minX="975" maxX="994" minY="508" maxY="526" name="peakt-l"/>
-  <symbol minX="994" maxX="1012" minY="508" maxY="526" name="star-l"/>
-  <symbol minX="0" maxX="18" minY="531" maxY="549" name="survey_point-l"/>
-  <symbol minX="18" maxX="48" minY="531" maxY="549" name="subway-minsk-l"/>
-  <symbol minX="48" maxX="73" minY="531" maxY="547" name="subway-kiev-s"/>
-  <symbol minX="73" maxX="89" minY="531" maxY="547" name="star-m"/>
-  <symbol minX="89" maxX="114" minY="531" maxY="546" name="subway-minsk-m"/>
-  <symbol minX="114" maxX="130" minY="531" maxY="546" name="peak-m"/>
-  <symbol minX="130" maxX="145" minY="531" maxY="546" name="subway-newyork-xs"/>
-  <symbol minX="145" maxX="160" minY="531" maxY="546" name="survey_point-m"/>
-  <symbol minX="160" maxX="183" minY="531" maxY="546" name="railway-crossing"/>
-  <symbol minX="183" maxX="198" minY="531" maxY="546" name="subway-xs"/>
-  <symbol minX="198" maxX="212" minY="531" maxY="545" name="crossing-l"/>
-  <symbol minX="212" maxX="226" minY="531" maxY="545" name="star-s"/>
-  <symbol minX="226" maxX="249" minY="531" maxY="545" name="subway-minsk-s"/>
-  <symbol minX="249" maxX="262" minY="531" maxY="544" name="survey_point-s"/>
-  <symbol minX="262" maxX="276" minY="531" maxY="544" name="peakt-m"/>
-  <symbol minX="276" maxX="290" minY="531" maxY="544" name="peak-s"/>
-  <symbol minX="290" maxX="318" minY="531" maxY="544" name="arrow-m"/>
-  <symbol minX="318" maxX="330" minY="531" maxY="543" name="crossing-m"/>
-  <symbol minX="330" maxX="342" minY="531" maxY="543" name="entrance-s"/>
-  <symbol minX="342" maxX="354" minY="531" maxY="542" name="peakt-s"/>
-  <symbol minX="354" maxX="364" minY="531" maxY="541" name="crossing-s"/>
-  <symbol minX="364" maxX="374" minY="531" maxY="541" name="dot-m"/>
-  <symbol minX="374" maxX="384" minY="531" maxY="541" name="none"/>
-  <symbol minX="384" maxX="405" minY="531" maxY="541" name="arrow-s"/>
-  <symbol minX="405" maxX="415" minY="531" maxY="541" name="tree-l"/>
-  <symbol minX="415" maxX="424" minY="531" maxY="540" name="tree-m"/>
-  <symbol minX="424" maxX="433" minY="531" maxY="540" name="entrance-xs"/>
-  <symbol minX="433" maxX="440" minY="531" maxY="538" name="zero-icon"/>
-  <symbol minX="440" maxX="447" minY="531" maxY="538" name="dot-s-light"/>
-  <symbol minX="447" maxX="454" minY="531" maxY="538" name="tree-s"/>
-  <symbol minX="454" maxX="461" minY="531" maxY="538" name="dot-s"/>
+  <symbol minX="542" maxX="573" minY="508" maxY="530" name="metro-barcelona-m"/>
+  <symbol minX="573" maxX="604" minY="508" maxY="530" name="subway-barcelona-m"/>
+  <symbol minX="604" maxX="635" minY="508" maxY="530" name="subway-barcelona-l"/>
+  <symbol minX="635" maxX="665" minY="508" maxY="529" name="subway-kiev-m"/>
+  <symbol minX="665" maxX="693" minY="508" maxY="529" name="subway-madrid-s"/>
+  <symbol minX="693" maxX="714" minY="508" maxY="529" name="peak-l"/>
+  <symbol minX="714" maxX="735" minY="508" maxY="529" name="lightrail-berlin-s"/>
+  <symbol minX="735" maxX="763" minY="508" maxY="529" name="metro-barcelona-s"/>
+  <symbol minX="763" maxX="793" minY="508" maxY="529" name="subway-kiev-l"/>
+  <symbol minX="793" maxX="814" minY="508" maxY="529" name="subway-paris-s"/>
+  <symbol minX="814" maxX="834" minY="508" maxY="528" name="subway-moscow-s"/>
+  <symbol minX="834" maxX="853" minY="508" maxY="527" name="subway-rome-s"/>
+  <symbol minX="853" maxX="874" minY="508" maxY="527" name="bench"/>
+  <symbol minX="874" maxX="893" minY="508" maxY="527" name="parking-s"/>
+  <symbol minX="893" maxX="912" minY="508" maxY="527" name="speedcam-s"/>
+  <symbol minX="912" maxX="931" minY="508" maxY="527" name="subway-berlin-s"/>
+  <symbol minX="931" maxX="954" minY="508" maxY="527" name="subway-london-s"/>
+  <symbol minX="954" maxX="972" minY="508" maxY="526" name="survey_point-l"/>
+  <symbol minX="972" maxX="991" minY="508" maxY="526" name="peakt-l"/>
+  <symbol minX="991" maxX="1009" minY="508" maxY="526" name="star-l"/>
+  <symbol minX="0" maxX="30" minY="531" maxY="549" name="subway-minsk-l"/>
+  <symbol minX="30" maxX="46" minY="531" maxY="547" name="star-m"/>
+  <symbol minX="46" maxX="71" minY="531" maxY="547" name="subway-kiev-s"/>
+  <symbol minX="71" maxX="94" minY="531" maxY="546" name="railway-crossing"/>
+  <symbol minX="94" maxX="119" minY="531" maxY="546" name="subway-minsk-m"/>
+  <symbol minX="119" maxX="135" minY="531" maxY="546" name="peak-m"/>
+  <symbol minX="135" maxX="150" minY="531" maxY="546" name="subway-newyork-xs"/>
+  <symbol minX="150" maxX="165" minY="531" maxY="546" name="survey_point-m"/>
+  <symbol minX="165" maxX="180" minY="531" maxY="546" name="subway-xs"/>
+  <symbol minX="180" maxX="194" minY="531" maxY="545" name="star-s"/>
+  <symbol minX="194" maxX="217" minY="531" maxY="545" name="subway-minsk-s"/>
+  <symbol minX="217" maxX="231" minY="531" maxY="545" name="crossing-l"/>
+  <symbol minX="231" maxX="245" minY="531" maxY="544" name="peakt-m"/>
+  <symbol minX="245" maxX="259" minY="531" maxY="544" name="peak-s"/>
+  <symbol minX="259" maxX="272" minY="531" maxY="544" name="survey_point-s"/>
+  <symbol minX="272" maxX="300" minY="531" maxY="544" name="arrow-m"/>
+  <symbol minX="300" maxX="312" minY="531" maxY="543" name="crossing-m"/>
+  <symbol minX="312" maxX="324" minY="531" maxY="543" name="entrance-s"/>
+  <symbol minX="324" maxX="336" minY="531" maxY="542" name="peakt-s"/>
+  <symbol minX="336" maxX="346" minY="531" maxY="541" name="dot-m"/>
+  <symbol minX="346" maxX="356" minY="531" maxY="541" name="crossing-s"/>
+  <symbol minX="356" maxX="366" minY="531" maxY="541" name="tree-l"/>
+  <symbol minX="366" maxX="387" minY="531" maxY="541" name="arrow-s"/>
+  <symbol minX="387" maxX="397" minY="531" maxY="541" name="none"/>
+  <symbol minX="397" maxX="406" minY="531" maxY="540" name="entrance-xs"/>
+  <symbol minX="406" maxX="415" minY="531" maxY="540" name="tree-m"/>
+  <symbol minX="415" maxX="422" minY="531" maxY="538" name="tree-s"/>
+  <symbol minX="422" maxX="429" minY="531" maxY="538" name="dot-s"/>
+  <symbol minX="429" maxX="436" minY="531" maxY="538" name="zero-icon"/>
+  <symbol minX="436" maxX="443" minY="531" maxY="538" name="dot-s-light"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index b2ad29002a..c6f3591fe0 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 c89339db24..8fb494b846 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -19,164 +19,164 @@
   <symbol minX="820" maxX="844" minY="0" maxY="45" name="placemark-red"/>
   <symbol minX="844" maxX="878" minY="0" maxY="34" name="current-position"/>
   <symbol minX="878" maxX="909" minY="0" maxY="31" name="atm-l"/>
-  <symbol minX="909" maxX="940" minY="0" maxY="31" name="ship-l"/>
-  <symbol minX="940" maxX="971" minY="0" maxY="31" name="restaurant-l"/>
+  <symbol minX="909" maxX="940" minY="0" maxY="31" name="sauna-l"/>
+  <symbol minX="940" maxX="971" minY="0" maxY="31" name="seafood-shop-l"/>
   <symbol minX="971" maxX="1002" minY="0" maxY="31" name="archery-l"/>
   <symbol minX="0" maxX="31" minY="154" maxY="185" name="australian-football-l"/>
-  <symbol minX="31" maxX="62" minY="154" maxY="185" name="remains-l"/>
-  <symbol minX="62" maxX="93" minY="154" maxY="185" name="seafood-shop-l"/>
+  <symbol minX="31" maxX="62" minY="154" maxY="185" name="restaurant-l"/>
+  <symbol minX="62" maxX="93" minY="154" maxY="185" name="remains-l"/>
   <symbol minX="93" maxX="124" minY="154" maxY="185" name="bakery-l"/>
-  <symbol minX="124" maxX="155" minY="154" maxY="185" name="recycling-l"/>
-  <symbol minX="155" maxX="186" minY="154" maxY="185" name="shoes-l"/>
+  <symbol minX="124" maxX="155" minY="154" maxY="185" name="ship-l"/>
+  <symbol minX="155" maxX="186" minY="154" maxY="185" name="recycling-l"/>
   <symbol minX="186" maxX="216" minY="154" maxY="185" name="bank-l"/>
   <symbol minX="216" maxX="246" minY="154" maxY="185" name="bank-m"/>
   <symbol minX="246" maxX="276" minY="154" maxY="185" name="banknote-l"/>
-  <symbol minX="276" maxX="307" minY="154" maxY="185" name="pub-l"/>
+  <symbol minX="276" maxX="307" minY="154" maxY="185" name="shoes-l"/>
   <symbol minX="307" maxX="338" minY="154" maxY="185" name="bar-l"/>
-  <symbol minX="338" maxX="369" minY="154" maxY="185" name="power-m"/>
+  <symbol minX="338" maxX="369" minY="154" maxY="185" name="pub-l"/>
   <symbol minX="369" maxX="400" minY="154" maxY="185" name="america-football-l"/>
   <symbol minX="400" maxX="431" minY="154" maxY="185" name="baseball-l"/>
-  <symbol minX="431" maxX="462" minY="154" maxY="185" name="power-l"/>
-  <symbol minX="462" maxX="493" minY="154" maxY="185" name="sauna-l"/>
+  <symbol minX="431" maxX="462" minY="154" maxY="185" name="power-m"/>
+  <symbol minX="462" maxX="493" minY="154" maxY="185" name="power-l"/>
   <symbol minX="493" maxX="524" minY="154" maxY="185" name="basketball-l"/>
   <symbol minX="524" maxX="555" minY="154" maxY="185" name="postbox-l"/>
   <symbol minX="555" maxX="586" minY="154" maxY="185" name="alpine_hut-l"/>
   <symbol minX="586" maxX="617" minY="154" maxY="185" name="bbq-l"/>
   <symbol minX="617" maxX="648" minY="154" maxY="185" name="pool-l"/>
   <symbol minX="648" maxX="679" minY="154" maxY="185" name="bcontrol-l"/>
-  <symbol minX="679" maxX="710" minY="154" maxY="185" name="shop-bicycle-l"/>
-  <symbol minX="710" maxX="741" minY="154" maxY="185" name="school-l"/>
+  <symbol minX="679" maxX="710" minY="154" maxY="185" name="police-l"/>
+  <symbol minX="710" maxX="741" minY="154" maxY="185" name="shop-bicycle-l"/>
   <symbol minX="741" maxX="772" minY="154" maxY="185" name="beach-l"/>
-  <symbol minX="772" maxX="803" minY="154" maxY="185" name="police-l"/>
+  <symbol minX="772" maxX="803" minY="154" maxY="185" name="place-of-worship-l"/>
   <symbol minX="803" maxX="834" minY="154" maxY="185" name="alcohol-l"/>
   <symbol minX="834" maxX="865" minY="154" maxY="185" name="beauty-l"/>
-  <symbol minX="865" maxX="896" minY="154" maxY="185" name="place-of-worship-l"/>
+  <symbol minX="865" maxX="896" minY="154" maxY="185" name="pitch-l"/>
   <symbol minX="896" maxX="927" minY="154" maxY="185" name="beer-l"/>
   <symbol minX="927" maxX="958" minY="154" maxY="185" name="shop-l copy"/>
   <symbol minX="958" maxX="989" minY="154" maxY="185" name="airport-m"/>
   <symbol minX="989" maxX="1020" minY="154" maxY="185" name="airport-l"/>
   <symbol minX="0" maxX="31" minY="185" maxY="216" name="bicycle-l"/>
-  <symbol minX="31" maxX="62" minY="185" maxY="216" name="pitch-l"/>
-  <symbol minX="62" maxX="93" minY="185" maxY="216" name="shop-l"/>
-  <symbol minX="93" maxX="124" minY="185" maxY="216" name="picnic-l"/>
+  <symbol minX="31" maxX="62" minY="185" maxY="216" name="picnic-l"/>
+  <symbol minX="62" maxX="93" minY="185" maxY="216" name="photo-shop-l"/>
+  <symbol minX="93" maxX="124" minY="185" maxY="216" name="shop-l"/>
   <symbol minX="124" maxX="155" minY="185" maxY="216" name="book-shop-l"/>
-  <symbol minX="155" maxX="186" minY="185" maxY="216" name="photo-shop-l"/>
+  <symbol minX="155" maxX="186" minY="185" maxY="216" name="phone-l"/>
   <symbol minX="186" maxX="217" minY="185" maxY="216" name="zoo-l"/>
   <symbol minX="217" maxX="248" minY="185" maxY="216" name="bookmaker-l"/>
   <symbol minX="248" maxX="279" minY="185" maxY="216" name="boundary_stone-l"/>
-  <symbol minX="279" maxX="310" minY="185" maxY="216" name="phone-l"/>
+  <symbol minX="279" maxX="310" minY="185" maxY="216" name="pharmacy-l"/>
   <symbol minX="310" maxX="341" minY="185" maxY="216" name="bowls-l"/>
-  <symbol minX="341" maxX="372" minY="185" maxY="216" name="pharmacy-l"/>
-  <symbol minX="372" maxX="403" minY="185" maxY="216" name="petshop-l"/>
+  <symbol minX="341" maxX="372" minY="185" maxY="216" name="petshop-l"/>
+  <symbol minX="372" maxX="403" minY="185" maxY="216" name="skiing-l"/>
   <symbol minX="403" maxX="434" minY="185" maxY="216" name="bus-l"/>
-  <symbol minX="434" maxX="465" minY="185" maxY="216" name="skiing-l"/>
+  <symbol minX="434" maxX="465" minY="185" maxY="216" name="soccer-l"/>
   <symbol minX="465" maxX="496" minY="185" maxY="216" name="windmill-l"/>
   <symbol minX="496" maxX="527" minY="185" maxY="216" name="butcher-l"/>
-  <symbol minX="527" maxX="558" minY="185" maxY="216" name="soccer-l"/>
+  <symbol minX="527" maxX="558" minY="185" maxY="216" name="peak-l"/>
   <symbol minX="558" maxX="589" minY="185" maxY="216" name="cable-car-l"/>
-  <symbol minX="589" maxX="620" minY="185" maxY="216" name="peak-l"/>
-  <symbol minX="620" maxX="651" minY="185" maxY="216" name="parking-meter-l"/>
+  <symbol minX="589" maxX="620" minY="185" maxY="216" name="parking-meter-l"/>
+  <symbol minX="620" maxX="651" minY="185" maxY="216" name="sports-l"/>
   <symbol minX="651" maxX="682" minY="185" maxY="216" name="cafe-l"/>
-  <symbol minX="682" maxX="713" minY="185" maxY="216" name="sports-l"/>
+  <symbol minX="682" maxX="713" minY="185" maxY="216" name="park-l"/>
   <symbol minX="713" maxX="744" minY="185" maxY="216" name="wayside_shrine-l"/>
   <symbol minX="744" maxX="775" minY="185" maxY="216" name="campsite-l"/>
-  <symbol minX="775" maxX="806" minY="185" maxY="216" name="park-l"/>
-  <symbol minX="806" maxX="837" minY="185" maxY="216" name="optician-l"/>
+  <symbol minX="775" maxX="806" minY="185" maxY="216" name="optician-l"/>
+  <symbol minX="806" maxX="837" minY="185" maxY="216" name="office-l"/>
   <symbol minX="837" maxX="868" minY="185" maxY="216" name="car-part-l"/>
-  <symbol minX="868" maxX="899" minY="185" maxY="216" name="office-l"/>
+  <symbol minX="868" maxX="899" minY="185" maxY="216" name="nparkf-l"/>
   <symbol minX="899" maxX="930" minY="185" maxY="216" name="car-repair-l"/>
-  <symbol minX="930" maxX="961" minY="185" maxY="216" name="nparkf-l"/>
+  <symbol minX="930" maxX="961" minY="185" maxY="216" name="subway-entrance-l"/>
   <symbol minX="961" maxX="992" minY="185" maxY="216" name="wayside_cross-l"/>
   <symbol minX="992" maxX="1023" minY="185" maxY="216" name="car-wash-l"/>
-  <symbol minX="0" maxX="31" minY="216" maxY="247" name="subway-entrance-l"/>
+  <symbol minX="0" maxX="31" minY="216" maxY="247" name="npark-l"/>
   <symbol minX="31" maxX="62" minY="216" maxY="247" name="car_sharing-l"/>
-  <symbol minX="62" maxX="93" minY="216" maxY="247" name="npark-l"/>
+  <symbol minX="62" maxX="93" minY="216" maxY="247" name="subway-l"/>
   <symbol minX="93" maxX="124" minY="216" maxY="247" name="caravan_site-l"/>
-  <symbol minX="124" maxX="155" minY="216" maxY="247" name="subway-l"/>
+  <symbol minX="124" maxX="155" minY="216" maxY="247" name="subway-newyork-l"/>
   <symbol minX="155" maxX="186" minY="216" maxY="247" name="casino-l"/>
-  <symbol minX="186" maxX="217" minY="216" maxY="247" name="subway-newyork-l"/>
-  <symbol minX="217" maxX="248" minY="216" maxY="247" name="subway-paris-l"/>
+  <symbol minX="186" maxX="217" minY="216" maxY="247" name="subway-paris-l"/>
+  <symbol minX="217" maxX="248" minY="216" maxY="247" name="museum-l"/>
   <symbol minX="248" maxX="279" minY="216" maxY="247" name="cave-l"/>
-  <symbol minX="279" maxX="310" minY="216" maxY="247" name="museum-l"/>
+  <symbol minX="279" maxX="310" minY="216" maxY="247" name="moto-sharing-l"/>
   <symbol minX="310" maxX="341" minY="216" maxY="247" name="waterfall-l"/>
   <symbol minX="341" maxX="372" minY="216" maxY="247" name="cemetery-l"/>
-  <symbol minX="372" maxX="403" minY="216" maxY="247" name="moto-sharing-l"/>
-  <symbol minX="403" maxX="434" minY="216" maxY="247" name="motel-l"/>
+  <symbol minX="372" maxX="403" minY="216" maxY="247" name="motel-l"/>
+  <symbol minX="403" maxX="434" minY="216" maxY="247" name="subway-spb-l"/>
   <symbol minX="434" maxX="465" minY="216" maxY="247" name="charging-station-l"/>
-  <symbol minX="465" maxX="496" minY="216" maxY="247" name="subway-spb-l"/>
-  <symbol minX="496" maxX="527" minY="216" maxY="247" name="monument-l"/>
+  <symbol minX="465" maxX="496" minY="216" maxY="247" name="monument-l"/>
+  <symbol minX="496" maxX="527" minY="216" maxY="247" name="mobile_phone-l"/>
   <symbol minX="527" maxX="558" minY="216" maxY="247" name="chemist-l"/>
-  <symbol minX="558" maxX="589" minY="216" maxY="247" name="mobile_phone-l"/>
+  <symbol minX="558" maxX="589" minY="216" maxY="247" name="military-l"/>
   <symbol minX="589" maxX="620" minY="216" maxY="247" name="childcare-l"/>
   <symbol minX="620" maxX="651" minY="216" maxY="247" name="chimney-l"/>
-  <symbol minX="651" maxX="682" minY="216" maxY="247" name="military-l"/>
+  <symbol minX="651" maxX="682" minY="216" maxY="247" name="sweets-l"/>
   <symbol minX="682" maxX="713" minY="216" maxY="247" name="cinema-l"/>
-  <symbol minX="713" maxX="744" minY="216" maxY="247" name="sweets-l"/>
+  <symbol minX="713" maxX="744" minY="216" maxY="247" name="swimming-l"/>
   <symbol minX="744" maxX="775" minY="216" maxY="247" name="volcano-l"/>
   <symbol minX="775" maxX="806" minY="216" maxY="247" name="climbing-l"/>
-  <symbol minX="806" maxX="837" minY="216" maxY="247" name="swimming-l"/>
+  <symbol minX="806" maxX="837" minY="216" maxY="247" name="marketplace-l"/>
   <symbol minX="837" maxX="868" minY="216" maxY="247" name="viewpoint-m"/>
   <symbol minX="868" maxX="899" minY="216" maxY="247" name="clothes-l"/>
-  <symbol minX="899" maxX="930" minY="216" maxY="247" name="marketplace-l"/>
+  <symbol minX="899" maxX="930" minY="216" maxY="247" name="mail-l"/>
   <symbol minX="930" maxX="961" minY="216" maxY="247" name="college-l"/>
-  <symbol minX="961" maxX="992" minY="216" maxY="247" name="mail-l"/>
+  <symbol minX="961" maxX="992" minY="216" maxY="247" name="taxi-l"/>
   <symbol minX="992" maxX="1023" minY="216" maxY="247" name="viewpoint-l"/>
   <symbol minX="0" maxX="31" minY="247" maxY="278" name="computer-l"/>
-  <symbol minX="31" maxX="62" minY="247" maxY="278" name="taxi-l"/>
+  <symbol minX="31" maxX="62" minY="247" maxY="278" name="lightrail-berlin-l"/>
   <symbol minX="62" maxX="93" minY="247" maxY="278" name="convenience-l"/>
-  <symbol minX="93" maxX="124" minY="247" maxY="278" name="lightrail-berlin-l"/>
+  <symbol minX="93" maxX="124" minY="247" maxY="278" name="lighthouse-l"/>
   <symbol minX="124" maxX="155" minY="247" maxY="278" name="copyshop-l"/>
-  <symbol minX="155" maxX="186" minY="247" maxY="278" name="lighthouse-l"/>
+  <symbol minX="155" maxX="186" minY="247" maxY="278" name="lift_gate-l"/>
   <symbol minX="186" maxX="217" minY="247" maxY="278" name="courthouse-l"/>
   <symbol minX="217" maxX="248" minY="247" maxY="278" name="cricket-l"/>
-  <symbol minX="248" maxX="279" minY="247" maxY="278" name="lift_gate-l"/>
-  <symbol minX="279" maxX="310" minY="247" maxY="278" name="tennis-l"/>
+  <symbol minX="248" maxX="279" minY="247" maxY="278" name="tennis-l"/>
+  <symbol minX="279" maxX="310" minY="247" maxY="278" name="library-l"/>
   <symbol minX="310" maxX="341" minY="247" maxY="278" name="curling-l"/>
-  <symbol minX="341" maxX="372" minY="247" maxY="278" name="library-l"/>
+  <symbol minX="341" maxX="372" minY="247" maxY="278" name="lawyer-l"/>
   <symbol minX="372" maxX="403" minY="247" maxY="278" name="veterinary-l"/>
   <symbol minX="403" maxX="434" minY="247" maxY="278" name="dentist-l"/>
   <symbol minX="434" maxX="465" minY="247" maxY="278" name="dentist-m"/>
-  <symbol minX="465" maxX="496" minY="247" maxY="278" name="lawyer-l"/>
+  <symbol minX="465" maxX="496" minY="247" maxY="278" name="laundry-l"/>
   <symbol minX="496" maxX="527" minY="247" maxY="278" name="department_store-l"/>
-  <symbol minX="527" maxX="558" minY="247" maxY="278" name="laundry-l"/>
+  <symbol minX="527" maxX="558" minY="247" maxY="278" name="kiosk-l"/>
   <symbol minX="558" maxX="589" minY="247" maxY="278" name="diving-l"/>
-  <symbol minX="589" maxX="620" minY="247" maxY="278" name="kiosk-l"/>
+  <symbol minX="589" maxX="620" minY="247" maxY="278" name="kindergarten-m"/>
   <symbol minX="620" maxX="651" minY="247" maxY="278" name="vending-l"/>
   <symbol minX="651" maxX="682" minY="247" maxY="278" name="dog_park-l"/>
-  <symbol minX="682" maxX="713" minY="247" maxY="278" name="kindergarten-m"/>
+  <symbol minX="682" maxX="713" minY="247" maxY="278" name="kindergarten-l"/>
   <symbol minX="713" maxX="744" minY="247" maxY="278" name="doityourself-l"/>
-  <symbol minX="744" maxX="775" minY="247" maxY="278" name="kindergarten-l"/>
-  <symbol minX="775" maxX="806" minY="247" maxY="278" name="jewelry-l"/>
+  <symbol minX="744" maxX="775" minY="247" maxY="278" name="jewelry-l"/>
+  <symbol minX="775" maxX="806" minY="247" maxY="278" name="theatre-l"/>
   <symbol minX="806" maxX="837" minY="247" maxY="278" name="tram-l"/>
-  <symbol minX="837" maxX="868" minY="247" maxY="278" name="theatre-l"/>
+  <symbol minX="837" maxX="868" minY="247" maxY="278" name="information-l"/>
   <symbol minX="868" maxX="899" minY="247" maxY="278" name="drinking-water-l"/>
-  <symbol minX="899" maxX="930" minY="247" maxY="278" name="information-l"/>
+  <symbol minX="899" maxX="930" minY="247" maxY="278" name="hunting-tower-l"/>
   <symbol minX="930" maxX="961" minY="247" maxY="278" name="train-l"/>
-  <symbol minX="961" maxX="992" minY="247" maxY="278" name="hunting-tower-l"/>
+  <symbol minX="961" maxX="992" minY="247" maxY="278" name="hotel-l"/>
   <symbol minX="992" maxX="1023" minY="247" maxY="278" name="electronics-l"/>
-  <symbol minX="0" maxX="31" minY="278" maxY="309" name="hotel-l"/>
+  <symbol minX="0" maxX="31" minY="278" maxY="309" name="ticket-shop-l"/>
   <symbol minX="31" maxX="62" minY="278" maxY="309" name="embassy-l"/>
-  <symbol minX="62" maxX="93" minY="278" maxY="309" name="ticket-shop-l"/>
-  <symbol minX="93" maxX="124" minY="278" maxY="309" name="hospital-l"/>
+  <symbol minX="62" maxX="93" minY="278" maxY="309" name="hospital-l"/>
+  <symbol minX="93" maxX="124" minY="278" maxY="309" name="historic-ship-l"/>
   <symbol minX="124" maxX="155" minY="278" maxY="309" name="toys-l"/>
-  <symbol minX="155" maxX="186" minY="278" maxY="309" name="historic-ship-l"/>
+  <symbol minX="155" maxX="186" minY="278" maxY="309" name="heliport-l"/>
   <symbol minX="186" maxX="217" minY="278" maxY="309" name="equestrian-l"/>
   <symbol minX="217" maxX="248" minY="278" maxY="309" name="equestrian-m"/>
   <symbol minX="248" maxX="279" minY="278" maxY="309" name="fastfood-l"/>
-  <symbol minX="279" maxX="310" minY="278" maxY="309" name="heliport-l"/>
+  <symbol minX="279" maxX="310" minY="278" maxY="309" name="toilets-l"/>
   <symbol minX="310" maxX="341" minY="278" maxY="309" name="townhall-l"/>
   <symbol minX="341" maxX="372" minY="278" maxY="309" name="fire_station-l"/>
-  <symbol minX="372" maxX="403" minY="278" maxY="309" name="toilets-l"/>
+  <symbol minX="372" maxX="403" minY="278" maxY="309" name="helipad-l"/>
   <symbol minX="403" maxX="434" minY="278" maxY="309" name="tourist-shop-l"/>
-  <symbol minX="434" maxX="465" minY="278" maxY="309" name="helipad-l"/>
+  <symbol minX="434" maxX="465" minY="278" maxY="309" name="hardware-l"/>
   <symbol minX="465" maxX="496" minY="278" maxY="309" name="florist-l"/>
-  <symbol minX="496" maxX="527" minY="278" maxY="309" name="hardware-l"/>
+  <symbol minX="496" maxX="527" minY="278" maxY="309" name="hand-m"/>
   <symbol minX="527" maxX="558" minY="278" maxY="309" name="fountain-l"/>
-  <symbol minX="558" maxX="589" minY="278" maxY="309" name="hand-m"/>
+  <symbol minX="558" maxX="589" minY="278" maxY="309" name="hand-l"/>
   <symbol minX="589" maxX="620" minY="278" maxY="309" name="tourist-office-l"/>
   <symbol minX="620" maxX="651" minY="278" maxY="309" name="fuel-l copy"/>
   <symbol minX="651" maxX="682" minY="278" maxY="309" name="fuel-l"/>
-  <symbol minX="682" maxX="713" minY="278" maxY="309" name="hand-l"/>
+  <symbol minX="682" maxX="713" minY="278" maxY="309" name="school-l"/>
   <symbol minX="713" maxX="744" minY="278" maxY="309" name="hairdresser-l"/>
   <symbol minX="744" maxX="775" minY="278" maxY="309" name="funicular-l"/>
   <symbol minX="775" maxX="806" minY="278" maxY="309" name="gym-l"/>
@@ -208,314 +208,314 @@
   <symbol minX="545" maxX="575" minY="309" maxY="339" name="toilets-m"/>
   <symbol minX="575" maxX="605" minY="309" maxY="339" name="tourism-m"/>
   <symbol minX="605" maxX="635" minY="309" maxY="339" name="hairdresser-m"/>
-  <symbol minX="635" maxX="665" minY="309" maxY="339" name="fuel-m"/>
-  <symbol minX="665" maxX="695" minY="309" maxY="339" name="fountain-m"/>
-  <symbol minX="695" maxX="725" minY="309" maxY="339" name="florist-m"/>
+  <symbol minX="635" maxX="665" minY="309" maxY="339" name="fountain-m"/>
+  <symbol minX="665" maxX="695" minY="309" maxY="339" name="florist-m"/>
+  <symbol minX="695" maxX="725" minY="309" maxY="339" name="fuel-m"/>
   <symbol minX="725" maxX="755" minY="309" maxY="339" name="hardware-m"/>
-  <symbol minX="755" maxX="785" minY="309" maxY="339" name="school-m"/>
+  <symbol minX="755" maxX="785" minY="309" maxY="339" name="fire_station-m"/>
   <symbol minX="785" maxX="815" minY="309" maxY="339" name="helipad-m"/>
-  <symbol minX="815" maxX="845" minY="309" maxY="339" name="fire_station-m"/>
-  <symbol minX="845" maxX="875" minY="309" maxY="339" name="fastfood-m"/>
+  <symbol minX="815" maxX="845" minY="309" maxY="339" name="fastfood-m"/>
+  <symbol minX="845" maxX="875" minY="309" maxY="339" name="townhall-m"/>
   <symbol minX="875" maxX="905" minY="309" maxY="339" name="heliport-m"/>
   <symbol minX="905" maxX="935" minY="309" maxY="339" name="ticket-shop-m"/>
-  <symbol minX="935" maxX="965" minY="309" maxY="339" name="townhall-m"/>
+  <symbol minX="935" maxX="965" minY="309" maxY="339" name="toys-m"/>
   <symbol minX="965" maxX="995" minY="309" maxY="339" name="historic-ship-m"/>
-  <symbol minX="0" maxX="30" minY="340" maxY="370" name="toys-m"/>
+  <symbol minX="0" maxX="30" minY="340" maxY="370" name="embassy-m"/>
   <symbol minX="30" maxX="60" minY="340" maxY="370" name="hospital-m"/>
-  <symbol minX="60" maxX="90" minY="340" maxY="370" name="embassy-m"/>
-  <symbol minX="90" maxX="120" minY="340" maxY="370" name="electronics-m"/>
+  <symbol minX="60" maxX="90" minY="340" maxY="370" name="electronics-m"/>
+  <symbol minX="90" maxX="120" minY="340" maxY="370" name="drugs"/>
   <symbol minX="120" maxX="150" minY="340" maxY="370" name="hotel-m"/>
   <symbol minX="150" maxX="180" minY="340" maxY="370" name="theatre-m"/>
-  <symbol minX="180" maxX="210" minY="340" maxY="370" name="drugs"/>
+  <symbol minX="180" maxX="210" minY="340" maxY="370" name="drinking-water-m"/>
   <symbol minX="210" maxX="240" minY="340" maxY="370" name="hunting-tower-m"/>
-  <symbol minX="240" maxX="270" minY="340" maxY="370" name="drinking-water-m"/>
+  <symbol minX="240" maxX="270" minY="340" maxY="370" name="train-m"/>
   <symbol minX="270" maxX="300" minY="340" maxY="370" name="information-m"/>
-  <symbol minX="300" maxX="330" minY="340" maxY="370" name="train-m"/>
-  <symbol minX="330" maxX="360" minY="340" maxY="370" name="tram-m"/>
+  <symbol minX="300" maxX="330" minY="340" maxY="370" name="tram-m"/>
+  <symbol minX="330" maxX="360" minY="340" maxY="370" name="doityourself-m"/>
   <symbol minX="360" maxX="390" minY="340" maxY="370" name="jewelry-m"/>
-  <symbol minX="390" maxX="420" minY="340" maxY="370" name="doityourself-m"/>
-  <symbol minX="420" maxX="450" minY="340" maxY="370" name="dog_park-m"/>
+  <symbol minX="390" maxX="420" minY="340" maxY="370" name="dog_park-m"/>
+  <symbol minX="420" maxX="450" minY="340" maxY="370" name="diving-m"/>
   <symbol minX="450" maxX="480" minY="340" maxY="370" name="tennis-m"/>
-  <symbol minX="480" maxX="510" minY="340" maxY="370" name="diving-m"/>
+  <symbol minX="480" maxX="510" minY="340" maxY="370" name="department_store-m"/>
   <symbol minX="510" maxX="540" minY="340" maxY="370" name="kiosk-m"/>
-  <symbol minX="540" maxX="570" minY="340" maxY="370" name="department_store-m"/>
+  <symbol minX="540" maxX="570" minY="340" maxY="370" name="vending-m"/>
   <symbol minX="570" maxX="600" minY="340" maxY="370" name="laundry-m"/>
-  <symbol minX="600" maxX="630" minY="340" maxY="370" name="vending-m"/>
-  <symbol minX="630" maxX="660" minY="340" maxY="370" name="curling-m"/>
+  <symbol minX="600" maxX="630" minY="340" maxY="370" name="curling-m"/>
+  <symbol minX="630" maxX="660" minY="340" maxY="370" name="veterinary-m"/>
   <symbol minX="660" maxX="690" minY="340" maxY="370" name="library-m"/>
-  <symbol minX="690" maxX="720" minY="340" maxY="370" name="veterinary-m"/>
-  <symbol minX="720" maxX="750" minY="340" maxY="370" name="cricket-m"/>
+  <symbol minX="690" maxX="720" minY="340" maxY="370" name="cricket-m"/>
+  <symbol minX="720" maxX="750" minY="340" maxY="370" name="copyshop-m"/>
   <symbol minX="750" maxX="780" minY="340" maxY="370" name="lift_gate-m"/>
-  <symbol minX="780" maxX="810" minY="340" maxY="370" name="copyshop-m"/>
+  <symbol minX="780" maxX="810" minY="340" maxY="370" name="convenience-m"/>
   <symbol minX="810" maxX="840" minY="340" maxY="370" name="lighthouse-m"/>
   <symbol minX="840" maxX="870" minY="340" maxY="370" name="taxi-m"/>
-  <symbol minX="870" maxX="900" minY="340" maxY="370" name="convenience-m"/>
-  <symbol minX="900" maxX="930" minY="340" maxY="370" name="alcohol-m"/>
-  <symbol minX="930" maxX="960" minY="340" maxY="370" name="computer-m"/>
-  <symbol minX="960" maxX="990" minY="340" maxY="370" name="college-m"/>
+  <symbol minX="870" maxX="900" minY="340" maxY="370" name="computer-m"/>
+  <symbol minX="900" maxX="930" minY="340" maxY="370" name="sauna-m"/>
+  <symbol minX="930" maxX="960" minY="340" maxY="370" name="college-m"/>
+  <symbol minX="960" maxX="990" minY="340" maxY="370" name="clothes-m"/>
   <symbol minX="990" maxX="1020" minY="340" maxY="370" name="mail-m"/>
   <symbol minX="0" maxX="30" minY="370" maxY="400" name="swimming-m"/>
-  <symbol minX="30" maxX="60" minY="370" maxY="400" name="clothes-m"/>
+  <symbol minX="30" maxX="60" minY="370" maxY="400" name="climbing-m"/>
   <symbol minX="60" maxX="90" minY="370" maxY="400" name="marketplace-m"/>
-  <symbol minX="90" maxX="120" minY="370" maxY="400" name="climbing-m"/>
+  <symbol minX="90" maxX="120" minY="370" maxY="400" name="cinema-m"/>
   <symbol minX="120" maxX="150" minY="370" maxY="400" name="sweets-m"/>
-  <symbol minX="150" maxX="180" minY="370" maxY="400" name="cinema-m"/>
-  <symbol minX="180" maxX="210" minY="370" maxY="400" name="chimney-m"/>
+  <symbol minX="150" maxX="180" minY="370" maxY="400" name="chimney-m"/>
+  <symbol minX="180" maxX="210" minY="370" maxY="400" name="chemist-m"/>
   <symbol minX="210" maxX="240" minY="370" maxY="400" name="military-m"/>
   <symbol minX="240" maxX="270" minY="370" maxY="400" name="subway-spb-m"/>
-  <symbol minX="270" maxX="300" minY="370" maxY="400" name="chemist-m"/>
+  <symbol minX="270" maxX="300" minY="370" maxY="400" name="volcano-m"/>
   <symbol minX="300" maxX="330" minY="370" maxY="400" name="mobile_phone-m"/>
-  <symbol minX="330" maxX="360" minY="370" maxY="400" name="volcano-m"/>
+  <symbol minX="330" maxX="360" minY="370" maxY="400" name="charging-station-m"/>
   <symbol minX="360" maxX="390" minY="370" maxY="400" name="monument-m"/>
-  <symbol minX="390" maxX="420" minY="370" maxY="400" name="charging-station-m"/>
-  <symbol minX="420" maxX="450" minY="370" maxY="400" name="sauna-m"/>
+  <symbol minX="390" maxX="420" minY="370" maxY="400" name="atm-m"/>
+  <symbol minX="420" maxX="450" minY="370" maxY="400" name="cemetery-m"/>
   <symbol minX="450" maxX="480" minY="370" maxY="400" name="motel-m"/>
-  <symbol minX="480" maxX="510" minY="370" maxY="400" name="alpine_hut-m"/>
-  <symbol minX="510" maxX="540" minY="370" maxY="400" name="cemetery-m"/>
-  <symbol minX="540" maxX="570" minY="370" maxY="400" name="cave-m"/>
+  <symbol minX="480" maxX="510" minY="370" maxY="400" name="school-m"/>
+  <symbol minX="510" maxX="540" minY="370" maxY="400" name="cave-m"/>
+  <symbol minX="540" maxX="570" minY="370" maxY="400" name="waterfall-m"/>
   <symbol minX="570" maxX="600" minY="370" maxY="400" name="museum-m"/>
-  <symbol minX="600" maxX="630" minY="370" maxY="400" name="waterfall-m"/>
+  <symbol minX="600" maxX="630" minY="370" maxY="400" name="casino-m"/>
   <symbol minX="630" maxX="660" minY="370" maxY="400" name="subway-newyork-m"/>
-  <symbol minX="660" maxX="690" minY="370" maxY="400" name="casino-m"/>
-  <symbol minX="690" maxX="720" minY="370" maxY="400" name="america-football-m"/>
+  <symbol minX="660" maxX="690" minY="370" maxY="400" name="caravan_site-m"/>
+  <symbol minX="690" maxX="720" minY="370" maxY="400" name="archery-m"/>
   <symbol minX="720" maxX="750" minY="370" maxY="400" name="subway-m"/>
-  <symbol minX="750" maxX="780" minY="370" maxY="400" name="caravan_site-m"/>
+  <symbol minX="750" maxX="780" minY="370" maxY="400" name="car_sharing-m"/>
   <symbol minX="780" maxX="810" minY="370" maxY="400" name="subway-entrance-m"/>
-  <symbol minX="810" maxX="840" minY="370" maxY="400" name="car_sharing-m"/>
+  <symbol minX="810" maxX="840" minY="370" maxY="400" name="car-wash-m"/>
   <symbol minX="840" maxX="870" minY="370" maxY="400" name="npark-m"/>
-  <symbol minX="870" maxX="900" minY="370" maxY="400" name="car-wash-m"/>
-  <symbol minX="900" maxX="930" minY="370" maxY="400" name="car-repair-m"/>
+  <symbol minX="870" maxX="900" minY="370" maxY="400" name="car-repair-m"/>
+  <symbol minX="900" maxX="930" minY="370" maxY="400" name="car-part-m"/>
   <symbol minX="930" maxX="960" minY="370" maxY="400" name="nparkf-m"/>
   <symbol minX="960" maxX="990" minY="370" maxY="400" name="subway-entrance-2-m"/>
-  <symbol minX="990" maxX="1020" minY="370" maxY="400" name="car-part-m"/>
+  <symbol minX="990" maxX="1020" minY="370" maxY="400" name="wayside_cross-m"/>
   <symbol minX="0" maxX="30" minY="400" maxY="430" name="office-m"/>
-  <symbol minX="30" maxX="60" minY="400" maxY="430" name="seafood-shop-m"/>
-  <symbol minX="60" maxX="90" minY="400" maxY="430" name="wayside_cross-m"/>
+  <symbol minX="30" maxX="60" minY="400" maxY="430" name="restaurant-m"/>
+  <symbol minX="60" maxX="90" minY="400" maxY="430" name="campsite-m"/>
   <symbol minX="90" maxX="120" minY="400" maxY="430" name="optician-m"/>
-  <symbol minX="120" maxX="150" minY="400" maxY="430" name="campsite-m"/>
+  <symbol minX="120" maxX="150" minY="400" maxY="430" name="cafe-m"/>
   <symbol minX="150" maxX="180" minY="400" maxY="430" name="park-m"/>
   <symbol minX="180" maxX="210" minY="400" maxY="430" name="sports-m"/>
-  <symbol minX="210" maxX="240" minY="400" maxY="430" name="restaurant-m"/>
-  <symbol minX="240" maxX="270" minY="400" maxY="430" name="cafe-m"/>
-  <symbol minX="270" maxX="300" minY="400" maxY="430" name="wayside_shrine-m"/>
+  <symbol minX="210" maxX="240" minY="400" maxY="430" name="australian-football-m"/>
+  <symbol minX="240" maxX="270" minY="400" maxY="430" name="wayside_shrine-m"/>
+  <symbol minX="270" maxX="300" minY="400" maxY="430" name="cable-car-m"/>
   <symbol minX="300" maxX="330" minY="400" maxY="430" name="parking-meter-m"/>
-  <symbol minX="330" maxX="360" minY="400" maxY="430" name="archery-m"/>
-  <symbol minX="360" maxX="390" minY="400" maxY="430" name="atm-m"/>
-  <symbol minX="390" maxX="420" minY="400" maxY="430" name="cable-car-m"/>
+  <symbol minX="330" maxX="360" minY="400" maxY="430" name="seafood-shop-m"/>
+  <symbol minX="360" maxX="390" minY="400" maxY="430" name="soccer-m"/>
+  <symbol minX="390" maxX="420" minY="400" maxY="430" name="butcher-m"/>
   <symbol minX="420" maxX="450" minY="400" maxY="430" name="peak-m"/>
-  <symbol minX="450" maxX="480" minY="400" maxY="430" name="soccer-m"/>
-  <symbol minX="480" maxX="510" minY="400" maxY="430" name="butcher-m"/>
-  <symbol minX="510" maxX="540" minY="400" maxY="430" name="skiing-m"/>
-  <symbol minX="540" maxX="570" minY="400" maxY="430" name="bus-m"/>
-  <symbol minX="570" maxX="600" minY="400" maxY="430" name="windmill-m"/>
+  <symbol minX="450" maxX="480" minY="400" maxY="430" name="bus-m"/>
+  <symbol minX="480" maxX="510" minY="400" maxY="430" name="skiing-m"/>
+  <symbol minX="510" maxX="540" minY="400" maxY="430" name="windmill-m"/>
+  <symbol minX="540" maxX="570" minY="400" maxY="430" name="shop-m"/>
+  <symbol minX="570" maxX="600" minY="400" maxY="430" name="bowls-m"/>
   <symbol minX="600" maxX="630" minY="400" maxY="430" name="petshop-m"/>
-  <symbol minX="630" maxX="660" minY="400" maxY="430" name="bowls-m"/>
+  <symbol minX="630" maxX="660" minY="400" maxY="430" name="boundary_stone-m"/>
   <symbol minX="660" maxX="690" minY="400" maxY="430" name="pharmacy-m"/>
-  <symbol minX="690" maxX="720" minY="400" maxY="430" name="shop-m"/>
-  <symbol minX="720" maxX="750" minY="400" maxY="430" name="boundary_stone-m"/>
+  <symbol minX="690" maxX="720" minY="400" maxY="430" name="shop-m copy"/>
+  <symbol minX="720" maxX="750" minY="400" maxY="430" name="book-shop-m"/>
   <symbol minX="750" maxX="780" minY="400" maxY="430" name="phone-m"/>
-  <symbol minX="780" maxX="810" minY="400" maxY="430" name="shop-m copy"/>
-  <symbol minX="810" maxX="840" minY="400" maxY="430" name="book-shop-m"/>
+  <symbol minX="780" maxX="810" minY="400" maxY="430" name="remains-m"/>
+  <symbol minX="810" maxX="840" minY="400" maxY="430" name="zoo-m"/>
   <symbol minX="840" maxX="870" minY="400" maxY="430" name="photo-shop-m"/>
-  <symbol minX="870" maxX="900" minY="400" maxY="430" name="remains-m"/>
+  <symbol minX="870" maxX="900" minY="400" maxY="430" name="bicycle-m"/>
   <symbol minX="900" maxX="930" minY="400" maxY="430" name="picnic-m"/>
-  <symbol minX="930" maxX="960" minY="400" maxY="430" name="zoo-m"/>
-  <symbol minX="960" maxX="990" minY="400" maxY="430" name="bicycle-m"/>
+  <symbol minX="930" maxX="960" minY="400" maxY="430" name="beer-m"/>
+  <symbol minX="960" maxX="990" minY="400" maxY="430" name="beauty-m"/>
   <symbol minX="990" maxX="1020" minY="400" maxY="430" name="pitch-m"/>
-  <symbol minX="0" maxX="30" minY="430" maxY="460" name="beer-m"/>
-  <symbol minX="30" maxX="60" minY="430" maxY="460" name="beauty-m"/>
+  <symbol minX="0" maxX="30" minY="430" maxY="460" name="shop-bicycle-m"/>
+  <symbol minX="30" maxX="60" minY="430" maxY="460" name="beach-m"/>
   <symbol minX="60" maxX="90" minY="430" maxY="460" name="place-of-worship-m"/>
-  <symbol minX="90" maxX="120" minY="430" maxY="460" name="shop-bicycle-m"/>
-  <symbol minX="120" maxX="150" minY="430" maxY="460" name="beach-m"/>
+  <symbol minX="90" maxX="120" minY="430" maxY="460" name="alcohol-m"/>
+  <symbol minX="120" maxX="150" minY="430" maxY="460" name="bcontrol-m"/>
   <symbol minX="150" maxX="180" minY="430" maxY="460" name="police-m"/>
-  <symbol minX="180" maxX="210" minY="430" maxY="460" name="bcontrol-m"/>
+  <symbol minX="180" maxX="210" minY="430" maxY="460" name="shoes-m"/>
   <symbol minX="210" maxX="240" minY="430" maxY="460" name="bbq-m"/>
   <symbol minX="240" maxX="270" minY="430" maxY="460" name="basketball-m"/>
   <symbol minX="270" maxX="300" minY="430" maxY="460" name="postbox-m"/>
-  <symbol minX="300" maxX="330" minY="430" maxY="460" name="baseball-m"/>
-  <symbol minX="330" maxX="360" minY="430" maxY="460" name="bar-m"/>
-  <symbol minX="360" maxX="390" minY="430" maxY="460" name="banknote-m"/>
+  <symbol minX="300" maxX="330" minY="430" maxY="460" name="alpine_hut-m"/>
+  <symbol minX="330" maxX="360" minY="430" maxY="460" name="baseball-m"/>
+  <symbol minX="360" maxX="390" minY="430" maxY="460" name="bar-m"/>
   <symbol minX="390" maxX="420" minY="430" maxY="460" name="pub-m"/>
-  <symbol minX="420" maxX="450" minY="430" maxY="460" name="shoes-m"/>
-  <symbol minX="450" maxX="480" minY="430" maxY="460" name="bank-2-m"/>
-  <symbol minX="480" maxX="510" minY="430" maxY="460" name="bakery-m"/>
+  <symbol minX="420" maxX="450" minY="430" maxY="460" name="banknote-m"/>
+  <symbol minX="450" maxX="480" minY="430" maxY="460" name="ship-m"/>
+  <symbol minX="480" maxX="510" minY="430" maxY="460" name="bank-2-m"/>
   <symbol minX="510" maxX="540" minY="430" maxY="460" name="recycling-m"/>
-  <symbol minX="540" maxX="570" minY="430" maxY="460" name="ship-m"/>
-  <symbol minX="570" maxX="600" minY="430" maxY="460" name="australian-football-m"/>
+  <symbol minX="540" maxX="570" minY="430" maxY="460" name="bakery-m"/>
+  <symbol minX="570" maxX="600" minY="430" maxY="460" name="america-football-m"/>
   <symbol minX="600" maxX="628" minY="430" maxY="458" name="bike-parking-l"/>
-  <symbol minX="628" maxX="656" minY="430" maxY="458" name="parking-ticket-l"/>
-  <symbol minX="656" maxX="684" minY="430" maxY="458" name="speedcam-l"/>
-  <symbol minX="684" maxX="712" minY="430" maxY="458" name="parking-l"/>
-  <symbol minX="712" maxX="740" minY="430" maxY="458" name="subway-berlin-l"/>
-  <symbol minX="740" maxX="771" minY="430" maxY="458" name="subway-moscow-l"/>
-  <symbol minX="771" maxX="799" minY="430" maxY="458" name="subway-rome-l"/>
-  <symbol minX="799" maxX="827" minY="430" maxY="458" name="waste-basket-l"/>
-  <symbol minX="827" maxX="855" minY="430" maxY="458" name="lightrail-berlin-m"/>
-  <symbol minX="855" maxX="883" minY="430" maxY="458" name="firehydrant-l"/>
-  <symbol minX="883" maxX="908" minY="430" maxY="455" name="search-result"/>
-  <symbol minX="908" maxX="933" minY="430" maxY="455" name="subway-rome-m"/>
-  <symbol minX="933" maxX="958" minY="430" maxY="455" name="subway-paris-m"/>
-  <symbol minX="958" maxX="983" minY="430" maxY="455" name="no-icon-amenity"/>
-  <symbol minX="983" maxX="1008" minY="430" maxY="455" name="no-icon-leisure"/>
-  <symbol minX="0" maxX="29" minY="460" maxY="485" name="subway-moscow-m"/>
-  <symbol minX="29" maxX="54" minY="460" maxY="485" name="subway-berlin-m"/>
+  <symbol minX="628" maxX="656" minY="430" maxY="458" name="speedcam-l"/>
+  <symbol minX="656" maxX="684" minY="430" maxY="458" name="parking-l"/>
+  <symbol minX="684" maxX="712" minY="430" maxY="458" name="subway-berlin-l"/>
+  <symbol minX="712" maxX="743" minY="430" maxY="458" name="subway-moscow-l"/>
+  <symbol minX="743" maxX="771" minY="430" maxY="458" name="subway-rome-l"/>
+  <symbol minX="771" maxX="799" minY="430" maxY="458" name="waste-basket-l"/>
+  <symbol minX="799" maxX="827" minY="430" maxY="458" name="lightrail-berlin-m"/>
+  <symbol minX="827" maxX="849" minY="430" maxY="457" name="firehydrant-l"/>
+  <symbol minX="849" maxX="874" minY="430" maxY="455" name="search-result"/>
+  <symbol minX="874" maxX="899" minY="430" maxY="455" name="no-icon-leisure"/>
+  <symbol minX="899" maxX="924" minY="430" maxY="455" name="api-result"/>
+  <symbol minX="924" maxX="949" minY="430" maxY="455" name="waste-basket-s"/>
+  <symbol minX="949" maxX="974" minY="430" maxY="455" name="subway-rome-m"/>
+  <symbol minX="974" maxX="999" minY="430" maxY="455" name="subway-paris-m"/>
+  <symbol minX="999" maxX="1024" minY="430" maxY="455" name="no-icon-amenity"/>
+  <symbol minX="0" maxX="25" minY="460" maxY="485" name="subway-berlin-m"/>
+  <symbol minX="25" maxX="54" minY="460" maxY="485" name="subway-moscow-m"/>
   <symbol minX="54" maxX="79" minY="460" maxY="485" name="no-icon-shop"/>
   <symbol minX="79" maxX="104" minY="460" maxY="485" name="no-icon-tourism"/>
-  <symbol minX="104" maxX="129" minY="460" maxY="485" name="api-result"/>
-  <symbol minX="129" maxX="160" minY="460" maxY="485" name="subway-london-l"/>
-  <symbol minX="160" maxX="185" minY="460" maxY="485" name="no-icon"/>
-  <symbol minX="185" maxX="209" minY="460" maxY="484" name="airport-s"/>
-  <symbol minX="209" maxX="232" minY="460" maxY="483" name="pharmacy-s"/>
-  <symbol minX="232" maxX="255" minY="460" maxY="483" name="shop-s copy"/>
-  <symbol minX="255" maxX="278" minY="460" maxY="483" name="shop-s"/>
-  <symbol minX="278" maxX="301" minY="460" maxY="483" name="alcohol-s"/>
-  <symbol minX="301" maxX="324" minY="460" maxY="483" name="alpine_hut-s"/>
-  <symbol minX="324" maxX="347" minY="460" maxY="483" name="skiing-s"/>
-  <symbol minX="347" maxX="370" minY="460" maxY="483" name="america-football-s"/>
-  <symbol minX="370" maxX="393" minY="460" maxY="483" name="peak-s"/>
-  <symbol minX="393" maxX="416" minY="460" maxY="483" name="soccer-s"/>
-  <symbol minX="416" maxX="439" minY="460" maxY="483" name="archery-s"/>
-  <symbol minX="439" maxX="462" minY="460" maxY="483" name="speedcam-m"/>
-  <symbol minX="462" maxX="485" minY="460" maxY="483" name="atm-s copy 2"/>
-  <symbol minX="485" maxX="508" minY="460" maxY="483" name="diving-s"/>
-  <symbol minX="508" maxX="531" minY="460" maxY="483" name="park-s"/>
-  <symbol minX="531" maxX="554" minY="460" maxY="483" name="atm-s"/>
-  <symbol minX="554" maxX="577" minY="460" maxY="483" name="australian-football-s"/>
-  <symbol minX="577" maxX="600" minY="460" maxY="483" name="bar-s"/>
-  <symbol minX="600" maxX="623" minY="460" maxY="483" name="curling-s"/>
-  <symbol minX="623" maxX="646" minY="460" maxY="483" name="cricket-s"/>
-  <symbol minX="646" maxX="674" minY="460" maxY="483" name="subway-barcelona-s"/>
-  <symbol minX="674" maxX="697" minY="460" maxY="483" name="office-s"/>
-  <symbol minX="697" maxX="720" minY="460" maxY="483" name="phone-s"/>
-  <symbol minX="720" maxX="743" minY="460" maxY="483" name="baseball-s"/>
-  <symbol minX="743" maxX="766" minY="460" maxY="483" name="nparkf-s"/>
-  <symbol minX="766" maxX="789" minY="460" maxY="483" name="subway-entrance-2-s"/>
-  <symbol minX="789" maxX="812" minY="460" maxY="483" name="subway-entrance-arrow"/>
-  <symbol minX="812" maxX="835" minY="460" maxY="483" name="npark-s"/>
-  <symbol minX="835" maxX="858" minY="460" maxY="483" name="basketball-s"/>
-  <symbol minX="858" maxX="881" minY="460" maxY="483" name="subway-entrance-s"/>
-  <symbol minX="881" maxX="904" minY="460" maxY="483" name="bcontrol-s"/>
-  <symbol minX="904" maxX="927" minY="460" maxY="483" name="beach-s"/>
-  <symbol minX="927" maxX="950" minY="460" maxY="483" name="beer-s"/>
-  <symbol minX="950" maxX="973" minY="460" maxY="483" name="picnic-s"/>
-  <symbol minX="973" maxX="996" minY="460" maxY="483" name="pitch-s"/>
-  <symbol minX="0" maxX="30" minY="485" maxY="508" name="subway-london-m"/>
-  <symbol minX="30" maxX="53" minY="485" maxY="508" name="place-of-worship-s"/>
-  <symbol minX="53" maxX="76" minY="485" maxY="508" name="police-s"/>
-  <symbol minX="76" maxX="99" minY="485" maxY="508" name="college-s"/>
-  <symbol minX="99" maxX="122" minY="485" maxY="508" name="tram-s"/>
-  <symbol minX="122" maxX="145" minY="485" maxY="508" name="zoo-s"/>
-  <symbol minX="145" maxX="168" minY="485" maxY="508" name="bicycle-s"/>
-  <symbol minX="168" maxX="191" minY="485" maxY="508" name="book-shop-s"/>
-  <symbol minX="191" maxX="214" minY="485" maxY="508" name="windmill-s"/>
-  <symbol minX="214" maxX="237" minY="485" maxY="508" name="pub-s"/>
-  <symbol minX="237" maxX="260" minY="485" maxY="508" name="ship-s"/>
-  <symbol minX="260" maxX="283" minY="485" maxY="508" name="bowls-s"/>
-  <symbol minX="283" maxX="306" minY="485" maxY="508" name="recycling-s"/>
-  <symbol minX="306" maxX="329" minY="485" maxY="508" name="remains-s"/>
-  <symbol minX="329" maxX="352" minY="485" maxY="508" name="dentist-s"/>
-  <symbol minX="352" maxX="375" minY="485" maxY="508" name="bus-s"/>
-  <symbol minX="375" maxX="398" minY="485" maxY="508" name="museum-s"/>
-  <symbol minX="398" maxX="421" minY="485" maxY="508" name="restaurant-s"/>
-  <symbol minX="421" maxX="444" minY="485" maxY="508" name="cable-car-s"/>
-  <symbol minX="444" maxX="467" minY="485" maxY="508" name="motel-s"/>
-  <symbol minX="467" maxX="490" minY="485" maxY="508" name="subway-newyork-s"/>
-  <symbol minX="490" maxX="513" minY="485" maxY="508" name="cafe-s"/>
-  <symbol minX="513" maxX="536" minY="485" maxY="508" name="subway-s"/>
-  <symbol minX="536" maxX="559" minY="485" maxY="508" name="monument-s"/>
-  <symbol minX="559" maxX="582" minY="485" maxY="508" name="military-s"/>
-  <symbol minX="582" maxX="605" minY="485" maxY="508" name="subway-spb-s"/>
-  <symbol minX="605" maxX="628" minY="485" maxY="508" name="campsite-s"/>
-  <symbol minX="628" maxX="651" minY="485" maxY="508" name="car-repair-s"/>
-  <symbol minX="651" maxX="674" minY="485" maxY="508" name="waterfall-s"/>
-  <symbol minX="674" maxX="697" minY="485" maxY="508" name="casino-s"/>
-  <symbol minX="697" maxX="720" minY="485" maxY="508" name="cave-s"/>
-  <symbol minX="720" maxX="743" minY="485" maxY="508" name="school-s"/>
-  <symbol minX="743" maxX="766" minY="485" maxY="508" name="climbing-s"/>
-  <symbol minX="766" maxX="789" minY="485" maxY="508" name="marketplace-s"/>
-  <symbol minX="789" maxX="812" minY="485" maxY="508" name="mail-s"/>
-  <symbol minX="812" maxX="835" minY="485" maxY="508" name="swimming-s"/>
-  <symbol minX="835" maxX="858" minY="485" maxY="508" name="cemetery-s"/>
-  <symbol minX="858" maxX="881" minY="485" maxY="508" name="lighthouse-s"/>
-  <symbol minX="881" maxX="904" minY="485" maxY="508" name="library-s"/>
-  <symbol minX="904" maxX="927" minY="485" maxY="508" name="kindergarten-s"/>
-  <symbol minX="927" maxX="950" minY="485" maxY="508" name="tennis-s"/>
-  <symbol minX="950" maxX="973" minY="485" maxY="508" name="information-s"/>
-  <symbol minX="973" maxX="996" minY="485" maxY="508" name="hotel-s"/>
-  <symbol minX="996" maxX="1019" minY="485" maxY="508" name="theatre-s"/>
-  <symbol minX="0" maxX="23" minY="508" maxY="531" name="hospital-s"/>
-  <symbol minX="23" maxX="46" minY="508" maxY="531" name="heliport-s"/>
-  <symbol minX="46" maxX="69" minY="508" maxY="531" name="helipad-s"/>
-  <symbol minX="69" maxX="92" minY="508" maxY="531" name="gym-s"/>
-  <symbol minX="92" maxX="115" minY="508" maxY="531" name="toilets-s"/>
-  <symbol minX="115" maxX="138" minY="508" maxY="531" name="grocery-s"/>
-  <symbol minX="138" maxX="161" minY="508" maxY="531" name="golf-s"/>
-  <symbol minX="161" maxX="184" minY="508" maxY="531" name="toll_booth-s"/>
-  <symbol minX="184" maxX="207" minY="508" maxY="531" name="garden-s"/>
-  <symbol minX="207" maxX="230" minY="508" maxY="531" name="gallery-s"/>
-  <symbol minX="230" maxX="253" minY="508" maxY="531" name="funicular-s"/>
-  <symbol minX="253" maxX="276" minY="508" maxY="531" name="fuel-s"/>
-  <symbol minX="276" maxX="299" minY="508" maxY="531" name="tourism-s"/>
-  <symbol minX="299" maxX="322" minY="508" maxY="531" name="fountain-s"/>
-  <symbol minX="322" maxX="345" minY="508" maxY="531" name="fire_station-s"/>
-  <symbol minX="345" maxX="368" minY="508" maxY="531" name="fastfood-s"/>
-  <symbol minX="368" maxX="391" minY="508" maxY="531" name="volcano-s"/>
-  <symbol minX="391" maxX="414" minY="508" maxY="531" name="townhall-s"/>
-  <symbol minX="414" maxX="437" minY="508" maxY="531" name="charging-station-s"/>
-  <symbol minX="437" maxX="460" minY="508" maxY="531" name="embassy-s"/>
-  <symbol minX="460" maxX="483" minY="508" maxY="531" name="drinking-water-s"/>
-  <symbol minX="483" maxX="506" minY="508" maxY="531" name="cinema-s"/>
-  <symbol minX="506" maxX="529" minY="508" maxY="531" name="train-s"/>
-  <symbol minX="529" maxX="552" minY="508" maxY="531" name="viewpoint-s"/>
-  <symbol minX="552" maxX="583" minY="508" maxY="530" name="metro-barcelona-m"/>
-  <symbol minX="583" maxX="614" minY="508" maxY="530" name="subway-madrid-m"/>
-  <symbol minX="614" maxX="645" minY="508" maxY="530" name="subway-madrid-l"/>
-  <symbol minX="645" maxX="676" minY="508" maxY="530" name="subway-barcelona-m"/>
-  <symbol minX="676" maxX="707" minY="508" maxY="530" name="subway-barcelona-l"/>
-  <symbol minX="707" maxX="729" minY="508" maxY="530" name="parking-m"/>
-  <symbol minX="729" maxX="750" minY="508" maxY="530" name="s-arrow"/>
-  <symbol minX="750" maxX="771" minY="508" maxY="529" name="lightrail-berlin-s"/>
-  <symbol minX="771" maxX="799" minY="508" maxY="529" name="metro-barcelona-s"/>
-  <symbol minX="799" maxX="820" minY="508" maxY="529" name="subway-paris-s"/>
-  <symbol minX="820" maxX="850" minY="508" maxY="529" name="subway-kiev-m"/>
-  <symbol minX="850" maxX="878" minY="508" maxY="529" name="subway-madrid-s"/>
-  <symbol minX="878" maxX="899" minY="508" maxY="529" name="waste-basket-s"/>
-  <symbol minX="899" maxX="929" minY="508" maxY="529" name="subway-kiev-l"/>
-  <symbol minX="929" maxX="949" minY="508" maxY="528" name="subway-moscow-s"/>
-  <symbol minX="949" maxX="970" minY="508" maxY="527" name="bench"/>
-  <symbol minX="970" maxX="989" minY="508" maxY="527" name="subway-berlin-s"/>
-  <symbol minX="989" maxX="1012" minY="508" maxY="527" name="subway-london-s"/>
-  <symbol minX="0" maxX="19" minY="531" maxY="550" name="star-l"/>
-  <symbol minX="19" maxX="38" minY="531" maxY="550" name="speedcam-s"/>
-  <symbol minX="38" maxX="57" minY="531" maxY="550" name="parking-s"/>
-  <symbol minX="57" maxX="76" minY="531" maxY="550" name="subway-rome-s"/>
-  <symbol minX="76" maxX="106" minY="531" maxY="549" name="subway-minsk-l"/>
-  <symbol minX="106" maxX="125" minY="531" maxY="549" name="peakt-l"/>
-  <symbol minX="125" maxX="143" minY="531" maxY="549" name="survey_point-l"/>
-  <symbol minX="143" maxX="161" minY="531" maxY="549" name="star-m"/>
-  <symbol minX="161" maxX="186" minY="531" maxY="547" name="subway-kiev-s"/>
-  <symbol minX="186" maxX="209" minY="531" maxY="546" name="railway-crossing"/>
-  <symbol minX="209" maxX="234" minY="531" maxY="546" name="subway-minsk-m"/>
-  <symbol minX="234" maxX="249" minY="531" maxY="546" name="subway-xs"/>
-  <symbol minX="249" maxX="264" minY="531" maxY="546" name="survey_point-m"/>
-  <symbol minX="264" maxX="279" minY="531" maxY="546" name="star-s"/>
-  <symbol minX="279" maxX="294" minY="531" maxY="546" name="subway-newyork-xs"/>
-  <symbol minX="294" maxX="317" minY="531" maxY="545" name="subway-minsk-s"/>
-  <symbol minX="317" maxX="331" minY="531" maxY="545" name="subway-xs copy"/>
-  <symbol minX="331" maxX="345" minY="531" maxY="544" name="peakt-m"/>
-  <symbol minX="345" maxX="373" minY="531" maxY="544" name="arrow-m"/>
-  <symbol minX="373" maxX="386" minY="531" maxY="544" name="survey_point-s"/>
-  <symbol minX="386" maxX="398" minY="531" maxY="543" name="entrance-s"/>
-  <symbol minX="398" maxX="410" minY="531" maxY="542" name="peakt-s"/>
-  <symbol minX="410" maxX="421" minY="531" maxY="542" name="dot-m"/>
-  <symbol minX="421" maxX="431" minY="531" maxY="541" name="none"/>
-  <symbol minX="431" maxX="452" minY="531" maxY="541" name="arrow-s"/>
-  <symbol minX="452" maxX="462" minY="531" maxY="541" name="tree-l"/>
-  <symbol minX="462" maxX="471" minY="531" maxY="540" name="dot-s"/>
-  <symbol minX="471" maxX="480" minY="531" maxY="540" name="dot-s-light"/>
-  <symbol minX="480" maxX="489" minY="531" maxY="540" name="entrance-xs"/>
-  <symbol minX="489" maxX="498" minY="531" maxY="540" name="tree-m"/>
-  <symbol minX="498" maxX="505" minY="531" maxY="538" name="tree-s"/>
-  <symbol minX="505" maxX="512" minY="531" maxY="538" name="zero-icon"/>
+  <symbol minX="104" maxX="135" minY="460" maxY="485" name="subway-london-l"/>
+  <symbol minX="135" maxX="160" minY="460" maxY="485" name="no-icon"/>
+  <symbol minX="160" maxX="184" minY="460" maxY="484" name="airport-s"/>
+  <symbol minX="184" maxX="207" minY="460" maxY="483" name="swimming-s"/>
+  <symbol minX="207" maxX="230" minY="460" maxY="483" name="shop-s copy"/>
+  <symbol minX="230" maxX="253" minY="460" maxY="483" name="shop-s"/>
+  <symbol minX="253" maxX="276" minY="460" maxY="483" name="school-s"/>
+  <symbol minX="276" maxX="299" minY="460" maxY="483" name="alcohol-s"/>
+  <symbol minX="299" maxX="322" minY="460" maxY="483" name="skiing-s"/>
+  <symbol minX="322" maxX="345" minY="460" maxY="483" name="peak-s"/>
+  <symbol minX="345" maxX="359" minY="460" maxY="483" name="parking-ticket-l"/>
+  <symbol minX="359" maxX="382" minY="460" maxY="483" name="soccer-s"/>
+  <symbol minX="382" maxX="405" minY="460" maxY="483" name="alpine_hut-s"/>
+  <symbol minX="405" maxX="428" minY="460" maxY="483" name="speedcam-m"/>
+  <symbol minX="428" maxX="451" minY="460" maxY="483" name="america-football-s"/>
+  <symbol minX="451" maxX="474" minY="460" maxY="483" name="archery-s"/>
+  <symbol minX="474" maxX="497" minY="460" maxY="483" name="park-s"/>
+  <symbol minX="497" maxX="520" minY="460" maxY="483" name="atm-s copy 2"/>
+  <symbol minX="520" maxX="543" minY="460" maxY="483" name="atm-s"/>
+  <symbol minX="543" maxX="566" minY="460" maxY="483" name="australian-football-s"/>
+  <symbol minX="566" maxX="589" minY="460" maxY="483" name="bar-s"/>
+  <symbol minX="589" maxX="612" minY="460" maxY="483" name="baseball-s"/>
+  <symbol minX="612" maxX="640" minY="460" maxY="483" name="subway-barcelona-s"/>
+  <symbol minX="640" maxX="663" minY="460" maxY="483" name="office-s"/>
+  <symbol minX="663" maxX="686" minY="460" maxY="483" name="pharmacy-s"/>
+  <symbol minX="686" maxX="709" minY="460" maxY="483" name="basketball-s"/>
+  <symbol minX="709" maxX="732" minY="460" maxY="483" name="nparkf-s"/>
+  <symbol minX="732" maxX="755" minY="460" maxY="483" name="subway-entrance-2-s"/>
+  <symbol minX="755" maxX="778" minY="460" maxY="483" name="subway-entrance-arrow"/>
+  <symbol minX="778" maxX="801" minY="460" maxY="483" name="npark-s"/>
+  <symbol minX="801" maxX="824" minY="460" maxY="483" name="bcontrol-s"/>
+  <symbol minX="824" maxX="847" minY="460" maxY="483" name="subway-entrance-s"/>
+  <symbol minX="847" maxX="870" minY="460" maxY="483" name="beach-s"/>
+  <symbol minX="870" maxX="893" minY="460" maxY="483" name="beer-s"/>
+  <symbol minX="893" maxX="916" minY="460" maxY="483" name="restaurant-s"/>
+  <symbol minX="916" maxX="939" minY="460" maxY="483" name="phone-s"/>
+  <symbol minX="939" maxX="962" minY="460" maxY="483" name="picnic-s"/>
+  <symbol minX="962" maxX="992" minY="460" maxY="483" name="subway-london-m"/>
+  <symbol minX="992" maxX="1015" minY="460" maxY="483" name="zoo-s"/>
+  <symbol minX="0" maxX="23" minY="485" maxY="508" name="pitch-s"/>
+  <symbol minX="23" maxX="46" minY="485" maxY="508" name="bicycle-s"/>
+  <symbol minX="46" maxX="69" minY="485" maxY="508" name="book-shop-s"/>
+  <symbol minX="69" maxX="92" minY="485" maxY="508" name="windmill-s"/>
+  <symbol minX="92" maxX="115" minY="485" maxY="508" name="bowls-s"/>
+  <symbol minX="115" maxX="138" minY="485" maxY="508" name="bus-s"/>
+  <symbol minX="138" maxX="161" minY="485" maxY="508" name="cable-car-s"/>
+  <symbol minX="161" maxX="184" minY="485" maxY="508" name="place-of-worship-s"/>
+  <symbol minX="184" maxX="207" minY="485" maxY="508" name="police-s"/>
+  <symbol minX="207" maxX="230" minY="485" maxY="508" name="cafe-s"/>
+  <symbol minX="230" maxX="253" minY="485" maxY="508" name="pub-s"/>
+  <symbol minX="253" maxX="276" minY="485" maxY="508" name="ship-s"/>
+  <symbol minX="276" maxX="299" minY="485" maxY="508" name="subway-newyork-s"/>
+  <symbol minX="299" maxX="322" minY="485" maxY="508" name="campsite-s"/>
+  <symbol minX="322" maxX="345" minY="485" maxY="508" name="museum-s"/>
+  <symbol minX="345" maxX="368" minY="485" maxY="508" name="car-repair-s"/>
+  <symbol minX="368" maxX="391" minY="485" maxY="508" name="waterfall-s"/>
+  <symbol minX="391" maxX="414" minY="485" maxY="508" name="motel-s"/>
+  <symbol minX="414" maxX="437" minY="485" maxY="508" name="recycling-s"/>
+  <symbol minX="437" maxX="460" minY="485" maxY="508" name="casino-s"/>
+  <symbol minX="460" maxX="483" minY="485" maxY="508" name="subway-s"/>
+  <symbol minX="483" maxX="506" minY="485" maxY="508" name="monument-s"/>
+  <symbol minX="506" maxX="529" minY="485" maxY="508" name="military-s"/>
+  <symbol minX="529" maxX="552" minY="485" maxY="508" name="subway-spb-s"/>
+  <symbol minX="552" maxX="575" minY="485" maxY="508" name="cave-s"/>
+  <symbol minX="575" maxX="598" minY="485" maxY="508" name="remains-s"/>
+  <symbol minX="598" maxX="621" minY="485" maxY="508" name="cemetery-s"/>
+  <symbol minX="621" maxX="644" minY="485" maxY="508" name="volcano-s"/>
+  <symbol minX="644" maxX="667" minY="485" maxY="508" name="charging-station-s"/>
+  <symbol minX="667" maxX="690" minY="485" maxY="508" name="cinema-s"/>
+  <symbol minX="690" maxX="713" minY="485" maxY="508" name="viewpoint-s"/>
+  <symbol minX="713" maxX="736" minY="485" maxY="508" name="marketplace-s"/>
+  <symbol minX="736" maxX="759" minY="485" maxY="508" name="mail-s"/>
+  <symbol minX="759" maxX="782" minY="485" maxY="508" name="climbing-s"/>
+  <symbol minX="782" maxX="805" minY="485" maxY="508" name="college-s"/>
+  <symbol minX="805" maxX="828" minY="485" maxY="508" name="lighthouse-s"/>
+  <symbol minX="828" maxX="851" minY="485" maxY="508" name="library-s"/>
+  <symbol minX="851" maxX="874" minY="485" maxY="508" name="kindergarten-s"/>
+  <symbol minX="874" maxX="897" minY="485" maxY="508" name="tennis-s"/>
+  <symbol minX="897" maxX="920" minY="485" maxY="508" name="information-s"/>
+  <symbol minX="920" maxX="943" minY="485" maxY="508" name="hotel-s"/>
+  <symbol minX="943" maxX="966" minY="485" maxY="508" name="theatre-s"/>
+  <symbol minX="966" maxX="989" minY="485" maxY="508" name="hospital-s"/>
+  <symbol minX="989" maxX="1012" minY="485" maxY="508" name="heliport-s"/>
+  <symbol minX="0" maxX="23" minY="508" maxY="531" name="helipad-s"/>
+  <symbol minX="23" maxX="46" minY="508" maxY="531" name="gym-s"/>
+  <symbol minX="46" maxX="69" minY="508" maxY="531" name="toilets-s"/>
+  <symbol minX="69" maxX="92" minY="508" maxY="531" name="grocery-s"/>
+  <symbol minX="92" maxX="115" minY="508" maxY="531" name="golf-s"/>
+  <symbol minX="115" maxX="138" minY="508" maxY="531" name="toll_booth-s"/>
+  <symbol minX="138" maxX="161" minY="508" maxY="531" name="garden-s"/>
+  <symbol minX="161" maxX="184" minY="508" maxY="531" name="gallery-s"/>
+  <symbol minX="184" maxX="207" minY="508" maxY="531" name="funicular-s"/>
+  <symbol minX="207" maxX="230" minY="508" maxY="531" name="fuel-s"/>
+  <symbol minX="230" maxX="253" minY="508" maxY="531" name="tourism-s"/>
+  <symbol minX="253" maxX="276" minY="508" maxY="531" name="fountain-s"/>
+  <symbol minX="276" maxX="299" minY="508" maxY="531" name="fire_station-s"/>
+  <symbol minX="299" maxX="322" minY="508" maxY="531" name="fastfood-s"/>
+  <symbol minX="322" maxX="345" minY="508" maxY="531" name="cricket-s"/>
+  <symbol minX="345" maxX="368" minY="508" maxY="531" name="townhall-s"/>
+  <symbol minX="368" maxX="391" minY="508" maxY="531" name="curling-s"/>
+  <symbol minX="391" maxX="414" minY="508" maxY="531" name="embassy-s"/>
+  <symbol minX="414" maxX="437" minY="508" maxY="531" name="drinking-water-s"/>
+  <symbol minX="437" maxX="460" minY="508" maxY="531" name="dentist-s"/>
+  <symbol minX="460" maxX="483" minY="508" maxY="531" name="train-s"/>
+  <symbol minX="483" maxX="506" minY="508" maxY="531" name="diving-s"/>
+  <symbol minX="506" maxX="529" minY="508" maxY="531" name="tram-s"/>
+  <symbol minX="529" maxX="560" minY="508" maxY="530" name="metro-barcelona-m"/>
+  <symbol minX="560" maxX="591" minY="508" maxY="530" name="subway-madrid-m"/>
+  <symbol minX="591" maxX="622" minY="508" maxY="530" name="subway-madrid-l"/>
+  <symbol minX="622" maxX="644" minY="508" maxY="530" name="parking-m"/>
+  <symbol minX="644" maxX="665" minY="508" maxY="530" name="s-arrow"/>
+  <symbol minX="665" maxX="696" minY="508" maxY="530" name="subway-barcelona-l"/>
+  <symbol minX="696" maxX="727" minY="508" maxY="530" name="subway-barcelona-m"/>
+  <symbol minX="727" maxX="755" minY="508" maxY="529" name="metro-barcelona-s"/>
+  <symbol minX="755" maxX="776" minY="508" maxY="529" name="lightrail-berlin-s"/>
+  <symbol minX="776" maxX="806" minY="508" maxY="529" name="subway-kiev-l"/>
+  <symbol minX="806" maxX="834" minY="508" maxY="529" name="subway-madrid-s"/>
+  <symbol minX="834" maxX="855" minY="508" maxY="529" name="subway-paris-s"/>
+  <symbol minX="855" maxX="885" minY="508" maxY="529" name="subway-kiev-m"/>
+  <symbol minX="885" maxX="905" minY="508" maxY="528" name="subway-moscow-s"/>
+  <symbol minX="905" maxX="926" minY="508" maxY="527" name="bench"/>
+  <symbol minX="926" maxX="945" minY="508" maxY="527" name="speedcam-s"/>
+  <symbol minX="945" maxX="964" minY="508" maxY="527" name="parking-s"/>
+  <symbol minX="964" maxX="983" minY="508" maxY="527" name="subway-rome-s"/>
+  <symbol minX="983" maxX="1002" minY="508" maxY="527" name="star-l"/>
+  <symbol minX="1002" maxX="1021" minY="508" maxY="527" name="subway-berlin-s"/>
+  <symbol minX="0" maxX="23" minY="531" maxY="550" name="subway-london-s"/>
+  <symbol minX="23" maxX="53" minY="531" maxY="549" name="subway-minsk-l"/>
+  <symbol minX="53" maxX="71" minY="531" maxY="549" name="star-m"/>
+  <symbol minX="71" maxX="90" minY="531" maxY="549" name="peakt-l"/>
+  <symbol minX="90" maxX="108" minY="531" maxY="549" name="survey_point-l"/>
+  <symbol minX="108" maxX="133" minY="531" maxY="547" name="subway-kiev-s"/>
+  <symbol minX="133" maxX="148" minY="531" maxY="546" name="star-s"/>
+  <symbol minX="148" maxX="173" minY="531" maxY="546" name="subway-minsk-m"/>
+  <symbol minX="173" maxX="188" minY="531" maxY="546" name="subway-xs"/>
+  <symbol minX="188" maxX="211" minY="531" maxY="546" name="railway-crossing"/>
+  <symbol minX="211" maxX="226" minY="531" maxY="546" name="subway-newyork-xs"/>
+  <symbol minX="226" maxX="241" minY="531" maxY="546" name="survey_point-m"/>
+  <symbol minX="241" maxX="264" minY="531" maxY="545" name="subway-minsk-s"/>
+  <symbol minX="264" maxX="278" minY="531" maxY="545" name="subway-xs copy"/>
+  <symbol minX="278" maxX="292" minY="531" maxY="544" name="peakt-m"/>
+  <symbol minX="292" maxX="320" minY="531" maxY="544" name="arrow-m"/>
+  <symbol minX="320" maxX="333" minY="531" maxY="544" name="survey_point-s"/>
+  <symbol minX="333" maxX="345" minY="531" maxY="543" name="entrance-s"/>
+  <symbol minX="345" maxX="356" minY="531" maxY="542" name="dot-m"/>
+  <symbol minX="356" maxX="368" minY="531" maxY="542" name="peakt-s"/>
+  <symbol minX="368" maxX="378" minY="531" maxY="541" name="tree-l"/>
+  <symbol minX="378" maxX="399" minY="531" maxY="541" name="arrow-s"/>
+  <symbol minX="399" maxX="409" minY="531" maxY="541" name="none"/>
+  <symbol minX="409" maxX="418" minY="531" maxY="540" name="tree-m"/>
+  <symbol minX="418" maxX="427" minY="531" maxY="540" name="dot-s-light"/>
+  <symbol minX="427" maxX="436" minY="531" maxY="540" name="dot-s"/>
+  <symbol minX="436" maxX="445" minY="531" maxY="540" name="entrance-xs"/>
+  <symbol minX="445" maxX="452" minY="531" maxY="538" name="tree-s"/>
+  <symbol minX="452" maxX="459" minY="531" maxY="538" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_legacy/symbols.png b/data/resources-hdpi_legacy/symbols.png
index 1c90ac4207..239456be73 100644
Binary files a/data/resources-hdpi_legacy/symbols.png and b/data/resources-hdpi_legacy/symbols.png differ
diff --git a/data/resources-hdpi_legacy/symbols.sdf b/data/resources-hdpi_legacy/symbols.sdf
index cd978e13be..f88a92f75a 100644
--- a/data/resources-hdpi_legacy/symbols.sdf
+++ b/data/resources-hdpi_legacy/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="512" width="512">
+ <file width="512" height="512">
   <symbol minX="0" maxX="105" minY="0" maxY="105" name="route_to"/>
   <symbol minX="105" maxX="309" minY="0" maxY="100" name="route-arrow"/>
   <symbol minX="309" maxX="397" minY="0" maxY="88" name="compass-image"/>
diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png
index 78870bbe2d..eaac45a3bf 100644
Binary files a/data/resources-ldpi_clear/symbols.png and b/data/resources-ldpi_clear/symbols.png differ
diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf
index d7b2be943f..25abc0afbd 100644
--- a/data/resources-ldpi_clear/symbols.sdf
+++ b/data/resources-ldpi_clear/symbols.sdf
@@ -1,523 +1,523 @@
 <!DOCTYPE skin>
 <root>
- <file height="512" width="512">
-  <symbol name="route_to" minX="0" maxX="55" minY="0" maxY="79"/>
-  <symbol name="route_from" minX="55" maxX="82" minY="0" maxY="67"/>
-  <symbol name="route-arrow" minX="82" maxX="186" minY="0" maxY="52"/>
-  <symbol name="compass-image" minX="186" maxX="232" minY="0" maxY="46"/>
-  <symbol name="cross_geoposition" minX="232" maxX="265" minY="0" maxY="33"/>
-  <symbol name="current-position-obsolete" minX="265" maxX="290" minY="0" maxY="30"/>
-  <symbol name="current-position-compas" minX="290" maxX="315" minY="0" maxY="30"/>
-  <symbol name="search-result-active" minX="315" maxX="343" minY="0" maxY="28"/>
-  <symbol name="gallery-l" minX="343" maxX="365" minY="0" maxY="22"/>
-  <symbol name="america-football-l" minX="365" maxX="387" minY="0" maxY="22"/>
-  <symbol name="shoes-l" minX="387" maxX="409" minY="0" maxY="22"/>
-  <symbol name="alpine_hut-l" minX="409" maxX="431" minY="0" maxY="22"/>
-  <symbol name="archery-l" minX="431" maxX="453" minY="0" maxY="22"/>
-  <symbol name="ship-l" minX="453" maxX="475" minY="0" maxY="22"/>
-  <symbol name="seafood-shop-l" minX="475" maxX="497" minY="0" maxY="22"/>
-  <symbol name="placemark-yellow" minX="497" maxX="509" minY="0" maxY="22"/>
-  <symbol name="placemark-red" minX="0" maxX="12" minY="79" maxY="101"/>
-  <symbol name="atm-l" minX="12" maxX="34" minY="79" maxY="101"/>
-  <symbol name="shop-l" minX="34" maxX="56" minY="79" maxY="101"/>
-  <symbol name="placemark-purple" minX="56" maxX="68" minY="79" maxY="101"/>
-  <symbol name="australian-football-l" minX="68" maxX="90" minY="79" maxY="101"/>
-  <symbol name="school-l" minX="90" maxX="112" minY="79" maxY="101"/>
-  <symbol name="placemark-pink" minX="112" maxX="124" minY="79" maxY="101"/>
-  <symbol name="bakery-l" minX="124" maxX="146" minY="79" maxY="101"/>
-  <symbol name="sauna-l" minX="146" maxX="168" minY="79" maxY="101"/>
-  <symbol name="bank-l" minX="168" maxX="190" minY="79" maxY="101"/>
-  <symbol name="bank-m" minX="190" maxX="211" minY="79" maxY="101"/>
-  <symbol name="banknote-l" minX="211" maxX="233" minY="79" maxY="101"/>
-  <symbol name="skiing-l" minX="233" maxX="255" minY="79" maxY="101"/>
-  <symbol name="bar-l" minX="255" maxX="277" minY="79" maxY="101"/>
-  <symbol name="restaurant-l" minX="277" maxX="299" minY="79" maxY="101"/>
-  <symbol name="placemark-orange" minX="299" maxX="311" minY="79" maxY="101"/>
-  <symbol name="baseball-l" minX="311" maxX="333" minY="79" maxY="101"/>
-  <symbol name="remains-m" minX="333" maxX="354" minY="79" maxY="101"/>
-  <symbol name="placemark-green" minX="354" maxX="366" minY="79" maxY="101"/>
-  <symbol name="basketball-l" minX="366" maxX="388" minY="79" maxY="101"/>
-  <symbol name="remains-l" minX="388" maxX="410" minY="79" maxY="101"/>
-  <symbol name="placemark-brown" minX="410" maxX="422" minY="79" maxY="101"/>
-  <symbol name="bbq-l" minX="422" maxX="444" minY="79" maxY="101"/>
-  <symbol name="recycling-l" minX="444" maxX="466" minY="79" maxY="101"/>
-  <symbol name="bcontrol-l" minX="466" maxX="488" minY="79" maxY="101"/>
-  <symbol name="bcontrol-m" minX="488" maxX="509" minY="79" maxY="101"/>
-  <symbol name="soccer-l" minX="0" maxX="22" minY="101" maxY="123"/>
-  <symbol name="beach-l" minX="22" maxX="44" minY="101" maxY="123"/>
-  <symbol name="pub-l" minX="44" maxX="66" minY="101" maxY="123"/>
-  <symbol name="placemark-blue" minX="66" maxX="78" minY="101" maxY="123"/>
-  <symbol name="beauty-l" minX="78" maxX="100" minY="101" maxY="123"/>
-  <symbol name="power-m" minX="100" maxX="122" minY="101" maxY="123"/>
-  <symbol name="beer-l" minX="122" maxX="144" minY="101" maxY="123"/>
-  <symbol name="beer-m" minX="144" maxX="165" minY="101" maxY="123"/>
-  <symbol name="power-l" minX="165" maxX="187" minY="101" maxY="123"/>
-  <symbol name="postbox-l" minX="187" maxX="209" minY="101" maxY="123"/>
-  <symbol name="bicycle-l" minX="209" maxX="231" minY="101" maxY="123"/>
-  <symbol name="pool-l" minX="231" maxX="253" minY="101" maxY="123"/>
-  <symbol name="alcohol-l" minX="253" maxX="275" minY="101" maxY="123"/>
-  <symbol name="sports-l" minX="275" maxX="297" minY="101" maxY="123"/>
-  <symbol name="book-shop-l" minX="297" maxX="319" minY="101" maxY="123"/>
-  <symbol name="police-l" minX="319" maxX="341" minY="101" maxY="123"/>
-  <symbol name="place-of-worship-l" minX="341" maxX="363" minY="101" maxY="123"/>
-  <symbol name="bookmaker-l" minX="363" maxX="385" minY="101" maxY="123"/>
-  <symbol name="boundary_stone-l" minX="385" maxX="407" minY="101" maxY="123"/>
-  <symbol name="pitch-l" minX="407" maxX="429" minY="101" maxY="123"/>
-  <symbol name="bowls-l" minX="429" maxX="451" minY="101" maxY="123"/>
-  <symbol name="picnic-m" minX="451" maxX="472" minY="101" maxY="123"/>
-  <symbol name="airport-m" minX="472" maxX="494" minY="101" maxY="123"/>
-  <symbol name="bus-l" minX="0" maxX="22" minY="123" maxY="145"/>
-  <symbol name="picnic-l" minX="22" maxX="44" minY="123" maxY="145"/>
-  <symbol name="airport-l" minX="44" maxX="66" minY="123" maxY="145"/>
-  <symbol name="butcher-l" minX="66" maxX="88" minY="123" maxY="145"/>
-  <symbol name="photo-shop-l" minX="88" maxX="110" minY="123" maxY="145"/>
-  <symbol name="cable-car-l" minX="110" maxX="132" minY="123" maxY="145"/>
-  <symbol name="phone-l" minX="132" maxX="154" minY="123" maxY="145"/>
-  <symbol name="pharmacy-l" minX="154" maxX="176" minY="123" maxY="145"/>
-  <symbol name="cafe-l" minX="176" maxX="198" minY="123" maxY="145"/>
-  <symbol name="petshop-l" minX="198" maxX="220" minY="123" maxY="145"/>
-  <symbol name="zoo-l" minX="220" maxX="242" minY="123" maxY="145"/>
-  <symbol name="campsite-l" minX="242" maxX="264" minY="123" maxY="145"/>
-  <symbol name="subway-entrance-l" minX="264" maxX="286" minY="123" maxY="145"/>
-  <symbol name="subway-l" minX="286" maxX="308" minY="123" maxY="145"/>
-  <symbol name="car-part-l" minX="308" maxX="330" minY="123" maxY="145"/>
-  <symbol name="parking-meter-l" minX="330" maxX="352" minY="123" maxY="145"/>
-  <symbol name="car-repair-l" minX="352" maxX="374" minY="123" maxY="145"/>
-  <symbol name="car-repair-m" minX="374" maxX="395" minY="123" maxY="145"/>
-  <symbol name="windmill-l" minX="395" maxX="417" minY="123" maxY="145"/>
-  <symbol name="car-wash-l" minX="417" maxX="439" minY="123" maxY="145"/>
-  <symbol name="car-wash-m" minX="439" maxX="460" minY="123" maxY="145"/>
-  <symbol name="car_sharing-l" minX="460" maxX="482" minY="123" maxY="145"/>
-  <symbol name="subway-newyork-l" minX="482" maxX="504" minY="123" maxY="145"/>
-  <symbol name="caravan_site-l" minX="0" maxX="22" minY="145" maxY="167"/>
-  <symbol name="park-l" minX="22" maxX="44" minY="145" maxY="167"/>
-  <symbol name="casino-l" minX="44" maxX="66" minY="145" maxY="167"/>
-  <symbol name="optician-l" minX="66" maxX="88" minY="145" maxY="167"/>
-  <symbol name="office-m" minX="88" maxX="109" minY="145" maxY="167"/>
-  <symbol name="cave-l" minX="109" maxX="131" minY="145" maxY="167"/>
-  <symbol name="office-l" minX="131" maxX="153" minY="145" maxY="167"/>
-  <symbol name="wayside_shrine-l" minX="153" maxX="175" minY="145" maxY="167"/>
-  <symbol name="cemetery-l" minX="175" maxX="197" minY="145" maxY="167"/>
-  <symbol name="subway-paris-l" minX="197" maxX="219" minY="145" maxY="167"/>
-  <symbol name="nparkf-l" minX="219" maxX="241" minY="145" maxY="167"/>
-  <symbol name="charging-station-l" minX="241" maxX="263" minY="145" maxY="167"/>
-  <symbol name="npark-l" minX="263" maxX="285" minY="145" maxY="167"/>
-  <symbol name="wayside_cross-l" minX="285" maxX="307" minY="145" maxY="167"/>
-  <symbol name="chemist-l" minX="307" maxX="329" minY="145" maxY="167"/>
-  <symbol name="museum-l" minX="329" maxX="351" minY="145" maxY="167"/>
-  <symbol name="childcare-l" minX="351" maxX="373" minY="145" maxY="167"/>
-  <symbol name="chimney-l" minX="373" maxX="395" minY="145" maxY="167"/>
-  <symbol name="moto-sharing-l" minX="395" maxX="417" minY="145" maxY="167"/>
-  <symbol name="cinema-l" minX="417" maxX="439" minY="145" maxY="167"/>
-  <symbol name="subway-spb-l" minX="439" maxX="461" minY="145" maxY="167"/>
-  <symbol name="motel-l" minX="461" maxX="483" minY="145" maxY="167"/>
-  <symbol name="climbing-l" minX="483" maxX="505" minY="145" maxY="167"/>
-  <symbol name="monument-l" minX="0" maxX="22" minY="167" maxY="189"/>
-  <symbol name="waterfall-m" minX="22" maxX="43" minY="167" maxY="189"/>
-  <symbol name="clothes-l" minX="43" maxX="65" minY="167" maxY="189"/>
-  <symbol name="mobile_phone-l" minX="65" maxX="87" minY="167" maxY="189"/>
-  <symbol name="college-l" minX="87" maxX="109" minY="167" maxY="189"/>
-  <symbol name="sweets-l" minX="109" maxX="131" minY="167" maxY="189"/>
-  <symbol name="waterfall-l" minX="131" maxX="153" minY="167" maxY="189"/>
-  <symbol name="computer-l" minX="153" maxX="175" minY="167" maxY="189"/>
-  <symbol name="military-l" minX="175" maxX="197" minY="167" maxY="189"/>
-  <symbol name="convenience-l" minX="197" maxX="219" minY="167" maxY="189"/>
-  <symbol name="swimming-l" minX="219" maxX="241" minY="167" maxY="189"/>
-  <symbol name="copyshop-l" minX="241" maxX="263" minY="167" maxY="189"/>
-  <symbol name="marketplace-l" minX="263" maxX="285" minY="167" maxY="189"/>
-  <symbol name="courthouse-l" minX="285" maxX="307" minY="167" maxY="189"/>
-  <symbol name="cricket-l" minX="307" maxX="329" minY="167" maxY="189"/>
-  <symbol name="taxi-l" minX="329" maxX="351" minY="167" maxY="189"/>
-  <symbol name="mail-l" minX="351" maxX="373" minY="167" maxY="189"/>
-  <symbol name="lightrail-berlin-l" minX="373" maxX="395" minY="167" maxY="189"/>
-  <symbol name="volcano-l" minX="395" maxX="417" minY="167" maxY="189"/>
-  <symbol name="viewpoint-m" minX="417" maxX="439" minY="167" maxY="189"/>
-  <symbol name="curling-l" minX="439" maxX="461" minY="167" maxY="189"/>
-  <symbol name="tennis-l" minX="461" maxX="483" minY="167" maxY="189"/>
-  <symbol name="viewpoint-l" minX="483" maxX="505" minY="167" maxY="189"/>
-  <symbol name="dentist-l" minX="0" maxX="22" minY="189" maxY="211"/>
-  <symbol name="dentist-m" minX="22" maxX="44" minY="189" maxY="211"/>
-  <symbol name="lighthouse-l" minX="44" maxX="66" minY="189" maxY="211"/>
-  <symbol name="department_store-l" minX="66" maxX="88" minY="189" maxY="211"/>
-  <symbol name="lift_gate-l" minX="88" maxX="110" minY="189" maxY="211"/>
-  <symbol name="diving-l" minX="110" maxX="132" minY="189" maxY="211"/>
-  <symbol name="library-l" minX="132" maxX="154" minY="189" maxY="211"/>
-  <symbol name="veterinary-l" minX="154" maxX="176" minY="189" maxY="211"/>
-  <symbol name="dog_park-l" minX="176" maxX="198" minY="189" maxY="211"/>
-  <symbol name="lawyer-l" minX="198" maxX="220" minY="189" maxY="211"/>
-  <symbol name="doityourself-l" minX="220" maxX="242" minY="189" maxY="211"/>
-  <symbol name="laundry-m" minX="242" maxX="263" minY="189" maxY="211"/>
-  <symbol name="laundry-l" minX="263" maxX="285" minY="189" maxY="211"/>
-  <symbol name="vending-l" minX="285" maxX="307" minY="189" maxY="211"/>
-  <symbol name="kiosk-l" minX="307" maxX="329" minY="189" maxY="211"/>
-  <symbol name="drinking-water-l" minX="329" maxX="351" minY="189" maxY="211"/>
-  <symbol name="theatre-l" minX="351" maxX="373" minY="189" maxY="211"/>
-  <symbol name="tram-l" minX="373" maxX="395" minY="189" maxY="211"/>
-  <symbol name="kindergarten-m" minX="395" maxX="417" minY="189" maxY="211"/>
-  <symbol name="electronics-l" minX="417" maxX="439" minY="189" maxY="211"/>
-  <symbol name="kindergarten-l" minX="439" maxX="461" minY="189" maxY="211"/>
-  <symbol name="embassy-l" minX="461" maxX="483" minY="189" maxY="211"/>
-  <symbol name="jewelry-l" minX="483" maxX="505" minY="189" maxY="211"/>
-  <symbol name="information-l" minX="0" maxX="22" minY="211" maxY="233"/>
-  <symbol name="train-l" minX="22" maxX="44" minY="211" maxY="233"/>
-  <symbol name="hunting-tower-m" minX="44" maxX="65" minY="211" maxY="233"/>
-  <symbol name="equestrian-l" minX="65" maxX="87" minY="211" maxY="233"/>
-  <symbol name="equestrian-m" minX="87" maxX="109" minY="211" maxY="233"/>
-  <symbol name="toys-l" minX="109" maxX="131" minY="211" maxY="233"/>
-  <symbol name="fastfood-l" minX="131" maxX="153" minY="211" maxY="233"/>
-  <symbol name="hunting-tower-l" minX="153" maxX="175" minY="211" maxY="233"/>
-  <symbol name="ticket-shop-l" minX="175" maxX="197" minY="211" maxY="233"/>
-  <symbol name="fire_station-l" minX="197" maxX="219" minY="211" maxY="233"/>
-  <symbol name="hotel-l" minX="219" maxX="241" minY="211" maxY="233"/>
-  <symbol name="townhall-l" minX="241" maxX="263" minY="211" maxY="233"/>
-  <symbol name="hospital-l" minX="263" maxX="285" minY="211" maxY="233"/>
-  <symbol name="florist-l" minX="285" maxX="307" minY="211" maxY="233"/>
-  <symbol name="historic-ship-l" minX="307" maxX="329" minY="211" maxY="233"/>
-  <symbol name="fountain-l" minX="329" maxX="351" minY="211" maxY="233"/>
-  <symbol name="heliport-m" minX="351" maxX="372" minY="211" maxY="233"/>
-  <symbol name="tourist-shop-l" minX="372" maxX="394" minY="211" maxY="233"/>
-  <symbol name="fuel-l" minX="394" maxX="416" minY="211" maxY="233"/>
-  <symbol name="heliport-l" minX="416" maxX="438" minY="211" maxY="233"/>
-  <symbol name="tourist-office-l" minX="438" maxX="460" minY="211" maxY="233"/>
-  <symbol name="funicular-l" minX="460" maxX="482" minY="211" maxY="233"/>
-  <symbol name="toilets-l" minX="482" maxX="504" minY="211" maxY="233"/>
-  <symbol name="helipad-l" minX="0" maxX="22" minY="233" maxY="255"/>
-  <symbol name="furniture-l" minX="22" maxX="44" minY="233" maxY="255"/>
-  <symbol name="hardware-l" minX="44" maxX="66" minY="233" maxY="255"/>
-  <symbol name="hand-m" minX="66" maxX="88" minY="233" maxY="255"/>
-  <symbol name="hand-l" minX="88" maxX="110" minY="233" maxY="255"/>
-  <symbol name="tourism-l" minX="110" maxX="132" minY="233" maxY="255"/>
-  <symbol name="garden-l" minX="132" maxX="154" minY="233" maxY="255"/>
-  <symbol name="shop-bicycle-l" minX="154" maxX="176" minY="233" maxY="255"/>
-  <symbol name="hairdresser-l" minX="176" maxX="198" minY="233" maxY="255"/>
-  <symbol name="garden_center-l" minX="198" maxX="220" minY="233" maxY="255"/>
-  <symbol name="toll_booth-l" minX="220" maxX="242" minY="233" maxY="255"/>
-  <symbol name="gate-l" minX="242" maxX="264" minY="233" maxY="255"/>
-  <symbol name="gym-l" minX="264" maxX="286" minY="233" maxY="255"/>
-  <symbol name="gift-l" minX="286" maxX="308" minY="233" maxY="255"/>
-  <symbol name="grocery-l" minX="308" maxX="330" minY="233" maxY="255"/>
-  <symbol name="golf-l" minX="330" maxX="352" minY="233" maxY="255"/>
-  <symbol name="greengrocer-l" minX="352" maxX="374" minY="233" maxY="255"/>
-  <symbol name="tomb-l" minX="374" maxX="396" minY="233" maxY="255"/>
-  <symbol name="golf-m" minX="396" maxX="417" minY="233" maxY="254"/>
-  <symbol name="greengrocer-m" minX="417" maxX="438" minY="233" maxY="254"/>
-  <symbol name="gift-m" minX="438" maxX="459" minY="233" maxY="254"/>
-  <symbol name="grocery-m" minX="459" maxX="480" minY="233" maxY="254"/>
-  <symbol name="toll_booth-m" minX="480" maxX="501" minY="233" maxY="254"/>
-  <symbol name="gate-m" minX="0" maxX="21" minY="255" maxY="276"/>
-  <symbol name="gym-m" minX="21" maxX="42" minY="255" maxY="276"/>
-  <symbol name="garden_center-m" minX="42" maxX="63" minY="255" maxY="276"/>
-  <symbol name="tomb-m" minX="63" maxX="84" minY="255" maxY="276"/>
-  <symbol name="hairdresser-m" minX="84" maxX="105" minY="255" maxY="276"/>
-  <symbol name="gallery-m" minX="105" maxX="126" minY="255" maxY="276"/>
-  <symbol name="alpine_hut-m" minX="126" maxX="147" minY="255" maxY="276"/>
-  <symbol name="toilets-m" minX="147" maxX="168" minY="255" maxY="276"/>
-  <symbol name="furniture-m" minX="168" maxX="189" minY="255" maxY="276"/>
-  <symbol name="hardware-m" minX="189" maxX="210" minY="255" maxY="276"/>
-  <symbol name="tourism-m" minX="210" maxX="231" minY="255" maxY="276"/>
-  <symbol name="helipad-m" minX="231" maxX="252" minY="255" maxY="276"/>
-  <symbol name="funicular-m" minX="252" maxX="273" minY="255" maxY="276"/>
-  <symbol name="fuel-m" minX="273" maxX="294" minY="255" maxY="276"/>
-  <symbol name="fountain-m" minX="294" maxX="315" minY="255" maxY="276"/>
-  <symbol name="shoes-m" minX="315" maxX="336" minY="255" maxY="276"/>
-  <symbol name="florist-m" minX="336" maxX="357" minY="255" maxY="276"/>
-  <symbol name="historic-ship-m" minX="357" maxX="378" minY="255" maxY="276"/>
-  <symbol name="america-football-m" minX="378" maxX="399" minY="255" maxY="276"/>
-  <symbol name="hospital-m" minX="399" maxX="420" minY="255" maxY="276"/>
-  <symbol name="ticket-shop-m" minX="420" maxX="441" minY="255" maxY="276"/>
-  <symbol name="fire_station-m" minX="441" maxX="462" minY="255" maxY="276"/>
-  <symbol name="hotel-m" minX="462" maxX="483" minY="255" maxY="276"/>
-  <symbol name="townhall-m" minX="483" maxX="504" minY="255" maxY="276"/>
-  <symbol name="fastfood-m" minX="0" maxX="21" minY="276" maxY="297"/>
-  <symbol name="toys-m" minX="21" maxX="42" minY="276" maxY="297"/>
-  <symbol name="shop-bicycle-m" minX="42" maxX="63" minY="276" maxY="297"/>
-  <symbol name="train-m" minX="63" maxX="84" minY="276" maxY="297"/>
-  <symbol name="information-m" minX="84" maxX="105" minY="276" maxY="297"/>
-  <symbol name="theatre-m" minX="105" maxX="126" minY="276" maxY="297"/>
-  <symbol name="embassy-m" minX="126" maxX="147" minY="276" maxY="297"/>
-  <symbol name="jewelry-m" minX="147" maxX="168" minY="276" maxY="297"/>
-  <symbol name="electronics-m" minX="168" maxX="189" minY="276" maxY="297"/>
-  <symbol name="drugs" minX="189" maxX="210" minY="276" maxY="297"/>
-  <symbol name="drinking-water-m" minX="210" maxX="231" minY="276" maxY="297"/>
-  <symbol name="tram-m" minX="231" maxX="252" minY="276" maxY="297"/>
-  <symbol name="kiosk-m" minX="252" maxX="273" minY="276" maxY="297"/>
-  <symbol name="vending-m" minX="273" maxX="294" minY="276" maxY="297"/>
-  <symbol name="doityourself-m" minX="294" maxX="315" minY="276" maxY="297"/>
-  <symbol name="dog_park-m" minX="315" maxX="336" minY="276" maxY="297"/>
-  <symbol name="diving-m" minX="336" maxX="357" minY="276" maxY="297"/>
-  <symbol name="library-m" minX="357" maxX="378" minY="276" maxY="297"/>
-  <symbol name="tennis-m" minX="378" maxX="399" minY="276" maxY="297"/>
-  <symbol name="department_store-m" minX="399" maxX="420" minY="276" maxY="297"/>
-  <symbol name="lift_gate-m" minX="420" maxX="441" minY="276" maxY="297"/>
-  <symbol name="veterinary-m" minX="441" maxX="462" minY="276" maxY="297"/>
-  <symbol name="lighthouse-m" minX="462" maxX="483" minY="276" maxY="297"/>
-  <symbol name="curling-m" minX="483" maxX="504" minY="276" maxY="297"/>
-  <symbol name="volcano-m" minX="0" maxX="21" minY="297" maxY="318"/>
-  <symbol name="ship-m" minX="21" maxX="42" minY="297" maxY="318"/>
-  <symbol name="taxi-m" minX="42" maxX="63" minY="297" maxY="318"/>
-  <symbol name="archery-m" minX="63" maxX="84" minY="297" maxY="318"/>
-  <symbol name="mail-m" minX="84" maxX="105" minY="297" maxY="318"/>
-  <symbol name="cricket-m" minX="105" maxX="126" minY="297" maxY="318"/>
-  <symbol name="copyshop-m" minX="126" maxX="147" minY="297" maxY="318"/>
-  <symbol name="marketplace-m" minX="147" maxX="168" minY="297" maxY="318"/>
-  <symbol name="swimming-m" minX="168" maxX="189" minY="297" maxY="318"/>
-  <symbol name="convenience-m" minX="189" maxX="210" minY="297" maxY="318"/>
-  <symbol name="sweets-m" minX="210" maxX="231" minY="297" maxY="318"/>
-  <symbol name="computer-m" minX="231" maxX="252" minY="297" maxY="318"/>
-  <symbol name="military-m" minX="252" maxX="273" minY="297" maxY="318"/>
-  <symbol name="college-m" minX="273" maxX="294" minY="297" maxY="318"/>
-  <symbol name="clothes-m" minX="294" maxX="315" minY="297" maxY="318"/>
-  <symbol name="mobile_phone-m" minX="315" maxX="336" minY="297" maxY="318"/>
-  <symbol name="climbing-m" minX="336" maxX="357" minY="297" maxY="318"/>
-  <symbol name="monument-m" minX="357" maxX="378" minY="297" maxY="318"/>
-  <symbol name="subway-spb-m" minX="378" maxX="399" minY="297" maxY="318"/>
-  <symbol name="seafood-shop-m" minX="399" maxX="420" minY="297" maxY="318"/>
-  <symbol name="motel-m" minX="420" maxX="441" minY="297" maxY="318"/>
-  <symbol name="cinema-m" minX="441" maxX="462" minY="297" maxY="318"/>
-  <symbol name="chimney-m" minX="462" maxX="483" minY="297" maxY="318"/>
-  <symbol name="chemist-m" minX="483" maxX="504" minY="297" maxY="318"/>
-  <symbol name="museum-m" minX="0" maxX="21" minY="318" maxY="339"/>
-  <symbol name="alcohol-m" minX="21" maxX="42" minY="318" maxY="339"/>
-  <symbol name="atm-m" minX="42" maxX="63" minY="318" maxY="339"/>
-  <symbol name="school-m" minX="63" maxX="84" minY="318" maxY="339"/>
-  <symbol name="australian-football-m" minX="84" maxX="105" minY="318" maxY="339"/>
-  <symbol name="sauna-m" minX="105" maxX="126" minY="318" maxY="339"/>
-  <symbol name="bakery-m" minX="126" maxX="147" minY="318" maxY="339"/>
-  <symbol name="garden-m" minX="147" maxX="168" minY="318" maxY="339"/>
-  <symbol name="charging-station-m" minX="168" maxX="189" minY="318" maxY="339"/>
-  <symbol name="npark-m" minX="189" maxX="210" minY="318" maxY="339"/>
-  <symbol name="shop-m" minX="210" maxX="231" minY="318" maxY="339"/>
-  <symbol name="wayside_cross-m" minX="231" maxX="252" minY="318" maxY="339"/>
-  <symbol name="nparkf-m " minX="252" maxX="273" minY="318" maxY="339"/>
-  <symbol name="nparkf-m" minX="273" maxX="294" minY="318" maxY="339"/>
-  <symbol name="cemetery-m" minX="294" maxX="315" minY="318" maxY="339"/>
-  <symbol name="cave-m" minX="315" maxX="336" minY="318" maxY="339"/>
-  <symbol name="wayside_shrine-m" minX="336" maxX="357" minY="318" maxY="339"/>
-  <symbol name="banknote-m" minX="357" maxX="378" minY="318" maxY="339"/>
-  <symbol name="casino-m" minX="378" maxX="399" minY="318" maxY="339"/>
-  <symbol name="optician-m" minX="399" maxX="420" minY="318" maxY="339"/>
-  <symbol name="caravan_site-m" minX="420" maxX="441" minY="318" maxY="339"/>
-  <symbol name="park-m" minX="441" maxX="462" minY="318" maxY="339"/>
-  <symbol name="subway-newyork-m" minX="462" maxX="483" minY="318" maxY="339"/>
-  <symbol name="restaurant-m" minX="483" maxX="504" minY="318" maxY="339"/>
-  <symbol name="car_sharing-m" minX="0" maxX="21" minY="339" maxY="360"/>
-  <symbol name="car-part-m" minX="21" maxX="42" minY="339" maxY="360"/>
-  <symbol name="parking-meter-m" minX="42" maxX="63" minY="339" maxY="360"/>
-  <symbol name="bar-m" minX="63" maxX="84" minY="339" maxY="360"/>
-  <symbol name="baseball-m" minX="84" maxX="105" minY="339" maxY="360"/>
-  <symbol name="basketball-m" minX="105" maxX="126" minY="339" maxY="360"/>
-  <symbol name="subway-m" minX="126" maxX="147" minY="339" maxY="360"/>
-  <symbol name="skiing-m" minX="147" maxX="168" minY="339" maxY="360"/>
-  <symbol name="windmill-m" minX="168" maxX="189" minY="339" maxY="360"/>
-  <symbol name="subway-entrance-m" minX="189" maxX="210" minY="339" maxY="360"/>
-  <symbol name="campsite-m" minX="210" maxX="231" minY="339" maxY="360"/>
-  <symbol name="cafe-m" minX="231" maxX="252" minY="339" maxY="360"/>
-  <symbol name="petshop-m" minX="252" maxX="273" minY="339" maxY="360"/>
-  <symbol name="pharmacy-2-m" minX="273" maxX="294" minY="339" maxY="360"/>
-  <symbol name="zoo-m" minX="294" maxX="315" minY="339" maxY="360"/>
-  <symbol name="pharmacy-m" minX="315" maxX="336" minY="339" maxY="360"/>
-  <symbol name="subway-entrance-2-m" minX="336" maxX="357" minY="339" maxY="360"/>
-  <symbol name="cable-car-m" minX="357" maxX="378" minY="339" maxY="360"/>
-  <symbol name="phone-m" minX="378" maxX="399" minY="339" maxY="360"/>
-  <symbol name="recycling-m" minX="399" maxX="420" minY="339" maxY="360"/>
-  <symbol name="butcher-m" minX="420" maxX="441" minY="339" maxY="360"/>
-  <symbol name="photo-shop-m" minX="441" maxX="462" minY="339" maxY="360"/>
-  <symbol name="bus-m" minX="462" maxX="483" minY="339" maxY="360"/>
-  <symbol name="bowls-m" minX="483" maxX="504" minY="339" maxY="360"/>
-  <symbol name="bbq-m" minX="0" maxX="21" minY="360" maxY="381"/>
-  <symbol name="boundary_stone-m" minX="21" maxX="42" minY="360" maxY="381"/>
-  <symbol name="pitch-m" minX="42" maxX="63" minY="360" maxY="381"/>
-  <symbol name="soccer-m" minX="63" maxX="84" minY="360" maxY="381"/>
-  <symbol name="pub-m" minX="84" maxX="105" minY="360" maxY="381"/>
-  <symbol name="place-of-worship-m" minX="105" maxX="126" minY="360" maxY="381"/>
-  <symbol name="sports-m" minX="126" maxX="147" minY="360" maxY="381"/>
-  <symbol name="book-shop-m" minX="147" maxX="168" minY="360" maxY="381"/>
-  <symbol name="police-m" minX="168" maxX="189" minY="360" maxY="381"/>
-  <symbol name="beach-m" minX="189" maxX="210" minY="360" maxY="381"/>
-  <symbol name="bicycle-m" minX="210" maxX="231" minY="360" maxY="381"/>
-  <symbol name="beauty-m" minX="231" maxX="252" minY="360" maxY="381"/>
-  <symbol name="postbox-m" minX="252" maxX="273" minY="360" maxY="381"/>
-  <symbol name="subway-rome-l" minX="273" maxX="293" minY="360" maxY="380"/>
-  <symbol name="parking-ticket-l" minX="293" maxX="313" minY="360" maxY="380"/>
-  <symbol name="speedcam-l" minX="313" maxX="333" minY="360" maxY="380"/>
-  <symbol name="bike-parking-l" minX="333" maxX="353" minY="360" maxY="380"/>
-  <symbol name="firehydrant-l" minX="353" maxX="373" minY="360" maxY="380"/>
-  <symbol name="subway-berlin-l" minX="373" maxX="393" minY="360" maxY="380"/>
-  <symbol name="lightrail-berlin-m" minX="393" maxX="413" minY="360" maxY="380"/>
-  <symbol name="waste-basket-l" minX="413" maxX="433" minY="360" maxY="380"/>
-  <symbol name="parking-l" minX="433" maxX="453" minY="360" maxY="380"/>
-  <symbol name="current-position" minX="453" maxX="472" minY="360" maxY="379"/>
-  <symbol name="subway-moscow-l" minX="472" maxX="494" minY="360" maxY="379"/>
-  <symbol name="subway-london-l" minX="0" maxX="22" minY="381" maxY="399"/>
-  <symbol name="remains-s" minX="22" maxX="39" minY="381" maxY="399"/>
-  <symbol name="subway-moscow-m" minX="39" maxX="60" minY="381" maxY="399"/>
-  <symbol name="subway-berlin-m" minX="60" maxX="78" minY="381" maxY="399"/>
-  <symbol name="beer-s" minX="78" maxX="95" minY="381" maxY="399"/>
-  <symbol name="subway-paris-m" minX="95" maxX="113" minY="381" maxY="399"/>
-  <symbol name="no-icon" minX="113" maxX="131" minY="381" maxY="399"/>
-  <symbol name="no-icon-tourism" minX="131" maxX="149" minY="381" maxY="399"/>
-  <symbol name="no-icon-shop" minX="149" maxX="167" minY="381" maxY="399"/>
-  <symbol name="no-icon-leisure" minX="167" maxX="185" minY="381" maxY="399"/>
-  <symbol name="no-icon-amenity" minX="185" maxX="203" minY="381" maxY="399"/>
-  <symbol name="subway-rome-m" minX="203" maxX="221" minY="381" maxY="399"/>
-  <symbol name="waterfall-s" minX="221" maxX="238" minY="381" maxY="399"/>
-  <symbol name="picnic-s" minX="238" maxX="255" minY="381" maxY="399"/>
-  <symbol name="bcontrol-s" minX="255" maxX="272" minY="381" maxY="399"/>
-  <symbol name="hunting-tower-s" minX="272" maxX="289" minY="381" maxY="399"/>
-  <symbol name="airport-s" minX="289" maxX="307" minY="381" maxY="399"/>
-  <symbol name="heliport-s" minX="307" maxX="324" minY="381" maxY="399"/>
-  <symbol name="office-s" minX="324" maxX="341" minY="381" maxY="399"/>
-  <symbol name="ship-s" minX="341" maxX="358" minY="381" maxY="398"/>
-  <symbol name="school-s" minX="358" maxX="375" minY="381" maxY="398"/>
-  <symbol name="alcohol-s" minX="375" maxX="392" minY="381" maxY="398"/>
-  <symbol name="shop-s" minX="392" maxX="409" minY="381" maxY="398"/>
-  <symbol name="restaurant-s" minX="409" maxX="426" minY="381" maxY="398"/>
-  <symbol name="recycling-s" minX="426" maxX="443" minY="381" maxY="398"/>
-  <symbol name="skiing-s" minX="443" maxX="460" minY="381" maxY="398"/>
-  <symbol name="alpine_hut-s" minX="460" maxX="477" minY="381" maxY="398"/>
-  <symbol name="pub-s" minX="477" maxX="494" minY="381" maxY="398"/>
-  <symbol name="soccer-s" minX="494" maxX="511" minY="381" maxY="398"/>
-  <symbol name="power-s" minX="0" maxX="17" minY="399" maxY="416"/>
-  <symbol name="speedcam-m" minX="17" maxX="34" minY="399" maxY="416"/>
-  <symbol name="america-football-s" minX="34" maxX="51" minY="399" maxY="416"/>
-  <symbol name="police-s" minX="51" maxX="68" minY="399" maxY="416"/>
-  <symbol name="place-of-worship-s" minX="68" maxX="85" minY="399" maxY="416"/>
-  <symbol name="archery-s" minX="85" maxX="102" minY="399" maxY="416"/>
-  <symbol name="atm-s" minX="102" maxX="119" minY="399" maxY="416"/>
-  <symbol name="australian-football-s" minX="119" maxX="136" minY="399" maxY="416"/>
-  <symbol name="bar-s" minX="136" maxX="153" minY="399" maxY="416"/>
-  <symbol name="baseball-s" minX="153" maxX="170" minY="399" maxY="416"/>
-  <symbol name="subway-barcelona-s" minX="170" maxX="190" minY="399" maxY="416"/>
-  <symbol name="pitch-s" minX="190" maxX="207" minY="399" maxY="416"/>
-  <symbol name="phone-s" minX="207" maxX="224" minY="399" maxY="416"/>
-  <symbol name="basketball-s" minX="224" maxX="241" minY="399" maxY="416"/>
-  <symbol name="pharmacy-s" minX="241" maxX="258" minY="399" maxY="416"/>
-  <symbol name="subway-entrance-2-s" minX="258" maxX="275" minY="399" maxY="416"/>
-  <symbol name="subway-entrance-arrow" minX="275" maxX="292" minY="399" maxY="416"/>
-  <symbol name="beach-s" minX="292" maxX="309" minY="399" maxY="416"/>
-  <symbol name="bicycle-s" minX="309" maxX="326" minY="399" maxY="416"/>
-  <symbol name="subway-entrance-s" minX="326" maxX="343" minY="399" maxY="416"/>
-  <symbol name="book-shop-s" minX="343" maxX="360" minY="399" maxY="416"/>
-  <symbol name="bowls-s" minX="360" maxX="377" minY="399" maxY="416"/>
-  <symbol name="bus-s" minX="377" maxX="394" minY="399" maxY="416"/>
-  <symbol name="zoo-s" minX="394" maxX="411" minY="399" maxY="416"/>
-  <symbol name="cable-car-s" minX="411" maxX="428" minY="399" maxY="416"/>
-  <symbol name="subway-london-m" minX="428" maxX="449" minY="399" maxY="416"/>
-  <symbol name="cafe-s" minX="449" maxX="466" minY="399" maxY="416"/>
-  <symbol name="windmill-s" minX="466" maxX="483" minY="399" maxY="416"/>
-  <symbol name="campsite-s" minX="483" maxX="500" minY="399" maxY="416"/>
-  <symbol name="car-repair-s" minX="0" maxX="17" minY="416" maxY="433"/>
-  <symbol name="casino-s" minX="17" maxX="34" minY="416" maxY="433"/>
-  <symbol name="cave-s" minX="34" maxX="51" minY="416" maxY="433"/>
-  <symbol name="cemetery-s" minX="51" maxX="68" minY="416" maxY="433"/>
-  <symbol name="charging-station-s" minX="68" maxX="85" minY="416" maxY="433"/>
-  <symbol name="cinema-s" minX="85" maxX="102" minY="416" maxY="433"/>
-  <symbol name="climbing-s" minX="102" maxX="119" minY="416" maxY="433"/>
-  <symbol name="college-s" minX="119" maxX="136" minY="416" maxY="433"/>
-  <symbol name="cricket-s" minX="136" maxX="153" minY="416" maxY="433"/>
-  <symbol name="park-s" minX="153" maxX="170" minY="416" maxY="433"/>
-  <symbol name="subway-newyork-s" minX="170" maxX="187" minY="416" maxY="433"/>
-  <symbol name="volcano-s" minX="187" maxX="204" minY="416" maxY="433"/>
-  <symbol name="nparkf-s" minX="204" maxX="221" minY="416" maxY="433"/>
-  <symbol name="npark-s" minX="221" maxX="238" minY="416" maxY="433"/>
-  <symbol name="viewpoint-s" minX="238" maxX="255" minY="416" maxY="433"/>
-  <symbol name="curling-s" minX="255" maxX="272" minY="416" maxY="433"/>
-  <symbol name="museum-s" minX="272" maxX="289" minY="416" maxY="433"/>
-  <symbol name="dentist-s" minX="289" maxX="306" minY="416" maxY="433"/>
-  <symbol name="subway-s" minX="306" maxX="323" minY="416" maxY="433"/>
-  <symbol name="motel-s" minX="323" maxX="340" minY="416" maxY="433"/>
-  <symbol name="monument-s" minX="340" maxX="357" minY="416" maxY="433"/>
-  <symbol name="subway-spb-s" minX="357" maxX="374" minY="416" maxY="433"/>
-  <symbol name="diving-s" minX="374" maxX="391" minY="416" maxY="433"/>
-  <symbol name="tram-s" minX="391" maxX="408" minY="416" maxY="433"/>
-  <symbol name="drinking-water-s" minX="408" maxX="425" minY="416" maxY="433"/>
-  <symbol name="train-s" minX="425" maxX="442" minY="416" maxY="433"/>
-  <symbol name="military-s" minX="442" maxX="459" minY="416" maxY="433"/>
-  <symbol name="embassy-s" minX="459" maxX="476" minY="416" maxY="433"/>
-  <symbol name="equestrian-s" minX="476" maxX="493" minY="416" maxY="433"/>
-  <symbol name="marketplace-s" minX="493" maxX="510" minY="416" maxY="433"/>
-  <symbol name="swimming-s" minX="0" maxX="17" minY="433" maxY="450"/>
-  <symbol name="mail-s" minX="17" maxX="34" minY="433" maxY="450"/>
-  <symbol name="townhall-s" minX="34" maxX="51" minY="433" maxY="450"/>
-  <symbol name="lighthouse-s" minX="51" maxX="68" minY="433" maxY="450"/>
-  <symbol name="library-s" minX="68" maxX="85" minY="433" maxY="450"/>
-  <symbol name="tennis-s" minX="85" maxX="102" minY="433" maxY="450"/>
-  <symbol name="kindergarten-s" minX="102" maxX="119" minY="433" maxY="450"/>
-  <symbol name="information-s" minX="119" maxX="136" minY="433" maxY="450"/>
-  <symbol name="theatre-s" minX="136" maxX="153" minY="433" maxY="450"/>
-  <symbol name="hotel-s" minX="153" maxX="170" minY="433" maxY="450"/>
-  <symbol name="hospital-s" minX="170" maxX="187" minY="433" maxY="450"/>
-  <symbol name="helipad-s" minX="187" maxX="204" minY="433" maxY="450"/>
-  <symbol name="hand-s" minX="204" maxX="221" minY="433" maxY="450"/>
-  <symbol name="toilets-s" minX="221" maxX="238" minY="433" maxY="450"/>
-  <symbol name="gym-s" minX="238" maxX="255" minY="433" maxY="450"/>
-  <symbol name="grocery-s" minX="255" maxX="272" minY="433" maxY="450"/>
-  <symbol name="toll_booth-s" minX="272" maxX="289" minY="433" maxY="450"/>
-  <symbol name="golf-s" minX="289" maxX="306" minY="433" maxY="450"/>
-  <symbol name="garden-s" minX="306" maxX="323" minY="433" maxY="450"/>
-  <symbol name="gallery-s" minX="323" maxX="340" minY="433" maxY="450"/>
-  <symbol name="funicular-s" minX="340" maxX="357" minY="433" maxY="450"/>
-  <symbol name="tourism-s" minX="357" maxX="374" minY="433" maxY="450"/>
-  <symbol name="fuel-s" minX="374" maxX="391" minY="433" maxY="450"/>
-  <symbol name="fountain-s" minX="391" maxX="408" minY="433" maxY="450"/>
-  <symbol name="fire_station-s" minX="408" maxX="425" minY="433" maxY="450"/>
-  <symbol name="fastfood-s" minX="425" maxX="442" minY="433" maxY="450"/>
-  <symbol name="s-arrow" minX="442" maxX="457" minY="433" maxY="449"/>
-  <symbol name="metro-barcelona-m" minX="457" maxX="479" minY="433" maxY="449"/>
-  <symbol name="subway-barcelona-l" minX="479" maxX="501" minY="433" maxY="449"/>
-  <symbol name="subway-barcelona-m" minX="0" maxX="22" minY="450" maxY="466"/>
-  <symbol name="subway-madrid-l" minX="22" maxX="44" minY="450" maxY="466"/>
-  <symbol name="subway-madrid-m" minX="44" maxX="66" minY="450" maxY="466"/>
-  <symbol name="parking-m" minX="66" maxX="82" minY="450" maxY="466"/>
-  <symbol name="search-result" minX="82" maxX="97" minY="450" maxY="465"/>
-  <symbol name="metro-barcelona-s" minX="97" maxX="117" minY="450" maxY="465"/>
-  <symbol name="lightrail-berlin-s" minX="117" maxX="132" minY="450" maxY="465"/>
-  <symbol name="waste-basket-s" minX="132" maxX="147" minY="450" maxY="465"/>
-  <symbol name="subway-moscow-s" minX="147" maxX="162" minY="450" maxY="465"/>
-  <symbol name="peak-l" minX="162" maxX="177" minY="450" maxY="465"/>
-  <symbol name="subway-kiev-l" minX="177" maxX="198" minY="450" maxY="465"/>
-  <symbol name="subway-kiev-m" minX="198" maxX="219" minY="450" maxY="465"/>
-  <symbol name="subway-madrid-s" minX="219" maxX="239" minY="450" maxY="465"/>
-  <symbol name="api-result" minX="239" maxX="254" minY="450" maxY="465"/>
-  <symbol name="subway-paris-s" minX="254" maxX="269" minY="450" maxY="465"/>
-  <symbol name="subway-london-s" minX="269" maxX="286" minY="450" maxY="464"/>
-  <symbol name="subway-rome-s" minX="286" maxX="300" minY="450" maxY="464"/>
-  <symbol name="bench" minX="300" maxX="315" minY="450" maxY="464"/>
-  <symbol name="parking-s" minX="315" maxX="329" minY="450" maxY="464"/>
-  <symbol name="subway-berlin-s" minX="329" maxX="343" minY="450" maxY="464"/>
-  <symbol name="speedcam-s" minX="343" maxX="357" minY="450" maxY="464"/>
-  <symbol name="survey_point-l" minX="357" maxX="370" minY="450" maxY="463"/>
-  <symbol name="star-l" minX="370" maxX="383" minY="450" maxY="463"/>
-  <symbol name="peakt-l" minX="383" maxX="397" minY="450" maxY="463"/>
-  <symbol name="subway-minsk-l" minX="397" maxX="418" minY="450" maxY="463"/>
-  <symbol name="subway-minsk-m" minX="418" maxX="436" minY="450" maxY="462"/>
-  <symbol name="star-m" minX="436" maxX="448" minY="450" maxY="462"/>
-  <symbol name="subway-xs" minX="448" maxX="460" minY="450" maxY="462"/>
-  <symbol name="subway-kiev-s" minX="460" maxX="478" minY="450" maxY="462"/>
-  <symbol name="survey_point-m" minX="478" maxX="490" minY="450" maxY="462"/>
-  <symbol name="peak-m" minX="490" maxX="502" minY="450" maxY="462"/>
-  <symbol name="railway-crossing" minX="0" maxX="17" minY="466" maxY="478"/>
-  <symbol name="subway-newyork-xs" minX="17" maxX="29" minY="466" maxY="478"/>
-  <symbol name="crossing-l" minX="29" maxX="40" minY="466" maxY="477"/>
-  <symbol name="subway-minsk-s" minX="40" maxX="57" minY="466" maxY="477"/>
-  <symbol name="star-s" minX="57" maxX="68" minY="466" maxY="477"/>
-  <symbol name="survey_point-s" minX="68" maxX="78" minY="466" maxY="476"/>
-  <symbol name="peak-s" minX="78" maxX="89" minY="466" maxY="476"/>
-  <symbol name="peakt-m" minX="89" maxX="100" minY="466" maxY="476"/>
-  <symbol name="arrow-m" minX="100" maxX="120" minY="466" maxY="476"/>
-  <symbol name="crossing-m" minX="120" maxX="129" minY="466" maxY="475"/>
-  <symbol name="peakt-s" minX="129" maxX="138" minY="466" maxY="475"/>
-  <symbol name="entrance-s" minX="138" maxX="147" minY="466" maxY="475"/>
-  <symbol name="dot-m" minX="147" maxX="155" minY="466" maxY="474"/>
-  <symbol name="crossing-s" minX="155" maxX="163" minY="466" maxY="474"/>
-  <symbol name="tree-l" minX="163" maxX="171" minY="466" maxY="474"/>
-  <symbol name="none" minX="171" maxX="179" minY="466" maxY="474"/>
-  <symbol name="arrow-s" minX="179" maxX="194" minY="466" maxY="474"/>
-  <symbol name="entrance-xs" minX="194" maxX="201" minY="466" maxY="473"/>
-  <symbol name="tree-m" minX="201" maxX="208" minY="466" maxY="473"/>
-  <symbol name="dot-s" minX="208" maxX="214" minY="466" maxY="472"/>
-  <symbol name="zero-icon" minX="214" maxX="220" minY="466" maxY="472"/>
-  <symbol name="tree-s" minX="220" maxX="226" minY="466" maxY="472"/>
-  <symbol name="dot-s-light" minX="226" maxX="232" minY="466" maxY="472"/>
+ <file width="512" height="512">
+  <symbol minX="0" maxX="55" minY="0" maxY="79" name="route_to"/>
+  <symbol minX="55" maxX="82" minY="0" maxY="67" name="route_from"/>
+  <symbol minX="82" maxX="186" minY="0" maxY="52" name="route-arrow"/>
+  <symbol minX="186" maxX="232" minY="0" maxY="46" name="compass-image"/>
+  <symbol minX="232" maxX="265" minY="0" maxY="33" name="cross_geoposition"/>
+  <symbol minX="265" maxX="290" minY="0" maxY="30" name="current-position-obsolete"/>
+  <symbol minX="290" maxX="315" minY="0" maxY="30" name="current-position-compas"/>
+  <symbol minX="315" maxX="343" minY="0" maxY="28" name="search-result-active"/>
+  <symbol minX="343" maxX="365" minY="0" maxY="22" name="gallery-l"/>
+  <symbol minX="365" maxX="387" minY="0" maxY="22" name="america-football-l"/>
+  <symbol minX="387" maxX="409" minY="0" maxY="22" name="shoes-l"/>
+  <symbol minX="409" maxX="431" minY="0" maxY="22" name="alpine_hut-l"/>
+  <symbol minX="431" maxX="453" minY="0" maxY="22" name="archery-l"/>
+  <symbol minX="453" maxX="475" minY="0" maxY="22" name="ship-l"/>
+  <symbol minX="475" maxX="497" minY="0" maxY="22" name="seafood-shop-l"/>
+  <symbol minX="497" maxX="509" minY="0" maxY="22" name="placemark-yellow"/>
+  <symbol minX="0" maxX="12" minY="79" maxY="101" name="placemark-red"/>
+  <symbol minX="12" maxX="34" minY="79" maxY="101" name="atm-l"/>
+  <symbol minX="34" maxX="56" minY="79" maxY="101" name="shop-l"/>
+  <symbol minX="56" maxX="68" minY="79" maxY="101" name="placemark-purple"/>
+  <symbol minX="68" maxX="90" minY="79" maxY="101" name="australian-football-l"/>
+  <symbol minX="90" maxX="112" minY="79" maxY="101" name="school-l"/>
+  <symbol minX="112" maxX="124" minY="79" maxY="101" name="placemark-pink"/>
+  <symbol minX="124" maxX="146" minY="79" maxY="101" name="bakery-l"/>
+  <symbol minX="146" maxX="168" minY="79" maxY="101" name="sauna-l"/>
+  <symbol minX="168" maxX="190" minY="79" maxY="101" name="bank-l"/>
+  <symbol minX="190" maxX="211" minY="79" maxY="101" name="bank-m"/>
+  <symbol minX="211" maxX="233" minY="79" maxY="101" name="banknote-l"/>
+  <symbol minX="233" maxX="255" minY="79" maxY="101" name="skiing-l"/>
+  <symbol minX="255" maxX="277" minY="79" maxY="101" name="bar-l"/>
+  <symbol minX="277" maxX="299" minY="79" maxY="101" name="restaurant-l"/>
+  <symbol minX="299" maxX="311" minY="79" maxY="101" name="placemark-orange"/>
+  <symbol minX="311" maxX="333" minY="79" maxY="101" name="baseball-l"/>
+  <symbol minX="333" maxX="354" minY="79" maxY="101" name="remains-m"/>
+  <symbol minX="354" maxX="366" minY="79" maxY="101" name="placemark-green"/>
+  <symbol minX="366" maxX="388" minY="79" maxY="101" name="basketball-l"/>
+  <symbol minX="388" maxX="410" minY="79" maxY="101" name="remains-l"/>
+  <symbol minX="410" maxX="422" minY="79" maxY="101" name="placemark-brown"/>
+  <symbol minX="422" maxX="444" minY="79" maxY="101" name="bbq-l"/>
+  <symbol minX="444" maxX="466" minY="79" maxY="101" name="recycling-l"/>
+  <symbol minX="466" maxX="488" minY="79" maxY="101" name="bcontrol-l"/>
+  <symbol minX="488" maxX="509" minY="79" maxY="101" name="bcontrol-m"/>
+  <symbol minX="0" maxX="22" minY="101" maxY="123" name="soccer-l"/>
+  <symbol minX="22" maxX="44" minY="101" maxY="123" name="beach-l"/>
+  <symbol minX="44" maxX="66" minY="101" maxY="123" name="pub-l"/>
+  <symbol minX="66" maxX="78" minY="101" maxY="123" name="placemark-blue"/>
+  <symbol minX="78" maxX="100" minY="101" maxY="123" name="beauty-l"/>
+  <symbol minX="100" maxX="122" minY="101" maxY="123" name="power-m"/>
+  <symbol minX="122" maxX="144" minY="101" maxY="123" name="beer-l"/>
+  <symbol minX="144" maxX="165" minY="101" maxY="123" name="beer-m"/>
+  <symbol minX="165" maxX="187" minY="101" maxY="123" name="power-l"/>
+  <symbol minX="187" maxX="209" minY="101" maxY="123" name="postbox-l"/>
+  <symbol minX="209" maxX="231" minY="101" maxY="123" name="bicycle-l"/>
+  <symbol minX="231" maxX="253" minY="101" maxY="123" name="pool-l"/>
+  <symbol minX="253" maxX="275" minY="101" maxY="123" name="alcohol-l"/>
+  <symbol minX="275" maxX="297" minY="101" maxY="123" name="sports-l"/>
+  <symbol minX="297" maxX="319" minY="101" maxY="123" name="book-shop-l"/>
+  <symbol minX="319" maxX="341" minY="101" maxY="123" name="police-l"/>
+  <symbol minX="341" maxX="363" minY="101" maxY="123" name="place-of-worship-l"/>
+  <symbol minX="363" maxX="385" minY="101" maxY="123" name="bookmaker-l"/>
+  <symbol minX="385" maxX="407" minY="101" maxY="123" name="boundary_stone-l"/>
+  <symbol minX="407" maxX="429" minY="101" maxY="123" name="pitch-l"/>
+  <symbol minX="429" maxX="451" minY="101" maxY="123" name="bowls-l"/>
+  <symbol minX="451" maxX="472" minY="101" maxY="123" name="picnic-m"/>
+  <symbol minX="472" maxX="494" minY="101" maxY="123" name="airport-m"/>
+  <symbol minX="0" maxX="22" minY="123" maxY="145" name="bus-l"/>
+  <symbol minX="22" maxX="44" minY="123" maxY="145" name="picnic-l"/>
+  <symbol minX="44" maxX="66" minY="123" maxY="145" name="airport-l"/>
+  <symbol minX="66" maxX="88" minY="123" maxY="145" name="butcher-l"/>
+  <symbol minX="88" maxX="110" minY="123" maxY="145" name="photo-shop-l"/>
+  <symbol minX="110" maxX="132" minY="123" maxY="145" name="cable-car-l"/>
+  <symbol minX="132" maxX="154" minY="123" maxY="145" name="phone-l"/>
+  <symbol minX="154" maxX="176" minY="123" maxY="145" name="pharmacy-l"/>
+  <symbol minX="176" maxX="198" minY="123" maxY="145" name="cafe-l"/>
+  <symbol minX="198" maxX="220" minY="123" maxY="145" name="petshop-l"/>
+  <symbol minX="220" maxX="242" minY="123" maxY="145" name="zoo-l"/>
+  <symbol minX="242" maxX="264" minY="123" maxY="145" name="campsite-l"/>
+  <symbol minX="264" maxX="286" minY="123" maxY="145" name="subway-entrance-l"/>
+  <symbol minX="286" maxX="308" minY="123" maxY="145" name="subway-l"/>
+  <symbol minX="308" maxX="330" minY="123" maxY="145" name="car-part-l"/>
+  <symbol minX="330" maxX="352" minY="123" maxY="145" name="subway-newyork-l"/>
+  <symbol minX="352" maxX="374" minY="123" maxY="145" name="car-repair-l"/>
+  <symbol minX="374" maxX="395" minY="123" maxY="145" name="car-repair-m"/>
+  <symbol minX="395" maxX="417" minY="123" maxY="145" name="windmill-l"/>
+  <symbol minX="417" maxX="439" minY="123" maxY="145" name="car-wash-l"/>
+  <symbol minX="439" maxX="460" minY="123" maxY="145" name="car-wash-m"/>
+  <symbol minX="460" maxX="482" minY="123" maxY="145" name="car_sharing-l"/>
+  <symbol minX="482" maxX="504" minY="123" maxY="145" name="parking-meter-l"/>
+  <symbol minX="0" maxX="22" minY="145" maxY="167" name="caravan_site-l"/>
+  <symbol minX="22" maxX="44" minY="145" maxY="167" name="subway-paris-l"/>
+  <symbol minX="44" maxX="66" minY="145" maxY="167" name="casino-l"/>
+  <symbol minX="66" maxX="88" minY="145" maxY="167" name="park-l"/>
+  <symbol minX="88" maxX="110" minY="145" maxY="167" name="optician-l"/>
+  <symbol minX="110" maxX="132" minY="145" maxY="167" name="cave-l"/>
+  <symbol minX="132" maxX="153" minY="145" maxY="167" name="office-m"/>
+  <symbol minX="153" maxX="175" minY="145" maxY="167" name="wayside_shrine-l"/>
+  <symbol minX="175" maxX="197" minY="145" maxY="167" name="cemetery-l"/>
+  <symbol minX="197" maxX="219" minY="145" maxY="167" name="office-l"/>
+  <symbol minX="219" maxX="241" minY="145" maxY="167" name="nparkf-l"/>
+  <symbol minX="241" maxX="263" minY="145" maxY="167" name="charging-station-l"/>
+  <symbol minX="263" maxX="285" minY="145" maxY="167" name="npark-l"/>
+  <symbol minX="285" maxX="307" minY="145" maxY="167" name="wayside_cross-l"/>
+  <symbol minX="307" maxX="329" minY="145" maxY="167" name="chemist-l"/>
+  <symbol minX="329" maxX="351" minY="145" maxY="167" name="subway-spb-l"/>
+  <symbol minX="351" maxX="373" minY="145" maxY="167" name="childcare-l"/>
+  <symbol minX="373" maxX="395" minY="145" maxY="167" name="chimney-l"/>
+  <symbol minX="395" maxX="417" minY="145" maxY="167" name="museum-l"/>
+  <symbol minX="417" maxX="439" minY="145" maxY="167" name="cinema-l"/>
+  <symbol minX="439" maxX="461" minY="145" maxY="167" name="moto-sharing-l"/>
+  <symbol minX="461" maxX="483" minY="145" maxY="167" name="motel-l"/>
+  <symbol minX="483" maxX="505" minY="145" maxY="167" name="climbing-l"/>
+  <symbol minX="0" maxX="22" minY="167" maxY="189" name="sweets-l"/>
+  <symbol minX="22" maxX="43" minY="167" maxY="189" name="waterfall-m"/>
+  <symbol minX="43" maxX="65" minY="167" maxY="189" name="clothes-l"/>
+  <symbol minX="65" maxX="87" minY="167" maxY="189" name="monument-l"/>
+  <symbol minX="87" maxX="109" minY="167" maxY="189" name="college-l"/>
+  <symbol minX="109" maxX="131" minY="167" maxY="189" name="mobile_phone-l"/>
+  <symbol minX="131" maxX="153" minY="167" maxY="189" name="waterfall-l"/>
+  <symbol minX="153" maxX="175" minY="167" maxY="189" name="computer-l"/>
+  <symbol minX="175" maxX="197" minY="167" maxY="189" name="military-l"/>
+  <symbol minX="197" maxX="219" minY="167" maxY="189" name="convenience-l"/>
+  <symbol minX="219" maxX="241" minY="167" maxY="189" name="swimming-l"/>
+  <symbol minX="241" maxX="263" minY="167" maxY="189" name="copyshop-l"/>
+  <symbol minX="263" maxX="285" minY="167" maxY="189" name="taxi-l"/>
+  <symbol minX="285" maxX="307" minY="167" maxY="189" name="courthouse-l"/>
+  <symbol minX="307" maxX="329" minY="167" maxY="189" name="cricket-l"/>
+  <symbol minX="329" maxX="351" minY="167" maxY="189" name="marketplace-l"/>
+  <symbol minX="351" maxX="373" minY="167" maxY="189" name="mail-l"/>
+  <symbol minX="373" maxX="395" minY="167" maxY="189" name="tennis-l"/>
+  <symbol minX="395" maxX="417" minY="167" maxY="189" name="lightrail-berlin-l"/>
+  <symbol minX="417" maxX="439" minY="167" maxY="189" name="volcano-l"/>
+  <symbol minX="439" maxX="461" minY="167" maxY="189" name="curling-l"/>
+  <symbol minX="461" maxX="483" minY="167" maxY="189" name="lighthouse-l"/>
+  <symbol minX="483" maxX="505" minY="167" maxY="189" name="viewpoint-m"/>
+  <symbol minX="0" maxX="22" minY="189" maxY="211" name="dentist-l"/>
+  <symbol minX="22" maxX="44" minY="189" maxY="211" name="dentist-m"/>
+  <symbol minX="44" maxX="66" minY="189" maxY="211" name="viewpoint-l"/>
+  <symbol minX="66" maxX="88" minY="189" maxY="211" name="department_store-l"/>
+  <symbol minX="88" maxX="110" minY="189" maxY="211" name="lift_gate-l"/>
+  <symbol minX="110" maxX="132" minY="189" maxY="211" name="diving-l"/>
+  <symbol minX="132" maxX="154" minY="189" maxY="211" name="theatre-l"/>
+  <symbol minX="154" maxX="176" minY="189" maxY="211" name="library-l"/>
+  <symbol minX="176" maxX="198" minY="189" maxY="211" name="dog_park-l"/>
+  <symbol minX="198" maxX="220" minY="189" maxY="211" name="lawyer-l"/>
+  <symbol minX="220" maxX="242" minY="189" maxY="211" name="doityourself-l"/>
+  <symbol minX="242" maxX="263" minY="189" maxY="211" name="laundry-m"/>
+  <symbol minX="263" maxX="285" minY="189" maxY="211" name="veterinary-l"/>
+  <symbol minX="285" maxX="307" minY="189" maxY="211" name="laundry-l"/>
+  <symbol minX="307" maxX="329" minY="189" maxY="211" name="vending-l"/>
+  <symbol minX="329" maxX="351" minY="189" maxY="211" name="drinking-water-l"/>
+  <symbol minX="351" maxX="373" minY="189" maxY="211" name="kiosk-l"/>
+  <symbol minX="373" maxX="395" minY="189" maxY="211" name="kindergarten-m"/>
+  <symbol minX="395" maxX="417" minY="189" maxY="211" name="kindergarten-l"/>
+  <symbol minX="417" maxX="439" minY="189" maxY="211" name="electronics-l"/>
+  <symbol minX="439" maxX="461" minY="189" maxY="211" name="jewelry-l"/>
+  <symbol minX="461" maxX="483" minY="189" maxY="211" name="embassy-l"/>
+  <symbol minX="483" maxX="505" minY="189" maxY="211" name="ticket-shop-l"/>
+  <symbol minX="0" maxX="22" minY="211" maxY="233" name="tram-l"/>
+  <symbol minX="22" maxX="44" minY="211" maxY="233" name="information-l"/>
+  <symbol minX="44" maxX="66" minY="211" maxY="233" name="train-l"/>
+  <symbol minX="66" maxX="88" minY="211" maxY="233" name="equestrian-l"/>
+  <symbol minX="88" maxX="110" minY="211" maxY="233" name="equestrian-m"/>
+  <symbol minX="110" maxX="131" minY="211" maxY="233" name="hunting-tower-m"/>
+  <symbol minX="131" maxX="153" minY="211" maxY="233" name="fastfood-l"/>
+  <symbol minX="153" maxX="175" minY="211" maxY="233" name="hunting-tower-l"/>
+  <symbol minX="175" maxX="197" minY="211" maxY="233" name="toys-l"/>
+  <symbol minX="197" maxX="219" minY="211" maxY="233" name="fire_station-l"/>
+  <symbol minX="219" maxX="241" minY="211" maxY="233" name="hotel-l"/>
+  <symbol minX="241" maxX="263" minY="211" maxY="233" name="toilets-l"/>
+  <symbol minX="263" maxX="285" minY="211" maxY="233" name="hospital-l"/>
+  <symbol minX="285" maxX="307" minY="211" maxY="233" name="florist-l"/>
+  <symbol minX="307" maxX="329" minY="211" maxY="233" name="historic-ship-l"/>
+  <symbol minX="329" maxX="351" minY="211" maxY="233" name="fountain-l"/>
+  <symbol minX="351" maxX="372" minY="211" maxY="233" name="heliport-m"/>
+  <symbol minX="372" maxX="394" minY="211" maxY="233" name="townhall-l"/>
+  <symbol minX="394" maxX="416" minY="211" maxY="233" name="fuel-l"/>
+  <symbol minX="416" maxX="438" minY="211" maxY="233" name="heliport-l"/>
+  <symbol minX="438" maxX="460" minY="211" maxY="233" name="tourist-shop-l"/>
+  <symbol minX="460" maxX="482" minY="211" maxY="233" name="funicular-l"/>
+  <symbol minX="482" maxX="504" minY="211" maxY="233" name="helipad-l"/>
+  <symbol minX="0" maxX="22" minY="233" maxY="255" name="tourist-office-l"/>
+  <symbol minX="22" maxX="44" minY="233" maxY="255" name="furniture-l"/>
+  <symbol minX="44" maxX="66" minY="233" maxY="255" name="hardware-l"/>
+  <symbol minX="66" maxX="88" minY="233" maxY="255" name="toll_booth-l"/>
+  <symbol minX="88" maxX="110" minY="233" maxY="255" name="hand-m"/>
+  <symbol minX="110" maxX="132" minY="233" maxY="255" name="hand-l"/>
+  <symbol minX="132" maxX="154" minY="233" maxY="255" name="garden-l"/>
+  <symbol minX="154" maxX="176" minY="233" maxY="255" name="shop-bicycle-l"/>
+  <symbol minX="176" maxX="198" minY="233" maxY="255" name="tourism-l"/>
+  <symbol minX="198" maxX="220" minY="233" maxY="255" name="garden_center-l"/>
+  <symbol minX="220" maxX="242" minY="233" maxY="255" name="hairdresser-l"/>
+  <symbol minX="242" maxX="264" minY="233" maxY="255" name="gate-l"/>
+  <symbol minX="264" maxX="286" minY="233" maxY="255" name="gym-l"/>
+  <symbol minX="286" maxX="308" minY="233" maxY="255" name="gift-l"/>
+  <symbol minX="308" maxX="330" minY="233" maxY="255" name="tomb-l"/>
+  <symbol minX="330" maxX="352" minY="233" maxY="255" name="golf-l"/>
+  <symbol minX="352" maxX="374" minY="233" maxY="255" name="grocery-l"/>
+  <symbol minX="374" maxX="396" minY="233" maxY="255" name="greengrocer-l"/>
+  <symbol minX="396" maxX="417" minY="233" maxY="254" name="tomb-m"/>
+  <symbol minX="417" maxX="438" minY="233" maxY="254" name="greengrocer-m"/>
+  <symbol minX="438" maxX="459" minY="233" maxY="254" name="golf-m"/>
+  <symbol minX="459" maxX="480" minY="233" maxY="254" name="grocery-m"/>
+  <symbol minX="480" maxX="501" minY="233" maxY="254" name="gift-m"/>
+  <symbol minX="0" maxX="21" minY="255" maxY="276" name="gate-m"/>
+  <symbol minX="21" maxX="42" minY="255" maxY="276" name="gym-m"/>
+  <symbol minX="42" maxX="63" minY="255" maxY="276" name="toll_booth-m"/>
+  <symbol minX="63" maxX="84" minY="255" maxY="276" name="garden_center-m"/>
+  <symbol minX="84" maxX="105" minY="255" maxY="276" name="hairdresser-m"/>
+  <symbol minX="105" maxX="126" minY="255" maxY="276" name="tourism-m"/>
+  <symbol minX="126" maxX="147" minY="255" maxY="276" name="gallery-m"/>
+  <symbol minX="147" maxX="168" minY="255" maxY="276" name="alpine_hut-m"/>
+  <symbol minX="168" maxX="189" minY="255" maxY="276" name="furniture-m"/>
+  <symbol minX="189" maxX="210" minY="255" maxY="276" name="hardware-m"/>
+  <symbol minX="210" maxX="231" minY="255" maxY="276" name="funicular-m"/>
+  <symbol minX="231" maxX="252" minY="255" maxY="276" name="helipad-m"/>
+  <symbol minX="252" maxX="273" minY="255" maxY="276" name="toilets-m"/>
+  <symbol minX="273" maxX="294" minY="255" maxY="276" name="fuel-m"/>
+  <symbol minX="294" maxX="315" minY="255" maxY="276" name="fountain-m"/>
+  <symbol minX="315" maxX="336" minY="255" maxY="276" name="shoes-m"/>
+  <symbol minX="336" maxX="357" minY="255" maxY="276" name="florist-m"/>
+  <symbol minX="357" maxX="378" minY="255" maxY="276" name="historic-ship-m"/>
+  <symbol minX="378" maxX="399" minY="255" maxY="276" name="america-football-m"/>
+  <symbol minX="399" maxX="420" minY="255" maxY="276" name="hospital-m"/>
+  <symbol minX="420" maxX="441" minY="255" maxY="276" name="townhall-m"/>
+  <symbol minX="441" maxX="462" minY="255" maxY="276" name="fire_station-m"/>
+  <symbol minX="462" maxX="483" minY="255" maxY="276" name="hotel-m"/>
+  <symbol minX="483" maxX="504" minY="255" maxY="276" name="ticket-shop-m"/>
+  <symbol minX="0" maxX="21" minY="276" maxY="297" name="fastfood-m"/>
+  <symbol minX="21" maxX="42" minY="276" maxY="297" name="toys-m"/>
+  <symbol minX="42" maxX="63" minY="276" maxY="297" name="shop-bicycle-m"/>
+  <symbol minX="63" maxX="84" minY="276" maxY="297" name="train-m"/>
+  <symbol minX="84" maxX="105" minY="276" maxY="297" name="information-m"/>
+  <symbol minX="105" maxX="126" minY="276" maxY="297" name="embassy-m"/>
+  <symbol minX="126" maxX="147" minY="276" maxY="297" name="electronics-m"/>
+  <symbol minX="147" maxX="168" minY="276" maxY="297" name="jewelry-m"/>
+  <symbol minX="168" maxX="189" minY="276" maxY="297" name="drugs"/>
+  <symbol minX="189" maxX="210" minY="276" maxY="297" name="tram-m"/>
+  <symbol minX="210" maxX="231" minY="276" maxY="297" name="theatre-m"/>
+  <symbol minX="231" maxX="252" minY="276" maxY="297" name="drinking-water-m"/>
+  <symbol minX="252" maxX="273" minY="276" maxY="297" name="kiosk-m"/>
+  <symbol minX="273" maxX="294" minY="276" maxY="297" name="vending-m"/>
+  <symbol minX="294" maxX="315" minY="276" maxY="297" name="doityourself-m"/>
+  <symbol minX="315" maxX="336" minY="276" maxY="297" name="dog_park-m"/>
+  <symbol minX="336" maxX="357" minY="276" maxY="297" name="veterinary-m"/>
+  <symbol minX="357" maxX="378" minY="276" maxY="297" name="library-m"/>
+  <symbol minX="378" maxX="399" minY="276" maxY="297" name="diving-m"/>
+  <symbol minX="399" maxX="420" minY="276" maxY="297" name="department_store-m"/>
+  <symbol minX="420" maxX="441" minY="276" maxY="297" name="lift_gate-m"/>
+  <symbol minX="441" maxX="462" minY="276" maxY="297" name="curling-m"/>
+  <symbol minX="462" maxX="483" minY="276" maxY="297" name="lighthouse-m"/>
+  <symbol minX="483" maxX="504" minY="276" maxY="297" name="tennis-m"/>
+  <symbol minX="0" maxX="21" minY="297" maxY="318" name="volcano-m"/>
+  <symbol minX="21" maxX="42" minY="297" maxY="318" name="ship-m"/>
+  <symbol minX="42" maxX="63" minY="297" maxY="318" name="archery-m"/>
+  <symbol minX="63" maxX="84" minY="297" maxY="318" name="seafood-shop-m"/>
+  <symbol minX="84" maxX="105" minY="297" maxY="318" name="mail-m"/>
+  <symbol minX="105" maxX="126" minY="297" maxY="318" name="taxi-m"/>
+  <symbol minX="126" maxX="147" minY="297" maxY="318" name="cricket-m"/>
+  <symbol minX="147" maxX="168" minY="297" maxY="318" name="marketplace-m"/>
+  <symbol minX="168" maxX="189" minY="297" maxY="318" name="copyshop-m"/>
+  <symbol minX="189" maxX="210" minY="297" maxY="318" name="swimming-m"/>
+  <symbol minX="210" maxX="231" minY="297" maxY="318" name="convenience-m"/>
+  <symbol minX="231" maxX="252" minY="297" maxY="318" name="computer-m"/>
+  <symbol minX="252" maxX="273" minY="297" maxY="318" name="military-m"/>
+  <symbol minX="273" maxX="294" minY="297" maxY="318" name="sweets-m"/>
+  <symbol minX="294" maxX="315" minY="297" maxY="318" name="college-m"/>
+  <symbol minX="315" maxX="336" minY="297" maxY="318" name="mobile_phone-m"/>
+  <symbol minX="336" maxX="357" minY="297" maxY="318" name="clothes-m"/>
+  <symbol minX="357" maxX="378" minY="297" maxY="318" name="monument-m"/>
+  <symbol minX="378" maxX="399" minY="297" maxY="318" name="climbing-m"/>
+  <symbol minX="399" maxX="420" minY="297" maxY="318" name="alcohol-m"/>
+  <symbol minX="420" maxX="441" minY="297" maxY="318" name="motel-m"/>
+  <symbol minX="441" maxX="462" minY="297" maxY="318" name="subway-spb-m"/>
+  <symbol minX="462" maxX="483" minY="297" maxY="318" name="cinema-m"/>
+  <symbol minX="483" maxX="504" minY="297" maxY="318" name="chimney-m"/>
+  <symbol minX="0" maxX="21" minY="318" maxY="339" name="museum-m"/>
+  <symbol minX="21" maxX="42" minY="318" maxY="339" name="chemist-m"/>
+  <symbol minX="42" maxX="63" minY="318" maxY="339" name="atm-m"/>
+  <symbol minX="63" maxX="84" minY="318" maxY="339" name="school-m"/>
+  <symbol minX="84" maxX="105" minY="318" maxY="339" name="australian-football-m"/>
+  <symbol minX="105" maxX="126" minY="318" maxY="339" name="sauna-m"/>
+  <symbol minX="126" maxX="147" minY="318" maxY="339" name="bakery-m"/>
+  <symbol minX="147" maxX="168" minY="318" maxY="339" name="garden-m"/>
+  <symbol minX="168" maxX="189" minY="318" maxY="339" name="charging-station-m"/>
+  <symbol minX="189" maxX="210" minY="318" maxY="339" name="npark-m"/>
+  <symbol minX="210" maxX="231" minY="318" maxY="339" name="shop-m"/>
+  <symbol minX="231" maxX="252" minY="318" maxY="339" name="wayside_cross-m"/>
+  <symbol minX="252" maxX="273" minY="318" maxY="339" name="nparkf-m "/>
+  <symbol minX="273" maxX="294" minY="318" maxY="339" name="nparkf-m"/>
+  <symbol minX="294" maxX="315" minY="318" maxY="339" name="banknote-m"/>
+  <symbol minX="315" maxX="336" minY="318" maxY="339" name="cemetery-m"/>
+  <symbol minX="336" maxX="357" minY="318" maxY="339" name="cave-m"/>
+  <symbol minX="357" maxX="378" minY="318" maxY="339" name="restaurant-m"/>
+  <symbol minX="378" maxX="399" minY="318" maxY="339" name="wayside_shrine-m"/>
+  <symbol minX="399" maxX="420" minY="318" maxY="339" name="optician-m"/>
+  <symbol minX="420" maxX="441" minY="318" maxY="339" name="casino-m"/>
+  <symbol minX="441" maxX="462" minY="318" maxY="339" name="park-m"/>
+  <symbol minX="462" maxX="483" minY="318" maxY="339" name="caravan_site-m"/>
+  <symbol minX="483" maxX="504" minY="318" maxY="339" name="bar-m"/>
+  <symbol minX="0" maxX="21" minY="339" maxY="360" name="subway-newyork-m"/>
+  <symbol minX="21" maxX="42" minY="339" maxY="360" name="car_sharing-m"/>
+  <symbol minX="42" maxX="63" minY="339" maxY="360" name="parking-meter-m"/>
+  <symbol minX="63" maxX="84" minY="339" maxY="360" name="car-part-m"/>
+  <symbol minX="84" maxX="105" minY="339" maxY="360" name="baseball-m"/>
+  <symbol minX="105" maxX="126" minY="339" maxY="360" name="basketball-m"/>
+  <symbol minX="126" maxX="147" minY="339" maxY="360" name="subway-m"/>
+  <symbol minX="147" maxX="168" minY="339" maxY="360" name="skiing-m"/>
+  <symbol minX="168" maxX="189" minY="339" maxY="360" name="windmill-m"/>
+  <symbol minX="189" maxX="210" minY="339" maxY="360" name="subway-entrance-m"/>
+  <symbol minX="210" maxX="231" minY="339" maxY="360" name="campsite-m"/>
+  <symbol minX="231" maxX="252" minY="339" maxY="360" name="cafe-m"/>
+  <symbol minX="252" maxX="273" minY="339" maxY="360" name="petshop-m"/>
+  <symbol minX="273" maxX="294" minY="339" maxY="360" name="pharmacy-2-m"/>
+  <symbol minX="294" maxX="315" minY="339" maxY="360" name="zoo-m"/>
+  <symbol minX="315" maxX="336" minY="339" maxY="360" name="pharmacy-m"/>
+  <symbol minX="336" maxX="357" minY="339" maxY="360" name="subway-entrance-2-m"/>
+  <symbol minX="357" maxX="378" minY="339" maxY="360" name="cable-car-m"/>
+  <symbol minX="378" maxX="399" minY="339" maxY="360" name="phone-m"/>
+  <symbol minX="399" maxX="420" minY="339" maxY="360" name="recycling-m"/>
+  <symbol minX="420" maxX="441" minY="339" maxY="360" name="butcher-m"/>
+  <symbol minX="441" maxX="462" minY="339" maxY="360" name="photo-shop-m"/>
+  <symbol minX="462" maxX="483" minY="339" maxY="360" name="bus-m"/>
+  <symbol minX="483" maxX="504" minY="339" maxY="360" name="bowls-m"/>
+  <symbol minX="0" maxX="21" minY="360" maxY="381" name="bbq-m"/>
+  <symbol minX="21" maxX="42" minY="360" maxY="381" name="boundary_stone-m"/>
+  <symbol minX="42" maxX="63" minY="360" maxY="381" name="pitch-m"/>
+  <symbol minX="63" maxX="84" minY="360" maxY="381" name="soccer-m"/>
+  <symbol minX="84" maxX="105" minY="360" maxY="381" name="pub-m"/>
+  <symbol minX="105" maxX="126" minY="360" maxY="381" name="place-of-worship-m"/>
+  <symbol minX="126" maxX="147" minY="360" maxY="381" name="sports-m"/>
+  <symbol minX="147" maxX="168" minY="360" maxY="381" name="book-shop-m"/>
+  <symbol minX="168" maxX="189" minY="360" maxY="381" name="police-m"/>
+  <symbol minX="189" maxX="210" minY="360" maxY="381" name="beach-m"/>
+  <symbol minX="210" maxX="231" minY="360" maxY="381" name="bicycle-m"/>
+  <symbol minX="231" maxX="252" minY="360" maxY="381" name="beauty-m"/>
+  <symbol minX="252" maxX="273" minY="360" maxY="381" name="postbox-m"/>
+  <symbol minX="273" maxX="293" minY="360" maxY="380" name="subway-berlin-l"/>
+  <symbol minX="293" maxX="313" minY="360" maxY="380" name="parking-l"/>
+  <symbol minX="313" maxX="333" minY="360" maxY="380" name="speedcam-l"/>
+  <symbol minX="333" maxX="353" minY="360" maxY="380" name="bike-parking-l"/>
+  <symbol minX="353" maxX="373" minY="360" maxY="380" name="lightrail-berlin-m"/>
+  <symbol minX="373" maxX="393" minY="360" maxY="380" name="subway-rome-l"/>
+  <symbol minX="393" maxX="413" minY="360" maxY="380" name="waste-basket-l"/>
+  <symbol minX="413" maxX="429" minY="360" maxY="379" name="firehydrant-l"/>
+  <symbol minX="429" maxX="448" minY="360" maxY="379" name="current-position"/>
+  <symbol minX="448" maxX="470" minY="360" maxY="379" name="subway-moscow-l"/>
+  <symbol minX="470" maxX="492" minY="360" maxY="378" name="subway-london-l"/>
+  <symbol minX="0" maxX="21" minY="381" maxY="399" name="subway-moscow-m"/>
+  <symbol minX="21" maxX="38" minY="381" maxY="399" name="remains-s"/>
+  <symbol minX="38" maxX="56" minY="381" maxY="399" name="subway-berlin-m"/>
+  <symbol minX="56" maxX="73" minY="381" maxY="399" name="office-s"/>
+  <symbol minX="73" maxX="91" minY="381" maxY="399" name="subway-paris-m"/>
+  <symbol minX="91" maxX="108" minY="381" maxY="399" name="picnic-s"/>
+  <symbol minX="108" maxX="126" minY="381" maxY="399" name="no-icon"/>
+  <symbol minX="126" maxX="144" minY="381" maxY="399" name="no-icon-tourism"/>
+  <symbol minX="144" maxX="162" minY="381" maxY="399" name="no-icon-shop"/>
+  <symbol minX="162" maxX="180" minY="381" maxY="399" name="no-icon-leisure"/>
+  <symbol minX="180" maxX="198" minY="381" maxY="399" name="no-icon-amenity"/>
+  <symbol minX="198" maxX="215" minY="381" maxY="399" name="waterfall-s"/>
+  <symbol minX="215" maxX="233" minY="381" maxY="399" name="waste-basket-s"/>
+  <symbol minX="233" maxX="250" minY="381" maxY="399" name="bcontrol-s"/>
+  <symbol minX="250" maxX="268" minY="381" maxY="399" name="airport-s"/>
+  <symbol minX="268" maxX="285" minY="381" maxY="399" name="hunting-tower-s"/>
+  <symbol minX="285" maxX="302" minY="381" maxY="399" name="beer-s"/>
+  <symbol minX="302" maxX="319" minY="381" maxY="399" name="heliport-s"/>
+  <symbol minX="319" maxX="337" minY="381" maxY="399" name="subway-rome-m"/>
+  <symbol minX="337" maxX="354" minY="381" maxY="398" name="ship-s"/>
+  <symbol minX="354" maxX="371" minY="381" maxY="398" name="school-s"/>
+  <symbol minX="371" maxX="388" minY="381" maxY="398" name="alcohol-s"/>
+  <symbol minX="388" maxX="405" minY="381" maxY="398" name="shop-s"/>
+  <symbol minX="405" maxX="422" minY="381" maxY="398" name="restaurant-s"/>
+  <symbol minX="422" maxX="439" minY="381" maxY="398" name="recycling-s"/>
+  <symbol minX="439" maxX="456" minY="381" maxY="398" name="skiing-s"/>
+  <symbol minX="456" maxX="473" minY="381" maxY="398" name="alpine_hut-s"/>
+  <symbol minX="473" maxX="490" minY="381" maxY="398" name="pub-s"/>
+  <symbol minX="490" maxX="507" minY="381" maxY="398" name="soccer-s"/>
+  <symbol minX="0" maxX="17" minY="399" maxY="416" name="power-s"/>
+  <symbol minX="17" maxX="34" minY="399" maxY="416" name="speedcam-m"/>
+  <symbol minX="34" maxX="51" minY="399" maxY="416" name="america-football-s"/>
+  <symbol minX="51" maxX="68" minY="399" maxY="416" name="police-s"/>
+  <symbol minX="68" maxX="85" minY="399" maxY="416" name="place-of-worship-s"/>
+  <symbol minX="85" maxX="102" minY="399" maxY="416" name="archery-s"/>
+  <symbol minX="102" maxX="119" minY="399" maxY="416" name="atm-s"/>
+  <symbol minX="119" maxX="136" minY="399" maxY="416" name="australian-football-s"/>
+  <symbol minX="136" maxX="153" minY="399" maxY="416" name="bar-s"/>
+  <symbol minX="153" maxX="170" minY="399" maxY="416" name="baseball-s"/>
+  <symbol minX="170" maxX="190" minY="399" maxY="416" name="subway-barcelona-s"/>
+  <symbol minX="190" maxX="207" minY="399" maxY="416" name="pitch-s"/>
+  <symbol minX="207" maxX="224" minY="399" maxY="416" name="phone-s"/>
+  <symbol minX="224" maxX="241" minY="399" maxY="416" name="basketball-s"/>
+  <symbol minX="241" maxX="258" minY="399" maxY="416" name="pharmacy-s"/>
+  <symbol minX="258" maxX="275" minY="399" maxY="416" name="subway-entrance-2-s"/>
+  <symbol minX="275" maxX="292" minY="399" maxY="416" name="subway-entrance-arrow"/>
+  <symbol minX="292" maxX="309" minY="399" maxY="416" name="beach-s"/>
+  <symbol minX="309" maxX="326" minY="399" maxY="416" name="bicycle-s"/>
+  <symbol minX="326" maxX="343" minY="399" maxY="416" name="subway-entrance-s"/>
+  <symbol minX="343" maxX="360" minY="399" maxY="416" name="book-shop-s"/>
+  <symbol minX="360" maxX="377" minY="399" maxY="416" name="bowls-s"/>
+  <symbol minX="377" maxX="394" minY="399" maxY="416" name="bus-s"/>
+  <symbol minX="394" maxX="411" minY="399" maxY="416" name="zoo-s"/>
+  <symbol minX="411" maxX="428" minY="399" maxY="416" name="cable-car-s"/>
+  <symbol minX="428" maxX="449" minY="399" maxY="416" name="subway-london-m"/>
+  <symbol minX="449" maxX="466" minY="399" maxY="416" name="cafe-s"/>
+  <symbol minX="466" maxX="483" minY="399" maxY="416" name="windmill-s"/>
+  <symbol minX="483" maxX="500" minY="399" maxY="416" name="campsite-s"/>
+  <symbol minX="0" maxX="17" minY="416" maxY="433" name="car-repair-s"/>
+  <symbol minX="17" maxX="34" minY="416" maxY="433" name="casino-s"/>
+  <symbol minX="34" maxX="51" minY="416" maxY="433" name="cave-s"/>
+  <symbol minX="51" maxX="68" minY="416" maxY="433" name="cemetery-s"/>
+  <symbol minX="68" maxX="85" minY="416" maxY="433" name="charging-station-s"/>
+  <symbol minX="85" maxX="102" minY="416" maxY="433" name="cinema-s"/>
+  <symbol minX="102" maxX="113" minY="416" maxY="433" name="parking-ticket-l"/>
+  <symbol minX="113" maxX="130" minY="416" maxY="433" name="climbing-s"/>
+  <symbol minX="130" maxX="147" minY="416" maxY="433" name="college-s"/>
+  <symbol minX="147" maxX="164" minY="416" maxY="433" name="cricket-s"/>
+  <symbol minX="164" maxX="181" minY="416" maxY="433" name="subway-newyork-s"/>
+  <symbol minX="181" maxX="198" minY="416" maxY="433" name="volcano-s"/>
+  <symbol minX="198" maxX="215" minY="416" maxY="433" name="park-s"/>
+  <symbol minX="215" maxX="232" minY="416" maxY="433" name="nparkf-s"/>
+  <symbol minX="232" maxX="249" minY="416" maxY="433" name="viewpoint-s"/>
+  <symbol minX="249" maxX="266" minY="416" maxY="433" name="npark-s"/>
+  <symbol minX="266" maxX="283" minY="416" maxY="433" name="curling-s"/>
+  <symbol minX="283" maxX="300" minY="416" maxY="433" name="dentist-s"/>
+  <symbol minX="300" maxX="317" minY="416" maxY="433" name="subway-s"/>
+  <symbol minX="317" maxX="334" minY="416" maxY="433" name="museum-s"/>
+  <symbol minX="334" maxX="351" minY="416" maxY="433" name="motel-s"/>
+  <symbol minX="351" maxX="368" minY="416" maxY="433" name="subway-spb-s"/>
+  <symbol minX="368" maxX="385" minY="416" maxY="433" name="diving-s"/>
+  <symbol minX="385" maxX="402" minY="416" maxY="433" name="tram-s"/>
+  <symbol minX="402" maxX="419" minY="416" maxY="433" name="drinking-water-s"/>
+  <symbol minX="419" maxX="436" minY="416" maxY="433" name="embassy-s"/>
+  <symbol minX="436" maxX="453" minY="416" maxY="433" name="monument-s"/>
+  <symbol minX="453" maxX="470" minY="416" maxY="433" name="military-s"/>
+  <symbol minX="470" maxX="487" minY="416" maxY="433" name="train-s"/>
+  <symbol minX="487" maxX="504" minY="416" maxY="433" name="equestrian-s"/>
+  <symbol minX="0" maxX="17" minY="433" maxY="450" name="swimming-s"/>
+  <symbol minX="17" maxX="34" minY="433" maxY="450" name="marketplace-s"/>
+  <symbol minX="34" maxX="51" minY="433" maxY="450" name="mail-s"/>
+  <symbol minX="51" maxX="68" minY="433" maxY="450" name="fastfood-s"/>
+  <symbol minX="68" maxX="85" minY="433" maxY="450" name="lighthouse-s"/>
+  <symbol minX="85" maxX="102" minY="433" maxY="450" name="tennis-s"/>
+  <symbol minX="102" maxX="119" minY="433" maxY="450" name="library-s"/>
+  <symbol minX="119" maxX="136" minY="433" maxY="450" name="kindergarten-s"/>
+  <symbol minX="136" maxX="153" minY="433" maxY="450" name="theatre-s"/>
+  <symbol minX="153" maxX="170" minY="433" maxY="450" name="information-s"/>
+  <symbol minX="170" maxX="187" minY="433" maxY="450" name="hotel-s"/>
+  <symbol minX="187" maxX="204" minY="433" maxY="450" name="hospital-s"/>
+  <symbol minX="204" maxX="221" minY="433" maxY="450" name="helipad-s"/>
+  <symbol minX="221" maxX="238" minY="433" maxY="450" name="toilets-s"/>
+  <symbol minX="238" maxX="255" minY="433" maxY="450" name="hand-s"/>
+  <symbol minX="255" maxX="272" minY="433" maxY="450" name="gym-s"/>
+  <symbol minX="272" maxX="289" minY="433" maxY="450" name="toll_booth-s"/>
+  <symbol minX="289" maxX="306" minY="433" maxY="450" name="grocery-s"/>
+  <symbol minX="306" maxX="323" minY="433" maxY="450" name="golf-s"/>
+  <symbol minX="323" maxX="340" minY="433" maxY="450" name="garden-s"/>
+  <symbol minX="340" maxX="357" minY="433" maxY="450" name="gallery-s"/>
+  <symbol minX="357" maxX="374" minY="433" maxY="450" name="tourism-s"/>
+  <symbol minX="374" maxX="391" minY="433" maxY="450" name="funicular-s"/>
+  <symbol minX="391" maxX="408" minY="433" maxY="450" name="fuel-s"/>
+  <symbol minX="408" maxX="425" minY="433" maxY="450" name="fountain-s"/>
+  <symbol minX="425" maxX="442" minY="433" maxY="450" name="fire_station-s"/>
+  <symbol minX="442" maxX="459" minY="433" maxY="450" name="townhall-s"/>
+  <symbol minX="459" maxX="474" minY="433" maxY="449" name="s-arrow"/>
+  <symbol minX="474" maxX="496" minY="433" maxY="449" name="metro-barcelona-m"/>
+  <symbol minX="0" maxX="22" minY="450" maxY="466" name="subway-barcelona-l"/>
+  <symbol minX="22" maxX="44" minY="450" maxY="466" name="subway-barcelona-m"/>
+  <symbol minX="44" maxX="66" minY="450" maxY="466" name="subway-madrid-l"/>
+  <symbol minX="66" maxX="88" minY="450" maxY="466" name="subway-madrid-m"/>
+  <symbol minX="88" maxX="104" minY="450" maxY="466" name="parking-m"/>
+  <symbol minX="104" maxX="119" minY="450" maxY="465" name="search-result"/>
+  <symbol minX="119" maxX="134" minY="450" maxY="465" name="subway-paris-s"/>
+  <symbol minX="134" maxX="149" minY="450" maxY="465" name="lightrail-berlin-s"/>
+  <symbol minX="149" maxX="169" minY="450" maxY="465" name="metro-barcelona-s"/>
+  <symbol minX="169" maxX="184" minY="450" maxY="465" name="peak-l"/>
+  <symbol minX="184" maxX="199" minY="450" maxY="465" name="api-result"/>
+  <symbol minX="199" maxX="214" minY="450" maxY="465" name="subway-moscow-s"/>
+  <symbol minX="214" maxX="235" minY="450" maxY="465" name="subway-kiev-l"/>
+  <symbol minX="235" maxX="255" minY="450" maxY="465" name="subway-madrid-s"/>
+  <symbol minX="255" maxX="276" minY="450" maxY="465" name="subway-kiev-m"/>
+  <symbol minX="276" maxX="291" minY="450" maxY="464" name="bench"/>
+  <symbol minX="291" maxX="305" minY="450" maxY="464" name="subway-berlin-s"/>
+  <symbol minX="305" maxX="319" minY="450" maxY="464" name="parking-s"/>
+  <symbol minX="319" maxX="336" minY="450" maxY="464" name="subway-london-s"/>
+  <symbol minX="336" maxX="350" minY="450" maxY="464" name="speedcam-s"/>
+  <symbol minX="350" maxX="364" minY="450" maxY="464" name="subway-rome-s"/>
+  <symbol minX="364" maxX="378" minY="450" maxY="463" name="peakt-l"/>
+  <symbol minX="378" maxX="399" minY="450" maxY="463" name="subway-minsk-l"/>
+  <symbol minX="399" maxX="412" minY="450" maxY="463" name="star-l"/>
+  <symbol minX="412" maxX="425" minY="450" maxY="463" name="survey_point-l"/>
+  <symbol minX="425" maxX="443" minY="450" maxY="462" name="subway-minsk-m"/>
+  <symbol minX="443" maxX="460" minY="450" maxY="462" name="railway-crossing"/>
+  <symbol minX="460" maxX="472" minY="450" maxY="462" name="survey_point-m"/>
+  <symbol minX="472" maxX="484" minY="450" maxY="462" name="subway-xs"/>
+  <symbol minX="484" maxX="496" minY="450" maxY="462" name="star-m"/>
+  <symbol minX="496" maxX="508" minY="450" maxY="462" name="peak-m"/>
+  <symbol minX="0" maxX="18" minY="466" maxY="478" name="subway-kiev-s"/>
+  <symbol minX="18" maxX="30" minY="466" maxY="478" name="subway-newyork-xs"/>
+  <symbol minX="30" maxX="41" minY="466" maxY="477" name="crossing-l"/>
+  <symbol minX="41" maxX="52" minY="466" maxY="477" name="star-s"/>
+  <symbol minX="52" maxX="69" minY="466" maxY="477" name="subway-minsk-s"/>
+  <symbol minX="69" maxX="89" minY="466" maxY="476" name="arrow-m"/>
+  <symbol minX="89" maxX="100" minY="466" maxY="476" name="peak-s"/>
+  <symbol minX="100" maxX="110" minY="466" maxY="476" name="survey_point-s"/>
+  <symbol minX="110" maxX="121" minY="466" maxY="476" name="peakt-m"/>
+  <symbol minX="121" maxX="130" minY="466" maxY="475" name="crossing-m"/>
+  <symbol minX="130" maxX="139" minY="466" maxY="475" name="peakt-s"/>
+  <symbol minX="139" maxX="148" minY="466" maxY="475" name="entrance-s"/>
+  <symbol minX="148" maxX="156" minY="466" maxY="474" name="dot-m"/>
+  <symbol minX="156" maxX="164" minY="466" maxY="474" name="tree-l"/>
+  <symbol minX="164" maxX="172" minY="466" maxY="474" name="crossing-s"/>
+  <symbol minX="172" maxX="180" minY="466" maxY="474" name="none"/>
+  <symbol minX="180" maxX="195" minY="466" maxY="474" name="arrow-s"/>
+  <symbol minX="195" maxX="202" minY="466" maxY="473" name="entrance-xs"/>
+  <symbol minX="202" maxX="209" minY="466" maxY="473" name="tree-m"/>
+  <symbol minX="209" maxX="215" minY="466" maxY="472" name="dot-s-light"/>
+  <symbol minX="215" maxX="221" minY="466" maxY="472" name="tree-s"/>
+  <symbol minX="221" maxX="227" minY="466" maxY="472" name="zero-icon"/>
+  <symbol minX="227" maxX="233" minY="466" maxY="472" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png
index e360edd2ac..22b3a9fa37 100644
Binary files a/data/resources-ldpi_dark/symbols.png and b/data/resources-ldpi_dark/symbols.png differ
diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf
index 22b808326c..a9fb81aba3 100644
--- a/data/resources-ldpi_dark/symbols.sdf
+++ b/data/resources-ldpi_dark/symbols.sdf
@@ -9,152 +9,152 @@
   <symbol minX="265" maxX="290" minY="0" maxY="30" name="current-position-obsolete"/>
   <symbol minX="290" maxX="315" minY="0" maxY="30" name="current-position-compas"/>
   <symbol minX="315" maxX="343" minY="0" maxY="28" name="search-result-active"/>
-  <symbol minX="343" maxX="365" minY="0" maxY="22" name="kiosk-l"/>
+  <symbol minX="343" maxX="365" minY="0" maxY="22" name="vending-l"/>
   <symbol minX="365" maxX="387" minY="0" maxY="22" name="america-football-l"/>
-  <symbol minX="387" maxX="409" minY="0" maxY="22" name="vending-l"/>
-  <symbol minX="409" maxX="431" minY="0" maxY="22" name="veterinary-l"/>
+  <symbol minX="387" maxX="409" minY="0" maxY="22" name="veterinary-l"/>
+  <symbol minX="409" maxX="431" minY="0" maxY="22" name="tram-l"/>
   <symbol minX="431" maxX="453" minY="0" maxY="22" name="archery-l"/>
-  <symbol minX="453" maxX="475" minY="0" maxY="22" name="tram-l"/>
-  <symbol minX="475" maxX="497" minY="0" maxY="22" name="train-l"/>
-  <symbol minX="0" maxX="22" minY="79" maxY="101" name="toys-l"/>
+  <symbol minX="453" maxX="475" minY="0" maxY="22" name="train-l"/>
+  <symbol minX="475" maxX="497" minY="0" maxY="22" name="toys-l"/>
+  <symbol minX="0" maxX="22" minY="79" maxY="101" name="townhall-l"/>
   <symbol minX="22" maxX="44" minY="79" maxY="101" name="alpine_hut-l"/>
   <symbol minX="44" maxX="66" minY="79" maxY="101" name="atm-l"/>
-  <symbol minX="66" maxX="88" minY="79" maxY="101" name="townhall-l"/>
-  <symbol minX="88" maxX="110" minY="79" maxY="101" name="tourist-shop-l"/>
-  <symbol minX="110" maxX="132" minY="79" maxY="101" name="tourist-office-l"/>
+  <symbol minX="66" maxX="88" minY="79" maxY="101" name="tourist-shop-l"/>
+  <symbol minX="88" maxX="110" minY="79" maxY="101" name="tourist-office-l"/>
+  <symbol minX="110" maxX="132" minY="79" maxY="101" name="tourism-l"/>
   <symbol minX="132" maxX="154" minY="79" maxY="101" name="australian-football-l"/>
-  <symbol minX="154" maxX="176" minY="79" maxY="101" name="tourism-l"/>
-  <symbol minX="176" maxX="198" minY="79" maxY="101" name="tomb-l"/>
+  <symbol minX="154" maxX="176" minY="79" maxY="101" name="tomb-l"/>
+  <symbol minX="176" maxX="198" minY="79" maxY="101" name="toll_booth-l"/>
   <symbol minX="198" maxX="220" minY="79" maxY="101" name="bakery-l"/>
-  <symbol minX="220" maxX="242" minY="79" maxY="101" name="toll_booth-l"/>
-  <symbol minX="242" maxX="264" minY="79" maxY="101" name="toilets-l"/>
+  <symbol minX="220" maxX="242" minY="79" maxY="101" name="toilets-l"/>
+  <symbol minX="242" maxX="264" minY="79" maxY="101" name="ticket-shop-l"/>
   <symbol minX="264" maxX="286" minY="79" maxY="101" name="bank-l"/>
   <symbol minX="286" maxX="307" minY="79" maxY="101" name="bank-m"/>
   <symbol minX="307" maxX="329" minY="79" maxY="101" name="banknote-l"/>
-  <symbol minX="329" maxX="351" minY="79" maxY="101" name="ticket-shop-l"/>
+  <symbol minX="329" maxX="351" minY="79" maxY="101" name="theatre-l"/>
   <symbol minX="351" maxX="373" minY="79" maxY="101" name="bar-l"/>
-  <symbol minX="373" maxX="395" minY="79" maxY="101" name="theatre-l"/>
-  <symbol minX="395" maxX="417" minY="79" maxY="101" name="tennis-l"/>
+  <symbol minX="373" maxX="395" minY="79" maxY="101" name="tennis-l"/>
+  <symbol minX="395" maxX="417" minY="79" maxY="101" name="taxi-l"/>
   <symbol minX="417" maxX="439" minY="79" maxY="101" name="baseball-l"/>
-  <symbol minX="439" maxX="461" minY="79" maxY="101" name="taxi-l"/>
-  <symbol minX="461" maxX="483" minY="79" maxY="101" name="swimming-l"/>
+  <symbol minX="439" maxX="461" minY="79" maxY="101" name="swimming-l"/>
+  <symbol minX="461" maxX="483" minY="79" maxY="101" name="sweets-l"/>
   <symbol minX="483" maxX="505" minY="79" maxY="101" name="basketball-l"/>
-  <symbol minX="0" maxX="22" minY="101" maxY="123" name="sweets-l"/>
-  <symbol minX="22" maxX="44" minY="101" maxY="123" name="viewpoint-l"/>
+  <symbol minX="0" maxX="22" minY="101" maxY="123" name="viewpoint-l"/>
+  <symbol minX="22" maxX="44" minY="101" maxY="123" name="viewpoint-m"/>
   <symbol minX="44" maxX="66" minY="101" maxY="123" name="bbq-l"/>
-  <symbol minX="66" maxX="88" minY="101" maxY="123" name="viewpoint-m"/>
+  <symbol minX="66" maxX="88" minY="101" maxY="123" name="volcano-l"/>
   <symbol minX="88" maxX="110" minY="101" maxY="123" name="bcontrol-l"/>
-  <symbol minX="110" maxX="132" minY="101" maxY="123" name="volcano-l"/>
-  <symbol minX="132" maxX="154" minY="101" maxY="123" name="subway-spb-l"/>
+  <symbol minX="110" maxX="132" minY="101" maxY="123" name="subway-spb-l"/>
+  <symbol minX="132" maxX="154" minY="101" maxY="123" name="subway-paris-l"/>
   <symbol minX="154" maxX="176" minY="101" maxY="123" name="beach-l"/>
-  <symbol minX="176" maxX="198" minY="101" maxY="123" name="subway-paris-l"/>
-  <symbol minX="198" maxX="220" minY="101" maxY="123" name="subway-newyork-l"/>
+  <symbol minX="176" maxX="198" minY="101" maxY="123" name="subway-newyork-l"/>
+  <symbol minX="198" maxX="220" minY="101" maxY="123" name="waterfall-l"/>
   <symbol minX="220" maxX="242" minY="101" maxY="123" name="beauty-l"/>
-  <symbol minX="242" maxX="264" minY="101" maxY="123" name="waterfall-l"/>
+  <symbol minX="242" maxX="264" minY="101" maxY="123" name="wayside_cross-l"/>
   <symbol minX="264" maxX="286" minY="101" maxY="123" name="beer-l"/>
-  <symbol minX="286" maxX="308" minY="101" maxY="123" name="wayside_cross-l"/>
-  <symbol minX="308" maxX="330" minY="101" maxY="123" name="wayside_shrine-l"/>
-  <symbol minX="330" maxX="352" minY="101" maxY="123" name="subway-l"/>
+  <symbol minX="286" maxX="308" minY="101" maxY="123" name="wayside_shrine-l"/>
+  <symbol minX="308" maxX="330" minY="101" maxY="123" name="subway-l"/>
+  <symbol minX="330" maxX="352" minY="101" maxY="123" name="windmill-l"/>
   <symbol minX="352" maxX="374" minY="101" maxY="123" name="bicycle-l"/>
-  <symbol minX="374" maxX="396" minY="101" maxY="123" name="windmill-l"/>
-  <symbol minX="396" maxX="418" minY="101" maxY="123" name="subway-entrance-l"/>
-  <symbol minX="418" maxX="440" minY="101" maxY="123" name="zoo-l"/>
+  <symbol minX="374" maxX="396" minY="101" maxY="123" name="subway-entrance-l"/>
+  <symbol minX="396" maxX="418" minY="101" maxY="123" name="zoo-l"/>
+  <symbol minX="418" maxX="440" minY="101" maxY="123" name="sports-l"/>
   <symbol minX="440" maxX="462" minY="101" maxY="123" name="book-shop-l"/>
-  <symbol minX="462" maxX="484" minY="101" maxY="123" name="sports-l"/>
-  <symbol minX="484" maxX="506" minY="101" maxY="123" name="airport-l"/>
+  <symbol minX="462" maxX="484" minY="101" maxY="123" name="airport-l"/>
+  <symbol minX="484" maxX="506" minY="101" maxY="123" name="soccer-l"/>
   <symbol minX="0" maxX="22" minY="123" maxY="145" name="bookmaker-l"/>
   <symbol minX="22" maxX="44" minY="123" maxY="145" name="boundary_stone-l"/>
-  <symbol minX="44" maxX="66" minY="123" maxY="145" name="soccer-l"/>
+  <symbol minX="44" maxX="66" minY="123" maxY="145" name="skiing-l"/>
   <symbol minX="66" maxX="88" minY="123" maxY="145" name="bowls-l"/>
-  <symbol minX="88" maxX="110" minY="123" maxY="145" name="skiing-l"/>
-  <symbol minX="110" maxX="132" minY="123" maxY="145" name="shop-l"/>
+  <symbol minX="88" maxX="110" minY="123" maxY="145" name="shop-l"/>
+  <symbol minX="110" maxX="132" minY="123" maxY="145" name="shop-l copy"/>
   <symbol minX="132" maxX="154" minY="123" maxY="145" name="bus-l"/>
-  <symbol minX="154" maxX="176" minY="123" maxY="145" name="shop-l copy"/>
-  <symbol minX="176" maxX="198" minY="123" maxY="145" name="shop-bicycle-l"/>
+  <symbol minX="154" maxX="176" minY="123" maxY="145" name="shop-bicycle-l"/>
+  <symbol minX="176" maxX="198" minY="123" maxY="145" name="shoes-l"/>
   <symbol minX="198" maxX="220" minY="123" maxY="145" name="butcher-l"/>
-  <symbol minX="220" maxX="242" minY="123" maxY="145" name="shoes-l"/>
+  <symbol minX="220" maxX="242" minY="123" maxY="145" name="ship-l"/>
   <symbol minX="242" maxX="264" minY="123" maxY="145" name="cable-car-l"/>
-  <symbol minX="264" maxX="286" minY="123" maxY="145" name="ship-l"/>
-  <symbol minX="286" maxX="308" minY="123" maxY="145" name="seafood-shop-l"/>
+  <symbol minX="264" maxX="286" minY="123" maxY="145" name="seafood-shop-l"/>
+  <symbol minX="286" maxX="308" minY="123" maxY="145" name="school-l"/>
   <symbol minX="308" maxX="330" minY="123" maxY="145" name="cafe-l"/>
-  <symbol minX="330" maxX="352" minY="123" maxY="145" name="school-l"/>
-  <symbol minX="352" maxX="374" minY="123" maxY="145" name="sauna-l"/>
+  <symbol minX="330" maxX="352" minY="123" maxY="145" name="sauna-l"/>
+  <symbol minX="352" maxX="374" minY="123" maxY="145" name="restaurant-l"/>
   <symbol minX="374" maxX="396" minY="123" maxY="145" name="campsite-l"/>
-  <symbol minX="396" maxX="418" minY="123" maxY="145" name="restaurant-l"/>
-  <symbol minX="418" maxX="440" minY="123" maxY="145" name="remains-l"/>
+  <symbol minX="396" maxX="418" minY="123" maxY="145" name="remains-l"/>
+  <symbol minX="418" maxX="440" minY="123" maxY="145" name="recycling-l"/>
   <symbol minX="440" maxX="462" minY="123" maxY="145" name="car-part-l"/>
-  <symbol minX="462" maxX="484" minY="123" maxY="145" name="recycling-l"/>
+  <symbol minX="462" maxX="484" minY="123" maxY="145" name="airport-m"/>
   <symbol minX="484" maxX="506" minY="123" maxY="145" name="car-repair-l"/>
-  <symbol minX="0" maxX="22" minY="145" maxY="167" name="airport-m"/>
-  <symbol minX="22" maxX="44" minY="145" maxY="167" name="pub-l"/>
+  <symbol minX="0" maxX="22" minY="145" maxY="167" name="pub-l"/>
+  <symbol minX="22" maxX="44" minY="145" maxY="167" name="power-m"/>
   <symbol minX="44" maxX="66" minY="145" maxY="167" name="car-wash-l"/>
-  <symbol minX="66" maxX="88" minY="145" maxY="167" name="power-m"/>
+  <symbol minX="66" maxX="88" minY="145" maxY="167" name="power-l"/>
   <symbol minX="88" maxX="110" minY="145" maxY="167" name="car_sharing-l"/>
-  <symbol minX="110" maxX="132" minY="145" maxY="167" name="power-l"/>
+  <symbol minX="110" maxX="132" minY="145" maxY="167" name="postbox-l"/>
   <symbol minX="132" maxX="154" minY="145" maxY="167" name="caravan_site-l"/>
-  <symbol minX="154" maxX="176" minY="145" maxY="167" name="postbox-l"/>
+  <symbol minX="154" maxX="176" minY="145" maxY="167" name="pool-l"/>
   <symbol minX="176" maxX="198" minY="145" maxY="167" name="casino-l"/>
-  <symbol minX="198" maxX="220" minY="145" maxY="167" name="pool-l"/>
-  <symbol minX="220" maxX="242" minY="145" maxY="167" name="police-l"/>
+  <symbol minX="198" maxX="220" minY="145" maxY="167" name="police-l"/>
+  <symbol minX="220" maxX="242" minY="145" maxY="167" name="place-of-worship-l"/>
   <symbol minX="242" maxX="264" minY="145" maxY="167" name="cave-l"/>
-  <symbol minX="264" maxX="286" minY="145" maxY="167" name="place-of-worship-l"/>
-  <symbol minX="286" maxX="308" minY="145" maxY="167" name="pitch-l"/>
+  <symbol minX="264" maxX="286" minY="145" maxY="167" name="pitch-l"/>
+  <symbol minX="286" maxX="308" minY="145" maxY="167" name="picnic-l"/>
   <symbol minX="308" maxX="330" minY="145" maxY="167" name="cemetery-l"/>
-  <symbol minX="330" maxX="352" minY="145" maxY="167" name="picnic-l"/>
-  <symbol minX="352" maxX="374" minY="145" maxY="167" name="photo-shop-l"/>
+  <symbol minX="330" maxX="352" minY="145" maxY="167" name="photo-shop-l"/>
+  <symbol minX="352" maxX="374" minY="145" maxY="167" name="phone-l"/>
   <symbol minX="374" maxX="396" minY="145" maxY="167" name="charging-station-l"/>
-  <symbol minX="396" maxX="418" minY="145" maxY="167" name="phone-l"/>
-  <symbol minX="418" maxX="440" minY="145" maxY="167" name="pharmacy-l"/>
+  <symbol minX="396" maxX="418" minY="145" maxY="167" name="pharmacy-l"/>
+  <symbol minX="418" maxX="440" minY="145" maxY="167" name="petshop-l"/>
   <symbol minX="440" maxX="462" minY="145" maxY="167" name="chemist-l"/>
-  <symbol minX="462" maxX="484" minY="145" maxY="167" name="petshop-l"/>
+  <symbol minX="462" maxX="484" minY="145" maxY="167" name="alcohol-l"/>
   <symbol minX="484" maxX="506" minY="145" maxY="167" name="childcare-l"/>
   <symbol minX="0" maxX="22" minY="167" maxY="189" name="chimney-l"/>
-  <symbol minX="22" maxX="44" minY="167" maxY="189" name="alcohol-l"/>
+  <symbol minX="22" maxX="44" minY="167" maxY="189" name="peak-l"/>
   <symbol minX="44" maxX="66" minY="167" maxY="189" name="cinema-l"/>
-  <symbol minX="66" maxX="88" minY="167" maxY="189" name="peak-l"/>
-  <symbol minX="88" maxX="100" minY="167" maxY="189" name="placemark-blue"/>
+  <symbol minX="66" maxX="78" minY="167" maxY="189" name="placemark-blue"/>
+  <symbol minX="78" maxX="100" minY="167" maxY="189" name="parking-meter-l"/>
   <symbol minX="100" maxX="122" minY="167" maxY="189" name="climbing-l"/>
-  <symbol minX="122" maxX="144" minY="167" maxY="189" name="parking-meter-l"/>
-  <symbol minX="144" maxX="166" minY="167" maxY="189" name="park-l"/>
+  <symbol minX="122" maxX="144" minY="167" maxY="189" name="park-l"/>
+  <symbol minX="144" maxX="166" minY="167" maxY="189" name="optician-l"/>
   <symbol minX="166" maxX="188" minY="167" maxY="189" name="clothes-l"/>
-  <symbol minX="188" maxX="210" minY="167" maxY="189" name="optician-l"/>
+  <symbol minX="188" maxX="210" minY="167" maxY="189" name="office-l"/>
   <symbol minX="210" maxX="232" minY="167" maxY="189" name="college-l"/>
-  <symbol minX="232" maxX="254" minY="167" maxY="189" name="office-l"/>
-  <symbol minX="254" maxX="276" minY="167" maxY="189" name="nparkf-l"/>
+  <symbol minX="232" maxX="254" minY="167" maxY="189" name="nparkf-l"/>
+  <symbol minX="254" maxX="276" minY="167" maxY="189" name="npark-l"/>
   <symbol minX="276" maxX="298" minY="167" maxY="189" name="computer-l"/>
-  <symbol minX="298" maxX="320" minY="167" maxY="189" name="npark-l"/>
-  <symbol minX="320" maxX="342" minY="167" maxY="189" name="convenience-l"/>
-  <symbol minX="342" maxX="354" minY="167" maxY="189" name="placemark-brown"/>
+  <symbol minX="298" maxX="310" minY="167" maxY="189" name="placemark-brown"/>
+  <symbol minX="310" maxX="332" minY="167" maxY="189" name="convenience-l"/>
+  <symbol minX="332" maxX="354" minY="167" maxY="189" name="museum-l"/>
   <symbol minX="354" maxX="376" minY="167" maxY="189" name="copyshop-l"/>
-  <symbol minX="376" maxX="398" minY="167" maxY="189" name="museum-l"/>
+  <symbol minX="376" maxX="398" minY="167" maxY="189" name="moto-sharing-l"/>
   <symbol minX="398" maxX="420" minY="167" maxY="189" name="courthouse-l"/>
   <symbol minX="420" maxX="442" minY="167" maxY="189" name="cricket-l"/>
-  <symbol minX="442" maxX="464" minY="167" maxY="189" name="moto-sharing-l"/>
-  <symbol minX="464" maxX="486" minY="167" maxY="189" name="motel-l"/>
+  <symbol minX="442" maxX="464" minY="167" maxY="189" name="motel-l"/>
+  <symbol minX="464" maxX="486" minY="167" maxY="189" name="monument-l"/>
   <symbol minX="486" maxX="508" minY="167" maxY="189" name="curling-l"/>
-  <symbol minX="0" maxX="22" minY="189" maxY="211" name="monument-l"/>
-  <symbol minX="22" maxX="44" minY="189" maxY="211" name="mobile_phone-l"/>
+  <symbol minX="0" maxX="22" minY="189" maxY="211" name="mobile_phone-l"/>
+  <symbol minX="22" maxX="44" minY="189" maxY="211" name="military-l"/>
   <symbol minX="44" maxX="66" minY="189" maxY="211" name="dentist-l"/>
   <symbol minX="66" maxX="88" minY="189" maxY="211" name="dentist-m"/>
-  <symbol minX="88" maxX="110" minY="189" maxY="211" name="military-l"/>
-  <symbol minX="110" maxX="132" minY="189" maxY="211" name="department_store-l"/>
-  <symbol minX="132" maxX="144" minY="189" maxY="211" name="placemark-green"/>
+  <symbol minX="88" maxX="100" minY="189" maxY="211" name="placemark-green"/>
+  <symbol minX="100" maxX="122" minY="189" maxY="211" name="department_store-l"/>
+  <symbol minX="122" maxX="144" minY="189" maxY="211" name="marketplace-l"/>
   <symbol minX="144" maxX="166" minY="189" maxY="211" name="diving-l"/>
-  <symbol minX="166" maxX="188" minY="189" maxY="211" name="marketplace-l"/>
-  <symbol minX="188" maxX="210" minY="189" maxY="211" name="mail-l"/>
-  <symbol minX="210" maxX="232" minY="189" maxY="211" name="dog_park-l"/>
-  <symbol minX="232" maxX="244" minY="189" maxY="211" name="placemark-orange"/>
+  <symbol minX="166" maxX="188" minY="189" maxY="211" name="mail-l"/>
+  <symbol minX="188" maxX="200" minY="189" maxY="211" name="placemark-orange"/>
+  <symbol minX="200" maxX="222" minY="189" maxY="211" name="dog_park-l"/>
+  <symbol minX="222" maxX="244" minY="189" maxY="211" name="lightrail-berlin-l"/>
   <symbol minX="244" maxX="266" minY="189" maxY="211" name="doityourself-l"/>
-  <symbol minX="266" maxX="288" minY="189" maxY="211" name="lightrail-berlin-l"/>
-  <symbol minX="288" maxX="310" minY="189" maxY="211" name="lighthouse-l"/>
+  <symbol minX="266" maxX="288" minY="189" maxY="211" name="lighthouse-l"/>
+  <symbol minX="288" maxX="310" minY="189" maxY="211" name="lift_gate-l"/>
   <symbol minX="310" maxX="322" minY="189" maxY="211" name="placemark-yellow"/>
   <symbol minX="322" maxX="334" minY="189" maxY="211" name="placemark-red"/>
   <symbol minX="334" maxX="356" minY="189" maxY="211" name="drinking-water-l"/>
-  <symbol minX="356" maxX="378" minY="189" maxY="211" name="lift_gate-l"/>
-  <symbol minX="378" maxX="400" minY="189" maxY="211" name="library-l"/>
-  <symbol minX="400" maxX="422" minY="189" maxY="211" name="lawyer-l"/>
+  <symbol minX="356" maxX="378" minY="189" maxY="211" name="library-l"/>
+  <symbol minX="378" maxX="400" minY="189" maxY="211" name="lawyer-l"/>
+  <symbol minX="400" maxX="422" minY="189" maxY="211" name="laundry-l"/>
   <symbol minX="422" maxX="444" minY="189" maxY="211" name="electronics-l"/>
-  <symbol minX="444" maxX="466" minY="189" maxY="211" name="laundry-l"/>
+  <symbol minX="444" maxX="466" minY="189" maxY="211" name="kiosk-l"/>
   <symbol minX="466" maxX="488" minY="189" maxY="211" name="embassy-l"/>
   <symbol minX="488" maxX="510" minY="189" maxY="211" name="kindergarten-m"/>
   <symbol minX="0" maxX="22" minY="211" maxY="233" name="kindergarten-l"/>
@@ -193,329 +193,329 @@
   <symbol minX="198" maxX="220" minY="233" maxY="255" name="gate-l"/>
   <symbol minX="220" maxX="241" minY="233" maxY="254" name="garden_center-m"/>
   <symbol minX="241" maxX="262" minY="233" maxY="254" name="gate-m"/>
-  <symbol minX="262" maxX="283" minY="233" maxY="254" name="america-football-m"/>
+  <symbol minX="262" maxX="283" minY="233" maxY="254" name="kiosk-m"/>
   <symbol minX="283" maxX="304" minY="233" maxY="254" name="gift-m"/>
   <symbol minX="304" maxX="325" minY="233" maxY="254" name="garden-m"/>
   <symbol minX="325" maxX="346" minY="233" maxY="254" name="golf-m"/>
   <symbol minX="346" maxX="367" minY="233" maxY="254" name="vending-m"/>
-  <symbol minX="367" maxX="388" minY="233" maxY="254" name="tram-m"/>
+  <symbol minX="367" maxX="388" minY="233" maxY="254" name="america-football-m"/>
   <symbol minX="388" maxX="409" minY="233" maxY="254" name="greengrocer-m"/>
   <symbol minX="409" maxX="430" minY="233" maxY="254" name="gallery-m"/>
   <symbol minX="430" maxX="451" minY="233" maxY="254" name="grocery-m"/>
-  <symbol minX="451" maxX="472" minY="233" maxY="254" name="archery-m"/>
+  <symbol minX="451" maxX="472" minY="233" maxY="254" name="veterinary-m"/>
   <symbol minX="472" maxX="493" minY="233" maxY="254" name="furniture-m"/>
   <symbol minX="0" maxX="21" minY="255" maxY="276" name="gym-m"/>
-  <symbol minX="21" maxX="42" minY="255" maxY="276" name="train-m"/>
-  <symbol minX="42" maxX="63" minY="255" maxY="276" name="toys-m"/>
+  <symbol minX="21" maxX="42" minY="255" maxY="276" name="tram-m"/>
+  <symbol minX="42" maxX="63" minY="255" maxY="276" name="train-m"/>
   <symbol minX="63" maxX="84" minY="255" maxY="276" name="hairdresser-m"/>
   <symbol minX="84" maxX="105" minY="255" maxY="276" name="funicular-m"/>
-  <symbol minX="105" maxX="126" minY="255" maxY="276" name="alpine_hut-m"/>
+  <symbol minX="105" maxX="126" minY="255" maxY="276" name="archery-m"/>
   <symbol minX="126" maxX="147" minY="255" maxY="276" name="fuel-m"/>
   <symbol minX="147" maxX="168" minY="255" maxY="276" name="hardware-m"/>
-  <symbol minX="168" maxX="189" minY="255" maxY="276" name="townhall-m"/>
+  <symbol minX="168" maxX="189" minY="255" maxY="276" name="toys-m"/>
   <symbol minX="189" maxX="210" minY="255" maxY="276" name="helipad-m"/>
-  <symbol minX="210" maxX="231" minY="255" maxY="276" name="atm-m"/>
+  <symbol minX="210" maxX="231" minY="255" maxY="276" name="townhall-m"/>
   <symbol minX="231" maxX="252" minY="255" maxY="276" name="fountain-m"/>
   <symbol minX="252" maxX="273" minY="255" maxY="276" name="heliport-m"/>
-  <symbol minX="273" maxX="294" minY="255" maxY="276" name="tourism-m"/>
+  <symbol minX="273" maxX="294" minY="255" maxY="276" name="alpine_hut-m"/>
   <symbol minX="294" maxX="315" minY="255" maxY="276" name="florist-m"/>
   <symbol minX="315" maxX="336" minY="255" maxY="276" name="historic-ship-m"/>
-  <symbol minX="336" maxX="357" minY="255" maxY="276" name="australian-football-m"/>
+  <symbol minX="336" maxX="357" minY="255" maxY="276" name="atm-m"/>
   <symbol minX="357" maxX="378" minY="255" maxY="276" name="hospital-m"/>
-  <symbol minX="378" maxX="399" minY="255" maxY="276" name="tomb-m"/>
-  <symbol minX="399" maxX="420" minY="255" maxY="276" name="toll_booth-m"/>
+  <symbol minX="378" maxX="399" minY="255" maxY="276" name="tourism-m"/>
+  <symbol minX="399" maxX="420" minY="255" maxY="276" name="tomb-m"/>
   <symbol minX="420" maxX="441" minY="255" maxY="276" name="hotel-m"/>
-  <symbol minX="441" maxX="462" minY="255" maxY="276" name="bakery-m"/>
+  <symbol minX="441" maxX="462" minY="255" maxY="276" name="australian-football-m"/>
   <symbol minX="462" maxX="483" minY="255" maxY="276" name="fire_station-m"/>
   <symbol minX="483" maxX="504" minY="255" maxY="276" name="hunting-tower-m"/>
-  <symbol minX="0" maxX="21" minY="276" maxY="297" name="toilets-m"/>
+  <symbol minX="0" maxX="21" minY="276" maxY="297" name="toll_booth-m"/>
   <symbol minX="21" maxX="42" minY="276" maxY="297" name="information-m"/>
-  <symbol minX="42" maxX="63" minY="276" maxY="297" name="bank-2-m"/>
+  <symbol minX="42" maxX="63" minY="276" maxY="297" name="toilets-m"/>
   <symbol minX="63" maxX="84" minY="276" maxY="297" name="fastfood-m"/>
   <symbol minX="84" maxX="105" minY="276" maxY="297" name="jewelry-m"/>
-  <symbol minX="105" maxX="126" minY="276" maxY="297" name="ticket-shop-m"/>
+  <symbol minX="105" maxX="126" minY="276" maxY="297" name="bakery-m"/>
   <symbol minX="126" maxX="147" minY="276" maxY="297" name="embassy-m"/>
-  <symbol minX="147" maxX="168" minY="276" maxY="297" name="banknote-m"/>
-  <symbol minX="168" maxX="189" minY="276" maxY="297" name="theatre-m"/>
-  <symbol minX="189" maxX="210" minY="276" maxY="297" name="kiosk-m"/>
-  <symbol minX="210" maxX="231" minY="276" maxY="297" name="electronics-m"/>
+  <symbol minX="147" maxX="168" minY="276" maxY="297" name="ticket-shop-m"/>
+  <symbol minX="168" maxX="189" minY="276" maxY="297" name="electronics-m"/>
+  <symbol minX="189" maxX="210" minY="276" maxY="297" name="bank-2-m"/>
+  <symbol minX="210" maxX="231" minY="276" maxY="297" name="drugs"/>
   <symbol minX="231" maxX="252" minY="276" maxY="297" name="laundry-m"/>
-  <symbol minX="252" maxX="273" minY="276" maxY="297" name="drugs"/>
-  <symbol minX="273" maxX="294" minY="276" maxY="297" name="bar-m"/>
+  <symbol minX="252" maxX="273" minY="276" maxY="297" name="theatre-m"/>
+  <symbol minX="273" maxX="294" minY="276" maxY="297" name="drinking-water-m"/>
   <symbol minX="294" maxX="315" minY="276" maxY="297" name="library-m"/>
-  <symbol minX="315" maxX="336" minY="276" maxY="297" name="tennis-m"/>
-  <symbol minX="336" maxX="357" minY="276" maxY="297" name="drinking-water-m"/>
+  <symbol minX="315" maxX="336" minY="276" maxY="297" name="banknote-m"/>
+  <symbol minX="336" maxX="357" minY="276" maxY="297" name="alcohol-m"/>
   <symbol minX="357" maxX="378" minY="276" maxY="297" name="lift_gate-m"/>
-  <symbol minX="378" maxX="399" minY="276" maxY="297" name="alcohol-m"/>
+  <symbol minX="378" maxX="399" minY="276" maxY="297" name="doityourself-m"/>
   <symbol minX="399" maxX="420" minY="276" maxY="297" name="lighthouse-m"/>
-  <symbol minX="420" maxX="441" minY="276" maxY="297" name="taxi-m"/>
-  <symbol minX="441" maxX="462" minY="276" maxY="297" name="doityourself-m"/>
-  <symbol minX="462" maxX="483" minY="276" maxY="297" name="baseball-m"/>
-  <symbol minX="483" maxX="504" minY="276" maxY="297" name="dog_park-m"/>
-  <symbol minX="0" maxX="21" minY="297" maxY="318" name="swimming-m"/>
+  <symbol minX="420" maxX="441" minY="276" maxY="297" name="tennis-m"/>
+  <symbol minX="441" maxX="462" minY="276" maxY="297" name="dog_park-m"/>
+  <symbol minX="462" maxX="483" minY="276" maxY="297" name="bar-m"/>
+  <symbol minX="483" maxX="504" minY="276" maxY="297" name="taxi-m"/>
+  <symbol minX="0" maxX="21" minY="297" maxY="318" name="diving-m"/>
   <symbol minX="21" maxX="42" minY="297" maxY="318" name="mail-m"/>
-  <symbol minX="42" maxX="63" minY="297" maxY="318" name="sweets-m"/>
-  <symbol minX="63" maxX="84" minY="297" maxY="318" name="diving-m"/>
+  <symbol minX="42" maxX="63" minY="297" maxY="318" name="swimming-m"/>
+  <symbol minX="63" maxX="84" minY="297" maxY="318" name="department_store-m"/>
   <symbol minX="84" maxX="105" minY="297" maxY="318" name="marketplace-m"/>
-  <symbol minX="105" maxX="126" minY="297" maxY="318" name="basketball-m"/>
-  <symbol minX="126" maxX="147" minY="297" maxY="318" name="veterinary-m"/>
-  <symbol minX="147" maxX="168" minY="297" maxY="318" name="department_store-m"/>
+  <symbol minX="105" maxX="126" minY="297" maxY="318" name="baseball-m"/>
+  <symbol minX="126" maxX="147" minY="297" maxY="318" name="sweets-m"/>
+  <symbol minX="147" maxX="168" minY="297" maxY="318" name="basketball-m"/>
   <symbol minX="168" maxX="189" minY="297" maxY="318" name="bbq-m"/>
   <symbol minX="189" maxX="210" minY="297" maxY="318" name="military-m"/>
-  <symbol minX="210" maxX="231" minY="297" maxY="318" name="bcontrol-m"/>
-  <symbol minX="231" maxX="252" minY="297" maxY="318" name="subway-spb-m"/>
+  <symbol minX="210" maxX="231" minY="297" maxY="318" name="volcano-m"/>
+  <symbol minX="231" maxX="252" minY="297" maxY="318" name="curling-m"/>
   <symbol minX="252" maxX="273" minY="297" maxY="318" name="mobile_phone-m"/>
-  <symbol minX="273" maxX="294" minY="297" maxY="318" name="curling-m"/>
+  <symbol minX="273" maxX="294" minY="297" maxY="318" name="subway-spb-m"/>
   <symbol minX="294" maxX="315" minY="297" maxY="318" name="monument-m"/>
-  <symbol minX="315" maxX="336" minY="297" maxY="318" name="volcano-m"/>
-  <symbol minX="336" maxX="357" minY="297" maxY="318" name="beach-m"/>
+  <symbol minX="315" maxX="336" minY="297" maxY="318" name="bcontrol-m"/>
+  <symbol minX="336" maxX="357" minY="297" maxY="318" name="cricket-m"/>
   <symbol minX="357" maxX="378" minY="297" maxY="318" name="motel-m"/>
   <symbol minX="378" maxX="399" minY="297" maxY="318" name="subway-newyork-m"/>
-  <symbol minX="399" maxX="420" minY="297" maxY="318" name="cricket-m"/>
-  <symbol minX="420" maxX="441" minY="297" maxY="318" name="copyshop-m"/>
+  <symbol minX="399" maxX="420" minY="297" maxY="318" name="copyshop-m"/>
+  <symbol minX="420" maxX="441" minY="297" maxY="318" name="convenience-m"/>
   <symbol minX="441" maxX="462" minY="297" maxY="318" name="museum-m"/>
-  <symbol minX="462" maxX="483" minY="297" maxY="318" name="beauty-m"/>
+  <symbol minX="462" maxX="483" minY="297" maxY="318" name="beach-m"/>
   <symbol minX="483" maxX="504" minY="297" maxY="318" name="waterfall-m"/>
-  <symbol minX="0" maxX="21" minY="318" maxY="339" name="beer-m"/>
+  <symbol minX="0" maxX="21" minY="318" maxY="339" name="beauty-m"/>
   <symbol minX="21" maxX="42" minY="318" maxY="339" name="wayside_cross-m"/>
   <symbol minX="42" maxX="63" minY="318" maxY="339" name="subway-m"/>
-  <symbol minX="63" maxX="84" minY="318" maxY="339" name="wayside_shrine-m"/>
-  <symbol minX="84" maxX="105" minY="318" maxY="339" name="convenience-m"/>
-  <symbol minX="105" maxX="126" minY="318" maxY="339" name="computer-m"/>
+  <symbol minX="63" maxX="84" minY="318" maxY="339" name="beer-m"/>
+  <symbol minX="84" maxX="105" minY="318" maxY="339" name="computer-m"/>
+  <symbol minX="105" maxX="126" minY="318" maxY="339" name="wayside_shrine-m"/>
   <symbol minX="126" maxX="147" minY="318" maxY="339" name="npark-m"/>
-  <symbol minX="147" maxX="168" minY="318" maxY="339" name="bicycle-m"/>
-  <symbol minX="168" maxX="189" minY="318" maxY="339" name="windmill-m"/>
+  <symbol minX="147" maxX="168" minY="318" maxY="339" name="windmill-m"/>
+  <symbol minX="168" maxX="189" minY="318" maxY="339" name="college-m"/>
   <symbol minX="189" maxX="210" minY="318" maxY="339" name="nparkf-m"/>
   <symbol minX="210" maxX="231" minY="318" maxY="339" name="subway-entrance-m"/>
-  <symbol minX="231" maxX="252" minY="318" maxY="339" name="college-m"/>
+  <symbol minX="231" maxX="252" minY="318" maxY="339" name="clothes-m"/>
   <symbol minX="252" maxX="273" minY="318" maxY="339" name="office-m"/>
-  <symbol minX="273" maxX="294" minY="318" maxY="339" name="subway-entrance-2-m"/>
-  <symbol minX="294" maxX="315" minY="318" maxY="339" name="clothes-m"/>
+  <symbol minX="273" maxX="294" minY="318" maxY="339" name="bicycle-m"/>
+  <symbol minX="294" maxX="315" minY="318" maxY="339" name="subway-entrance-2-m"/>
   <symbol minX="315" maxX="336" minY="318" maxY="339" name="optician-m"/>
-  <symbol minX="336" maxX="357" minY="318" maxY="339" name="zoo-m"/>
+  <symbol minX="336" maxX="357" minY="318" maxY="339" name="climbing-m"/>
   <symbol minX="357" maxX="378" minY="318" maxY="339" name="park-m"/>
-  <symbol minX="378" maxX="399" minY="318" maxY="339" name="sports-m"/>
-  <symbol minX="399" maxX="420" minY="318" maxY="339" name="book-shop-m"/>
-  <symbol minX="420" maxX="441" minY="318" maxY="339" name="soccer-m"/>
-  <symbol minX="441" maxX="462" minY="318" maxY="339" name="climbing-m"/>
+  <symbol minX="378" maxX="399" minY="318" maxY="339" name="zoo-m"/>
+  <symbol minX="399" maxX="420" minY="318" maxY="339" name="sports-m"/>
+  <symbol minX="420" maxX="441" minY="318" maxY="339" name="book-shop-m"/>
+  <symbol minX="441" maxX="462" minY="318" maxY="339" name="soccer-m"/>
   <symbol minX="462" maxX="483" minY="318" maxY="339" name="parking-meter-m"/>
-  <symbol minX="483" maxX="504" minY="318" maxY="339" name="boundary_stone-m"/>
+  <symbol minX="483" maxX="504" minY="318" maxY="339" name="cinema-m"/>
   <symbol minX="0" maxX="21" minY="339" maxY="360" name="skiing-m"/>
-  <symbol minX="21" maxX="42" minY="339" maxY="360" name="cinema-m"/>
+  <symbol minX="21" maxX="42" minY="339" maxY="360" name="chimney-m"/>
   <symbol minX="42" maxX="63" minY="339" maxY="360" name="peak-m"/>
-  <symbol minX="63" maxX="84" minY="339" maxY="360" name="bowls-m"/>
+  <symbol minX="63" maxX="84" minY="339" maxY="360" name="boundary_stone-m"/>
   <symbol minX="84" maxX="105" minY="339" maxY="360" name="shop-m"/>
-  <symbol minX="105" maxX="126" minY="339" maxY="360" name="chimney-m"/>
+  <symbol minX="105" maxX="126" minY="339" maxY="360" name="chemist-m"/>
   <symbol minX="126" maxX="147" minY="339" maxY="360" name="shop-m copy"/>
-  <symbol minX="147" maxX="168" minY="339" maxY="360" name="chemist-m"/>
+  <symbol minX="147" maxX="168" minY="339" maxY="360" name="bowls-m"/>
   <symbol minX="168" maxX="189" minY="339" maxY="360" name="petshop-m"/>
-  <symbol minX="189" maxX="210" minY="339" maxY="360" name="bus-m"/>
+  <symbol minX="189" maxX="210" minY="339" maxY="360" name="charging-station-m"/>
   <symbol minX="210" maxX="231" minY="339" maxY="360" name="pharmacy-m"/>
   <symbol minX="231" maxX="252" minY="339" maxY="360" name="shop-bicycle-m"/>
-  <symbol minX="252" maxX="273" minY="339" maxY="360" name="charging-station-m"/>
+  <symbol minX="252" maxX="273" minY="339" maxY="360" name="bus-m"/>
   <symbol minX="273" maxX="294" minY="339" maxY="360" name="phone-m"/>
   <symbol minX="294" maxX="315" minY="339" maxY="360" name="shoes-m"/>
-  <symbol minX="315" maxX="336" minY="339" maxY="360" name="butcher-m"/>
+  <symbol minX="315" maxX="336" minY="339" maxY="360" name="cemetery-m"/>
   <symbol minX="336" maxX="357" minY="339" maxY="360" name="photo-shop-m"/>
-  <symbol minX="357" maxX="378" minY="339" maxY="360" name="cemetery-m"/>
+  <symbol minX="357" maxX="378" minY="339" maxY="360" name="ship-m"/>
   <symbol minX="378" maxX="399" minY="339" maxY="360" name="picnic-m"/>
-  <symbol minX="399" maxX="420" minY="339" maxY="360" name="ship-m"/>
-  <symbol minX="420" maxX="441" minY="339" maxY="360" name="cable-car-m"/>
+  <symbol minX="399" maxX="420" minY="339" maxY="360" name="butcher-m"/>
+  <symbol minX="420" maxX="441" minY="339" maxY="360" name="cave-m"/>
   <symbol minX="441" maxX="462" minY="339" maxY="360" name="pitch-m"/>
   <symbol minX="462" maxX="483" minY="339" maxY="360" name="seafood-shop-m"/>
-  <symbol minX="483" maxX="504" minY="339" maxY="360" name="cave-m"/>
+  <symbol minX="483" maxX="504" minY="339" maxY="360" name="cable-car-m"/>
   <symbol minX="0" maxX="21" minY="360" maxY="381" name="place-of-worship-m"/>
   <symbol minX="21" maxX="42" minY="360" maxY="381" name="school-m"/>
-  <symbol minX="42" maxX="63" minY="360" maxY="381" name="cafe-m"/>
+  <symbol minX="42" maxX="63" minY="360" maxY="381" name="casino-m"/>
   <symbol minX="63" maxX="84" minY="360" maxY="381" name="police-m"/>
   <symbol minX="84" maxX="105" minY="360" maxY="381" name="sauna-m"/>
-  <symbol minX="105" maxX="126" minY="360" maxY="381" name="casino-m"/>
-  <symbol minX="126" maxX="147" minY="360" maxY="381" name="caravan_site-m"/>
+  <symbol minX="105" maxX="126" minY="360" maxY="381" name="caravan_site-m"/>
+  <symbol minX="126" maxX="147" minY="360" maxY="381" name="car_sharing-m"/>
   <symbol minX="147" maxX="168" minY="360" maxY="381" name="postbox-m"/>
-  <symbol minX="168" maxX="189" minY="360" maxY="381" name="car_sharing-m"/>
-  <symbol minX="189" maxX="210" minY="360" maxY="381" name="car-wash-m"/>
-  <symbol minX="210" maxX="231" minY="360" maxY="381" name="restaurant-m"/>
+  <symbol minX="168" maxX="189" minY="360" maxY="381" name="car-wash-m"/>
+  <symbol minX="189" maxX="210" minY="360" maxY="381" name="cafe-m"/>
+  <symbol minX="210" maxX="231" minY="360" maxY="381" name="car-repair-m"/>
   <symbol minX="231" maxX="252" minY="360" maxY="381" name="pub-m"/>
-  <symbol minX="252" maxX="273" minY="360" maxY="381" name="campsite-m"/>
-  <symbol minX="273" maxX="294" minY="360" maxY="381" name="car-repair-m"/>
-  <symbol minX="294" maxX="315" minY="360" maxY="381" name="car-part-m"/>
+  <symbol minX="252" maxX="273" minY="360" maxY="381" name="restaurant-m"/>
+  <symbol minX="273" maxX="294" minY="360" maxY="381" name="car-part-m"/>
+  <symbol minX="294" maxX="315" minY="360" maxY="381" name="remains-m"/>
   <symbol minX="315" maxX="336" minY="360" maxY="381" name="recycling-m"/>
-  <symbol minX="336" maxX="357" minY="360" maxY="381" name="remains-m"/>
-  <symbol minX="357" maxX="377" minY="360" maxY="380" name="firehydrant-l"/>
-  <symbol minX="377" maxX="397" minY="360" maxY="380" name="lightrail-berlin-m"/>
-  <symbol minX="397" maxX="417" minY="360" maxY="380" name="subway-berlin-l"/>
-  <symbol minX="417" maxX="437" minY="360" maxY="380" name="subway-rome-l"/>
-  <symbol minX="437" maxX="457" minY="360" maxY="380" name="parking-ticket-l"/>
-  <symbol minX="457" maxX="477" minY="360" maxY="380" name="waste-basket-l"/>
-  <symbol minX="477" maxX="497" minY="360" maxY="380" name="speedcam-l"/>
-  <symbol minX="0" maxX="20" minY="381" maxY="401" name="bike-parking-l"/>
-  <symbol minX="20" maxX="40" minY="381" maxY="401" name="parking-l"/>
-  <symbol minX="40" maxX="62" minY="381" maxY="400" name="subway-moscow-l"/>
-  <symbol minX="62" maxX="81" minY="381" maxY="400" name="current-position"/>
-  <symbol minX="81" maxX="99" minY="381" maxY="399" name="no-icon-tourism"/>
-  <symbol minX="99" maxX="121" minY="381" maxY="399" name="subway-london-l"/>
-  <symbol minX="121" maxX="139" minY="381" maxY="399" name="no-icon"/>
-  <symbol minX="139" maxX="157" minY="381" maxY="399" name="subway-berlin-m"/>
-  <symbol minX="157" maxX="175" minY="381" maxY="399" name="no-icon-shop"/>
-  <symbol minX="175" maxX="193" minY="381" maxY="399" name="no-icon-leisure"/>
-  <symbol minX="193" maxX="211" minY="381" maxY="399" name="no-icon-amenity"/>
-  <symbol minX="211" maxX="232" minY="381" maxY="399" name="subway-moscow-m"/>
-  <symbol minX="232" maxX="250" minY="381" maxY="399" name="subway-paris-m"/>
-  <symbol minX="250" maxX="268" minY="381" maxY="399" name="subway-rome-m"/>
-  <symbol minX="268" maxX="286" minY="381" maxY="399" name="airport-s"/>
-  <symbol minX="286" maxX="303" minY="381" maxY="398" name="bowls-s"/>
-  <symbol minX="303" maxX="320" minY="381" maxY="398" name="charging-station-s"/>
-  <symbol minX="320" maxX="337" minY="381" maxY="398" name="pharmacy-s"/>
-  <symbol minX="337" maxX="354" minY="381" maxY="398" name="shop-s copy"/>
-  <symbol minX="354" maxX="371" minY="381" maxY="398" name="shop-s"/>
-  <symbol minX="371" maxX="388" minY="381" maxY="398" name="peak-s"/>
-  <symbol minX="388" maxX="405" minY="381" maxY="398" name="bus-s"/>
-  <symbol minX="405" maxX="422" minY="381" maxY="398" name="skiing-s"/>
-  <symbol minX="422" maxX="439" minY="381" maxY="398" name="cinema-s"/>
-  <symbol minX="439" maxX="456" minY="381" maxY="398" name="garden-s"/>
-  <symbol minX="456" maxX="473" minY="381" maxY="398" name="soccer-s"/>
-  <symbol minX="473" maxX="490" minY="381" maxY="398" name="phone-s"/>
-  <symbol minX="490" maxX="507" minY="381" maxY="398" name="speedcam-m"/>
-  <symbol minX="0" maxX="17" minY="401" maxY="418" name="book-shop-s"/>
-  <symbol minX="17" maxX="34" minY="401" maxY="418" name="cemetery-s"/>
-  <symbol minX="34" maxX="51" minY="401" maxY="418" name="park-s"/>
-  <symbol minX="51" maxX="68" minY="401" maxY="418" name="zoo-s"/>
-  <symbol minX="68" maxX="85" minY="401" maxY="418" name="climbing-s"/>
-  <symbol minX="85" maxX="102" minY="401" maxY="418" name="ship-s"/>
-  <symbol minX="102" maxX="119" minY="401" maxY="418" name="golf-s"/>
-  <symbol minX="119" maxX="136" minY="401" maxY="418" name="america-football-s"/>
-  <symbol minX="136" maxX="156" minY="401" maxY="418" name="subway-barcelona-s"/>
-  <symbol minX="156" maxX="173" minY="401" maxY="418" name="picnic-s"/>
-  <symbol minX="173" maxX="190" minY="401" maxY="418" name="cave-s"/>
-  <symbol minX="190" maxX="207" minY="401" maxY="418" name="windmill-s"/>
-  <symbol minX="207" maxX="224" minY="401" maxY="418" name="office-s"/>
-  <symbol minX="224" maxX="241" minY="401" maxY="418" name="subway-entrance-2-s"/>
-  <symbol minX="241" maxX="258" minY="401" maxY="418" name="subway-entrance-arrow"/>
-  <symbol minX="258" maxX="275" minY="401" maxY="418" name="bicycle-s"/>
-  <symbol minX="275" maxX="292" minY="401" maxY="418" name="nparkf-s"/>
-  <symbol minX="292" maxX="309" minY="401" maxY="418" name="subway-entrance-s"/>
-  <symbol minX="309" maxX="326" minY="401" maxY="418" name="college-s"/>
-  <symbol minX="326" maxX="343" minY="401" maxY="418" name="npark-s"/>
-  <symbol minX="343" maxX="360" minY="401" maxY="418" name="pitch-s"/>
-  <symbol minX="360" maxX="377" minY="401" maxY="418" name="alcohol-s"/>
-  <symbol minX="377" maxX="394" minY="401" maxY="418" name="cable-car-s"/>
-  <symbol minX="394" maxX="415" minY="401" maxY="418" name="subway-london-m"/>
-  <symbol minX="415" maxX="432" minY="401" maxY="418" name="beer-s"/>
-  <symbol minX="432" maxX="449" minY="401" maxY="418" name="school-s"/>
-  <symbol minX="449" maxX="466" minY="401" maxY="418" name="tram-s"/>
-  <symbol minX="466" maxX="483" minY="401" maxY="418" name="gallery-s"/>
-  <symbol minX="483" maxX="500" minY="401" maxY="418" name="place-of-worship-s"/>
-  <symbol minX="0" maxX="17" minY="418" maxY="435" name="casino-s"/>
-  <symbol minX="17" maxX="34" minY="418" maxY="435" name="waterfall-s"/>
-  <symbol minX="34" maxX="51" minY="418" maxY="435" name="police-s"/>
-  <symbol minX="51" maxX="68" minY="418" maxY="435" name="cafe-s"/>
-  <symbol minX="68" maxX="85" minY="418" maxY="435" name="grocery-s"/>
-  <symbol minX="85" maxX="102" minY="418" maxY="435" name="museum-s"/>
-  <symbol minX="102" maxX="119" minY="418" maxY="435" name="beach-s"/>
-  <symbol minX="119" maxX="136" minY="418" maxY="435" name="motel-s"/>
-  <symbol minX="136" maxX="153" minY="418" maxY="435" name="subway-newyork-s"/>
-  <symbol minX="153" maxX="170" minY="418" maxY="435" name="restaurant-s"/>
-  <symbol minX="170" maxX="187" minY="418" maxY="435" name="cricket-s"/>
-  <symbol minX="187" maxX="204" minY="418" maxY="435" name="car-repair-s"/>
-  <symbol minX="204" maxX="221" minY="418" maxY="435" name="volcano-s"/>
-  <symbol minX="221" maxX="238" minY="418" maxY="435" name="pub-s"/>
-  <symbol minX="238" maxX="255" minY="418" maxY="435" name="remains-s"/>
-  <symbol minX="255" maxX="272" minY="418" maxY="435" name="monument-s"/>
-  <symbol minX="272" maxX="289" minY="418" maxY="435" name="subway-s"/>
-  <symbol minX="289" maxX="306" minY="418" maxY="435" name="bcontrol-s"/>
-  <symbol minX="306" maxX="323" minY="418" maxY="435" name="curling-s"/>
-  <symbol minX="323" maxX="340" minY="418" maxY="435" name="subway-spb-s"/>
-  <symbol minX="340" maxX="357" minY="418" maxY="435" name="military-s"/>
-  <symbol minX="357" maxX="374" minY="418" maxY="435" name="viewpoint-s"/>
-  <symbol minX="374" maxX="391" minY="418" maxY="435" name="dentist-s"/>
-  <symbol minX="391" maxX="408" minY="418" maxY="435" name="basketball-s"/>
-  <symbol minX="408" maxX="425" minY="418" maxY="435" name="train-s"/>
-  <symbol minX="425" maxX="442" minY="418" maxY="435" name="marketplace-s"/>
-  <symbol minX="442" maxX="459" minY="418" maxY="435" name="mail-s"/>
-  <symbol minX="459" maxX="476" minY="418" maxY="435" name="baseball-s"/>
-  <symbol minX="476" maxX="493" minY="418" maxY="435" name="diving-s"/>
-  <symbol minX="493" maxX="510" minY="418" maxY="435" name="swimming-s"/>
-  <symbol minX="0" maxX="17" minY="435" maxY="452" name="recycling-s"/>
-  <symbol minX="17" maxX="34" minY="435" maxY="452" name="lighthouse-s"/>
-  <symbol minX="34" maxX="51" minY="435" maxY="452" name="bar-s"/>
-  <symbol minX="51" maxX="68" minY="435" maxY="452" name="library-s"/>
-  <symbol minX="68" maxX="85" minY="435" maxY="452" name="tennis-s"/>
-  <symbol minX="85" maxX="102" minY="435" maxY="452" name="drinking-water-s"/>
-  <symbol minX="102" maxX="119" minY="435" maxY="452" name="alpine_hut-s"/>
-  <symbol minX="119" maxX="136" minY="435" maxY="452" name="theatre-s"/>
-  <symbol minX="136" maxX="153" minY="435" maxY="452" name="kindergarten-s"/>
-  <symbol minX="153" maxX="170" minY="435" maxY="452" name="embassy-s"/>
-  <symbol minX="170" maxX="187" minY="435" maxY="452" name="information-s"/>
-  <symbol minX="187" maxX="204" minY="435" maxY="452" name="fastfood-s"/>
-  <symbol minX="204" maxX="221" minY="435" maxY="452" name="toilets-s"/>
-  <symbol minX="221" maxX="238" minY="435" maxY="452" name="hotel-s"/>
-  <symbol minX="238" maxX="255" minY="435" maxY="452" name="fire_station-s"/>
-  <symbol minX="255" maxX="272" minY="435" maxY="452" name="toll_booth-s"/>
-  <symbol minX="272" maxX="289" minY="435" maxY="452" name="australian-football-s"/>
-  <symbol minX="289" maxX="306" minY="435" maxY="452" name="hospital-s"/>
-  <symbol minX="306" maxX="323" minY="435" maxY="452" name="campsite-s"/>
-  <symbol minX="323" maxX="340" minY="435" maxY="452" name="heliport-s"/>
-  <symbol minX="340" maxX="357" minY="435" maxY="452" name="tourism-s"/>
-  <symbol minX="357" maxX="374" minY="435" maxY="452" name="atm-s"/>
-  <symbol minX="374" maxX="391" minY="435" maxY="452" name="atm-s copy 2"/>
-  <symbol minX="391" maxX="408" minY="435" maxY="452" name="helipad-s"/>
-  <symbol minX="408" maxX="425" minY="435" maxY="452" name="fountain-s"/>
-  <symbol minX="425" maxX="442" minY="435" maxY="452" name="townhall-s"/>
-  <symbol minX="442" maxX="459" minY="435" maxY="452" name="fuel-s"/>
-  <symbol minX="459" maxX="476" minY="435" maxY="452" name="funicular-s"/>
-  <symbol minX="476" maxX="493" minY="435" maxY="452" name="archery-s"/>
-  <symbol minX="493" maxX="510" minY="435" maxY="452" name="gym-s"/>
-  <symbol minX="0" maxX="22" minY="452" maxY="468" name="metro-barcelona-m"/>
-  <symbol minX="22" maxX="37" minY="452" maxY="468" name="s-arrow"/>
-  <symbol minX="37" maxX="59" minY="452" maxY="468" name="subway-madrid-m"/>
-  <symbol minX="59" maxX="81" minY="452" maxY="468" name="subway-madrid-l"/>
-  <symbol minX="81" maxX="103" minY="452" maxY="468" name="subway-barcelona-m"/>
-  <symbol minX="103" maxX="125" minY="452" maxY="468" name="subway-barcelona-l"/>
-  <symbol minX="125" maxX="141" minY="452" maxY="468" name="parking-m"/>
-  <symbol minX="141" maxX="161" minY="452" maxY="467" name="metro-barcelona-s"/>
-  <symbol minX="161" maxX="176" minY="452" maxY="467" name="search-result"/>
-  <symbol minX="176" maxX="197" minY="452" maxY="467" name="subway-kiev-l"/>
-  <symbol minX="197" maxX="212" minY="452" maxY="467" name="lightrail-berlin-s"/>
-  <symbol minX="212" maxX="233" minY="452" maxY="467" name="subway-kiev-m"/>
-  <symbol minX="233" maxX="253" minY="452" maxY="467" name="subway-madrid-s"/>
-  <symbol minX="253" maxX="268" minY="452" maxY="467" name="subway-moscow-s"/>
-  <symbol minX="268" maxX="283" minY="452" maxY="467" name="waste-basket-s"/>
-  <symbol minX="283" maxX="298" minY="452" maxY="467" name="api-result"/>
-  <symbol minX="298" maxX="313" minY="452" maxY="467" name="subway-paris-s"/>
-  <symbol minX="313" maxX="327" minY="452" maxY="466" name="subway-rome-s"/>
-  <symbol minX="327" maxX="341" minY="452" maxY="466" name="speedcam-s"/>
-  <symbol minX="341" maxX="355" minY="452" maxY="466" name="parking-s"/>
-  <symbol minX="355" maxX="369" minY="452" maxY="466" name="star-l"/>
-  <symbol minX="369" maxX="383" minY="452" maxY="466" name="subway-berlin-s"/>
-  <symbol minX="383" maxX="398" minY="452" maxY="466" name="bench"/>
-  <symbol minX="398" maxX="415" minY="452" maxY="466" name="subway-london-s"/>
-  <symbol minX="415" maxX="428" minY="452" maxY="465" name="survey_point-l"/>
-  <symbol minX="428" maxX="441" minY="452" maxY="465" name="star-m"/>
-  <symbol minX="441" maxX="455" minY="452" maxY="465" name="peakt-l"/>
-  <symbol minX="455" maxX="476" minY="452" maxY="465" name="subway-minsk-l"/>
-  <symbol minX="476" maxX="494" minY="452" maxY="464" name="subway-kiev-s"/>
-  <symbol minX="494" maxX="506" minY="452" maxY="464" name="survey_point-m"/>
-  <symbol minX="0" maxX="12" minY="468" maxY="480" name="star-s"/>
-  <symbol minX="12" maxX="30" minY="468" maxY="480" name="subway-minsk-m"/>
-  <symbol minX="30" maxX="42" minY="468" maxY="480" name="subway-xs"/>
-  <symbol minX="42" maxX="54" minY="468" maxY="480" name="subway-newyork-xs"/>
-  <symbol minX="54" maxX="71" minY="468" maxY="480" name="railway-crossing"/>
-  <symbol minX="71" maxX="82" minY="468" maxY="479" name="subway-xs copy"/>
-  <symbol minX="82" maxX="99" minY="468" maxY="479" name="subway-minsk-s"/>
-  <symbol minX="99" maxX="109" minY="468" maxY="478" name="survey_point-s"/>
-  <symbol minX="109" maxX="129" minY="468" maxY="478" name="arrow-m"/>
-  <symbol minX="129" maxX="140" minY="468" maxY="478" name="peakt-m"/>
-  <symbol minX="140" maxX="149" minY="468" maxY="477" name="dot-m"/>
-  <symbol minX="149" maxX="158" minY="468" maxY="477" name="peakt-s"/>
-  <symbol minX="158" maxX="167" minY="468" maxY="477" name="entrance-s"/>
-  <symbol minX="167" maxX="182" minY="468" maxY="476" name="arrow-s"/>
-  <symbol minX="182" maxX="190" minY="468" maxY="476" name="tree-l"/>
-  <symbol minX="190" maxX="198" minY="468" maxY="476" name="none"/>
-  <symbol minX="198" maxX="205" minY="468" maxY="475" name="dot-s-light"/>
-  <symbol minX="205" maxX="212" minY="468" maxY="475" name="dot-s"/>
-  <symbol minX="212" maxX="219" minY="468" maxY="475" name="entrance-xs"/>
-  <symbol minX="219" maxX="226" minY="468" maxY="475" name="tree-m"/>
-  <symbol minX="226" maxX="232" minY="468" maxY="474" name="tree-s"/>
-  <symbol minX="232" maxX="238" minY="468" maxY="474" name="zero-icon"/>
+  <symbol minX="336" maxX="357" minY="360" maxY="381" name="campsite-m"/>
+  <symbol minX="357" maxX="377" minY="360" maxY="380" name="waste-basket-l"/>
+  <symbol minX="377" maxX="397" minY="360" maxY="380" name="subway-berlin-l"/>
+  <symbol minX="397" maxX="417" minY="360" maxY="380" name="lightrail-berlin-m"/>
+  <symbol minX="417" maxX="437" minY="360" maxY="380" name="speedcam-l"/>
+  <symbol minX="437" maxX="457" minY="360" maxY="380" name="subway-rome-l"/>
+  <symbol minX="457" maxX="477" minY="360" maxY="380" name="parking-l"/>
+  <symbol minX="477" maxX="497" minY="360" maxY="380" name="bike-parking-l"/>
+  <symbol minX="0" maxX="19" minY="381" maxY="400" name="current-position"/>
+  <symbol minX="19" maxX="35" minY="381" maxY="400" name="firehydrant-l"/>
+  <symbol minX="35" maxX="57" minY="381" maxY="400" name="subway-moscow-l"/>
+  <symbol minX="57" maxX="75" minY="381" maxY="399" name="no-icon-leisure"/>
+  <symbol minX="75" maxX="93" minY="381" maxY="399" name="no-icon-shop"/>
+  <symbol minX="93" maxX="111" minY="381" maxY="399" name="no-icon-tourism"/>
+  <symbol minX="111" maxX="129" minY="381" maxY="399" name="no-icon"/>
+  <symbol minX="129" maxX="151" minY="381" maxY="399" name="subway-london-l"/>
+  <symbol minX="151" maxX="169" minY="381" maxY="399" name="subway-berlin-m"/>
+  <symbol minX="169" maxX="190" minY="381" maxY="399" name="subway-moscow-m"/>
+  <symbol minX="190" maxX="208" minY="381" maxY="399" name="waste-basket-s"/>
+  <symbol minX="208" maxX="226" minY="381" maxY="399" name="subway-paris-m"/>
+  <symbol minX="226" maxX="244" minY="381" maxY="399" name="subway-rome-m"/>
+  <symbol minX="244" maxX="262" minY="381" maxY="399" name="no-icon-amenity"/>
+  <symbol minX="262" maxX="280" minY="381" maxY="399" name="airport-s"/>
+  <symbol minX="280" maxX="297" minY="381" maxY="398" name="charging-station-s"/>
+  <symbol minX="297" maxX="314" minY="381" maxY="398" name="bowls-s"/>
+  <symbol minX="314" maxX="331" minY="381" maxY="398" name="pharmacy-s"/>
+  <symbol minX="331" maxX="348" minY="381" maxY="398" name="shop-s copy"/>
+  <symbol minX="348" maxX="365" minY="381" maxY="398" name="shop-s"/>
+  <symbol minX="365" maxX="382" minY="381" maxY="398" name="peak-s"/>
+  <symbol minX="382" maxX="393" minY="381" maxY="398" name="parking-ticket-l"/>
+  <symbol minX="393" maxX="410" minY="381" maxY="398" name="skiing-s"/>
+  <symbol minX="410" maxX="427" minY="381" maxY="398" name="book-shop-s"/>
+  <symbol minX="427" maxX="444" minY="381" maxY="398" name="cinema-s"/>
+  <symbol minX="444" maxX="461" minY="381" maxY="398" name="soccer-s"/>
+  <symbol minX="461" maxX="478" minY="381" maxY="398" name="cemetery-s"/>
+  <symbol minX="478" maxX="495" minY="381" maxY="398" name="speedcam-m"/>
+  <symbol minX="495" maxX="512" minY="381" maxY="398" name="garden-s"/>
+  <symbol minX="0" maxX="17" minY="400" maxY="417" name="phone-s"/>
+  <symbol minX="17" maxX="34" minY="400" maxY="417" name="bus-s"/>
+  <symbol minX="34" maxX="51" minY="400" maxY="417" name="zoo-s"/>
+  <symbol minX="51" maxX="68" minY="400" maxY="417" name="park-s"/>
+  <symbol minX="68" maxX="85" minY="400" maxY="417" name="bicycle-s"/>
+  <symbol minX="85" maxX="102" minY="400" maxY="417" name="golf-s"/>
+  <symbol minX="102" maxX="119" minY="400" maxY="417" name="gallery-s"/>
+  <symbol minX="119" maxX="139" minY="400" maxY="417" name="subway-barcelona-s"/>
+  <symbol minX="139" maxX="156" minY="400" maxY="417" name="ship-s"/>
+  <symbol minX="156" maxX="173" minY="400" maxY="417" name="cave-s"/>
+  <symbol minX="173" maxX="190" minY="400" maxY="417" name="windmill-s"/>
+  <symbol minX="190" maxX="207" minY="400" maxY="417" name="climbing-s"/>
+  <symbol minX="207" maxX="224" minY="400" maxY="417" name="subway-entrance-2-s"/>
+  <symbol minX="224" maxX="241" minY="400" maxY="417" name="subway-entrance-arrow"/>
+  <symbol minX="241" maxX="258" minY="400" maxY="417" name="office-s"/>
+  <symbol minX="258" maxX="275" minY="400" maxY="417" name="nparkf-s"/>
+  <symbol minX="275" maxX="292" minY="400" maxY="417" name="subway-entrance-s"/>
+  <symbol minX="292" maxX="309" minY="400" maxY="417" name="npark-s"/>
+  <symbol minX="309" maxX="326" minY="400" maxY="417" name="alcohol-s"/>
+  <symbol minX="326" maxX="343" minY="400" maxY="417" name="college-s"/>
+  <symbol minX="343" maxX="360" minY="400" maxY="417" name="beer-s"/>
+  <symbol minX="360" maxX="377" minY="400" maxY="417" name="picnic-s"/>
+  <symbol minX="377" maxX="398" minY="400" maxY="417" name="subway-london-m"/>
+  <symbol minX="398" maxX="415" minY="400" maxY="417" name="pitch-s"/>
+  <symbol minX="415" maxX="432" minY="400" maxY="417" name="casino-s"/>
+  <symbol minX="432" maxX="449" minY="400" maxY="417" name="grocery-s"/>
+  <symbol minX="449" maxX="466" minY="400" maxY="417" name="tram-s"/>
+  <symbol minX="466" maxX="483" minY="400" maxY="417" name="school-s"/>
+  <symbol minX="483" maxX="500" minY="400" maxY="417" name="place-of-worship-s"/>
+  <symbol minX="0" maxX="17" minY="417" maxY="434" name="waterfall-s"/>
+  <symbol minX="17" maxX="34" minY="417" maxY="434" name="recycling-s"/>
+  <symbol minX="34" maxX="51" minY="417" maxY="434" name="cable-car-s"/>
+  <symbol minX="51" maxX="68" minY="417" maxY="434" name="police-s"/>
+  <symbol minX="68" maxX="85" minY="417" maxY="434" name="beach-s"/>
+  <symbol minX="85" maxX="102" minY="417" maxY="434" name="museum-s"/>
+  <symbol minX="102" maxX="119" minY="417" maxY="434" name="motel-s"/>
+  <symbol minX="119" maxX="136" minY="417" maxY="434" name="subway-newyork-s"/>
+  <symbol minX="136" maxX="153" minY="417" maxY="434" name="car-repair-s"/>
+  <symbol minX="153" maxX="170" minY="417" maxY="434" name="bcontrol-s"/>
+  <symbol minX="170" maxX="187" minY="417" maxY="434" name="gym-s"/>
+  <symbol minX="187" maxX="204" minY="417" maxY="434" name="restaurant-s"/>
+  <symbol minX="204" maxX="221" minY="417" maxY="434" name="pub-s"/>
+  <symbol minX="221" maxX="238" minY="417" maxY="434" name="cafe-s"/>
+  <symbol minX="238" maxX="255" minY="417" maxY="434" name="volcano-s"/>
+  <symbol minX="255" maxX="272" minY="417" maxY="434" name="subway-s"/>
+  <symbol minX="272" maxX="289" minY="417" maxY="434" name="monument-s"/>
+  <symbol minX="289" maxX="306" minY="417" maxY="434" name="cricket-s"/>
+  <symbol minX="306" maxX="323" minY="417" maxY="434" name="subway-spb-s"/>
+  <symbol minX="323" maxX="340" minY="417" maxY="434" name="military-s"/>
+  <symbol minX="340" maxX="357" minY="417" maxY="434" name="curling-s"/>
+  <symbol minX="357" maxX="374" minY="417" maxY="434" name="viewpoint-s"/>
+  <symbol minX="374" maxX="391" minY="417" maxY="434" name="basketball-s"/>
+  <symbol minX="391" maxX="408" minY="417" maxY="434" name="dentist-s"/>
+  <symbol minX="408" maxX="425" minY="417" maxY="434" name="baseball-s"/>
+  <symbol minX="425" maxX="442" minY="417" maxY="434" name="america-football-s"/>
+  <symbol minX="442" maxX="459" minY="417" maxY="434" name="marketplace-s"/>
+  <symbol minX="459" maxX="476" minY="417" maxY="434" name="mail-s"/>
+  <symbol minX="476" maxX="493" minY="417" maxY="434" name="swimming-s"/>
+  <symbol minX="493" maxX="510" minY="417" maxY="434" name="bar-s"/>
+  <symbol minX="0" maxX="17" minY="434" maxY="451" name="diving-s"/>
+  <symbol minX="17" maxX="34" minY="434" maxY="451" name="remains-s"/>
+  <symbol minX="34" maxX="51" minY="434" maxY="451" name="lighthouse-s"/>
+  <symbol minX="51" maxX="68" minY="434" maxY="451" name="tennis-s"/>
+  <symbol minX="68" maxX="85" minY="434" maxY="451" name="library-s"/>
+  <symbol minX="85" maxX="102" minY="434" maxY="451" name="drinking-water-s"/>
+  <symbol minX="102" maxX="119" minY="434" maxY="451" name="theatre-s"/>
+  <symbol minX="119" maxX="136" minY="434" maxY="451" name="alpine_hut-s"/>
+  <symbol minX="136" maxX="153" minY="434" maxY="451" name="kindergarten-s"/>
+  <symbol minX="153" maxX="170" minY="434" maxY="451" name="embassy-s"/>
+  <symbol minX="170" maxX="187" minY="434" maxY="451" name="information-s"/>
+  <symbol minX="187" maxX="204" minY="434" maxY="451" name="toilets-s"/>
+  <symbol minX="204" maxX="221" minY="434" maxY="451" name="australian-football-s"/>
+  <symbol minX="221" maxX="238" minY="434" maxY="451" name="fastfood-s"/>
+  <symbol minX="238" maxX="255" minY="434" maxY="451" name="toll_booth-s"/>
+  <symbol minX="255" maxX="272" minY="434" maxY="451" name="hotel-s"/>
+  <symbol minX="272" maxX="289" minY="434" maxY="451" name="fire_station-s"/>
+  <symbol minX="289" maxX="306" minY="434" maxY="451" name="atm-s"/>
+  <symbol minX="306" maxX="323" minY="434" maxY="451" name="hospital-s"/>
+  <symbol minX="323" maxX="340" minY="434" maxY="451" name="tourism-s"/>
+  <symbol minX="340" maxX="357" minY="434" maxY="451" name="atm-s copy 2"/>
+  <symbol minX="357" maxX="374" minY="434" maxY="451" name="campsite-s"/>
+  <symbol minX="374" maxX="391" minY="434" maxY="451" name="heliport-s"/>
+  <symbol minX="391" maxX="408" minY="434" maxY="451" name="helipad-s"/>
+  <symbol minX="408" maxX="425" minY="434" maxY="451" name="townhall-s"/>
+  <symbol minX="425" maxX="442" minY="434" maxY="451" name="archery-s"/>
+  <symbol minX="442" maxX="459" minY="434" maxY="451" name="fountain-s"/>
+  <symbol minX="459" maxX="476" minY="434" maxY="451" name="fuel-s"/>
+  <symbol minX="476" maxX="493" minY="434" maxY="451" name="funicular-s"/>
+  <symbol minX="493" maxX="510" minY="434" maxY="451" name="train-s"/>
+  <symbol minX="0" maxX="22" minY="451" maxY="467" name="metro-barcelona-m"/>
+  <symbol minX="22" maxX="37" minY="451" maxY="467" name="s-arrow"/>
+  <symbol minX="37" maxX="59" minY="451" maxY="467" name="subway-madrid-m"/>
+  <symbol minX="59" maxX="81" minY="451" maxY="467" name="subway-madrid-l"/>
+  <symbol minX="81" maxX="103" minY="451" maxY="467" name="subway-barcelona-m"/>
+  <symbol minX="103" maxX="125" minY="451" maxY="467" name="subway-barcelona-l"/>
+  <symbol minX="125" maxX="141" minY="451" maxY="467" name="parking-m"/>
+  <symbol minX="141" maxX="161" minY="451" maxY="466" name="metro-barcelona-s"/>
+  <symbol minX="161" maxX="176" minY="451" maxY="466" name="search-result"/>
+  <symbol minX="176" maxX="197" minY="451" maxY="466" name="subway-kiev-l"/>
+  <symbol minX="197" maxX="212" minY="451" maxY="466" name="lightrail-berlin-s"/>
+  <symbol minX="212" maxX="233" minY="451" maxY="466" name="subway-kiev-m"/>
+  <symbol minX="233" maxX="253" minY="451" maxY="466" name="subway-madrid-s"/>
+  <symbol minX="253" maxX="268" minY="451" maxY="466" name="subway-moscow-s"/>
+  <symbol minX="268" maxX="283" minY="451" maxY="466" name="api-result"/>
+  <symbol minX="283" maxX="298" minY="451" maxY="466" name="subway-paris-s"/>
+  <symbol minX="298" maxX="312" minY="451" maxY="465" name="subway-rome-s"/>
+  <symbol minX="312" maxX="326" minY="451" maxY="465" name="speedcam-s"/>
+  <symbol minX="326" maxX="340" minY="451" maxY="465" name="parking-s"/>
+  <symbol minX="340" maxX="354" minY="451" maxY="465" name="star-l"/>
+  <symbol minX="354" maxX="368" minY="451" maxY="465" name="subway-berlin-s"/>
+  <symbol minX="368" maxX="383" minY="451" maxY="465" name="bench"/>
+  <symbol minX="383" maxX="400" minY="451" maxY="465" name="subway-london-s"/>
+  <symbol minX="400" maxX="413" minY="451" maxY="464" name="survey_point-l"/>
+  <symbol minX="413" maxX="426" minY="451" maxY="464" name="star-m"/>
+  <symbol minX="426" maxX="440" minY="451" maxY="464" name="peakt-l"/>
+  <symbol minX="440" maxX="461" minY="451" maxY="464" name="subway-minsk-l"/>
+  <symbol minX="461" maxX="479" minY="451" maxY="463" name="subway-kiev-s"/>
+  <symbol minX="479" maxX="491" minY="451" maxY="463" name="survey_point-m"/>
+  <symbol minX="491" maxX="503" minY="451" maxY="463" name="star-s"/>
+  <symbol minX="0" maxX="18" minY="467" maxY="479" name="subway-minsk-m"/>
+  <symbol minX="18" maxX="30" minY="467" maxY="479" name="subway-xs"/>
+  <symbol minX="30" maxX="42" minY="467" maxY="479" name="subway-newyork-xs"/>
+  <symbol minX="42" maxX="59" minY="467" maxY="479" name="railway-crossing"/>
+  <symbol minX="59" maxX="70" minY="467" maxY="478" name="subway-xs copy"/>
+  <symbol minX="70" maxX="87" minY="467" maxY="478" name="subway-minsk-s"/>
+  <symbol minX="87" maxX="97" minY="467" maxY="477" name="survey_point-s"/>
+  <symbol minX="97" maxX="117" minY="467" maxY="477" name="arrow-m"/>
+  <symbol minX="117" maxX="128" minY="467" maxY="477" name="peakt-m"/>
+  <symbol minX="128" maxX="137" minY="467" maxY="476" name="dot-m"/>
+  <symbol minX="137" maxX="146" minY="467" maxY="476" name="peakt-s"/>
+  <symbol minX="146" maxX="155" minY="467" maxY="476" name="entrance-s"/>
+  <symbol minX="155" maxX="170" minY="467" maxY="475" name="arrow-s"/>
+  <symbol minX="170" maxX="178" minY="467" maxY="475" name="tree-l"/>
+  <symbol minX="178" maxX="186" minY="467" maxY="475" name="none"/>
+  <symbol minX="186" maxX="193" minY="467" maxY="474" name="dot-s-light"/>
+  <symbol minX="193" maxX="200" minY="467" maxY="474" name="dot-s"/>
+  <symbol minX="200" maxX="207" minY="467" maxY="474" name="entrance-xs"/>
+  <symbol minX="207" maxX="214" minY="467" maxY="474" name="tree-m"/>
+  <symbol minX="214" maxX="220" minY="467" maxY="473" name="tree-s"/>
+  <symbol minX="220" maxX="226" minY="467" maxY="473" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-ldpi_legacy/symbols.png b/data/resources-ldpi_legacy/symbols.png
index 9608de4aba..50e633fdd3 100644
Binary files a/data/resources-ldpi_legacy/symbols.png and b/data/resources-ldpi_legacy/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index af02a229c4..fc074199ce 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 53e722e7d3..24224d8a18 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file width="1024" height="512">
+ <file height="512" width="1024">
   <symbol minX="0" maxX="72" minY="0" maxY="104" name="route_to"/>
   <symbol minX="72" maxX="106" minY="0" maxY="88" name="route_from"/>
   <symbol minX="106" maxX="243" minY="0" maxY="68" name="route-arrow"/>
@@ -340,187 +340,187 @@
   <symbol minX="399" maxX="420" minY="234" maxY="255" name="pub-m"/>
   <symbol minX="420" maxX="441" minY="234" maxY="255" name="college-m"/>
   <symbol minX="441" maxX="462" minY="234" maxY="255" name="clothes-m"/>
-  <symbol minX="462" maxX="482" minY="234" maxY="254" name="lightrail-berlin-m"/>
-  <symbol minX="482" maxX="502" minY="234" maxY="254" name="bike-parking-l"/>
-  <symbol minX="502" maxX="522" minY="234" maxY="254" name="firehydrant-l"/>
+  <symbol minX="462" maxX="482" minY="234" maxY="254" name="speedcam-l"/>
+  <symbol minX="482" maxX="502" minY="234" maxY="254" name="lightrail-berlin-m"/>
+  <symbol minX="502" maxX="522" minY="234" maxY="254" name="bike-parking-l"/>
   <symbol minX="522" maxX="542" minY="234" maxY="254" name="watch-my-position"/>
-  <symbol minX="542" maxX="562" minY="234" maxY="254" name="subway-rome-l"/>
-  <symbol minX="562" maxX="582" minY="234" maxY="254" name="waste-basket-l"/>
-  <symbol minX="582" maxX="602" minY="234" maxY="254" name="speedcam-l"/>
-  <symbol minX="602" maxX="622" minY="234" maxY="254" name="parking-l"/>
-  <symbol minX="622" maxX="642" minY="234" maxY="254" name="subway-berlin-l"/>
-  <symbol minX="642" maxX="662" minY="234" maxY="254" name="parking-ticket-l"/>
-  <symbol minX="662" maxX="684" minY="234" maxY="253" name="subway-moscow-l"/>
-  <symbol minX="684" maxX="701" minY="234" maxY="252" name="hunting-tower-s"/>
-  <symbol minX="701" maxX="719" minY="234" maxY="252" name="no-icon-amenity"/>
-  <symbol minX="719" maxX="737" minY="234" maxY="252" name="no-icon-leisure"/>
-  <symbol minX="737" maxX="754" minY="234" maxY="252" name="picnic-s"/>
-  <symbol minX="754" maxX="772" minY="234" maxY="252" name="search-result"/>
-  <symbol minX="772" maxX="790" minY="234" maxY="252" name="airport-s"/>
-  <symbol minX="790" maxX="808" minY="234" maxY="252" name="no-icon-shop"/>
-  <symbol minX="808" maxX="826" minY="234" maxY="252" name="no-icon-tourism"/>
-  <symbol minX="826" maxX="844" minY="234" maxY="252" name="no-icon"/>
-  <symbol minX="844" maxX="861" minY="234" maxY="252" name="beer-s"/>
-  <symbol minX="861" maxX="879" minY="234" maxY="252" name="subway-rome-m"/>
-  <symbol minX="879" maxX="897" minY="234" maxY="252" name="subway-paris-m"/>
-  <symbol minX="897" maxX="914" minY="234" maxY="252" name="bcontrol-s"/>
-  <symbol minX="914" maxX="935" minY="234" maxY="252" name="subway-moscow-m"/>
-  <symbol minX="935" maxX="952" minY="234" maxY="252" name="waterfall-s"/>
-  <symbol minX="952" maxX="969" minY="234" maxY="252" name="office-s"/>
-  <symbol minX="969" maxX="991" minY="234" maxY="252" name="subway-london-l"/>
-  <symbol minX="991" maxX="1009" minY="234" maxY="252" name="api-result"/>
-  <symbol minX="0" maxX="18" minY="255" maxY="273" name="subway-berlin-m"/>
-  <symbol minX="18" maxX="35" minY="255" maxY="273" name="heliport-s"/>
-  <symbol minX="35" maxX="52" minY="255" maxY="273" name="remains-s"/>
-  <symbol minX="52" maxX="69" minY="255" maxY="272" name="alpine_hut-s"/>
-  <symbol minX="69" maxX="86" minY="255" maxY="272" name="skiing-s"/>
-  <symbol minX="86" maxX="103" minY="255" maxY="272" name="casino-s"/>
-  <symbol minX="103" maxX="120" minY="255" maxY="272" name="helipad-s"/>
-  <symbol minX="120" maxX="137" minY="255" maxY="272" name="soccer-s"/>
-  <symbol minX="137" maxX="154" minY="255" maxY="272" name="pitch-s"/>
-  <symbol minX="154" maxX="171" minY="255" maxY="272" name="speedcam-m"/>
-  <symbol minX="171" maxX="188" minY="255" maxY="272" name="garden-s"/>
-  <symbol minX="188" maxX="205" minY="255" maxY="272" name="hand-s"/>
-  <symbol minX="205" maxX="222" minY="255" maxY="272" name="america-football-s"/>
-  <symbol minX="222" maxX="239" minY="255" maxY="272" name="shop-s"/>
-  <symbol minX="239" maxX="256" minY="255" maxY="272" name="gallery-s"/>
-  <symbol minX="256" maxX="273" minY="255" maxY="272" name="archery-s"/>
-  <symbol minX="273" maxX="290" minY="255" maxY="272" name="bar-s"/>
-  <symbol minX="290" maxX="307" minY="255" maxY="272" name="hospital-s"/>
-  <symbol minX="307" maxX="327" minY="255" maxY="272" name="subway-barcelona-s"/>
-  <symbol minX="327" maxX="344" minY="255" maxY="272" name="cinema-s"/>
-  <symbol minX="344" maxX="361" minY="255" maxY="272" name="golf-s"/>
-  <symbol minX="361" maxX="378" minY="255" maxY="272" name="cave-s"/>
-  <symbol minX="378" maxX="395" minY="255" maxY="272" name="zoo-s"/>
-  <symbol minX="395" maxX="412" minY="255" maxY="272" name="subway-entrance-2-s"/>
-  <symbol minX="412" maxX="429" minY="255" maxY="272" name="subway-entrance-arrow"/>
-  <symbol minX="429" maxX="446" minY="255" maxY="272" name="place-of-worship-s"/>
-  <symbol minX="446" maxX="463" minY="255" maxY="272" name="park-s"/>
-  <symbol minX="463" maxX="480" minY="255" maxY="272" name="subway-entrance-s"/>
-  <symbol minX="480" maxX="497" minY="255" maxY="272" name="hotel-s"/>
-  <symbol minX="497" maxX="514" minY="255" maxY="272" name="funicular-s"/>
-  <symbol minX="514" maxX="531" minY="255" maxY="272" name="windmill-s"/>
-  <symbol minX="531" maxX="548" minY="255" maxY="272" name="diving-s"/>
-  <symbol minX="548" maxX="565" minY="255" maxY="272" name="alcohol-s"/>
-  <symbol minX="565" maxX="586" minY="255" maxY="272" name="subway-london-m"/>
-  <symbol minX="586" maxX="603" minY="255" maxY="272" name="cricket-s"/>
-  <symbol minX="603" maxX="620" minY="255" maxY="272" name="gym-s"/>
-  <symbol minX="620" maxX="637" minY="255" maxY="272" name="baseball-s"/>
-  <symbol minX="637" maxX="654" minY="255" maxY="272" name="fuel-s"/>
-  <symbol minX="654" maxX="671" minY="255" maxY="272" name="information-s"/>
-  <symbol minX="671" maxX="688" minY="255" maxY="272" name="fountain-s"/>
-  <symbol minX="688" maxX="705" minY="255" maxY="272" name="basketball-s"/>
-  <symbol minX="705" maxX="722" minY="255" maxY="272" name="dentist-s"/>
-  <symbol minX="722" maxX="739" minY="255" maxY="272" name="recycling-s"/>
-  <symbol minX="739" maxX="756" minY="255" maxY="272" name="cemetery-s"/>
-  <symbol minX="756" maxX="773" minY="255" maxY="272" name="kindergarten-s"/>
-  <symbol minX="773" maxX="790" minY="255" maxY="272" name="car-repair-s"/>
-  <symbol minX="790" maxX="807" minY="255" maxY="272" name="nparkf-s"/>
-  <symbol minX="807" maxX="824" minY="255" maxY="272" name="subway-newyork-s"/>
-  <symbol minX="824" maxX="841" minY="255" maxY="272" name="ship-s"/>
-  <symbol minX="841" maxX="858" minY="255" maxY="272" name="police-s"/>
-  <symbol minX="858" maxX="875" minY="255" maxY="272" name="curling-s"/>
-  <symbol minX="875" maxX="892" minY="255" maxY="272" name="volcano-s"/>
-  <symbol minX="892" maxX="909" minY="255" maxY="272" name="climbing-s"/>
-  <symbol minX="909" maxX="926" minY="255" maxY="272" name="pharmacy-s"/>
-  <symbol minX="926" maxX="943" minY="255" maxY="272" name="pub-s"/>
-  <symbol minX="943" maxX="960" minY="255" maxY="272" name="subway-s"/>
-  <symbol minX="960" maxX="977" minY="255" maxY="272" name="campsite-s"/>
-  <symbol minX="977" maxX="994" minY="255" maxY="272" name="npark-s"/>
-  <symbol minX="994" maxX="1011" minY="255" maxY="272" name="subway-spb-s"/>
-  <symbol minX="0" maxX="17" minY="273" maxY="290" name="fire_station-s"/>
-  <symbol minX="17" maxX="34" minY="273" maxY="290" name="viewpoint-s"/>
-  <symbol minX="34" maxX="51" minY="273" maxY="290" name="beach-s"/>
-  <symbol minX="51" maxX="68" minY="273" maxY="290" name="fastfood-s"/>
-  <symbol minX="68" maxX="85" minY="273" maxY="290" name="library-s"/>
-  <symbol minX="85" maxX="102" minY="273" maxY="290" name="phone-s"/>
-  <symbol minX="102" maxX="119" minY="273" maxY="290" name="cafe-s"/>
-  <symbol minX="119" maxX="136" minY="273" maxY="290" name="charging-station-s"/>
-  <symbol minX="136" maxX="153" minY="273" maxY="290" name="swimming-s"/>
-  <symbol minX="153" maxX="170" minY="273" maxY="290" name="school-s"/>
-  <symbol minX="170" maxX="187" minY="273" maxY="290" name="australian-football-s"/>
-  <symbol minX="187" maxX="204" minY="273" maxY="290" name="cable-car-s"/>
-  <symbol minX="204" maxX="221" minY="273" maxY="290" name="grocery-s"/>
-  <symbol minX="221" maxX="238" minY="273" maxY="290" name="tennis-s"/>
-  <symbol minX="238" maxX="255" minY="273" maxY="290" name="restaurant-s"/>
-  <symbol minX="255" maxX="272" minY="273" maxY="290" name="museum-s"/>
-  <symbol minX="272" maxX="289" minY="273" maxY="290" name="theatre-s"/>
-  <symbol minX="289" maxX="306" minY="273" maxY="290" name="equestrian-s"/>
-  <symbol minX="306" maxX="323" minY="273" maxY="290" name="motel-s"/>
-  <symbol minX="323" maxX="340" minY="273" maxY="290" name="bus-s"/>
-  <symbol minX="340" maxX="357" minY="273" maxY="290" name="drinking-water-s"/>
-  <symbol minX="357" maxX="374" minY="273" maxY="290" name="toilets-s"/>
-  <symbol minX="374" maxX="391" minY="273" maxY="290" name="monument-s"/>
-  <symbol minX="391" maxX="408" minY="273" maxY="290" name="military-s"/>
-  <symbol minX="408" maxX="425" minY="273" maxY="290" name="toll_booth-s"/>
-  <symbol minX="425" maxX="442" minY="273" maxY="290" name="bowls-s"/>
-  <symbol minX="442" maxX="459" minY="273" maxY="290" name="tram-s"/>
-  <symbol minX="459" maxX="476" minY="273" maxY="290" name="atm-s"/>
-  <symbol minX="476" maxX="493" minY="273" maxY="290" name="marketplace-s"/>
-  <symbol minX="493" maxX="510" minY="273" maxY="290" name="tourism-s"/>
-  <symbol minX="510" maxX="527" minY="273" maxY="290" name="embassy-s"/>
-  <symbol minX="527" maxX="544" minY="273" maxY="290" name="book-shop-s"/>
-  <symbol minX="544" maxX="561" minY="273" maxY="290" name="mail-s"/>
-  <symbol minX="561" maxX="578" minY="273" maxY="290" name="lighthouse-s"/>
-  <symbol minX="578" maxX="595" minY="273" maxY="290" name="townhall-s"/>
-  <symbol minX="595" maxX="612" minY="273" maxY="290" name="college-s"/>
-  <symbol minX="612" maxX="629" minY="273" maxY="290" name="train-s"/>
-  <symbol minX="629" maxX="646" minY="273" maxY="290" name="bicycle-s"/>
-  <symbol minX="646" maxX="663" minY="273" maxY="290" name="power-s"/>
-  <symbol minX="663" maxX="685" minY="273" maxY="289" name="metro-barcelona-m"/>
-  <symbol minX="685" maxX="707" minY="273" maxY="289" name="subway-barcelona-l"/>
-  <symbol minX="707" maxX="729" minY="273" maxY="289" name="subway-barcelona-m"/>
-  <symbol minX="729" maxX="751" minY="273" maxY="289" name="subway-madrid-l"/>
-  <symbol minX="751" maxX="766" minY="273" maxY="289" name="s-arrow"/>
-  <symbol minX="766" maxX="788" minY="273" maxY="289" name="subway-madrid-m"/>
-  <symbol minX="788" maxX="804" minY="273" maxY="289" name="parking-m"/>
-  <symbol minX="804" maxX="819" minY="273" maxY="288" name="subway-paris-s"/>
-  <symbol minX="819" maxX="839" minY="273" maxY="288" name="subway-madrid-s"/>
-  <symbol minX="839" maxX="854" minY="273" maxY="288" name="peak-l"/>
-  <symbol minX="854" maxX="874" minY="273" maxY="288" name="metro-barcelona-s"/>
-  <symbol minX="874" maxX="889" minY="273" maxY="288" name="lightrail-berlin-s"/>
-  <symbol minX="889" maxX="910" minY="273" maxY="288" name="subway-kiev-l"/>
-  <symbol minX="910" maxX="925" minY="273" maxY="288" name="subway-moscow-s"/>
-  <symbol minX="925" maxX="946" minY="273" maxY="288" name="subway-kiev-m"/>
-  <symbol minX="946" maxX="961" minY="273" maxY="288" name="waste-basket-s"/>
-  <symbol minX="961" maxX="976" minY="273" maxY="287" name="bench"/>
-  <symbol minX="976" maxX="990" minY="273" maxY="287" name="parking-s"/>
-  <symbol minX="990" maxX="1004" minY="273" maxY="287" name="subway-rome-s"/>
-  <symbol minX="1004" maxX="1018" minY="273" maxY="287" name="speedcam-s"/>
-  <symbol minX="0" maxX="14" minY="290" maxY="304" name="subway-berlin-s"/>
-  <symbol minX="14" maxX="31" minY="290" maxY="304" name="subway-london-s"/>
-  <symbol minX="31" maxX="44" minY="290" maxY="303" name="star-l"/>
-  <symbol minX="44" maxX="65" minY="290" maxY="303" name="subway-minsk-l"/>
-  <symbol minX="65" maxX="79" minY="290" maxY="303" name="peakt-l"/>
-  <symbol minX="79" maxX="92" minY="290" maxY="303" name="survey_point-l"/>
-  <symbol minX="92" maxX="110" minY="290" maxY="302" name="subway-minsk-m"/>
-  <symbol minX="110" maxX="122" minY="290" maxY="302" name="peak-m"/>
-  <symbol minX="122" maxX="134" minY="290" maxY="302" name="subway-newyork-xs"/>
-  <symbol minX="134" maxX="146" minY="290" maxY="302" name="star-m"/>
-  <symbol minX="146" maxX="158" minY="290" maxY="302" name="subway-xs"/>
-  <symbol minX="158" maxX="170" minY="290" maxY="302" name="survey_point-m"/>
-  <symbol minX="170" maxX="188" minY="290" maxY="302" name="subway-kiev-s"/>
-  <symbol minX="188" maxX="205" minY="290" maxY="302" name="railway-crossing"/>
-  <symbol minX="205" maxX="216" minY="290" maxY="301" name="crossing-l"/>
-  <symbol minX="216" maxX="233" minY="290" maxY="301" name="subway-minsk-s"/>
-  <symbol minX="233" maxX="244" minY="290" maxY="301" name="star-s"/>
-  <symbol minX="244" maxX="264" minY="290" maxY="300" name="arrow-m"/>
-  <symbol minX="264" maxX="274" minY="290" maxY="300" name="survey_point-s"/>
-  <symbol minX="274" maxX="285" minY="290" maxY="300" name="peakt-m"/>
-  <symbol minX="285" maxX="296" minY="290" maxY="300" name="peak-s"/>
-  <symbol minX="296" maxX="305" minY="290" maxY="299" name="peakt-s"/>
-  <symbol minX="305" maxX="314" minY="290" maxY="299" name="entrance-s"/>
-  <symbol minX="314" maxX="323" minY="290" maxY="299" name="crossing-m"/>
-  <symbol minX="323" maxX="338" minY="290" maxY="298" name="arrow-s"/>
-  <symbol minX="338" maxX="346" minY="290" maxY="298" name="tree-l"/>
-  <symbol minX="346" maxX="354" minY="290" maxY="298" name="crossing-s"/>
-  <symbol minX="354" maxX="362" minY="290" maxY="298" name="dot-m"/>
-  <symbol minX="362" maxX="370" minY="290" maxY="298" name="none"/>
-  <symbol minX="370" maxX="377" minY="290" maxY="297" name="entrance-xs"/>
-  <symbol minX="377" maxX="384" minY="290" maxY="297" name="tree-m"/>
-  <symbol minX="384" maxX="390" minY="290" maxY="296" name="dot-s"/>
-  <symbol minX="390" maxX="396" minY="290" maxY="296" name="dot-s-light"/>
-  <symbol minX="396" maxX="402" minY="290" maxY="296" name="zero-icon"/>
-  <symbol minX="402" maxX="408" minY="290" maxY="296" name="tree-s"/>
+  <symbol minX="542" maxX="562" minY="234" maxY="254" name="subway-berlin-l"/>
+  <symbol minX="562" maxX="582" minY="234" maxY="254" name="parking-l"/>
+  <symbol minX="582" maxX="602" minY="234" maxY="254" name="subway-rome-l"/>
+  <symbol minX="602" maxX="622" minY="234" maxY="254" name="waste-basket-l"/>
+  <symbol minX="622" maxX="644" minY="234" maxY="253" name="subway-moscow-l"/>
+  <symbol minX="644" maxX="660" minY="234" maxY="253" name="firehydrant-l"/>
+  <symbol minX="660" maxX="678" minY="234" maxY="252" name="no-icon"/>
+  <symbol minX="678" maxX="695" minY="234" maxY="252" name="remains-s"/>
+  <symbol minX="695" maxX="713" minY="234" maxY="252" name="subway-rome-m"/>
+  <symbol minX="713" maxX="731" minY="234" maxY="252" name="no-icon-tourism"/>
+  <symbol minX="731" maxX="748" minY="234" maxY="252" name="picnic-s"/>
+  <symbol minX="748" maxX="766" minY="234" maxY="252" name="search-result"/>
+  <symbol minX="766" maxX="783" minY="234" maxY="252" name="office-s"/>
+  <symbol minX="783" maxX="801" minY="234" maxY="252" name="no-icon-shop"/>
+  <symbol minX="801" maxX="819" minY="234" maxY="252" name="subway-paris-m"/>
+  <symbol minX="819" maxX="837" minY="234" maxY="252" name="waste-basket-s"/>
+  <symbol minX="837" maxX="854" minY="234" maxY="252" name="bcontrol-s"/>
+  <symbol minX="854" maxX="875" minY="234" maxY="252" name="subway-moscow-m"/>
+  <symbol minX="875" maxX="893" minY="234" maxY="252" name="no-icon-leisure"/>
+  <symbol minX="893" maxX="910" minY="234" maxY="252" name="waterfall-s"/>
+  <symbol minX="910" maxX="927" minY="234" maxY="252" name="hunting-tower-s"/>
+  <symbol minX="927" maxX="949" minY="234" maxY="252" name="subway-london-l"/>
+  <symbol minX="949" maxX="967" minY="234" maxY="252" name="no-icon-amenity"/>
+  <symbol minX="967" maxX="985" minY="234" maxY="252" name="api-result"/>
+  <symbol minX="985" maxX="1003" minY="234" maxY="252" name="subway-berlin-m"/>
+  <symbol minX="1003" maxX="1020" minY="234" maxY="252" name="beer-s"/>
+  <symbol minX="0" maxX="17" minY="255" maxY="273" name="heliport-s"/>
+  <symbol minX="17" maxX="35" minY="255" maxY="273" name="airport-s"/>
+  <symbol minX="35" maxX="52" minY="255" maxY="272" name="alpine_hut-s"/>
+  <symbol minX="52" maxX="69" minY="255" maxY="272" name="skiing-s"/>
+  <symbol minX="69" maxX="86" minY="255" maxY="272" name="casino-s"/>
+  <symbol minX="86" maxX="103" minY="255" maxY="272" name="helipad-s"/>
+  <symbol minX="103" maxX="120" minY="255" maxY="272" name="soccer-s"/>
+  <symbol minX="120" maxX="137" minY="255" maxY="272" name="hand-s"/>
+  <symbol minX="137" maxX="154" minY="255" maxY="272" name="speedcam-m"/>
+  <symbol minX="154" maxX="171" minY="255" maxY="272" name="garden-s"/>
+  <symbol minX="171" maxX="182" minY="255" maxY="272" name="parking-ticket-l"/>
+  <symbol minX="182" maxX="199" minY="255" maxY="272" name="america-football-s"/>
+  <symbol minX="199" maxX="216" minY="255" maxY="272" name="shop-s"/>
+  <symbol minX="216" maxX="233" minY="255" maxY="272" name="gallery-s"/>
+  <symbol minX="233" maxX="250" minY="255" maxY="272" name="archery-s"/>
+  <symbol minX="250" maxX="267" minY="255" maxY="272" name="bar-s"/>
+  <symbol minX="267" maxX="284" minY="255" maxY="272" name="hospital-s"/>
+  <symbol minX="284" maxX="304" minY="255" maxY="272" name="subway-barcelona-s"/>
+  <symbol minX="304" maxX="321" minY="255" maxY="272" name="golf-s"/>
+  <symbol minX="321" maxX="338" minY="255" maxY="272" name="cave-s"/>
+  <symbol minX="338" maxX="355" minY="255" maxY="272" name="alcohol-s"/>
+  <symbol minX="355" maxX="372" minY="255" maxY="272" name="zoo-s"/>
+  <symbol minX="372" maxX="389" minY="255" maxY="272" name="subway-entrance-2-s"/>
+  <symbol minX="389" maxX="406" minY="255" maxY="272" name="subway-entrance-arrow"/>
+  <symbol minX="406" maxX="423" minY="255" maxY="272" name="gym-s"/>
+  <symbol minX="423" maxX="440" minY="255" maxY="272" name="park-s"/>
+  <symbol minX="440" maxX="457" minY="255" maxY="272" name="subway-entrance-s"/>
+  <symbol minX="457" maxX="474" minY="255" maxY="272" name="hotel-s"/>
+  <symbol minX="474" maxX="491" minY="255" maxY="272" name="funicular-s"/>
+  <symbol minX="491" maxX="508" minY="255" maxY="272" name="windmill-s"/>
+  <symbol minX="508" maxX="525" minY="255" maxY="272" name="diving-s"/>
+  <symbol minX="525" maxX="542" minY="255" maxY="272" name="dentist-s"/>
+  <symbol minX="542" maxX="563" minY="255" maxY="272" name="subway-london-m"/>
+  <symbol minX="563" maxX="580" minY="255" maxY="272" name="cemetery-s"/>
+  <symbol minX="580" maxX="597" minY="255" maxY="272" name="power-s"/>
+  <symbol minX="597" maxX="614" minY="255" maxY="272" name="baseball-s"/>
+  <symbol minX="614" maxX="631" minY="255" maxY="272" name="fuel-s"/>
+  <symbol minX="631" maxX="648" minY="255" maxY="272" name="information-s"/>
+  <symbol minX="648" maxX="665" minY="255" maxY="272" name="fountain-s"/>
+  <symbol minX="665" maxX="682" minY="255" maxY="272" name="basketball-s"/>
+  <symbol minX="682" maxX="699" minY="255" maxY="272" name="ship-s"/>
+  <symbol minX="699" maxX="716" minY="255" maxY="272" name="curling-s"/>
+  <symbol minX="716" maxX="733" minY="255" maxY="272" name="pharmacy-s"/>
+  <symbol minX="733" maxX="750" minY="255" maxY="272" name="kindergarten-s"/>
+  <symbol minX="750" maxX="767" minY="255" maxY="272" name="car-repair-s"/>
+  <symbol minX="767" maxX="784" minY="255" maxY="272" name="nparkf-s"/>
+  <symbol minX="784" maxX="801" minY="255" maxY="272" name="subway-newyork-s"/>
+  <symbol minX="801" maxX="818" minY="255" maxY="272" name="phone-s"/>
+  <symbol minX="818" maxX="835" minY="255" maxY="272" name="charging-station-s"/>
+  <symbol minX="835" maxX="852" minY="255" maxY="272" name="school-s"/>
+  <symbol minX="852" maxX="869" minY="255" maxY="272" name="australian-football-s"/>
+  <symbol minX="869" maxX="886" minY="255" maxY="272" name="grocery-s"/>
+  <symbol minX="886" maxX="903" minY="255" maxY="272" name="restaurant-s"/>
+  <symbol minX="903" maxX="920" minY="255" maxY="272" name="volcano-s"/>
+  <symbol minX="920" maxX="937" minY="255" maxY="272" name="subway-s"/>
+  <symbol minX="937" maxX="954" minY="255" maxY="272" name="campsite-s"/>
+  <symbol minX="954" maxX="971" minY="255" maxY="272" name="npark-s"/>
+  <symbol minX="971" maxX="988" minY="255" maxY="272" name="subway-spb-s"/>
+  <symbol minX="988" maxX="1005" minY="255" maxY="272" name="cricket-s"/>
+  <symbol minX="1005" maxX="1022" minY="255" maxY="272" name="fire_station-s"/>
+  <symbol minX="0" maxX="17" minY="273" maxY="290" name="viewpoint-s"/>
+  <symbol minX="17" maxX="34" minY="273" maxY="290" name="beach-s"/>
+  <symbol minX="34" maxX="51" minY="273" maxY="290" name="fastfood-s"/>
+  <symbol minX="51" maxX="68" minY="273" maxY="290" name="library-s"/>
+  <symbol minX="68" maxX="85" minY="273" maxY="290" name="cafe-s"/>
+  <symbol minX="85" maxX="102" minY="273" maxY="290" name="pitch-s"/>
+  <symbol minX="102" maxX="119" minY="273" maxY="290" name="swimming-s"/>
+  <symbol minX="119" maxX="136" minY="273" maxY="290" name="cinema-s"/>
+  <symbol minX="136" maxX="153" minY="273" maxY="290" name="place-of-worship-s"/>
+  <symbol minX="153" maxX="170" minY="273" maxY="290" name="cable-car-s"/>
+  <symbol minX="170" maxX="187" minY="273" maxY="290" name="recycling-s"/>
+  <symbol minX="187" maxX="204" minY="273" maxY="290" name="tennis-s"/>
+  <symbol minX="204" maxX="221" minY="273" maxY="290" name="police-s"/>
+  <symbol minX="221" maxX="238" minY="273" maxY="290" name="museum-s"/>
+  <symbol minX="238" maxX="255" minY="273" maxY="290" name="theatre-s"/>
+  <symbol minX="255" maxX="272" minY="273" maxY="290" name="climbing-s"/>
+  <symbol minX="272" maxX="289" minY="273" maxY="290" name="motel-s"/>
+  <symbol minX="289" maxX="306" minY="273" maxY="290" name="bus-s"/>
+  <symbol minX="306" maxX="323" minY="273" maxY="290" name="drinking-water-s"/>
+  <symbol minX="323" maxX="340" minY="273" maxY="290" name="toilets-s"/>
+  <symbol minX="340" maxX="357" minY="273" maxY="290" name="monument-s"/>
+  <symbol minX="357" maxX="374" minY="273" maxY="290" name="military-s"/>
+  <symbol minX="374" maxX="391" minY="273" maxY="290" name="toll_booth-s"/>
+  <symbol minX="391" maxX="408" minY="273" maxY="290" name="bowls-s"/>
+  <symbol minX="408" maxX="425" minY="273" maxY="290" name="equestrian-s"/>
+  <symbol minX="425" maxX="442" minY="273" maxY="290" name="atm-s"/>
+  <symbol minX="442" maxX="459" minY="273" maxY="290" name="marketplace-s"/>
+  <symbol minX="459" maxX="476" minY="273" maxY="290" name="tourism-s"/>
+  <symbol minX="476" maxX="493" minY="273" maxY="290" name="embassy-s"/>
+  <symbol minX="493" maxX="510" minY="273" maxY="290" name="book-shop-s"/>
+  <symbol minX="510" maxX="527" minY="273" maxY="290" name="mail-s"/>
+  <symbol minX="527" maxX="544" minY="273" maxY="290" name="tram-s"/>
+  <symbol minX="544" maxX="561" minY="273" maxY="290" name="townhall-s"/>
+  <symbol minX="561" maxX="578" minY="273" maxY="290" name="pub-s"/>
+  <symbol minX="578" maxX="595" minY="273" maxY="290" name="lighthouse-s"/>
+  <symbol minX="595" maxX="612" minY="273" maxY="290" name="bicycle-s"/>
+  <symbol minX="612" maxX="629" minY="273" maxY="290" name="college-s"/>
+  <symbol minX="629" maxX="646" minY="273" maxY="290" name="train-s"/>
+  <symbol minX="646" maxX="668" minY="273" maxY="289" name="metro-barcelona-m"/>
+  <symbol minX="668" maxX="690" minY="273" maxY="289" name="subway-madrid-m"/>
+  <symbol minX="690" maxX="705" minY="273" maxY="289" name="s-arrow"/>
+  <symbol minX="705" maxX="727" minY="273" maxY="289" name="subway-madrid-l"/>
+  <symbol minX="727" maxX="743" minY="273" maxY="289" name="parking-m"/>
+  <symbol minX="743" maxX="765" minY="273" maxY="289" name="subway-barcelona-m"/>
+  <symbol minX="765" maxX="787" minY="273" maxY="289" name="subway-barcelona-l"/>
+  <symbol minX="787" maxX="807" minY="273" maxY="288" name="metro-barcelona-s"/>
+  <symbol minX="807" maxX="822" minY="273" maxY="288" name="subway-paris-s"/>
+  <symbol minX="822" maxX="842" minY="273" maxY="288" name="subway-madrid-s"/>
+  <symbol minX="842" maxX="857" minY="273" maxY="288" name="subway-moscow-s"/>
+  <symbol minX="857" maxX="878" minY="273" maxY="288" name="subway-kiev-m"/>
+  <symbol minX="878" maxX="899" minY="273" maxY="288" name="subway-kiev-l"/>
+  <symbol minX="899" maxX="914" minY="273" maxY="288" name="lightrail-berlin-s"/>
+  <symbol minX="914" maxX="929" minY="273" maxY="288" name="peak-l"/>
+  <symbol minX="929" maxX="943" minY="273" maxY="287" name="subway-rome-s"/>
+  <symbol minX="943" maxX="957" minY="273" maxY="287" name="parking-s"/>
+  <symbol minX="957" maxX="971" minY="273" maxY="287" name="subway-berlin-s"/>
+  <symbol minX="971" maxX="985" minY="273" maxY="287" name="speedcam-s"/>
+  <symbol minX="985" maxX="1000" minY="273" maxY="287" name="bench"/>
+  <symbol minX="1000" maxX="1017" minY="273" maxY="287" name="subway-london-s"/>
+  <symbol minX="0" maxX="14" minY="290" maxY="303" name="peakt-l"/>
+  <symbol minX="14" maxX="35" minY="290" maxY="303" name="subway-minsk-l"/>
+  <symbol minX="35" maxX="48" minY="290" maxY="303" name="star-l"/>
+  <symbol minX="48" maxX="61" minY="290" maxY="303" name="survey_point-l"/>
+  <symbol minX="61" maxX="79" minY="290" maxY="302" name="subway-minsk-m"/>
+  <symbol minX="79" maxX="91" minY="290" maxY="302" name="subway-xs"/>
+  <symbol minX="91" maxX="109" minY="290" maxY="302" name="subway-kiev-s"/>
+  <symbol minX="109" maxX="126" minY="290" maxY="302" name="railway-crossing"/>
+  <symbol minX="126" maxX="138" minY="290" maxY="302" name="subway-newyork-xs"/>
+  <symbol minX="138" maxX="150" minY="290" maxY="302" name="star-m"/>
+  <symbol minX="150" maxX="162" minY="290" maxY="302" name="peak-m"/>
+  <symbol minX="162" maxX="174" minY="290" maxY="302" name="survey_point-m"/>
+  <symbol minX="174" maxX="191" minY="290" maxY="301" name="subway-minsk-s"/>
+  <symbol minX="191" maxX="202" minY="290" maxY="301" name="crossing-l"/>
+  <symbol minX="202" maxX="213" minY="290" maxY="301" name="star-s"/>
+  <symbol minX="213" maxX="233" minY="290" maxY="300" name="arrow-m"/>
+  <symbol minX="233" maxX="243" minY="290" maxY="300" name="survey_point-s"/>
+  <symbol minX="243" maxX="254" minY="290" maxY="300" name="peakt-m"/>
+  <symbol minX="254" maxX="265" minY="290" maxY="300" name="peak-s"/>
+  <symbol minX="265" maxX="274" minY="290" maxY="299" name="entrance-s"/>
+  <symbol minX="274" maxX="283" minY="290" maxY="299" name="crossing-m"/>
+  <symbol minX="283" maxX="292" minY="290" maxY="299" name="peakt-s"/>
+  <symbol minX="292" maxX="300" minY="290" maxY="298" name="tree-l"/>
+  <symbol minX="300" maxX="315" minY="290" maxY="298" name="arrow-s"/>
+  <symbol minX="315" maxX="323" minY="290" maxY="298" name="none"/>
+  <symbol minX="323" maxX="331" minY="290" maxY="298" name="crossing-s"/>
+  <symbol minX="331" maxX="339" minY="290" maxY="298" name="dot-m"/>
+  <symbol minX="339" maxX="346" minY="290" maxY="297" name="tree-m"/>
+  <symbol minX="346" maxX="353" minY="290" maxY="297" name="entrance-xs"/>
+  <symbol minX="353" maxX="359" minY="290" maxY="296" name="dot-s-light"/>
+  <symbol minX="359" maxX="365" minY="290" maxY="296" name="tree-s"/>
+  <symbol minX="365" maxX="371" minY="290" maxY="296" name="zero-icon"/>
+  <symbol minX="371" maxX="377" minY="290" maxY="296" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index dd6bde80af..10df3720c3 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 6ac7ed5111..e51c0dcf0e 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,524 +1,524 @@
 <!DOCTYPE skin>
 <root>
- <file height="512" width="1024">
-  <symbol minX="0" maxX="72" minY="0" maxY="104" name="route_to"/>
-  <symbol minX="72" maxX="106" minY="0" maxY="88" name="route_from"/>
-  <symbol minX="106" maxX="243" minY="0" maxY="68" name="route-arrow"/>
-  <symbol minX="243" maxX="303" minY="0" maxY="60" name="compass-image"/>
-  <symbol minX="303" maxX="345" minY="0" maxY="42" name="cross_geoposition"/>
-  <symbol minX="345" maxX="377" minY="0" maxY="39" name="current-position-compas"/>
-  <symbol minX="377" maxX="409" minY="0" maxY="39" name="current-position-obsolete"/>
-  <symbol minX="409" maxX="445" minY="0" maxY="36" name="search-result-active"/>
-  <symbol minX="445" maxX="462" minY="0" maxY="31" name="placemark-purple"/>
-  <symbol minX="462" maxX="479" minY="0" maxY="31" name="placemark-pink"/>
-  <symbol minX="479" maxX="496" minY="0" maxY="31" name="placemark-orange"/>
-  <symbol minX="496" maxX="513" minY="0" maxY="31" name="placemark-green"/>
-  <symbol minX="513" maxX="530" minY="0" maxY="31" name="placemark-brown"/>
-  <symbol minX="530" maxX="547" minY="0" maxY="31" name="placemark-blue"/>
-  <symbol minX="547" maxX="564" minY="0" maxY="31" name="placemark-yellow"/>
-  <symbol minX="564" maxX="581" minY="0" maxY="31" name="placemark-red"/>
-  <symbol minX="581" maxX="603" minY="0" maxY="29" name="watch-search-result"/>
-  <symbol minX="603" maxX="627" minY="0" maxY="26" name="watch-my-direction"/>
-  <symbol minX="627" maxX="651" minY="0" maxY="24" name="current-position"/>
-  <symbol minX="651" maxX="673" minY="0" maxY="22" name="airport-l"/>
-  <symbol minX="673" maxX="695" minY="0" maxY="22" name="military-l"/>
-  <symbol minX="695" maxX="717" minY="0" maxY="22" name="australian-football-l"/>
-  <symbol minX="717" maxX="739" minY="0" maxY="22" name="shop-l"/>
-  <symbol minX="739" maxX="761" minY="0" maxY="22" name="shop-l copy"/>
-  <symbol minX="761" maxX="783" minY="0" maxY="22" name="bakery-l"/>
-  <symbol minX="783" maxX="805" minY="0" maxY="22" name="shop-bicycle-l"/>
-  <symbol minX="805" maxX="827" minY="0" maxY="22" name="shoes-l"/>
-  <symbol minX="827" maxX="849" minY="0" maxY="22" name="bank-l"/>
-  <symbol minX="849" maxX="870" minY="0" maxY="22" name="bank-m"/>
-  <symbol minX="870" maxX="892" minY="0" maxY="22" name="banknote-l"/>
-  <symbol minX="892" maxX="914" minY="0" maxY="22" name="soccer-l"/>
-  <symbol minX="914" maxX="936" minY="0" maxY="22" name="bar-l"/>
-  <symbol minX="936" maxX="958" minY="0" maxY="22" name="ship-l"/>
-  <symbol minX="958" maxX="980" minY="0" maxY="22" name="airport-m"/>
-  <symbol minX="980" maxX="1002" minY="0" maxY="22" name="baseball-l"/>
-  <symbol minX="1002" maxX="1024" minY="0" maxY="22" name="seafood-shop-l"/>
-  <symbol minX="0" maxX="22" minY="104" maxY="126" name="school-l"/>
-  <symbol minX="22" maxX="44" minY="104" maxY="126" name="basketball-l"/>
-  <symbol minX="44" maxX="66" minY="104" maxY="126" name="sauna-l"/>
-  <symbol minX="66" maxX="88" minY="104" maxY="126" name="sports-l"/>
-  <symbol minX="88" maxX="110" minY="104" maxY="126" name="bbq-l"/>
-  <symbol minX="110" maxX="132" minY="104" maxY="126" name="restaurant-l"/>
-  <symbol minX="132" maxX="154" minY="104" maxY="126" name="bcontrol-l"/>
-  <symbol minX="154" maxX="176" minY="104" maxY="126" name="remains-l"/>
-  <symbol minX="176" maxX="198" minY="104" maxY="126" name="alcohol-l"/>
-  <symbol minX="198" maxX="220" minY="104" maxY="126" name="beach-l"/>
-  <symbol minX="220" maxX="242" minY="104" maxY="126" name="recycling-l"/>
-  <symbol minX="242" maxX="264" minY="104" maxY="126" name="pub-l"/>
-  <symbol minX="264" maxX="286" minY="104" maxY="126" name="beauty-l"/>
-  <symbol minX="286" maxX="308" minY="104" maxY="126" name="power-m"/>
-  <symbol minX="308" maxX="330" minY="104" maxY="126" name="beer-l"/>
-  <symbol minX="330" maxX="352" minY="104" maxY="126" name="power-l"/>
-  <symbol minX="352" maxX="374" minY="104" maxY="126" name="alpine_hut-l"/>
-  <symbol minX="374" maxX="396" minY="104" maxY="126" name="postbox-l"/>
-  <symbol minX="396" maxX="418" minY="104" maxY="126" name="bicycle-l"/>
-  <symbol minX="418" maxX="440" minY="104" maxY="126" name="pool-l"/>
-  <symbol minX="440" maxX="462" minY="104" maxY="126" name="america-football-l"/>
-  <symbol minX="462" maxX="484" minY="104" maxY="126" name="subway-entrance-l"/>
-  <symbol minX="484" maxX="506" minY="104" maxY="126" name="book-shop-l"/>
-  <symbol minX="506" maxX="528" minY="104" maxY="126" name="police-l"/>
-  <symbol minX="528" maxX="550" minY="104" maxY="126" name="place-of-worship-l"/>
-  <symbol minX="550" maxX="572" minY="104" maxY="126" name="bookmaker-l"/>
-  <symbol minX="572" maxX="594" minY="104" maxY="126" name="boundary_stone-l"/>
-  <symbol minX="594" maxX="616" minY="104" maxY="126" name="subway-l"/>
-  <symbol minX="616" maxX="638" minY="104" maxY="126" name="bowls-l"/>
-  <symbol minX="638" maxX="660" minY="104" maxY="126" name="pitch-l"/>
-  <symbol minX="660" maxX="682" minY="104" maxY="126" name="archery-l"/>
-  <symbol minX="682" maxX="704" minY="104" maxY="126" name="bus-l"/>
-  <symbol minX="704" maxX="726" minY="104" maxY="126" name="picnic-l"/>
-  <symbol minX="726" maxX="748" minY="104" maxY="126" name="photo-shop-l"/>
-  <symbol minX="748" maxX="770" minY="104" maxY="126" name="butcher-l"/>
-  <symbol minX="770" maxX="792" minY="104" maxY="126" name="phone-l"/>
-  <symbol minX="792" maxX="814" minY="104" maxY="126" name="cable-car-l"/>
-  <symbol minX="814" maxX="836" minY="104" maxY="126" name="pharmacy-l"/>
-  <symbol minX="836" maxX="858" minY="104" maxY="126" name="atm-l"/>
-  <symbol minX="858" maxX="880" minY="104" maxY="126" name="cafe-l"/>
-  <symbol minX="880" maxX="902" minY="104" maxY="126" name="petshop-l"/>
-  <symbol minX="902" maxX="924" minY="104" maxY="126" name="subway-newyork-l"/>
-  <symbol minX="924" maxX="946" minY="104" maxY="126" name="campsite-l"/>
-  <symbol minX="946" maxX="968" minY="104" maxY="126" name="subway-paris-l"/>
-  <symbol minX="968" maxX="990" minY="104" maxY="126" name="peak-l"/>
-  <symbol minX="990" maxX="1012" minY="104" maxY="126" name="car-part-l"/>
-  <symbol minX="0" maxX="22" minY="126" maxY="148" name="parking-meter-l"/>
-  <symbol minX="22" maxX="44" minY="126" maxY="148" name="car-repair-l"/>
-  <symbol minX="44" maxX="66" minY="126" maxY="148" name="park-l"/>
-  <symbol minX="66" maxX="88" minY="126" maxY="148" name="optician-l"/>
-  <symbol minX="88" maxX="110" minY="126" maxY="148" name="car-wash-l"/>
-  <symbol minX="110" maxX="132" minY="126" maxY="148" name="subway-spb-l"/>
-  <symbol minX="132" maxX="154" minY="126" maxY="148" name="car_sharing-l"/>
-  <symbol minX="154" maxX="176" minY="126" maxY="148" name="office-l"/>
-  <symbol minX="176" maxX="198" minY="126" maxY="148" name="caravan_site-l"/>
-  <symbol minX="198" maxX="220" minY="126" maxY="148" name="nparkf-l"/>
-  <symbol minX="220" maxX="242" minY="126" maxY="148" name="casino-l"/>
-  <symbol minX="242" maxX="264" minY="126" maxY="148" name="sweets-l"/>
-  <symbol minX="264" maxX="286" minY="126" maxY="148" name="zoo-l"/>
-  <symbol minX="286" maxX="308" minY="126" maxY="148" name="cave-l"/>
-  <symbol minX="308" maxX="330" minY="126" maxY="148" name="npark-l"/>
-  <symbol minX="330" maxX="352" minY="126" maxY="148" name="swimming-l"/>
-  <symbol minX="352" maxX="374" minY="126" maxY="148" name="cemetery-l"/>
-  <symbol minX="374" maxX="396" minY="126" maxY="148" name="museum-l"/>
-  <symbol minX="396" maxX="418" minY="126" maxY="148" name="windmill-l"/>
-  <symbol minX="418" maxX="440" minY="126" maxY="148" name="charging-station-l"/>
-  <symbol minX="440" maxX="462" minY="126" maxY="148" name="moto-sharing-l"/>
-  <symbol minX="462" maxX="484" minY="126" maxY="148" name="motel-l"/>
-  <symbol minX="484" maxX="506" minY="126" maxY="148" name="chemist-l"/>
-  <symbol minX="506" maxX="528" minY="126" maxY="148" name="taxi-l"/>
-  <symbol minX="528" maxX="550" minY="126" maxY="148" name="childcare-l"/>
-  <symbol minX="550" maxX="572" minY="126" maxY="148" name="chimney-l"/>
-  <symbol minX="572" maxX="594" minY="126" maxY="148" name="monument-l"/>
-  <symbol minX="594" maxX="616" minY="126" maxY="148" name="cinema-l"/>
-  <symbol minX="616" maxX="638" minY="126" maxY="148" name="mobile_phone-l"/>
-  <symbol minX="638" maxX="660" minY="126" maxY="148" name="wayside_shrine-l"/>
-  <symbol minX="660" maxX="682" minY="126" maxY="148" name="climbing-l"/>
-  <symbol minX="682" maxX="704" minY="126" maxY="148" name="tennis-l"/>
-  <symbol minX="704" maxX="726" minY="126" maxY="148" name="theatre-l"/>
-  <symbol minX="726" maxX="748" minY="126" maxY="148" name="clothes-l"/>
-  <symbol minX="748" maxX="770" minY="126" maxY="148" name="marketplace-l"/>
-  <symbol minX="770" maxX="792" minY="126" maxY="148" name="college-l"/>
-  <symbol minX="792" maxX="814" minY="126" maxY="148" name="ticket-shop-l"/>
-  <symbol minX="814" maxX="836" minY="126" maxY="148" name="wayside_cross-l"/>
-  <symbol minX="836" maxX="858" minY="126" maxY="148" name="computer-l"/>
-  <symbol minX="858" maxX="880" minY="126" maxY="148" name="mail-l"/>
-  <symbol minX="880" maxX="902" minY="126" maxY="148" name="convenience-l"/>
-  <symbol minX="902" maxX="924" minY="126" maxY="148" name="lightrail-berlin-l"/>
-  <symbol minX="924" maxX="946" minY="126" maxY="148" name="copyshop-l"/>
-  <symbol minX="946" maxX="968" minY="126" maxY="148" name="toilets-l"/>
-  <symbol minX="968" maxX="990" minY="126" maxY="148" name="courthouse-l"/>
-  <symbol minX="990" maxX="1012" minY="126" maxY="148" name="cricket-l"/>
-  <symbol minX="0" maxX="22" minY="148" maxY="170" name="lighthouse-l"/>
-  <symbol minX="22" maxX="44" minY="148" maxY="170" name="lift_gate-l"/>
-  <symbol minX="44" maxX="66" minY="148" maxY="170" name="curling-l"/>
-  <symbol minX="66" maxX="88" minY="148" maxY="170" name="library-l"/>
-  <symbol minX="88" maxX="110" minY="148" maxY="170" name="waterfall-l"/>
-  <symbol minX="110" maxX="132" minY="148" maxY="170" name="dentist-l"/>
-  <symbol minX="132" maxX="154" minY="148" maxY="170" name="dentist-m"/>
-  <symbol minX="154" maxX="176" minY="148" maxY="170" name="lawyer-l"/>
-  <symbol minX="176" maxX="198" minY="148" maxY="170" name="department_store-l"/>
-  <symbol minX="198" maxX="220" minY="148" maxY="170" name="laundry-l"/>
-  <symbol minX="220" maxX="242" minY="148" maxY="170" name="diving-l"/>
-  <symbol minX="242" maxX="264" minY="148" maxY="170" name="kiosk-l"/>
-  <symbol minX="264" maxX="286" minY="148" maxY="170" name="toll_booth-l"/>
-  <symbol minX="286" maxX="308" minY="148" maxY="170" name="dog_park-l"/>
-  <symbol minX="308" maxX="330" minY="148" maxY="170" name="kindergarten-m"/>
-  <symbol minX="330" maxX="352" minY="148" maxY="170" name="doityourself-l"/>
-  <symbol minX="352" maxX="374" minY="148" maxY="170" name="kindergarten-l"/>
-  <symbol minX="374" maxX="396" minY="148" maxY="170" name="volcano-l"/>
-  <symbol minX="396" maxX="418" minY="148" maxY="170" name="viewpoint-m"/>
-  <symbol minX="418" maxX="440" minY="148" maxY="170" name="viewpoint-l"/>
-  <symbol minX="440" maxX="462" minY="148" maxY="170" name="drinking-water-l"/>
-  <symbol minX="462" maxX="484" minY="148" maxY="170" name="jewelry-l"/>
-  <symbol minX="484" maxX="506" minY="148" maxY="170" name="information-l"/>
-  <symbol minX="506" maxX="528" minY="148" maxY="170" name="hunting-tower-l"/>
-  <symbol minX="528" maxX="550" minY="148" maxY="170" name="electronics-l"/>
-  <symbol minX="550" maxX="572" minY="148" maxY="170" name="tomb-l"/>
-  <symbol minX="572" maxX="594" minY="148" maxY="170" name="embassy-l"/>
-  <symbol minX="594" maxX="616" minY="148" maxY="170" name="hotel-l"/>
-  <symbol minX="616" maxX="638" minY="148" maxY="170" name="veterinary-l"/>
-  <symbol minX="638" maxX="660" minY="148" maxY="170" name="hospital-l"/>
-  <symbol minX="660" maxX="682" minY="148" maxY="170" name="vending-l"/>
-  <symbol minX="682" maxX="704" minY="148" maxY="170" name="equestrian-l"/>
-  <symbol minX="704" maxX="726" minY="148" maxY="170" name="equestrian-m"/>
-  <symbol minX="726" maxX="748" minY="148" maxY="170" name="fastfood-l"/>
-  <symbol minX="748" maxX="770" minY="148" maxY="170" name="historic-ship-l"/>
-  <symbol minX="770" maxX="792" minY="148" maxY="170" name="tourism-l"/>
-  <symbol minX="792" maxX="814" minY="148" maxY="170" name="fire_station-l"/>
-  <symbol minX="814" maxX="836" minY="148" maxY="170" name="heliport-l"/>
-  <symbol minX="836" maxX="858" minY="148" maxY="170" name="tram-l"/>
-  <symbol minX="858" maxX="880" minY="148" maxY="170" name="helipad-l"/>
-  <symbol minX="880" maxX="902" minY="148" maxY="170" name="florist-l"/>
-  <symbol minX="902" maxX="924" minY="148" maxY="170" name="hardware-l"/>
-  <symbol minX="924" maxX="946" minY="148" maxY="170" name="fountain-l"/>
-  <symbol minX="946" maxX="968" minY="148" maxY="170" name="hand-m"/>
-  <symbol minX="968" maxX="990" minY="148" maxY="170" name="hand-l"/>
-  <symbol minX="990" maxX="1012" minY="148" maxY="170" name="fuel-l copy"/>
-  <symbol minX="0" maxX="22" minY="170" maxY="192" name="fuel-l"/>
-  <symbol minX="22" maxX="44" minY="170" maxY="192" name="hairdresser-l"/>
-  <symbol minX="44" maxX="66" minY="170" maxY="192" name="train-l"/>
-  <symbol minX="66" maxX="88" minY="170" maxY="192" name="funicular-l"/>
-  <symbol minX="88" maxX="110" minY="170" maxY="192" name="tourist-office-l"/>
-  <symbol minX="110" maxX="132" minY="170" maxY="192" name="gym-l"/>
-  <symbol minX="132" maxX="154" minY="170" maxY="192" name="furniture-l"/>
-  <symbol minX="154" maxX="176" minY="170" maxY="192" name="tourist-shop-l"/>
-  <symbol minX="176" maxX="198" minY="170" maxY="192" name="gallery-l"/>
-  <symbol minX="198" maxX="220" minY="170" maxY="192" name="grocery-l"/>
-  <symbol minX="220" maxX="242" minY="170" maxY="192" name="toys-l"/>
-  <symbol minX="242" maxX="264" minY="170" maxY="192" name="garden-l"/>
-  <symbol minX="264" maxX="286" minY="170" maxY="192" name="greengrocer-l"/>
-  <symbol minX="286" maxX="308" minY="170" maxY="192" name="townhall-l"/>
-  <symbol minX="308" maxX="330" minY="170" maxY="192" name="garden_center-l"/>
-  <symbol minX="330" maxX="352" minY="170" maxY="192" name="golf-l"/>
-  <symbol minX="352" maxX="374" minY="170" maxY="192" name="gate-l"/>
-  <symbol minX="374" maxX="396" minY="170" maxY="192" name="skiing-l"/>
-  <symbol minX="396" maxX="418" minY="170" maxY="192" name="gift-l"/>
-  <symbol minX="418" maxX="439" minY="170" maxY="191" name="gate-m"/>
-  <symbol minX="439" maxX="460" minY="170" maxY="191" name="garden_center-m"/>
-  <symbol minX="460" maxX="481" minY="170" maxY="191" name="golf-m"/>
-  <symbol minX="481" maxX="502" minY="170" maxY="191" name="townhall-m"/>
-  <symbol minX="502" maxX="523" minY="170" maxY="191" name="garden-m"/>
-  <symbol minX="523" maxX="544" minY="170" maxY="191" name="greengrocer-m"/>
-  <symbol minX="544" maxX="565" minY="170" maxY="191" name="gallery-m"/>
-  <symbol minX="565" maxX="586" minY="170" maxY="191" name="grocery-m"/>
-  <symbol minX="586" maxX="607" minY="170" maxY="191" name="furniture-m"/>
-  <symbol minX="607" maxX="628" minY="170" maxY="191" name="toys-m"/>
-  <symbol minX="628" maxX="649" minY="170" maxY="191" name="gym-m"/>
-  <symbol minX="649" maxX="670" minY="170" maxY="191" name="funicular-m"/>
-  <symbol minX="670" maxX="691" minY="170" maxY="191" name="fuel-m"/>
-  <symbol minX="691" maxX="712" minY="170" maxY="191" name="hairdresser-m"/>
-  <symbol minX="712" maxX="733" minY="170" maxY="191" name="train-m"/>
-  <symbol minX="733" maxX="754" minY="170" maxY="191" name="fountain-m"/>
-  <symbol minX="754" maxX="775" minY="170" maxY="191" name="florist-m"/>
-  <symbol minX="775" maxX="796" minY="170" maxY="191" name="hardware-m"/>
-  <symbol minX="796" maxX="817" minY="170" maxY="191" name="gift-m"/>
-  <symbol minX="817" maxX="838" minY="170" maxY="191" name="helipad-m"/>
-  <symbol minX="838" maxX="859" minY="170" maxY="191" name="tourism-m"/>
-  <symbol minX="859" maxX="880" minY="170" maxY="191" name="fire_station-m"/>
-  <symbol minX="880" maxX="901" minY="170" maxY="191" name="heliport-m"/>
-  <symbol minX="901" maxX="922" minY="170" maxY="191" name="tram-m"/>
-  <symbol minX="922" maxX="943" minY="170" maxY="191" name="fastfood-m"/>
-  <symbol minX="943" maxX="964" minY="170" maxY="191" name="historic-ship-m"/>
-  <symbol minX="964" maxX="985" minY="170" maxY="191" name="vending-m"/>
-  <symbol minX="985" maxX="1006" minY="170" maxY="191" name="hospital-m"/>
-  <symbol minX="0" maxX="21" minY="192" maxY="213" name="tomb-m"/>
-  <symbol minX="21" maxX="42" minY="192" maxY="213" name="embassy-m"/>
-  <symbol minX="42" maxX="63" minY="192" maxY="213" name="hotel-m"/>
-  <symbol minX="63" maxX="84" minY="192" maxY="213" name="electronics-m"/>
-  <symbol minX="84" maxX="105" minY="192" maxY="213" name="drugs"/>
-  <symbol minX="105" maxX="126" minY="192" maxY="213" name="hunting-tower-m"/>
-  <symbol minX="126" maxX="147" minY="192" maxY="213" name="veterinary-m"/>
-  <symbol minX="147" maxX="168" minY="192" maxY="213" name="information-m"/>
-  <symbol minX="168" maxX="189" minY="192" maxY="213" name="toll_booth-m"/>
-  <symbol minX="189" maxX="210" minY="192" maxY="213" name="drinking-water-m"/>
-  <symbol minX="210" maxX="231" minY="192" maxY="213" name="jewelry-m"/>
-  <symbol minX="231" maxX="252" minY="192" maxY="213" name="doityourself-m"/>
-  <symbol minX="252" maxX="273" minY="192" maxY="213" name="dog_park-m"/>
-  <symbol minX="273" maxX="294" minY="192" maxY="213" name="volcano-m"/>
-  <symbol minX="294" maxX="315" minY="192" maxY="213" name="diving-m"/>
-  <symbol minX="315" maxX="336" minY="192" maxY="213" name="kiosk-m"/>
-  <symbol minX="336" maxX="357" minY="192" maxY="213" name="department_store-m"/>
-  <symbol minX="357" maxX="378" minY="192" maxY="213" name="laundry-m"/>
-  <symbol minX="378" maxX="399" minY="192" maxY="213" name="skiing-m"/>
-  <symbol minX="399" maxX="420" minY="192" maxY="213" name="curling-m"/>
-  <symbol minX="420" maxX="441" minY="192" maxY="213" name="library-m"/>
-  <symbol minX="441" maxX="462" minY="192" maxY="213" name="toilets-m"/>
-  <symbol minX="462" maxX="483" minY="192" maxY="213" name="waterfall-m"/>
-  <symbol minX="483" maxX="504" minY="192" maxY="213" name="lift_gate-m"/>
-  <symbol minX="504" maxX="525" minY="192" maxY="213" name="cricket-m"/>
-  <symbol minX="525" maxX="546" minY="192" maxY="213" name="lighthouse-m"/>
-  <symbol minX="546" maxX="567" minY="192" maxY="213" name="copyshop-m"/>
-  <symbol minX="567" maxX="588" minY="192" maxY="213" name="convenience-m"/>
-  <symbol minX="588" maxX="609" minY="192" maxY="213" name="shop-m"/>
-  <symbol minX="609" maxX="630" minY="192" maxY="213" name="ticket-shop-m"/>
-  <symbol minX="630" maxX="651" minY="192" maxY="213" name="computer-m"/>
-  <symbol minX="651" maxX="672" minY="192" maxY="213" name="mail-m"/>
-  <symbol minX="672" maxX="693" minY="192" maxY="213" name="college-m"/>
-  <symbol minX="693" maxX="714" minY="192" maxY="213" name="clothes-m"/>
-  <symbol minX="714" maxX="735" minY="192" maxY="213" name="marketplace-m"/>
-  <symbol minX="735" maxX="756" minY="192" maxY="213" name="theatre-m"/>
-  <symbol minX="756" maxX="777" minY="192" maxY="213" name="wayside_cross-m"/>
-  <symbol minX="777" maxX="798" minY="192" maxY="213" name="tennis-m"/>
-  <symbol minX="798" maxX="819" minY="192" maxY="213" name="climbing-m"/>
-  <symbol minX="819" maxX="840" minY="192" maxY="213" name="military-m"/>
-  <symbol minX="840" maxX="861" minY="192" maxY="213" name="taxi-m"/>
-  <symbol minX="861" maxX="882" minY="192" maxY="213" name="cinema-m"/>
-  <symbol minX="882" maxX="903" minY="192" maxY="213" name="mobile_phone-m"/>
-  <symbol minX="903" maxX="924" minY="192" maxY="213" name="chimney-m"/>
-  <symbol minX="924" maxX="945" minY="192" maxY="213" name="monument-m"/>
-  <symbol minX="945" maxX="966" minY="192" maxY="213" name="chemist-m"/>
-  <symbol minX="966" maxX="987" minY="192" maxY="213" name="wayside_shrine-m"/>
-  <symbol minX="987" maxX="1008" minY="192" maxY="213" name="motel-m"/>
-  <symbol minX="0" maxX="21" minY="213" maxY="234" name="swimming-m"/>
-  <symbol minX="21" maxX="42" minY="213" maxY="234" name="charging-station-m"/>
-  <symbol minX="42" maxX="63" minY="213" maxY="234" name="cemetery-m"/>
-  <symbol minX="63" maxX="84" minY="213" maxY="234" name="museum-m"/>
-  <symbol minX="84" maxX="105" minY="213" maxY="234" name="windmill-m"/>
-  <symbol minX="105" maxX="126" minY="213" maxY="234" name="shop-m copy"/>
-  <symbol minX="126" maxX="147" minY="213" maxY="234" name="australian-football-m"/>
-  <symbol minX="147" maxX="168" minY="213" maxY="234" name="shop-bicycle-m"/>
-  <symbol minX="168" maxX="189" minY="213" maxY="234" name="bakery-m"/>
-  <symbol minX="189" maxX="210" minY="213" maxY="234" name="shoes-m"/>
-  <symbol minX="210" maxX="231" minY="213" maxY="234" name="sweets-m"/>
-  <symbol minX="231" maxX="252" minY="213" maxY="234" name="cave-m"/>
-  <symbol minX="252" maxX="273" minY="213" maxY="234" name="npark-m"/>
-  <symbol minX="273" maxX="294" minY="213" maxY="234" name="casino-m"/>
-  <symbol minX="294" maxX="315" minY="213" maxY="234" name="caravan_site-m"/>
-  <symbol minX="315" maxX="336" minY="213" maxY="234" name="nparkf-m"/>
-  <symbol minX="336" maxX="357" minY="213" maxY="234" name="subway-spb-m"/>
-  <symbol minX="357" maxX="378" minY="213" maxY="234" name="car_sharing-m"/>
-  <symbol minX="378" maxX="399" minY="213" maxY="234" name="office-m"/>
-  <symbol minX="399" maxX="420" minY="213" maxY="234" name="car-wash-m"/>
-  <symbol minX="420" maxX="441" minY="213" maxY="234" name="zoo-m"/>
-  <symbol minX="441" maxX="462" minY="213" maxY="234" name="optician-m"/>
-  <symbol minX="462" maxX="483" minY="213" maxY="234" name="car-repair-m"/>
-  <symbol minX="483" maxX="504" minY="213" maxY="234" name="park-m"/>
-  <symbol minX="504" maxX="525" minY="213" maxY="234" name="bank-2-m"/>
-  <symbol minX="525" maxX="546" minY="213" maxY="234" name="banknote-m"/>
-  <symbol minX="546" maxX="567" minY="213" maxY="234" name="ship-m"/>
-  <symbol minX="567" maxX="588" minY="213" maxY="234" name="car-part-m"/>
-  <symbol minX="588" maxX="609" minY="213" maxY="234" name="parking-meter-m"/>
-  <symbol minX="609" maxX="630" minY="213" maxY="234" name="bar-m"/>
-  <symbol minX="630" maxX="651" minY="213" maxY="234" name="seafood-shop-m"/>
-  <symbol minX="651" maxX="672" minY="213" maxY="234" name="baseball-m"/>
-  <symbol minX="672" maxX="693" minY="213" maxY="234" name="peak-m"/>
-  <symbol minX="693" maxX="714" minY="213" maxY="234" name="campsite-m"/>
-  <symbol minX="714" maxX="735" minY="213" maxY="234" name="subway-newyork-m"/>
-  <symbol minX="735" maxX="756" minY="213" maxY="234" name="atm-m"/>
-  <symbol minX="756" maxX="777" minY="213" maxY="234" name="soccer-m"/>
-  <symbol minX="777" maxX="798" minY="213" maxY="234" name="cafe-m"/>
-  <symbol minX="798" maxX="819" minY="213" maxY="234" name="petshop-m"/>
-  <symbol minX="819" maxX="840" minY="213" maxY="234" name="cable-car-m"/>
-  <symbol minX="840" maxX="861" minY="213" maxY="234" name="pharmacy-m"/>
-  <symbol minX="861" maxX="882" minY="213" maxY="234" name="school-m"/>
-  <symbol minX="882" maxX="903" minY="213" maxY="234" name="butcher-m"/>
-  <symbol minX="903" maxX="924" minY="213" maxY="234" name="phone-m"/>
-  <symbol minX="924" maxX="945" minY="213" maxY="234" name="subway-m"/>
-  <symbol minX="945" maxX="966" minY="213" maxY="234" name="archery-m"/>
-  <symbol minX="966" maxX="987" minY="213" maxY="234" name="photo-shop-m"/>
-  <symbol minX="987" maxX="1008" minY="213" maxY="234" name="bus-m"/>
-  <symbol minX="0" maxX="21" minY="234" maxY="255" name="picnic-m"/>
-  <symbol minX="21" maxX="42" minY="234" maxY="255" name="sauna-m"/>
-  <symbol minX="42" maxX="63" minY="234" maxY="255" name="bowls-m"/>
-  <symbol minX="63" maxX="84" minY="234" maxY="255" name="pitch-m"/>
-  <symbol minX="84" maxX="105" minY="234" maxY="255" name="boundary_stone-m"/>
-  <symbol minX="105" maxX="126" minY="234" maxY="255" name="america-football-m"/>
-  <symbol minX="126" maxX="147" minY="234" maxY="255" name="place-of-worship-m"/>
-  <symbol minX="147" maxX="168" minY="234" maxY="255" name="subway-entrance-m"/>
-  <symbol minX="168" maxX="189" minY="234" maxY="255" name="book-shop-m"/>
-  <symbol minX="189" maxX="210" minY="234" maxY="255" name="police-m"/>
-  <symbol minX="210" maxX="231" minY="234" maxY="255" name="basketball-m"/>
-  <symbol minX="231" maxX="252" minY="234" maxY="255" name="bicycle-m"/>
-  <symbol minX="252" maxX="273" minY="234" maxY="255" name="alpine_hut-m"/>
-  <symbol minX="273" maxX="294" minY="234" maxY="255" name="postbox-m"/>
-  <symbol minX="294" maxX="315" minY="234" maxY="255" name="beer-m"/>
-  <symbol minX="315" maxX="336" minY="234" maxY="255" name="beauty-m"/>
-  <symbol minX="336" maxX="357" minY="234" maxY="255" name="alcohol-m"/>
-  <symbol minX="357" maxX="378" minY="234" maxY="255" name="pub-m"/>
-  <symbol minX="378" maxX="399" minY="234" maxY="255" name="subway-entrance-2-m"/>
-  <symbol minX="399" maxX="420" minY="234" maxY="255" name="restaurant-m"/>
-  <symbol minX="420" maxX="441" minY="234" maxY="255" name="beach-m"/>
-  <symbol minX="441" maxX="462" minY="234" maxY="255" name="recycling-m"/>
-  <symbol minX="462" maxX="483" minY="234" maxY="255" name="bbq-m"/>
-  <symbol minX="483" maxX="504" minY="234" maxY="255" name="bcontrol-m"/>
-  <symbol minX="504" maxX="525" minY="234" maxY="255" name="remains-m"/>
-  <symbol minX="525" maxX="546" minY="234" maxY="255" name="sports-m"/>
-  <symbol minX="546" maxX="566" minY="234" maxY="254" name="subway-berlin-l"/>
-  <symbol minX="566" maxX="586" minY="234" maxY="254" name="firehydrant-l"/>
-  <symbol minX="586" maxX="606" minY="234" maxY="254" name="waste-basket-l"/>
-  <symbol minX="606" maxX="626" minY="234" maxY="254" name="speedcam-l"/>
-  <symbol minX="626" maxX="646" minY="234" maxY="254" name="bike-parking-l"/>
-  <symbol minX="646" maxX="666" minY="234" maxY="254" name="lightrail-berlin-m"/>
-  <symbol minX="666" maxX="686" minY="234" maxY="254" name="watch-my-position"/>
-  <symbol minX="686" maxX="706" minY="234" maxY="254" name="parking-l"/>
-  <symbol minX="706" maxX="726" minY="234" maxY="254" name="subway-rome-l"/>
-  <symbol minX="726" maxX="746" minY="234" maxY="254" name="parking-ticket-l"/>
-  <symbol minX="746" maxX="768" minY="234" maxY="253" name="subway-moscow-l"/>
-  <symbol minX="768" maxX="786" minY="234" maxY="252" name="subway-paris-m"/>
-  <symbol minX="786" maxX="807" minY="234" maxY="252" name="subway-moscow-m"/>
-  <symbol minX="807" maxX="825" minY="234" maxY="252" name="api-result"/>
-  <symbol minX="825" maxX="843" minY="234" maxY="252" name="subway-rome-m"/>
-  <symbol minX="843" maxX="861" minY="234" maxY="252" name="no-icon"/>
-  <symbol minX="861" maxX="879" minY="234" maxY="252" name="no-icon-tourism"/>
-  <symbol minX="879" maxX="897" minY="234" maxY="252" name="no-icon-shop"/>
-  <symbol minX="897" maxX="915" minY="234" maxY="252" name="search-result"/>
-  <symbol minX="915" maxX="933" minY="234" maxY="252" name="no-icon-leisure"/>
-  <symbol minX="933" maxX="951" minY="234" maxY="252" name="no-icon-amenity"/>
-  <symbol minX="951" maxX="973" minY="234" maxY="252" name="subway-london-l"/>
-  <symbol minX="973" maxX="991" minY="234" maxY="252" name="airport-s"/>
-  <symbol minX="991" maxX="1009" minY="234" maxY="252" name="subway-berlin-m"/>
-  <symbol minX="0" maxX="17" minY="255" maxY="272" name="shop-s"/>
-  <symbol minX="17" maxX="34" minY="255" maxY="272" name="shop-s copy"/>
-  <symbol minX="34" maxX="51" minY="255" maxY="272" name="skiing-s"/>
-  <symbol minX="51" maxX="68" minY="255" maxY="272" name="ship-s"/>
-  <symbol minX="68" maxX="85" minY="255" maxY="272" name="school-s"/>
-  <symbol minX="85" maxX="102" minY="255" maxY="272" name="soccer-s"/>
-  <symbol minX="102" maxX="119" minY="255" maxY="272" name="australian-football-s"/>
-  <symbol minX="119" maxX="136" minY="255" maxY="272" name="speedcam-m"/>
-  <symbol minX="136" maxX="153" minY="255" maxY="272" name="bar-s"/>
-  <symbol minX="153" maxX="170" minY="255" maxY="272" name="restaurant-s"/>
-  <symbol minX="170" maxX="187" minY="255" maxY="272" name="remains-s"/>
-  <symbol minX="187" maxX="204" minY="255" maxY="272" name="baseball-s"/>
-  <symbol minX="204" maxX="221" minY="255" maxY="272" name="basketball-s"/>
-  <symbol minX="221" maxX="238" minY="255" maxY="272" name="bcontrol-s"/>
-  <symbol minX="238" maxX="255" minY="255" maxY="272" name="beach-s"/>
-  <symbol minX="255" maxX="272" minY="255" maxY="272" name="alcohol-s"/>
-  <symbol minX="272" maxX="292" minY="255" maxY="272" name="subway-barcelona-s"/>
-  <symbol minX="292" maxX="309" minY="255" maxY="272" name="recycling-s"/>
-  <symbol minX="309" maxX="326" minY="255" maxY="272" name="beer-s"/>
-  <symbol minX="326" maxX="343" minY="255" maxY="272" name="alpine_hut-s"/>
-  <symbol minX="343" maxX="360" minY="255" maxY="272" name="pub-s"/>
-  <symbol minX="360" maxX="377" minY="255" maxY="272" name="subway-entrance-2-s"/>
-  <symbol minX="377" maxX="394" minY="255" maxY="272" name="subway-entrance-arrow"/>
-  <symbol minX="394" maxX="411" minY="255" maxY="272" name="police-s"/>
-  <symbol minX="411" maxX="428" minY="255" maxY="272" name="place-of-worship-s"/>
-  <symbol minX="428" maxX="445" minY="255" maxY="272" name="subway-entrance-s"/>
-  <symbol minX="445" maxX="462" minY="255" maxY="272" name="bicycle-s"/>
-  <symbol minX="462" maxX="479" minY="255" maxY="272" name="book-shop-s"/>
-  <symbol minX="479" maxX="496" minY="255" maxY="272" name="america-football-s"/>
-  <symbol minX="496" maxX="513" minY="255" maxY="272" name="pitch-s"/>
-  <symbol minX="513" maxX="530" minY="255" maxY="272" name="picnic-s"/>
-  <symbol minX="530" maxX="551" minY="255" maxY="272" name="subway-london-m"/>
-  <symbol minX="551" maxX="568" minY="255" maxY="272" name="bowls-s"/>
-  <symbol minX="568" maxX="585" minY="255" maxY="272" name="phone-s"/>
-  <symbol minX="585" maxX="602" minY="255" maxY="272" name="bus-s"/>
-  <symbol minX="602" maxX="619" minY="255" maxY="272" name="archery-s"/>
-  <symbol minX="619" maxX="636" minY="255" maxY="272" name="cable-car-s"/>
-  <symbol minX="636" maxX="653" minY="255" maxY="272" name="cafe-s"/>
-  <symbol minX="653" maxX="670" minY="255" maxY="272" name="campsite-s"/>
-  <symbol minX="670" maxX="687" minY="255" maxY="272" name="zoo-s"/>
-  <symbol minX="687" maxX="704" minY="255" maxY="272" name="pharmacy-s"/>
-  <symbol minX="704" maxX="721" minY="255" maxY="272" name="car-repair-s"/>
-  <symbol minX="721" maxX="738" minY="255" maxY="272" name="casino-s"/>
-  <symbol minX="738" maxX="755" minY="255" maxY="272" name="windmill-s"/>
-  <symbol minX="755" maxX="772" minY="255" maxY="272" name="cave-s"/>
-  <symbol minX="772" maxX="789" minY="255" maxY="272" name="subway-newyork-s"/>
-  <symbol minX="789" maxX="806" minY="255" maxY="272" name="cemetery-s"/>
-  <symbol minX="806" maxX="823" minY="255" maxY="272" name="peak-s"/>
-  <symbol minX="823" maxX="840" minY="255" maxY="272" name="charging-station-s"/>
-  <symbol minX="840" maxX="857" minY="255" maxY="272" name="cinema-s"/>
-  <symbol minX="857" maxX="874" minY="255" maxY="272" name="climbing-s"/>
-  <symbol minX="874" maxX="891" minY="255" maxY="272" name="park-s"/>
-  <symbol minX="891" maxX="908" minY="255" maxY="272" name="college-s"/>
-  <symbol minX="908" maxX="925" minY="255" maxY="272" name="subway-s"/>
-  <symbol minX="925" maxX="942" minY="255" maxY="272" name="office-s"/>
-  <symbol minX="942" maxX="959" minY="255" maxY="272" name="nparkf-s"/>
-  <symbol minX="959" maxX="976" minY="255" maxY="272" name="subway-spb-s"/>
-  <symbol minX="976" maxX="993" minY="255" maxY="272" name="waterfall-s"/>
-  <symbol minX="993" maxX="1010" minY="255" maxY="272" name="cricket-s"/>
-  <symbol minX="0" maxX="17" minY="272" maxY="289" name="curling-s"/>
-  <symbol minX="17" maxX="34" minY="272" maxY="289" name="dentist-s"/>
-  <symbol minX="34" maxX="51" minY="272" maxY="289" name="volcano-s"/>
-  <symbol minX="51" maxX="68" minY="272" maxY="289" name="npark-s"/>
-  <symbol minX="68" maxX="85" minY="272" maxY="289" name="diving-s"/>
-  <symbol minX="85" maxX="102" minY="272" maxY="289" name="museum-s"/>
-  <symbol minX="102" maxX="119" minY="272" maxY="289" name="atm-s"/>
-  <symbol minX="119" maxX="136" minY="272" maxY="289" name="swimming-s"/>
-  <symbol minX="136" maxX="153" minY="272" maxY="289" name="monument-s"/>
-  <symbol minX="153" maxX="170" minY="272" maxY="289" name="military-s"/>
-  <symbol minX="170" maxX="187" minY="272" maxY="289" name="atm-s copy 2"/>
-  <symbol minX="187" maxX="204" minY="272" maxY="289" name="viewpoint-s"/>
-  <symbol minX="204" maxX="221" minY="272" maxY="289" name="tennis-s"/>
-  <symbol minX="221" maxX="238" minY="272" maxY="289" name="drinking-water-s"/>
-  <symbol minX="238" maxX="255" minY="272" maxY="289" name="marketplace-s"/>
-  <symbol minX="255" maxX="272" minY="272" maxY="289" name="theatre-s"/>
-  <symbol minX="272" maxX="289" minY="272" maxY="289" name="mail-s"/>
-  <symbol minX="289" maxX="306" minY="272" maxY="289" name="motel-s"/>
-  <symbol minX="306" maxX="323" minY="272" maxY="289" name="lighthouse-s"/>
-  <symbol minX="323" maxX="340" minY="272" maxY="289" name="library-s"/>
-  <symbol minX="340" maxX="357" minY="272" maxY="289" name="toilets-s"/>
-  <symbol minX="357" maxX="374" minY="272" maxY="289" name="kindergarten-s"/>
-  <symbol minX="374" maxX="391" minY="272" maxY="289" name="information-s"/>
-  <symbol minX="391" maxX="408" minY="272" maxY="289" name="toll_booth-s"/>
-  <symbol minX="408" maxX="425" minY="272" maxY="289" name="hotel-s"/>
-  <symbol minX="425" maxX="442" minY="272" maxY="289" name="hospital-s"/>
-  <symbol minX="442" maxX="459" minY="272" maxY="289" name="heliport-s"/>
-  <symbol minX="459" maxX="476" minY="272" maxY="289" name="helipad-s"/>
-  <symbol minX="476" maxX="493" minY="272" maxY="289" name="tourism-s"/>
-  <symbol minX="493" maxX="510" minY="272" maxY="289" name="gym-s"/>
-  <symbol minX="510" maxX="527" minY="272" maxY="289" name="grocery-s"/>
-  <symbol minX="527" maxX="544" minY="272" maxY="289" name="golf-s"/>
-  <symbol minX="544" maxX="561" minY="272" maxY="289" name="garden-s"/>
-  <symbol minX="561" maxX="578" minY="272" maxY="289" name="townhall-s"/>
-  <symbol minX="578" maxX="595" minY="272" maxY="289" name="gallery-s"/>
-  <symbol minX="595" maxX="612" minY="272" maxY="289" name="funicular-s"/>
-  <symbol minX="612" maxX="629" minY="272" maxY="289" name="fuel-s"/>
-  <symbol minX="629" maxX="646" minY="272" maxY="289" name="fountain-s"/>
-  <symbol minX="646" maxX="663" minY="272" maxY="289" name="train-s"/>
-  <symbol minX="663" maxX="680" minY="272" maxY="289" name="fire_station-s"/>
-  <symbol minX="680" maxX="697" minY="272" maxY="289" name="fastfood-s"/>
-  <symbol minX="697" maxX="714" minY="272" maxY="289" name="tram-s"/>
-  <symbol minX="714" maxX="731" minY="272" maxY="289" name="embassy-s"/>
-  <symbol minX="731" maxX="746" minY="272" maxY="288" name="s-arrow"/>
-  <symbol minX="746" maxX="768" minY="272" maxY="288" name="subway-barcelona-l"/>
-  <symbol minX="768" maxX="790" minY="272" maxY="288" name="subway-barcelona-m"/>
-  <symbol minX="790" maxX="812" minY="272" maxY="288" name="subway-madrid-l"/>
-  <symbol minX="812" maxX="834" minY="272" maxY="288" name="subway-madrid-m"/>
-  <symbol minX="834" maxX="856" minY="272" maxY="288" name="metro-barcelona-m"/>
-  <symbol minX="856" maxX="872" minY="272" maxY="288" name="parking-m"/>
-  <symbol minX="872" maxX="887" minY="272" maxY="287" name="lightrail-berlin-s"/>
-  <symbol minX="887" maxX="907" minY="272" maxY="287" name="metro-barcelona-s"/>
-  <symbol minX="907" maxX="922" minY="272" maxY="287" name="subway-moscow-s"/>
-  <symbol minX="922" maxX="942" minY="272" maxY="287" name="subway-madrid-s"/>
-  <symbol minX="942" maxX="957" minY="272" maxY="287" name="subway-paris-s"/>
-  <symbol minX="957" maxX="978" minY="272" maxY="287" name="subway-kiev-m"/>
-  <symbol minX="978" maxX="993" minY="272" maxY="287" name="waste-basket-s"/>
-  <symbol minX="993" maxX="1014" minY="272" maxY="287" name="subway-kiev-l"/>
-  <symbol minX="0" maxX="14" minY="289" maxY="303" name="subway-berlin-s"/>
-  <symbol minX="14" maxX="29" minY="289" maxY="303" name="bench"/>
-  <symbol minX="29" maxX="43" minY="289" maxY="303" name="subway-rome-s"/>
-  <symbol minX="43" maxX="60" minY="289" maxY="303" name="subway-london-s"/>
-  <symbol minX="60" maxX="74" minY="289" maxY="303" name="star-l"/>
-  <symbol minX="74" maxX="88" minY="289" maxY="303" name="parking-s"/>
-  <symbol minX="88" maxX="102" minY="289" maxY="303" name="speedcam-s"/>
-  <symbol minX="102" maxX="116" minY="289" maxY="302" name="peakt-l"/>
-  <symbol minX="116" maxX="137" minY="289" maxY="302" name="subway-minsk-l"/>
-  <symbol minX="137" maxX="150" minY="289" maxY="302" name="star-m"/>
-  <symbol minX="150" maxX="163" minY="289" maxY="302" name="survey_point-l"/>
-  <symbol minX="163" maxX="180" minY="289" maxY="301" name="railway-crossing"/>
-  <symbol minX="180" maxX="192" minY="289" maxY="301" name="survey_point-m"/>
-  <symbol minX="192" maxX="210" minY="289" maxY="301" name="subway-minsk-m"/>
-  <symbol minX="210" maxX="228" minY="289" maxY="301" name="subway-kiev-s"/>
-  <symbol minX="228" maxX="240" minY="289" maxY="301" name="subway-newyork-xs"/>
-  <symbol minX="240" maxX="252" minY="289" maxY="301" name="subway-xs"/>
-  <symbol minX="252" maxX="264" minY="289" maxY="301" name="star-s"/>
-  <symbol minX="264" maxX="281" minY="289" maxY="300" name="subway-minsk-s"/>
-  <symbol minX="281" maxX="292" minY="289" maxY="300" name="subway-xs copy"/>
-  <symbol minX="292" maxX="303" minY="289" maxY="299" name="peakt-m"/>
-  <symbol minX="303" maxX="313" minY="289" maxY="299" name="survey_point-s"/>
-  <symbol minX="313" maxX="333" minY="289" maxY="299" name="arrow-m"/>
-  <symbol minX="333" maxX="342" minY="289" maxY="298" name="dot-m"/>
-  <symbol minX="342" maxX="351" minY="289" maxY="298" name="entrance-s"/>
-  <symbol minX="351" maxX="360" minY="289" maxY="298" name="peakt-s"/>
-  <symbol minX="360" maxX="368" minY="289" maxY="297" name="tree-l"/>
-  <symbol minX="368" maxX="376" minY="289" maxY="297" name="none"/>
-  <symbol minX="376" maxX="391" minY="289" maxY="297" name="arrow-s"/>
-  <symbol minX="391" maxX="398" minY="289" maxY="296" name="dot-s-light"/>
-  <symbol minX="398" maxX="405" minY="289" maxY="296" name="tree-m"/>
-  <symbol minX="405" maxX="412" minY="289" maxY="296" name="entrance-xs"/>
-  <symbol minX="412" maxX="419" minY="289" maxY="296" name="dot-s"/>
-  <symbol minX="419" maxX="425" minY="289" maxY="295" name="zero-icon"/>
-  <symbol minX="425" maxX="431" minY="289" maxY="295" name="tree-s"/>
+ <file width="1024" height="512">
+  <symbol minY="0" maxY="104" name="route_to" minX="0" maxX="72"/>
+  <symbol minY="0" maxY="88" name="route_from" minX="72" maxX="106"/>
+  <symbol minY="0" maxY="68" name="route-arrow" minX="106" maxX="243"/>
+  <symbol minY="0" maxY="60" name="compass-image" minX="243" maxX="303"/>
+  <symbol minY="0" maxY="42" name="cross_geoposition" minX="303" maxX="345"/>
+  <symbol minY="0" maxY="39" name="current-position-compas" minX="345" maxX="377"/>
+  <symbol minY="0" maxY="39" name="current-position-obsolete" minX="377" maxX="409"/>
+  <symbol minY="0" maxY="36" name="search-result-active" minX="409" maxX="445"/>
+  <symbol minY="0" maxY="31" name="placemark-purple" minX="445" maxX="462"/>
+  <symbol minY="0" maxY="31" name="placemark-pink" minX="462" maxX="479"/>
+  <symbol minY="0" maxY="31" name="placemark-orange" minX="479" maxX="496"/>
+  <symbol minY="0" maxY="31" name="placemark-green" minX="496" maxX="513"/>
+  <symbol minY="0" maxY="31" name="placemark-brown" minX="513" maxX="530"/>
+  <symbol minY="0" maxY="31" name="placemark-blue" minX="530" maxX="547"/>
+  <symbol minY="0" maxY="31" name="placemark-yellow" minX="547" maxX="564"/>
+  <symbol minY="0" maxY="31" name="placemark-red" minX="564" maxX="581"/>
+  <symbol minY="0" maxY="29" name="watch-search-result" minX="581" maxX="603"/>
+  <symbol minY="0" maxY="26" name="watch-my-direction" minX="603" maxX="627"/>
+  <symbol minY="0" maxY="24" name="current-position" minX="627" maxX="651"/>
+  <symbol minY="0" maxY="22" name="airport-l" minX="651" maxX="673"/>
+  <symbol minY="0" maxY="22" name="military-l" minX="673" maxX="695"/>
+  <symbol minY="0" maxY="22" name="australian-football-l" minX="695" maxX="717"/>
+  <symbol minY="0" maxY="22" name="shop-l" minX="717" maxX="739"/>
+  <symbol minY="0" maxY="22" name="shop-l copy" minX="739" maxX="761"/>
+  <symbol minY="0" maxY="22" name="bakery-l" minX="761" maxX="783"/>
+  <symbol minY="0" maxY="22" name="shop-bicycle-l" minX="783" maxX="805"/>
+  <symbol minY="0" maxY="22" name="shoes-l" minX="805" maxX="827"/>
+  <symbol minY="0" maxY="22" name="bank-l" minX="827" maxX="849"/>
+  <symbol minY="0" maxY="22" name="bank-m" minX="849" maxX="870"/>
+  <symbol minY="0" maxY="22" name="banknote-l" minX="870" maxX="892"/>
+  <symbol minY="0" maxY="22" name="soccer-l" minX="892" maxX="914"/>
+  <symbol minY="0" maxY="22" name="bar-l" minX="914" maxX="936"/>
+  <symbol minY="0" maxY="22" name="ship-l" minX="936" maxX="958"/>
+  <symbol minY="0" maxY="22" name="airport-m" minX="958" maxX="980"/>
+  <symbol minY="0" maxY="22" name="baseball-l" minX="980" maxX="1002"/>
+  <symbol minY="0" maxY="22" name="seafood-shop-l" minX="1002" maxX="1024"/>
+  <symbol minY="104" maxY="126" name="school-l" minX="0" maxX="22"/>
+  <symbol minY="104" maxY="126" name="basketball-l" minX="22" maxX="44"/>
+  <symbol minY="104" maxY="126" name="sauna-l" minX="44" maxX="66"/>
+  <symbol minY="104" maxY="126" name="sports-l" minX="66" maxX="88"/>
+  <symbol minY="104" maxY="126" name="bbq-l" minX="88" maxX="110"/>
+  <symbol minY="104" maxY="126" name="restaurant-l" minX="110" maxX="132"/>
+  <symbol minY="104" maxY="126" name="bcontrol-l" minX="132" maxX="154"/>
+  <symbol minY="104" maxY="126" name="remains-l" minX="154" maxX="176"/>
+  <symbol minY="104" maxY="126" name="alcohol-l" minX="176" maxX="198"/>
+  <symbol minY="104" maxY="126" name="beach-l" minX="198" maxX="220"/>
+  <symbol minY="104" maxY="126" name="recycling-l" minX="220" maxX="242"/>
+  <symbol minY="104" maxY="126" name="pub-l" minX="242" maxX="264"/>
+  <symbol minY="104" maxY="126" name="beauty-l" minX="264" maxX="286"/>
+  <symbol minY="104" maxY="126" name="power-m" minX="286" maxX="308"/>
+  <symbol minY="104" maxY="126" name="beer-l" minX="308" maxX="330"/>
+  <symbol minY="104" maxY="126" name="power-l" minX="330" maxX="352"/>
+  <symbol minY="104" maxY="126" name="alpine_hut-l" minX="352" maxX="374"/>
+  <symbol minY="104" maxY="126" name="postbox-l" minX="374" maxX="396"/>
+  <symbol minY="104" maxY="126" name="bicycle-l" minX="396" maxX="418"/>
+  <symbol minY="104" maxY="126" name="pool-l" minX="418" maxX="440"/>
+  <symbol minY="104" maxY="126" name="america-football-l" minX="440" maxX="462"/>
+  <symbol minY="104" maxY="126" name="subway-entrance-l" minX="462" maxX="484"/>
+  <symbol minY="104" maxY="126" name="book-shop-l" minX="484" maxX="506"/>
+  <symbol minY="104" maxY="126" name="police-l" minX="506" maxX="528"/>
+  <symbol minY="104" maxY="126" name="place-of-worship-l" minX="528" maxX="550"/>
+  <symbol minY="104" maxY="126" name="bookmaker-l" minX="550" maxX="572"/>
+  <symbol minY="104" maxY="126" name="boundary_stone-l" minX="572" maxX="594"/>
+  <symbol minY="104" maxY="126" name="subway-l" minX="594" maxX="616"/>
+  <symbol minY="104" maxY="126" name="bowls-l" minX="616" maxX="638"/>
+  <symbol minY="104" maxY="126" name="pitch-l" minX="638" maxX="660"/>
+  <symbol minY="104" maxY="126" name="archery-l" minX="660" maxX="682"/>
+  <symbol minY="104" maxY="126" name="bus-l" minX="682" maxX="704"/>
+  <symbol minY="104" maxY="126" name="picnic-l" minX="704" maxX="726"/>
+  <symbol minY="104" maxY="126" name="photo-shop-l" minX="726" maxX="748"/>
+  <symbol minY="104" maxY="126" name="butcher-l" minX="748" maxX="770"/>
+  <symbol minY="104" maxY="126" name="phone-l" minX="770" maxX="792"/>
+  <symbol minY="104" maxY="126" name="cable-car-l" minX="792" maxX="814"/>
+  <symbol minY="104" maxY="126" name="pharmacy-l" minX="814" maxX="836"/>
+  <symbol minY="104" maxY="126" name="atm-l" minX="836" maxX="858"/>
+  <symbol minY="104" maxY="126" name="cafe-l" minX="858" maxX="880"/>
+  <symbol minY="104" maxY="126" name="petshop-l" minX="880" maxX="902"/>
+  <symbol minY="104" maxY="126" name="subway-newyork-l" minX="902" maxX="924"/>
+  <symbol minY="104" maxY="126" name="campsite-l" minX="924" maxX="946"/>
+  <symbol minY="104" maxY="126" name="subway-paris-l" minX="946" maxX="968"/>
+  <symbol minY="104" maxY="126" name="peak-l" minX="968" maxX="990"/>
+  <symbol minY="104" maxY="126" name="car-part-l" minX="990" maxX="1012"/>
+  <symbol minY="126" maxY="148" name="parking-meter-l" minX="0" maxX="22"/>
+  <symbol minY="126" maxY="148" name="car-repair-l" minX="22" maxX="44"/>
+  <symbol minY="126" maxY="148" name="subway-spb-l" minX="44" maxX="66"/>
+  <symbol minY="126" maxY="148" name="park-l" minX="66" maxX="88"/>
+  <symbol minY="126" maxY="148" name="car-wash-l" minX="88" maxX="110"/>
+  <symbol minY="126" maxY="148" name="optician-l" minX="110" maxX="132"/>
+  <symbol minY="126" maxY="148" name="car_sharing-l" minX="132" maxX="154"/>
+  <symbol minY="126" maxY="148" name="office-l" minX="154" maxX="176"/>
+  <symbol minY="126" maxY="148" name="caravan_site-l" minX="176" maxX="198"/>
+  <symbol minY="126" maxY="148" name="sweets-l" minX="198" maxX="220"/>
+  <symbol minY="126" maxY="148" name="casino-l" minX="220" maxX="242"/>
+  <symbol minY="126" maxY="148" name="nparkf-l" minX="242" maxX="264"/>
+  <symbol minY="126" maxY="148" name="zoo-l" minX="264" maxX="286"/>
+  <symbol minY="126" maxY="148" name="cave-l" minX="286" maxX="308"/>
+  <symbol minY="126" maxY="148" name="npark-l" minX="308" maxX="330"/>
+  <symbol minY="126" maxY="148" name="swimming-l" minX="330" maxX="352"/>
+  <symbol minY="126" maxY="148" name="cemetery-l" minX="352" maxX="374"/>
+  <symbol minY="126" maxY="148" name="museum-l" minX="374" maxX="396"/>
+  <symbol minY="126" maxY="148" name="windmill-l" minX="396" maxX="418"/>
+  <symbol minY="126" maxY="148" name="charging-station-l" minX="418" maxX="440"/>
+  <symbol minY="126" maxY="148" name="moto-sharing-l" minX="440" maxX="462"/>
+  <symbol minY="126" maxY="148" name="taxi-l" minX="462" maxX="484"/>
+  <symbol minY="126" maxY="148" name="chemist-l" minX="484" maxX="506"/>
+  <symbol minY="126" maxY="148" name="motel-l" minX="506" maxX="528"/>
+  <symbol minY="126" maxY="148" name="childcare-l" minX="528" maxX="550"/>
+  <symbol minY="126" maxY="148" name="chimney-l" minX="550" maxX="572"/>
+  <symbol minY="126" maxY="148" name="monument-l" minX="572" maxX="594"/>
+  <symbol minY="126" maxY="148" name="cinema-l" minX="594" maxX="616"/>
+  <symbol minY="126" maxY="148" name="mobile_phone-l" minX="616" maxX="638"/>
+  <symbol minY="126" maxY="148" name="wayside_shrine-l" minX="638" maxX="660"/>
+  <symbol minY="126" maxY="148" name="climbing-l" minX="660" maxX="682"/>
+  <symbol minY="126" maxY="148" name="tennis-l" minX="682" maxX="704"/>
+  <symbol minY="126" maxY="148" name="theatre-l" minX="704" maxX="726"/>
+  <symbol minY="126" maxY="148" name="clothes-l" minX="726" maxX="748"/>
+  <symbol minY="126" maxY="148" name="ticket-shop-l" minX="748" maxX="770"/>
+  <symbol minY="126" maxY="148" name="college-l" minX="770" maxX="792"/>
+  <symbol minY="126" maxY="148" name="marketplace-l" minX="792" maxX="814"/>
+  <symbol minY="126" maxY="148" name="wayside_cross-l" minX="814" maxX="836"/>
+  <symbol minY="126" maxY="148" name="computer-l" minX="836" maxX="858"/>
+  <symbol minY="126" maxY="148" name="mail-l" minX="858" maxX="880"/>
+  <symbol minY="126" maxY="148" name="convenience-l" minX="880" maxX="902"/>
+  <symbol minY="126" maxY="148" name="toilets-l" minX="902" maxX="924"/>
+  <symbol minY="126" maxY="148" name="copyshop-l" minX="924" maxX="946"/>
+  <symbol minY="126" maxY="148" name="lightrail-berlin-l" minX="946" maxX="968"/>
+  <symbol minY="126" maxY="148" name="courthouse-l" minX="968" maxX="990"/>
+  <symbol minY="126" maxY="148" name="cricket-l" minX="990" maxX="1012"/>
+  <symbol minY="148" maxY="170" name="lighthouse-l" minX="0" maxX="22"/>
+  <symbol minY="148" maxY="170" name="lift_gate-l" minX="22" maxX="44"/>
+  <symbol minY="148" maxY="170" name="curling-l" minX="44" maxX="66"/>
+  <symbol minY="148" maxY="170" name="toll_booth-l" minX="66" maxX="88"/>
+  <symbol minY="148" maxY="170" name="waterfall-l" minX="88" maxX="110"/>
+  <symbol minY="148" maxY="170" name="dentist-l" minX="110" maxX="132"/>
+  <symbol minY="148" maxY="170" name="dentist-m" minX="132" maxX="154"/>
+  <symbol minY="148" maxY="170" name="library-l" minX="154" maxX="176"/>
+  <symbol minY="148" maxY="170" name="department_store-l" minX="176" maxX="198"/>
+  <symbol minY="148" maxY="170" name="lawyer-l" minX="198" maxX="220"/>
+  <symbol minY="148" maxY="170" name="diving-l" minX="220" maxX="242"/>
+  <symbol minY="148" maxY="170" name="laundry-l" minX="242" maxX="264"/>
+  <symbol minY="148" maxY="170" name="kiosk-l" minX="264" maxX="286"/>
+  <symbol minY="148" maxY="170" name="dog_park-l" minX="286" maxX="308"/>
+  <symbol minY="148" maxY="170" name="kindergarten-m" minX="308" maxX="330"/>
+  <symbol minY="148" maxY="170" name="doityourself-l" minX="330" maxX="352"/>
+  <symbol minY="148" maxY="170" name="kindergarten-l" minX="352" maxX="374"/>
+  <symbol minY="148" maxY="170" name="jewelry-l" minX="374" maxX="396"/>
+  <symbol minY="148" maxY="170" name="volcano-l" minX="396" maxX="418"/>
+  <symbol minY="148" maxY="170" name="viewpoint-m" minX="418" maxX="440"/>
+  <symbol minY="148" maxY="170" name="drinking-water-l" minX="440" maxX="462"/>
+  <symbol minY="148" maxY="170" name="tomb-l" minX="462" maxX="484"/>
+  <symbol minY="148" maxY="170" name="viewpoint-l" minX="484" maxX="506"/>
+  <symbol minY="148" maxY="170" name="information-l" minX="506" maxX="528"/>
+  <symbol minY="148" maxY="170" name="electronics-l" minX="528" maxX="550"/>
+  <symbol minY="148" maxY="170" name="hunting-tower-l" minX="550" maxX="572"/>
+  <symbol minY="148" maxY="170" name="embassy-l" minX="572" maxX="594"/>
+  <symbol minY="148" maxY="170" name="hotel-l" minX="594" maxX="616"/>
+  <symbol minY="148" maxY="170" name="tourism-l" minX="616" maxX="638"/>
+  <symbol minY="148" maxY="170" name="veterinary-l" minX="638" maxX="660"/>
+  <symbol minY="148" maxY="170" name="hospital-l" minX="660" maxX="682"/>
+  <symbol minY="148" maxY="170" name="equestrian-l" minX="682" maxX="704"/>
+  <symbol minY="148" maxY="170" name="equestrian-m" minX="704" maxX="726"/>
+  <symbol minY="148" maxY="170" name="fastfood-l" minX="726" maxX="748"/>
+  <symbol minY="148" maxY="170" name="historic-ship-l" minX="748" maxX="770"/>
+  <symbol minY="148" maxY="170" name="vending-l" minX="770" maxX="792"/>
+  <symbol minY="148" maxY="170" name="fire_station-l" minX="792" maxX="814"/>
+  <symbol minY="148" maxY="170" name="heliport-l" minX="814" maxX="836"/>
+  <symbol minY="148" maxY="170" name="tourist-office-l" minX="836" maxX="858"/>
+  <symbol minY="148" maxY="170" name="helipad-l" minX="858" maxX="880"/>
+  <symbol minY="148" maxY="170" name="florist-l" minX="880" maxX="902"/>
+  <symbol minY="148" maxY="170" name="hardware-l" minX="902" maxX="924"/>
+  <symbol minY="148" maxY="170" name="fountain-l" minX="924" maxX="946"/>
+  <symbol minY="148" maxY="170" name="hand-m" minX="946" maxX="968"/>
+  <symbol minY="148" maxY="170" name="tram-l" minX="968" maxX="990"/>
+  <symbol minY="148" maxY="170" name="fuel-l copy" minX="990" maxX="1012"/>
+  <symbol minY="170" maxY="192" name="fuel-l" minX="0" maxX="22"/>
+  <symbol minY="170" maxY="192" name="hand-l" minX="22" maxX="44"/>
+  <symbol minY="170" maxY="192" name="hairdresser-l" minX="44" maxX="66"/>
+  <symbol minY="170" maxY="192" name="funicular-l" minX="66" maxX="88"/>
+  <symbol minY="170" maxY="192" name="tourist-shop-l" minX="88" maxX="110"/>
+  <symbol minY="170" maxY="192" name="train-l" minX="110" maxX="132"/>
+  <symbol minY="170" maxY="192" name="furniture-l" minX="132" maxX="154"/>
+  <symbol minY="170" maxY="192" name="gym-l" minX="154" maxX="176"/>
+  <symbol minY="170" maxY="192" name="gallery-l" minX="176" maxX="198"/>
+  <symbol minY="170" maxY="192" name="townhall-l" minX="198" maxX="220"/>
+  <symbol minY="170" maxY="192" name="grocery-l" minX="220" maxX="242"/>
+  <symbol minY="170" maxY="192" name="garden-l" minX="242" maxX="264"/>
+  <symbol minY="170" maxY="192" name="greengrocer-l" minX="264" maxX="286"/>
+  <symbol minY="170" maxY="192" name="toys-l" minX="286" maxX="308"/>
+  <symbol minY="170" maxY="192" name="garden_center-l" minX="308" maxX="330"/>
+  <symbol minY="170" maxY="192" name="golf-l" minX="330" maxX="352"/>
+  <symbol minY="170" maxY="192" name="gate-l" minX="352" maxX="374"/>
+  <symbol minY="170" maxY="192" name="skiing-l" minX="374" maxX="396"/>
+  <symbol minY="170" maxY="192" name="gift-l" minX="396" maxX="418"/>
+  <symbol minY="170" maxY="191" name="gate-m" minX="418" maxX="439"/>
+  <symbol minY="170" maxY="191" name="garden_center-m" minX="439" maxX="460"/>
+  <symbol minY="170" maxY="191" name="golf-m" minX="460" maxX="481"/>
+  <symbol minY="170" maxY="191" name="townhall-m" minX="481" maxX="502"/>
+  <symbol minY="170" maxY="191" name="garden-m" minX="502" maxX="523"/>
+  <symbol minY="170" maxY="191" name="greengrocer-m" minX="523" maxX="544"/>
+  <symbol minY="170" maxY="191" name="toys-m" minX="544" maxX="565"/>
+  <symbol minY="170" maxY="191" name="grocery-m" minX="565" maxX="586"/>
+  <symbol minY="170" maxY="191" name="gallery-m" minX="586" maxX="607"/>
+  <symbol minY="170" maxY="191" name="furniture-m" minX="607" maxX="628"/>
+  <symbol minY="170" maxY="191" name="gym-m" minX="628" maxX="649"/>
+  <symbol minY="170" maxY="191" name="funicular-m" minX="649" maxX="670"/>
+  <symbol minY="170" maxY="191" name="train-m" minX="670" maxX="691"/>
+  <symbol minY="170" maxY="191" name="hairdresser-m" minX="691" maxX="712"/>
+  <symbol minY="170" maxY="191" name="fuel-m" minX="712" maxX="733"/>
+  <symbol minY="170" maxY="191" name="fountain-m" minX="733" maxX="754"/>
+  <symbol minY="170" maxY="191" name="florist-m" minX="754" maxX="775"/>
+  <symbol minY="170" maxY="191" name="hardware-m" minX="775" maxX="796"/>
+  <symbol minY="170" maxY="191" name="gift-m" minX="796" maxX="817"/>
+  <symbol minY="170" maxY="191" name="helipad-m" minX="817" maxX="838"/>
+  <symbol minY="170" maxY="191" name="tram-m" minX="838" maxX="859"/>
+  <symbol minY="170" maxY="191" name="fire_station-m" minX="859" maxX="880"/>
+  <symbol minY="170" maxY="191" name="heliport-m" minX="880" maxX="901"/>
+  <symbol minY="170" maxY="191" name="tourism-m" minX="901" maxX="922"/>
+  <symbol minY="170" maxY="191" name="fastfood-m" minX="922" maxX="943"/>
+  <symbol minY="170" maxY="191" name="historic-ship-m" minX="943" maxX="964"/>
+  <symbol minY="170" maxY="191" name="vending-m" minX="964" maxX="985"/>
+  <symbol minY="170" maxY="191" name="hospital-m" minX="985" maxX="1006"/>
+  <symbol minY="192" maxY="213" name="veterinary-m" minX="0" maxX="21"/>
+  <symbol minY="192" maxY="213" name="embassy-m" minX="21" maxX="42"/>
+  <symbol minY="192" maxY="213" name="hotel-m" minX="42" maxX="63"/>
+  <symbol minY="192" maxY="213" name="tomb-m" minX="63" maxX="84"/>
+  <symbol minY="192" maxY="213" name="electronics-m" minX="84" maxX="105"/>
+  <symbol minY="192" maxY="213" name="hunting-tower-m" minX="105" maxX="126"/>
+  <symbol minY="192" maxY="213" name="drugs" minX="126" maxX="147"/>
+  <symbol minY="192" maxY="213" name="information-m" minX="147" maxX="168"/>
+  <symbol minY="192" maxY="213" name="drinking-water-m" minX="168" maxX="189"/>
+  <symbol minY="192" maxY="213" name="volcano-m" minX="189" maxX="210"/>
+  <symbol minY="192" maxY="213" name="jewelry-m" minX="210" maxX="231"/>
+  <symbol minY="192" maxY="213" name="doityourself-m" minX="231" maxX="252"/>
+  <symbol minY="192" maxY="213" name="dog_park-m" minX="252" maxX="273"/>
+  <symbol minY="192" maxY="213" name="toll_booth-m" minX="273" maxX="294"/>
+  <symbol minY="192" maxY="213" name="skiing-m" minX="294" maxX="315"/>
+  <symbol minY="192" maxY="213" name="kiosk-m" minX="315" maxX="336"/>
+  <symbol minY="192" maxY="213" name="diving-m" minX="336" maxX="357"/>
+  <symbol minY="192" maxY="213" name="laundry-m" minX="357" maxX="378"/>
+  <symbol minY="192" maxY="213" name="department_store-m" minX="378" maxX="399"/>
+  <symbol minY="192" maxY="213" name="shop-m" minX="399" maxX="420"/>
+  <symbol minY="192" maxY="213" name="library-m" minX="420" maxX="441"/>
+  <symbol minY="192" maxY="213" name="curling-m" minX="441" maxX="462"/>
+  <symbol minY="192" maxY="213" name="waterfall-m" minX="462" maxX="483"/>
+  <symbol minY="192" maxY="213" name="lift_gate-m" minX="483" maxX="504"/>
+  <symbol minY="192" maxY="213" name="cricket-m" minX="504" maxX="525"/>
+  <symbol minY="192" maxY="213" name="lighthouse-m" minX="525" maxX="546"/>
+  <symbol minY="192" maxY="213" name="toilets-m" minX="546" maxX="567"/>
+  <symbol minY="192" maxY="213" name="copyshop-m" minX="567" maxX="588"/>
+  <symbol minY="192" maxY="213" name="shop-m copy" minX="588" maxX="609"/>
+  <symbol minY="192" maxY="213" name="convenience-m" minX="609" maxX="630"/>
+  <symbol minY="192" maxY="213" name="computer-m" minX="630" maxX="651"/>
+  <symbol minY="192" maxY="213" name="mail-m" minX="651" maxX="672"/>
+  <symbol minY="192" maxY="213" name="ticket-shop-m" minX="672" maxX="693"/>
+  <symbol minY="192" maxY="213" name="college-m" minX="693" maxX="714"/>
+  <symbol minY="192" maxY="213" name="marketplace-m" minX="714" maxX="735"/>
+  <symbol minY="192" maxY="213" name="clothes-m" minX="735" maxX="756"/>
+  <symbol minY="192" maxY="213" name="theatre-m" minX="756" maxX="777"/>
+  <symbol minY="192" maxY="213" name="wayside_cross-m" minX="777" maxX="798"/>
+  <symbol minY="192" maxY="213" name="tennis-m" minX="798" maxX="819"/>
+  <symbol minY="192" maxY="213" name="military-m" minX="819" maxX="840"/>
+  <symbol minY="192" maxY="213" name="climbing-m" minX="840" maxX="861"/>
+  <symbol minY="192" maxY="213" name="cinema-m" minX="861" maxX="882"/>
+  <symbol minY="192" maxY="213" name="mobile_phone-m" minX="882" maxX="903"/>
+  <symbol minY="192" maxY="213" name="chimney-m" minX="903" maxX="924"/>
+  <symbol minY="192" maxY="213" name="monument-m" minX="924" maxX="945"/>
+  <symbol minY="192" maxY="213" name="taxi-m" minX="945" maxX="966"/>
+  <symbol minY="192" maxY="213" name="chemist-m" minX="966" maxX="987"/>
+  <symbol minY="192" maxY="213" name="motel-m" minX="987" maxX="1008"/>
+  <symbol minY="213" maxY="234" name="wayside_shrine-m" minX="0" maxX="21"/>
+  <symbol minY="213" maxY="234" name="charging-station-m" minX="21" maxX="42"/>
+  <symbol minY="213" maxY="234" name="cemetery-m" minX="42" maxX="63"/>
+  <symbol minY="213" maxY="234" name="museum-m" minX="63" maxX="84"/>
+  <symbol minY="213" maxY="234" name="swimming-m" minX="84" maxX="105"/>
+  <symbol minY="213" maxY="234" name="australian-football-m" minX="105" maxX="126"/>
+  <symbol minY="213" maxY="234" name="shop-bicycle-m" minX="126" maxX="147"/>
+  <symbol minY="213" maxY="234" name="bakery-m" minX="147" maxX="168"/>
+  <symbol minY="213" maxY="234" name="shoes-m" minX="168" maxX="189"/>
+  <symbol minY="213" maxY="234" name="bank-2-m" minX="189" maxX="210"/>
+  <symbol minY="213" maxY="234" name="windmill-m" minX="210" maxX="231"/>
+  <symbol minY="213" maxY="234" name="cave-m" minX="231" maxX="252"/>
+  <symbol minY="213" maxY="234" name="npark-m" minX="252" maxX="273"/>
+  <symbol minY="213" maxY="234" name="sweets-m" minX="273" maxX="294"/>
+  <symbol minY="213" maxY="234" name="casino-m" minX="294" maxX="315"/>
+  <symbol minY="213" maxY="234" name="nparkf-m" minX="315" maxX="336"/>
+  <symbol minY="213" maxY="234" name="caravan_site-m" minX="336" maxX="357"/>
+  <symbol minY="213" maxY="234" name="car_sharing-m" minX="357" maxX="378"/>
+  <symbol minY="213" maxY="234" name="office-m" minX="378" maxX="399"/>
+  <symbol minY="213" maxY="234" name="subway-spb-m" minX="399" maxX="420"/>
+  <symbol minY="213" maxY="234" name="car-wash-m" minX="420" maxX="441"/>
+  <symbol minY="213" maxY="234" name="optician-m" minX="441" maxX="462"/>
+  <symbol minY="213" maxY="234" name="zoo-m" minX="462" maxX="483"/>
+  <symbol minY="213" maxY="234" name="park-m" minX="483" maxX="504"/>
+  <symbol minY="213" maxY="234" name="car-repair-m" minX="504" maxX="525"/>
+  <symbol minY="213" maxY="234" name="banknote-m" minX="525" maxX="546"/>
+  <symbol minY="213" maxY="234" name="ship-m" minX="546" maxX="567"/>
+  <symbol minY="213" maxY="234" name="car-part-m" minX="567" maxX="588"/>
+  <symbol minY="213" maxY="234" name="parking-meter-m" minX="588" maxX="609"/>
+  <symbol minY="213" maxY="234" name="bar-m" minX="609" maxX="630"/>
+  <symbol minY="213" maxY="234" name="seafood-shop-m" minX="630" maxX="651"/>
+  <symbol minY="213" maxY="234" name="baseball-m" minX="651" maxX="672"/>
+  <symbol minY="213" maxY="234" name="peak-m" minX="672" maxX="693"/>
+  <symbol minY="213" maxY="234" name="campsite-m" minX="693" maxX="714"/>
+  <symbol minY="213" maxY="234" name="subway-newyork-m" minX="714" maxX="735"/>
+  <symbol minY="213" maxY="234" name="atm-m" minX="735" maxX="756"/>
+  <symbol minY="213" maxY="234" name="soccer-m" minX="756" maxX="777"/>
+  <symbol minY="213" maxY="234" name="cafe-m" minX="777" maxX="798"/>
+  <symbol minY="213" maxY="234" name="petshop-m" minX="798" maxX="819"/>
+  <symbol minY="213" maxY="234" name="cable-car-m" minX="819" maxX="840"/>
+  <symbol minY="213" maxY="234" name="pharmacy-m" minX="840" maxX="861"/>
+  <symbol minY="213" maxY="234" name="school-m" minX="861" maxX="882"/>
+  <symbol minY="213" maxY="234" name="butcher-m" minX="882" maxX="903"/>
+  <symbol minY="213" maxY="234" name="phone-m" minX="903" maxX="924"/>
+  <symbol minY="213" maxY="234" name="subway-m" minX="924" maxX="945"/>
+  <symbol minY="213" maxY="234" name="archery-m" minX="945" maxX="966"/>
+  <symbol minY="213" maxY="234" name="photo-shop-m" minX="966" maxX="987"/>
+  <symbol minY="213" maxY="234" name="bus-m" minX="987" maxX="1008"/>
+  <symbol minY="234" maxY="255" name="picnic-m" minX="0" maxX="21"/>
+  <symbol minY="234" maxY="255" name="sauna-m" minX="21" maxX="42"/>
+  <symbol minY="234" maxY="255" name="bowls-m" minX="42" maxX="63"/>
+  <symbol minY="234" maxY="255" name="pitch-m" minX="63" maxX="84"/>
+  <symbol minY="234" maxY="255" name="boundary_stone-m" minX="84" maxX="105"/>
+  <symbol minY="234" maxY="255" name="america-football-m" minX="105" maxX="126"/>
+  <symbol minY="234" maxY="255" name="place-of-worship-m" minX="126" maxX="147"/>
+  <symbol minY="234" maxY="255" name="subway-entrance-m" minX="147" maxX="168"/>
+  <symbol minY="234" maxY="255" name="book-shop-m" minX="168" maxX="189"/>
+  <symbol minY="234" maxY="255" name="police-m" minX="189" maxX="210"/>
+  <symbol minY="234" maxY="255" name="basketball-m" minX="210" maxX="231"/>
+  <symbol minY="234" maxY="255" name="bicycle-m" minX="231" maxX="252"/>
+  <symbol minY="234" maxY="255" name="alpine_hut-m" minX="252" maxX="273"/>
+  <symbol minY="234" maxY="255" name="postbox-m" minX="273" maxX="294"/>
+  <symbol minY="234" maxY="255" name="beer-m" minX="294" maxX="315"/>
+  <symbol minY="234" maxY="255" name="beauty-m" minX="315" maxX="336"/>
+  <symbol minY="234" maxY="255" name="alcohol-m" minX="336" maxX="357"/>
+  <symbol minY="234" maxY="255" name="pub-m" minX="357" maxX="378"/>
+  <symbol minY="234" maxY="255" name="subway-entrance-2-m" minX="378" maxX="399"/>
+  <symbol minY="234" maxY="255" name="restaurant-m" minX="399" maxX="420"/>
+  <symbol minY="234" maxY="255" name="beach-m" minX="420" maxX="441"/>
+  <symbol minY="234" maxY="255" name="recycling-m" minX="441" maxX="462"/>
+  <symbol minY="234" maxY="255" name="bbq-m" minX="462" maxX="483"/>
+  <symbol minY="234" maxY="255" name="bcontrol-m" minX="483" maxX="504"/>
+  <symbol minY="234" maxY="255" name="remains-m" minX="504" maxX="525"/>
+  <symbol minY="234" maxY="255" name="sports-m" minX="525" maxX="546"/>
+  <symbol minY="234" maxY="254" name="subway-berlin-l" minX="546" maxX="566"/>
+  <symbol minY="234" maxY="254" name="waste-basket-l" minX="566" maxX="586"/>
+  <symbol minY="234" maxY="254" name="lightrail-berlin-m" minX="586" maxX="606"/>
+  <symbol minY="234" maxY="254" name="speedcam-l" minX="606" maxX="626"/>
+  <symbol minY="234" maxY="254" name="bike-parking-l" minX="626" maxX="646"/>
+  <symbol minY="234" maxY="254" name="watch-my-position" minX="646" maxX="666"/>
+  <symbol minY="234" maxY="254" name="parking-l" minX="666" maxX="686"/>
+  <symbol minY="234" maxY="254" name="subway-rome-l" minX="686" maxX="706"/>
+  <symbol minY="234" maxY="253" name="firehydrant-l" minX="706" maxX="722"/>
+  <symbol minY="234" maxY="253" name="subway-moscow-l" minX="722" maxX="744"/>
+  <symbol minY="234" maxY="252" name="subway-paris-m" minX="744" maxX="762"/>
+  <symbol minY="234" maxY="252" name="api-result" minX="762" maxX="780"/>
+  <symbol minY="234" maxY="252" name="subway-moscow-m" minX="780" maxX="801"/>
+  <symbol minY="234" maxY="252" name="search-result" minX="801" maxX="819"/>
+  <symbol minY="234" maxY="252" name="no-icon" minX="819" maxX="837"/>
+  <symbol minY="234" maxY="252" name="no-icon-tourism" minX="837" maxX="855"/>
+  <symbol minY="234" maxY="252" name="no-icon-shop" minX="855" maxX="873"/>
+  <symbol minY="234" maxY="252" name="no-icon-leisure" minX="873" maxX="891"/>
+  <symbol minY="234" maxY="252" name="subway-london-l" minX="891" maxX="913"/>
+  <symbol minY="234" maxY="252" name="no-icon-amenity" minX="913" maxX="931"/>
+  <symbol minY="234" maxY="252" name="airport-s" minX="931" maxX="949"/>
+  <symbol minY="234" maxY="252" name="waste-basket-s" minX="949" maxX="967"/>
+  <symbol minY="234" maxY="252" name="subway-berlin-m" minX="967" maxX="985"/>
+  <symbol minY="234" maxY="252" name="subway-rome-m" minX="985" maxX="1003"/>
+  <symbol minY="234" maxY="251" name="shop-s" minX="1003" maxX="1020"/>
+  <symbol minY="255" maxY="272" name="shop-s copy" minX="0" maxX="17"/>
+  <symbol minY="255" maxY="272" name="skiing-s" minX="17" maxX="34"/>
+  <symbol minY="255" maxY="272" name="ship-s" minX="34" maxX="51"/>
+  <symbol minY="255" maxY="272" name="school-s" minX="51" maxX="68"/>
+  <symbol minY="255" maxY="272" name="soccer-s" minX="68" maxX="85"/>
+  <symbol minY="255" maxY="272" name="motel-s" minX="85" maxX="102"/>
+  <symbol minY="255" maxY="272" name="speedcam-m" minX="102" maxX="119"/>
+  <symbol minY="255" maxY="272" name="australian-football-s" minX="119" maxX="136"/>
+  <symbol minY="255" maxY="272" name="restaurant-s" minX="136" maxX="153"/>
+  <symbol minY="255" maxY="272" name="remains-s" minX="153" maxX="170"/>
+  <symbol minY="255" maxY="272" name="bar-s" minX="170" maxX="187"/>
+  <symbol minY="255" maxY="272" name="baseball-s" minX="187" maxX="204"/>
+  <symbol minY="255" maxY="272" name="basketball-s" minX="204" maxX="221"/>
+  <symbol minY="255" maxY="272" name="bcontrol-s" minX="221" maxX="238"/>
+  <symbol minY="255" maxY="272" name="beach-s" minX="238" maxX="255"/>
+  <symbol minY="255" maxY="272" name="subway-barcelona-s" minX="255" maxX="275"/>
+  <symbol minY="255" maxY="272" name="recycling-s" minX="275" maxX="292"/>
+  <symbol minY="255" maxY="272" name="alcohol-s" minX="292" maxX="309"/>
+  <symbol minY="255" maxY="272" name="beer-s" minX="309" maxX="326"/>
+  <symbol minY="255" maxY="272" name="pub-s" minX="326" maxX="343"/>
+  <symbol minY="255" maxY="272" name="subway-entrance-2-s" minX="343" maxX="360"/>
+  <symbol minY="255" maxY="272" name="subway-entrance-arrow" minX="360" maxX="377"/>
+  <symbol minY="255" maxY="272" name="police-s" minX="377" maxX="394"/>
+  <symbol minY="255" maxY="272" name="place-of-worship-s" minX="394" maxX="411"/>
+  <symbol minY="255" maxY="272" name="subway-entrance-s" minX="411" maxX="428"/>
+  <symbol minY="255" maxY="272" name="alpine_hut-s" minX="428" maxX="445"/>
+  <symbol minY="255" maxY="272" name="bicycle-s" minX="445" maxX="462"/>
+  <symbol minY="255" maxY="272" name="book-shop-s" minX="462" maxX="479"/>
+  <symbol minY="255" maxY="272" name="pitch-s" minX="479" maxX="496"/>
+  <symbol minY="255" maxY="272" name="picnic-s" minX="496" maxX="513"/>
+  <symbol minY="255" maxY="272" name="subway-london-m" minX="513" maxX="534"/>
+  <symbol minY="255" maxY="272" name="america-football-s" minX="534" maxX="551"/>
+  <symbol minY="255" maxY="272" name="phone-s" minX="551" maxX="568"/>
+  <symbol minY="255" maxY="272" name="bowls-s" minX="568" maxX="585"/>
+  <symbol minY="255" maxY="272" name="bus-s" minX="585" maxX="602"/>
+  <symbol minY="255" maxY="272" name="archery-s" minX="602" maxX="619"/>
+  <symbol minY="255" maxY="272" name="cable-car-s" minX="619" maxX="636"/>
+  <symbol minY="255" maxY="272" name="cafe-s" minX="636" maxX="653"/>
+  <symbol minY="255" maxY="272" name="campsite-s" minX="653" maxX="670"/>
+  <symbol minY="255" maxY="272" name="pharmacy-s" minX="670" maxX="687"/>
+  <symbol minY="255" maxY="272" name="zoo-s" minX="687" maxX="704"/>
+  <symbol minY="255" maxY="272" name="car-repair-s" minX="704" maxX="721"/>
+  <symbol minY="255" maxY="272" name="casino-s" minX="721" maxX="738"/>
+  <symbol minY="255" maxY="272" name="windmill-s" minX="738" maxX="755"/>
+  <symbol minY="255" maxY="272" name="subway-newyork-s" minX="755" maxX="772"/>
+  <symbol minY="255" maxY="272" name="cave-s" minX="772" maxX="789"/>
+  <symbol minY="255" maxY="272" name="peak-s" minX="789" maxX="806"/>
+  <symbol minY="255" maxY="272" name="parking-ticket-l" minX="806" maxX="817"/>
+  <symbol minY="255" maxY="272" name="cemetery-s" minX="817" maxX="834"/>
+  <symbol minY="255" maxY="272" name="charging-station-s" minX="834" maxX="851"/>
+  <symbol minY="255" maxY="272" name="cinema-s" minX="851" maxX="868"/>
+  <symbol minY="255" maxY="272" name="climbing-s" minX="868" maxX="885"/>
+  <symbol minY="255" maxY="272" name="subway-s" minX="885" maxX="902"/>
+  <symbol minY="255" maxY="272" name="park-s" minX="902" maxX="919"/>
+  <symbol minY="255" maxY="272" name="office-s" minX="919" maxX="936"/>
+  <symbol minY="255" maxY="272" name="subway-spb-s" minX="936" maxX="953"/>
+  <symbol minY="255" maxY="272" name="college-s" minX="953" maxX="970"/>
+  <symbol minY="255" maxY="272" name="waterfall-s" minX="970" maxX="987"/>
+  <symbol minY="255" maxY="272" name="cricket-s" minX="987" maxX="1004"/>
+  <symbol minY="255" maxY="272" name="curling-s" minX="1004" maxX="1021"/>
+  <symbol minY="272" maxY="289" name="dentist-s" minX="0" maxX="17"/>
+  <symbol minY="272" maxY="289" name="nparkf-s" minX="17" maxX="34"/>
+  <symbol minY="272" maxY="289" name="npark-s" minX="34" maxX="51"/>
+  <symbol minY="272" maxY="289" name="diving-s" minX="51" maxX="68"/>
+  <symbol minY="272" maxY="289" name="museum-s" minX="68" maxX="85"/>
+  <symbol minY="272" maxY="289" name="swimming-s" minX="85" maxX="102"/>
+  <symbol minY="272" maxY="289" name="atm-s" minX="102" maxX="119"/>
+  <symbol minY="272" maxY="289" name="monument-s" minX="119" maxX="136"/>
+  <symbol minY="272" maxY="289" name="military-s" minX="136" maxX="153"/>
+  <symbol minY="272" maxY="289" name="atm-s copy 2" minX="153" maxX="170"/>
+  <symbol minY="272" maxY="289" name="tennis-s" minX="170" maxX="187"/>
+  <symbol minY="272" maxY="289" name="volcano-s" minX="187" maxX="204"/>
+  <symbol minY="272" maxY="289" name="viewpoint-s" minX="204" maxX="221"/>
+  <symbol minY="272" maxY="289" name="theatre-s" minX="221" maxX="238"/>
+  <symbol minY="272" maxY="289" name="marketplace-s" minX="238" maxX="255"/>
+  <symbol minY="272" maxY="289" name="mail-s" minX="255" maxX="272"/>
+  <symbol minY="272" maxY="289" name="drinking-water-s" minX="272" maxX="289"/>
+  <symbol minY="272" maxY="289" name="lighthouse-s" minX="289" maxX="306"/>
+  <symbol minY="272" maxY="289" name="toilets-s" minX="306" maxX="323"/>
+  <symbol minY="272" maxY="289" name="library-s" minX="323" maxX="340"/>
+  <symbol minY="272" maxY="289" name="kindergarten-s" minX="340" maxX="357"/>
+  <symbol minY="272" maxY="289" name="toll_booth-s" minX="357" maxX="374"/>
+  <symbol minY="272" maxY="289" name="information-s" minX="374" maxX="391"/>
+  <symbol minY="272" maxY="289" name="hotel-s" minX="391" maxX="408"/>
+  <symbol minY="272" maxY="289" name="hospital-s" minX="408" maxX="425"/>
+  <symbol minY="272" maxY="289" name="heliport-s" minX="425" maxX="442"/>
+  <symbol minY="272" maxY="289" name="tourism-s" minX="442" maxX="459"/>
+  <symbol minY="272" maxY="289" name="helipad-s" minX="459" maxX="476"/>
+  <symbol minY="272" maxY="289" name="gym-s" minX="476" maxX="493"/>
+  <symbol minY="272" maxY="289" name="grocery-s" minX="493" maxX="510"/>
+  <symbol minY="272" maxY="289" name="golf-s" minX="510" maxX="527"/>
+  <symbol minY="272" maxY="289" name="townhall-s" minX="527" maxX="544"/>
+  <symbol minY="272" maxY="289" name="garden-s" minX="544" maxX="561"/>
+  <symbol minY="272" maxY="289" name="gallery-s" minX="561" maxX="578"/>
+  <symbol minY="272" maxY="289" name="funicular-s" minX="578" maxX="595"/>
+  <symbol minY="272" maxY="289" name="fuel-s" minX="595" maxX="612"/>
+  <symbol minY="272" maxY="289" name="train-s" minX="612" maxX="629"/>
+  <symbol minY="272" maxY="289" name="fountain-s" minX="629" maxX="646"/>
+  <symbol minY="272" maxY="289" name="fire_station-s" minX="646" maxX="663"/>
+  <symbol minY="272" maxY="289" name="tram-s" minX="663" maxX="680"/>
+  <symbol minY="272" maxY="289" name="embassy-s" minX="680" maxX="697"/>
+  <symbol minY="272" maxY="289" name="fastfood-s" minX="697" maxX="714"/>
+  <symbol minY="272" maxY="288" name="s-arrow" minX="714" maxX="729"/>
+  <symbol minY="272" maxY="288" name="subway-madrid-l" minX="729" maxX="751"/>
+  <symbol minY="272" maxY="288" name="parking-m" minX="751" maxX="767"/>
+  <symbol minY="272" maxY="288" name="subway-madrid-m" minX="767" maxX="789"/>
+  <symbol minY="272" maxY="288" name="subway-barcelona-m" minX="789" maxX="811"/>
+  <symbol minY="272" maxY="288" name="metro-barcelona-m" minX="811" maxX="833"/>
+  <symbol minY="272" maxY="288" name="subway-barcelona-l" minX="833" maxX="855"/>
+  <symbol minY="272" maxY="287" name="lightrail-berlin-s" minX="855" maxX="870"/>
+  <symbol minY="272" maxY="287" name="subway-madrid-s" minX="870" maxX="890"/>
+  <symbol minY="272" maxY="287" name="subway-moscow-s" minX="890" maxX="905"/>
+  <symbol minY="272" maxY="287" name="metro-barcelona-s" minX="905" maxX="925"/>
+  <symbol minY="272" maxY="287" name="subway-kiev-m" minX="925" maxX="946"/>
+  <symbol minY="272" maxY="287" name="subway-kiev-l" minX="946" maxX="967"/>
+  <symbol minY="272" maxY="287" name="subway-paris-s" minX="967" maxX="982"/>
+  <symbol minY="272" maxY="286" name="subway-berlin-s" minX="982" maxX="996"/>
+  <symbol minY="272" maxY="286" name="speedcam-s" minX="996" maxX="1010"/>
+  <symbol minY="289" maxY="303" name="subway-london-s" minX="0" maxX="17"/>
+  <symbol minY="289" maxY="303" name="subway-rome-s" minX="17" maxX="31"/>
+  <symbol minY="289" maxY="303" name="star-l" minX="31" maxX="45"/>
+  <symbol minY="289" maxY="303" name="parking-s" minX="45" maxX="59"/>
+  <symbol minY="289" maxY="303" name="bench" minX="59" maxX="74"/>
+  <symbol minY="289" maxY="302" name="survey_point-l" minX="74" maxX="87"/>
+  <symbol minY="289" maxY="302" name="peakt-l" minX="87" maxX="101"/>
+  <symbol minY="289" maxY="302" name="subway-minsk-l" minX="101" maxX="122"/>
+  <symbol minY="289" maxY="302" name="star-m" minX="122" maxX="135"/>
+  <symbol minY="289" maxY="301" name="railway-crossing" minX="135" maxX="152"/>
+  <symbol minY="289" maxY="301" name="subway-kiev-s" minX="152" maxX="170"/>
+  <symbol minY="289" maxY="301" name="subway-newyork-xs" minX="170" maxX="182"/>
+  <symbol minY="289" maxY="301" name="subway-minsk-m" minX="182" maxX="200"/>
+  <symbol minY="289" maxY="301" name="survey_point-m" minX="200" maxX="212"/>
+  <symbol minY="289" maxY="301" name="star-s" minX="212" maxX="224"/>
+  <symbol minY="289" maxY="301" name="subway-xs" minX="224" maxX="236"/>
+  <symbol minY="289" maxY="300" name="subway-xs copy" minX="236" maxX="247"/>
+  <symbol minY="289" maxY="300" name="subway-minsk-s" minX="247" maxX="264"/>
+  <symbol minY="289" maxY="299" name="arrow-m" minX="264" maxX="284"/>
+  <symbol minY="289" maxY="299" name="survey_point-s" minX="284" maxX="294"/>
+  <symbol minY="289" maxY="299" name="peakt-m" minX="294" maxX="305"/>
+  <symbol minY="289" maxY="298" name="peakt-s" minX="305" maxX="314"/>
+  <symbol minY="289" maxY="298" name="entrance-s" minX="314" maxX="323"/>
+  <symbol minY="289" maxY="298" name="dot-m" minX="323" maxX="332"/>
+  <symbol minY="289" maxY="297" name="none" minX="332" maxX="340"/>
+  <symbol minY="289" maxY="297" name="arrow-s" minX="340" maxX="355"/>
+  <symbol minY="289" maxY="297" name="tree-l" minX="355" maxX="363"/>
+  <symbol minY="289" maxY="296" name="dot-s" minX="363" maxX="370"/>
+  <symbol minY="289" maxY="296" name="dot-s-light" minX="370" maxX="377"/>
+  <symbol minY="289" maxY="296" name="entrance-xs" minX="377" maxX="384"/>
+  <symbol minY="289" maxY="296" name="tree-m" minX="384" maxX="391"/>
+  <symbol minY="289" maxY="295" name="zero-icon" minX="391" maxX="397"/>
+  <symbol minY="289" maxY="295" name="tree-s" minX="397" maxX="403"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_legacy/symbols.png b/data/resources-mdpi_legacy/symbols.png
index 257c6a392a..379cf85a48 100644
Binary files a/data/resources-mdpi_legacy/symbols.png and b/data/resources-mdpi_legacy/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 7b49314754..f1a87d3c0a 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 ebfdb26771..dd4e72ce26 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -260,51 +260,51 @@
   <symbol minX="702" maxX="741" minY="581" maxY="620" name="ship-m"/>
   <symbol minX="741" maxX="780" minY="581" maxY="620" name="charging-station-m"/>
   <symbol minX="780" maxX="819" minY="581" maxY="620" name="marketplace-m"/>
-  <symbol minX="819" maxX="858" minY="581" maxY="620" name="volcano-m"/>
-  <symbol minX="858" maxX="897" minY="581" maxY="620" name="beach-m"/>
-  <symbol minX="897" maxX="936" minY="581" maxY="620" name="beauty-m"/>
+  <symbol minX="819" maxX="858" minY="581" maxY="620" name="seafood-shop-m"/>
+  <symbol minX="858" maxX="897" minY="581" maxY="620" name="volcano-m"/>
+  <symbol minX="897" maxX="936" minY="581" maxY="620" name="beach-m"/>
   <symbol minX="936" maxX="975" minY="581" maxY="620" name="embassy-m"/>
   <symbol minX="975" maxX="1014" minY="581" maxY="620" name="military-m"/>
-  <symbol minX="0" maxX="39" minY="620" maxY="659" name="veterinary-m"/>
+  <symbol minX="0" maxX="39" minY="620" maxY="659" name="beauty-m"/>
   <symbol minX="39" maxX="78" minY="620" maxY="659" name="electronics-m"/>
   <symbol minX="78" maxX="117" minY="620" maxY="659" name="mobile_phone-m"/>
   <symbol minX="117" maxX="156" minY="620" maxY="659" name="drugs"/>
   <symbol minX="156" maxX="195" minY="620" maxY="659" name="monument-m"/>
-  <symbol minX="195" maxX="234" minY="620" maxY="659" name="seafood-shop-m"/>
-  <symbol minX="234" maxX="273" minY="620" maxY="659" name="vending-m"/>
-  <symbol minX="273" maxX="312" minY="620" maxY="659" name="tram-m"/>
-  <symbol minX="312" maxX="351" minY="620" maxY="659" name="bicycle-m"/>
+  <symbol minX="195" maxX="234" minY="620" maxY="659" name="veterinary-m"/>
+  <symbol minX="234" maxX="273" minY="620" maxY="659" name="sports-m"/>
+  <symbol minX="273" maxX="312" minY="620" maxY="659" name="vending-m"/>
+  <symbol minX="312" maxX="351" minY="620" maxY="659" name="tram-m"/>
   <symbol minX="351" maxX="390" minY="620" maxY="659" name="drinking-water-m"/>
-  <symbol minX="390" maxX="429" minY="620" maxY="659" name="train-m"/>
+  <symbol minX="390" maxX="429" minY="620" maxY="659" name="bicycle-m"/>
   <symbol minX="429" maxX="468" minY="620" maxY="659" name="museum-m"/>
-  <symbol minX="468" maxX="507" minY="620" maxY="659" name="toys-m"/>
-  <symbol minX="507" maxX="546" minY="620" maxY="659" name="sports-m"/>
-  <symbol minX="546" maxX="585" minY="620" maxY="659" name="school-m"/>
-  <symbol minX="585" maxX="624" minY="620" maxY="659" name="chemist-m"/>
-  <symbol minX="624" maxX="663" minY="620" maxY="659" name="sauna-m"/>
-  <symbol minX="663" maxX="702" minY="620" maxY="659" name="chimney-m"/>
-  <symbol minX="702" maxX="741" minY="620" maxY="659" name="subway-entrance-2-m"/>
-  <symbol minX="741" maxX="780" minY="620" maxY="659" name="townhall-m"/>
+  <symbol minX="468" maxX="507" minY="620" maxY="659" name="train-m"/>
+  <symbol minX="507" maxX="546" minY="620" maxY="659" name="school-m"/>
+  <symbol minX="546" maxX="585" minY="620" maxY="659" name="chemist-m"/>
+  <symbol minX="585" maxX="624" minY="620" maxY="659" name="sauna-m"/>
+  <symbol minX="624" maxX="663" minY="620" maxY="659" name="chimney-m"/>
+  <symbol minX="663" maxX="702" minY="620" maxY="659" name="subway-entrance-2-m"/>
+  <symbol minX="702" maxX="741" minY="620" maxY="659" name="toys-m"/>
+  <symbol minX="741" maxX="780" minY="620" maxY="659" name="restaurant-m"/>
   <symbol minX="780" maxX="819" minY="620" maxY="659" name="npark-m"/>
-  <symbol minX="819" maxX="858" minY="620" maxY="659" name="book-shop-m"/>
-  <symbol minX="858" maxX="897" minY="620" maxY="659" name="boundary_stone-m"/>
+  <symbol minX="819" maxX="858" minY="620" maxY="659" name="townhall-m"/>
+  <symbol minX="858" maxX="897" minY="620" maxY="659" name="book-shop-m"/>
   <symbol minX="897" maxX="936" minY="620" maxY="659" name="nparkf-m "/>
   <symbol minX="936" maxX="975" minY="620" maxY="659" name="nparkf-m"/>
-  <symbol minX="975" maxX="1014" minY="620" maxY="659" name="tourism-m"/>
+  <symbol minX="975" maxX="1014" minY="620" maxY="659" name="boundary_stone-m"/>
   <symbol minX="0" maxX="39" minY="659" maxY="698" name="doityourself-m"/>
   <symbol minX="39" maxX="78" minY="659" maxY="698" name="dog_park-m"/>
-  <symbol minX="78" maxX="117" minY="659" maxY="698" name="restaurant-m"/>
-  <symbol minX="117" maxX="156" minY="659" maxY="698" name="bowls-m"/>
+  <symbol minX="78" maxX="117" minY="659" maxY="698" name="cinema-m"/>
+  <symbol minX="117" maxX="156" minY="659" maxY="698" name="tourism-m"/>
   <symbol minX="156" maxX="195" minY="659" maxY="698" name="optician-m"/>
   <symbol minX="195" maxX="234" minY="659" maxY="698" name="diving-m"/>
   <symbol minX="234" maxX="273" minY="659" maxY="698" name="park-m"/>
-  <symbol minX="273" maxX="312" minY="659" maxY="698" name="tomb-m"/>
-  <symbol minX="312" maxX="351" minY="659" maxY="698" name="cinema-m"/>
-  <symbol minX="351" maxX="390" minY="659" maxY="698" name="toll_booth-m"/>
+  <symbol minX="273" maxX="312" minY="659" maxY="698" name="bowls-m"/>
+  <symbol minX="312" maxX="351" minY="659" maxY="698" name="caravan_site-m"/>
+  <symbol minX="351" maxX="390" minY="659" maxY="698" name="tomb-m"/>
   <symbol minX="390" maxX="429" minY="659" maxY="698" name="department_store-m"/>
   <symbol minX="429" maxX="468" minY="659" maxY="698" name="parking-meter-m"/>
-  <symbol minX="468" maxX="507" minY="659" maxY="698" name="bus-m"/>
-  <symbol minX="507" maxX="546" minY="659" maxY="698" name="caravan_site-m"/>
+  <symbol minX="468" maxX="507" minY="659" maxY="698" name="toll_booth-m"/>
+  <symbol minX="507" maxX="546" minY="659" maxY="698" name="bus-m"/>
   <symbol minX="546" maxX="585" minY="659" maxY="698" name="toilets-m"/>
   <symbol minX="585" maxX="624" minY="659" maxY="698" name="ticket-shop-m"/>
   <symbol minX="624" maxX="663" minY="659" maxY="698" name="butcher-m"/>
@@ -342,38 +342,38 @@
   <symbol minX="858" maxX="897" minY="698" maxY="737" name="pub-m"/>
   <symbol minX="897" maxX="936" minY="698" maxY="737" name="clothes-m"/>
   <symbol minX="936" maxX="976" minY="698" maxY="734" name="subway-moscow-l"/>
-  <symbol minX="976" maxX="1012" minY="698" maxY="734" name="firehydrant-l"/>
+  <symbol minX="976" maxX="1012" minY="698" maxY="734" name="bike-parking-l"/>
   <symbol minX="0" maxX="36" minY="737" maxY="773" name="lightrail-berlin-m"/>
   <symbol minX="36" maxX="72" minY="737" maxY="773" name="speedcam-l"/>
   <symbol minX="72" maxX="108" minY="737" maxY="773" name="subway-rome-l"/>
   <symbol minX="108" maxX="144" minY="737" maxY="773" name="waste-basket-l"/>
   <symbol minX="144" maxX="180" minY="737" maxY="773" name="subway-berlin-l"/>
-  <symbol minX="180" maxX="216" minY="737" maxY="773" name="parking-ticket-l"/>
-  <symbol minX="216" maxX="252" minY="737" maxY="773" name="bike-parking-l"/>
-  <symbol minX="252" maxX="288" minY="737" maxY="773" name="parking-l"/>
-  <symbol minX="288" maxX="321" minY="737" maxY="770" name="no-icon-shop"/>
-  <symbol minX="321" maxX="354" minY="737" maxY="770" name="no-icon-leisure"/>
-  <symbol minX="354" maxX="387" minY="737" maxY="770" name="subway-berlin-m"/>
-  <symbol minX="387" maxX="420" minY="737" maxY="770" name="no-icon"/>
-  <symbol minX="420" maxX="453" minY="737" maxY="770" name="no-icon-tourism"/>
-  <symbol minX="453" maxX="490" minY="737" maxY="770" name="subway-moscow-m"/>
-  <symbol minX="490" maxX="523" minY="737" maxY="770" name="subway-paris-m"/>
-  <symbol minX="523" maxX="556" minY="737" maxY="770" name="subway-rome-m"/>
-  <symbol minX="556" maxX="589" minY="737" maxY="770" name="no-icon-amenity"/>
-  <symbol minX="589" maxX="621" minY="737" maxY="769" name="api-result"/>
-  <symbol minX="621" maxX="661" minY="737" maxY="769" name="subway-london-l"/>
-  <symbol minX="661" maxX="693" minY="737" maxY="769" name="search-result"/>
-  <symbol minX="693" maxX="723" minY="737" maxY="768" name="waterfall-s"/>
-  <symbol minX="723" maxX="753" minY="737" maxY="768" name="bcontrol-s"/>
-  <symbol minX="753" maxX="783" minY="737" maxY="768" name="picnic-s"/>
-  <symbol minX="783" maxX="813" minY="737" maxY="768" name="beer-s"/>
-  <symbol minX="813" maxX="843" minY="737" maxY="768" name="office-s"/>
-  <symbol minX="843" maxX="873" minY="737" maxY="768" name="hunting-tower-s"/>
-  <symbol minX="873" maxX="903" minY="737" maxY="768" name="heliport-s"/>
-  <symbol minX="903" maxX="933" minY="737" maxY="768" name="remains-s"/>
-  <symbol minX="933" maxX="964" minY="737" maxY="768" name="airport-s"/>
-  <symbol minX="964" maxX="994" minY="737" maxY="767" name="shop-s"/>
-  <symbol minX="994" maxX="1024" minY="737" maxY="767" name="skiing-s"/>
+  <symbol minX="180" maxX="216" minY="737" maxY="773" name="parking-l"/>
+  <symbol minX="216" maxX="244" minY="737" maxY="771" name="firehydrant-l"/>
+  <symbol minX="244" maxX="277" minY="737" maxY="770" name="no-icon-leisure"/>
+  <symbol minX="277" maxX="310" minY="737" maxY="770" name="waste-basket-s"/>
+  <symbol minX="310" maxX="343" minY="737" maxY="770" name="no-icon"/>
+  <symbol minX="343" maxX="376" minY="737" maxY="770" name="subway-berlin-m"/>
+  <symbol minX="376" maxX="409" minY="737" maxY="770" name="no-icon-tourism"/>
+  <symbol minX="409" maxX="442" minY="737" maxY="770" name="no-icon-shop"/>
+  <symbol minX="442" maxX="475" minY="737" maxY="770" name="subway-paris-m"/>
+  <symbol minX="475" maxX="508" minY="737" maxY="770" name="no-icon-amenity"/>
+  <symbol minX="508" maxX="541" minY="737" maxY="770" name="subway-rome-m"/>
+  <symbol minX="541" maxX="578" minY="737" maxY="770" name="subway-moscow-m"/>
+  <symbol minX="578" maxX="610" minY="737" maxY="769" name="api-result"/>
+  <symbol minX="610" maxX="650" minY="737" maxY="769" name="subway-london-l"/>
+  <symbol minX="650" maxX="682" minY="737" maxY="769" name="search-result"/>
+  <symbol minX="682" maxX="712" minY="737" maxY="768" name="waterfall-s"/>
+  <symbol minX="712" maxX="742" minY="737" maxY="768" name="bcontrol-s"/>
+  <symbol minX="742" maxX="772" minY="737" maxY="768" name="remains-s"/>
+  <symbol minX="772" maxX="802" minY="737" maxY="768" name="picnic-s"/>
+  <symbol minX="802" maxX="832" minY="737" maxY="768" name="beer-s"/>
+  <symbol minX="832" maxX="862" minY="737" maxY="768" name="hunting-tower-s"/>
+  <symbol minX="862" maxX="892" minY="737" maxY="768" name="heliport-s"/>
+  <symbol minX="892" maxX="922" minY="737" maxY="768" name="office-s"/>
+  <symbol minX="922" maxX="953" minY="737" maxY="768" name="airport-s"/>
+  <symbol minX="953" maxX="983" minY="737" maxY="767" name="shop-s"/>
+  <symbol minX="983" maxX="1013" minY="737" maxY="767" name="skiing-s"/>
   <symbol minX="0" maxX="30" minY="773" maxY="803" name="casino-s"/>
   <symbol minX="30" maxX="60" minY="773" maxY="803" name="cave-s"/>
   <symbol minX="60" maxX="90" minY="773" maxY="803" name="soccer-s"/>
@@ -440,9 +440,9 @@
   <symbol minX="900" maxX="930" minY="803" maxY="833" name="curling-s"/>
   <symbol minX="930" maxX="960" minY="803" maxY="833" name="dentist-s"/>
   <symbol minX="960" maxX="990" minY="803" maxY="833" name="cable-car-s"/>
-  <symbol minX="990" maxX="1020" minY="803" maxY="833" name="volcano-s"/>
+  <symbol minX="990" maxX="1020" minY="803" maxY="833" name="marketplace-s"/>
   <symbol minX="0" maxX="30" minY="833" maxY="863" name="tennis-s"/>
-  <symbol minX="30" maxX="60" minY="833" maxY="863" name="marketplace-s"/>
+  <symbol minX="30" maxX="60" minY="833" maxY="863" name="volcano-s"/>
   <symbol minX="60" maxX="90" minY="833" maxY="863" name="embassy-s"/>
   <symbol minX="90" maxX="120" minY="833" maxY="863" name="theatre-s"/>
   <symbol minX="120" maxX="150" minY="833" maxY="863" name="viewpoint-s"/>
@@ -450,77 +450,77 @@
   <symbol minX="180" maxX="210" minY="833" maxY="863" name="bus-s"/>
   <symbol minX="210" maxX="240" minY="833" maxY="863" name="military-s"/>
   <symbol minX="240" maxX="270" minY="833" maxY="863" name="toilets-s"/>
-  <symbol minX="270" maxX="300" minY="833" maxY="863" name="monument-s"/>
-  <symbol minX="300" maxX="330" minY="833" maxY="863" name="drinking-water-s"/>
-  <symbol minX="330" maxX="360" minY="833" maxY="863" name="toll_booth-s"/>
-  <symbol minX="360" maxX="390" minY="833" maxY="863" name="bowls-s"/>
-  <symbol minX="390" maxX="420" minY="833" maxY="863" name="park-s"/>
-  <symbol minX="420" maxX="450" minY="833" maxY="863" name="diving-s"/>
-  <symbol minX="450" maxX="480" minY="833" maxY="863" name="nparkf-s"/>
-  <symbol minX="480" maxX="510" minY="833" maxY="863" name="tourism-s"/>
-  <symbol minX="510" maxX="540" minY="833" maxY="863" name="tram-s"/>
-  <symbol minX="540" maxX="570" minY="833" maxY="863" name="book-shop-s"/>
-  <symbol minX="570" maxX="600" minY="833" maxY="863" name="npark-s"/>
-  <symbol minX="600" maxX="630" minY="833" maxY="863" name="grocery-s"/>
-  <symbol minX="630" maxX="660" minY="833" maxY="863" name="townhall-s"/>
-  <symbol minX="660" maxX="690" minY="833" maxY="863" name="motel-s"/>
-  <symbol minX="690" maxX="720" minY="833" maxY="863" name="museum-s"/>
-  <symbol minX="720" maxX="750" minY="833" maxY="863" name="bicycle-s"/>
-  <symbol minX="750" maxX="780" minY="833" maxY="863" name="train-s"/>
-  <symbol minX="780" maxX="820" minY="833" maxY="862" name="metro-barcelona-m"/>
-  <symbol minX="820" maxX="860" minY="833" maxY="862" name="subway-barcelona-l"/>
-  <symbol minX="860" maxX="900" minY="833" maxY="862" name="subway-barcelona-m"/>
-  <symbol minX="900" maxX="940" minY="833" maxY="862" name="subway-madrid-m"/>
-  <symbol minX="940" maxX="980" minY="833" maxY="862" name="subway-madrid-l"/>
-  <symbol minX="980" maxX="1008" minY="833" maxY="861" name="parking-m"/>
-  <symbol minX="0" maxX="27" minY="863" maxY="891" name="s-arrow"/>
-  <symbol minX="27" maxX="66" minY="863" maxY="890" name="subway-kiev-l"/>
-  <symbol minX="66" maxX="105" minY="863" maxY="890" name="subway-kiev-m"/>
-  <symbol minX="105" maxX="141" minY="863" maxY="890" name="subway-madrid-s"/>
-  <symbol minX="141" maxX="168" minY="863" maxY="890" name="peak-l"/>
-  <symbol minX="168" maxX="204" minY="863" maxY="890" name="metro-barcelona-s"/>
-  <symbol minX="204" maxX="231" minY="863" maxY="890" name="waste-basket-s"/>
-  <symbol minX="231" maxX="258" minY="863" maxY="890" name="subway-paris-s"/>
-  <symbol minX="258" maxX="285" minY="863" maxY="890" name="lightrail-berlin-s"/>
-  <symbol minX="285" maxX="310" minY="863" maxY="888" name="subway-moscow-s"/>
-  <symbol minX="310" maxX="334" minY="863" maxY="887" name="subway-rome-s"/>
-  <symbol minX="334" maxX="358" minY="863" maxY="887" name="parking-s"/>
-  <symbol minX="358" maxX="388" minY="863" maxY="887" name="subway-london-s"/>
-  <symbol minX="388" maxX="412" minY="863" maxY="887" name="speedcam-s"/>
-  <symbol minX="412" maxX="439" minY="863" maxY="887" name="bench"/>
-  <symbol minX="439" maxX="463" minY="863" maxY="887" name="subway-berlin-s"/>
-  <symbol minX="463" maxX="487" minY="863" maxY="885" name="peakt-l"/>
-  <symbol minX="487" maxX="526" minY="863" maxY="885" name="subway-minsk-l"/>
-  <symbol minX="526" maxX="548" minY="863" maxY="885" name="survey_point-l"/>
-  <symbol minX="548" maxX="570" minY="863" maxY="885" name="star-l"/>
-  <symbol minX="570" maxX="591" minY="863" maxY="884" name="star-m"/>
-  <symbol minX="591" maxX="624" minY="863" maxY="884" name="subway-kiev-s"/>
-  <symbol minX="624" maxX="643" minY="863" maxY="882" name="subway-newyork-xs"/>
-  <symbol minX="643" maxX="664" minY="863" maxY="882" name="peak-m"/>
-  <symbol minX="664" maxX="683" minY="863" maxY="882" name="subway-xs"/>
-  <symbol minX="683" maxX="713" minY="863" maxY="882" name="railway-crossing"/>
-  <symbol minX="713" maxX="732" minY="863" maxY="882" name="survey_point-m"/>
-  <symbol minX="732" maxX="765" minY="863" maxY="882" name="subway-minsk-m"/>
-  <symbol minX="765" maxX="795" minY="863" maxY="881" name="subway-minsk-s"/>
-  <symbol minX="795" maxX="813" minY="863" maxY="881" name="crossing-l"/>
-  <symbol minX="813" maxX="831" minY="863" maxY="881" name="star-s"/>
-  <symbol minX="831" maxX="847" minY="863" maxY="879" name="survey_point-s"/>
-  <symbol minX="847" maxX="883" minY="863" maxY="879" name="arrow-m"/>
-  <symbol minX="883" maxX="901" minY="863" maxY="879" name="peak-s"/>
-  <symbol minX="901" maxX="919" minY="863" maxY="879" name="peakt-m"/>
-  <symbol minX="919" maxX="934" minY="863" maxY="878" name="entrance-s"/>
-  <symbol minX="934" maxX="949" minY="863" maxY="878" name="crossing-m"/>
-  <symbol minX="949" maxX="964" minY="863" maxY="876" name="peakt-s"/>
-  <symbol minX="964" maxX="991" minY="863" maxY="875" name="arrow-s"/>
-  <symbol minX="991" maxX="1003" minY="863" maxY="875" name="tree-l"/>
-  <symbol minX="1003" maxX="1015" minY="863" maxY="875" name="dot-m"/>
+  <symbol minX="270" maxX="288" minY="833" maxY="863" name="parking-ticket-l"/>
+  <symbol minX="288" maxX="318" minY="833" maxY="863" name="monument-s"/>
+  <symbol minX="318" maxX="348" minY="833" maxY="863" name="toll_booth-s"/>
+  <symbol minX="348" maxX="378" minY="833" maxY="863" name="bowls-s"/>
+  <symbol minX="378" maxX="408" minY="833" maxY="863" name="drinking-water-s"/>
+  <symbol minX="408" maxX="438" minY="833" maxY="863" name="park-s"/>
+  <symbol minX="438" maxX="468" minY="833" maxY="863" name="diving-s"/>
+  <symbol minX="468" maxX="498" minY="833" maxY="863" name="tourism-s"/>
+  <symbol minX="498" maxX="528" minY="833" maxY="863" name="nparkf-s"/>
+  <symbol minX="528" maxX="558" minY="833" maxY="863" name="book-shop-s"/>
+  <symbol minX="558" maxX="588" minY="833" maxY="863" name="grocery-s"/>
+  <symbol minX="588" maxX="618" minY="833" maxY="863" name="npark-s"/>
+  <symbol minX="618" maxX="648" minY="833" maxY="863" name="townhall-s"/>
+  <symbol minX="648" maxX="678" minY="833" maxY="863" name="tram-s"/>
+  <symbol minX="678" maxX="708" minY="833" maxY="863" name="motel-s"/>
+  <symbol minX="708" maxX="738" minY="833" maxY="863" name="bicycle-s"/>
+  <symbol minX="738" maxX="768" minY="833" maxY="863" name="museum-s"/>
+  <symbol minX="768" maxX="798" minY="833" maxY="863" name="train-s"/>
+  <symbol minX="798" maxX="838" minY="833" maxY="862" name="metro-barcelona-m"/>
+  <symbol minX="838" maxX="878" minY="833" maxY="862" name="subway-madrid-m"/>
+  <symbol minX="878" maxX="918" minY="833" maxY="862" name="subway-madrid-l"/>
+  <symbol minX="918" maxX="958" minY="833" maxY="862" name="subway-barcelona-m"/>
+  <symbol minX="958" maxX="998" minY="833" maxY="862" name="subway-barcelona-l"/>
+  <symbol minX="0" maxX="28" minY="863" maxY="891" name="parking-m"/>
+  <symbol minX="28" maxX="55" minY="863" maxY="891" name="s-arrow"/>
+  <symbol minX="55" maxX="94" minY="863" maxY="890" name="subway-kiev-m"/>
+  <symbol minX="94" maxX="121" minY="863" maxY="890" name="lightrail-berlin-s"/>
+  <symbol minX="121" maxX="157" minY="863" maxY="890" name="subway-madrid-s"/>
+  <symbol minX="157" maxX="184" minY="863" maxY="890" name="peak-l"/>
+  <symbol minX="184" maxX="223" minY="863" maxY="890" name="subway-kiev-l"/>
+  <symbol minX="223" maxX="250" minY="863" maxY="890" name="subway-paris-s"/>
+  <symbol minX="250" maxX="286" minY="863" maxY="890" name="metro-barcelona-s"/>
+  <symbol minX="286" maxX="311" minY="863" maxY="888" name="subway-moscow-s"/>
+  <symbol minX="311" maxX="338" minY="863" maxY="887" name="bench"/>
+  <symbol minX="338" maxX="362" minY="863" maxY="887" name="parking-s"/>
+  <symbol minX="362" maxX="386" minY="863" maxY="887" name="subway-berlin-s"/>
+  <symbol minX="386" maxX="410" minY="863" maxY="887" name="subway-rome-s"/>
+  <symbol minX="410" maxX="440" minY="863" maxY="887" name="subway-london-s"/>
+  <symbol minX="440" maxX="464" minY="863" maxY="887" name="speedcam-s"/>
+  <symbol minX="464" maxX="486" minY="863" maxY="885" name="star-l"/>
+  <symbol minX="486" maxX="525" minY="863" maxY="885" name="subway-minsk-l"/>
+  <symbol minX="525" maxX="547" minY="863" maxY="885" name="survey_point-l"/>
+  <symbol minX="547" maxX="571" minY="863" maxY="885" name="peakt-l"/>
+  <symbol minX="571" maxX="592" minY="863" maxY="884" name="star-m"/>
+  <symbol minX="592" maxX="625" minY="863" maxY="884" name="subway-kiev-s"/>
+  <symbol minX="625" maxX="644" minY="863" maxY="882" name="subway-xs"/>
+  <symbol minX="644" maxX="674" minY="863" maxY="882" name="railway-crossing"/>
+  <symbol minX="674" maxX="693" minY="863" maxY="882" name="survey_point-m"/>
+  <symbol minX="693" maxX="712" minY="863" maxY="882" name="subway-newyork-xs"/>
+  <symbol minX="712" maxX="733" minY="863" maxY="882" name="peak-m"/>
+  <symbol minX="733" maxX="766" minY="863" maxY="882" name="subway-minsk-m"/>
+  <symbol minX="766" maxX="796" minY="863" maxY="881" name="subway-minsk-s"/>
+  <symbol minX="796" maxX="814" minY="863" maxY="881" name="star-s"/>
+  <symbol minX="814" maxX="832" minY="863" maxY="881" name="crossing-l"/>
+  <symbol minX="832" maxX="850" minY="863" maxY="879" name="peakt-m"/>
+  <symbol minX="850" maxX="886" minY="863" maxY="879" name="arrow-m"/>
+  <symbol minX="886" maxX="904" minY="863" maxY="879" name="peak-s"/>
+  <symbol minX="904" maxX="920" minY="863" maxY="879" name="survey_point-s"/>
+  <symbol minX="920" maxX="935" minY="863" maxY="878" name="entrance-s"/>
+  <symbol minX="935" maxX="950" minY="863" maxY="878" name="crossing-m"/>
+  <symbol minX="950" maxX="965" minY="863" maxY="876" name="peakt-s"/>
+  <symbol minX="965" maxX="977" minY="863" maxY="875" name="dot-m"/>
+  <symbol minX="977" maxX="989" minY="863" maxY="875" name="none"/>
+  <symbol minX="989" maxX="1016" minY="863" maxY="875" name="arrow-s"/>
   <symbol minX="0" maxX="12" minY="891" maxY="903" name="crossing-s"/>
-  <symbol minX="12" maxX="24" minY="891" maxY="903" name="none"/>
+  <symbol minX="12" maxX="24" minY="891" maxY="903" name="tree-l"/>
   <symbol minX="24" maxX="34" minY="891" maxY="901" name="tree-m"/>
   <symbol minX="34" maxX="44" minY="891" maxY="901" name="entrance-xs"/>
-  <symbol minX="44" maxX="53" minY="891" maxY="900" name="dot-s-light"/>
-  <symbol minX="53" maxX="62" minY="891" maxY="900" name="zero-icon"/>
-  <symbol minX="62" maxX="71" minY="891" maxY="900" name="tree-s"/>
+  <symbol minX="44" maxX="53" minY="891" maxY="900" name="tree-s"/>
+  <symbol minX="53" maxX="62" minY="891" maxY="900" name="dot-s-light"/>
+  <symbol minX="62" maxX="71" minY="891" maxY="900" name="zero-icon"/>
   <symbol minX="71" maxX="80" minY="891" maxY="900" name="dot-s"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 6abc463a34..e9fea3df3a 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 5452881775..75bef3be88 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -346,130 +346,131 @@
   <symbol minX="975" maxX="1014" minY="698" maxY="737" name="restaurant-m"/>
   <symbol minX="0" maxX="39" minY="737" maxY="776" name="charging-station-m"/>
   <symbol minX="39" maxX="75" minY="737" maxY="773" name="speedcam-l"/>
-  <symbol minX="75" maxX="111" minY="737" maxY="773" name="parking-ticket-l"/>
-  <symbol minX="111" maxX="147" minY="737" maxY="773" name="subway-berlin-l"/>
-  <symbol minX="147" maxX="183" minY="737" maxY="773" name="firehydrant-l"/>
-  <symbol minX="183" maxX="219" minY="737" maxY="773" name="waste-basket-l"/>
-  <symbol minX="219" maxX="255" minY="737" maxY="773" name="lightrail-berlin-m"/>
-  <symbol minX="255" maxX="291" minY="737" maxY="773" name="bike-parking-l"/>
-  <symbol minX="291" maxX="327" minY="737" maxY="773" name="parking-l"/>
-  <symbol minX="327" maxX="367" minY="737" maxY="773" name="subway-moscow-l"/>
-  <symbol minX="367" maxX="403" minY="737" maxY="773" name="subway-rome-l"/>
-  <symbol minX="403" maxX="436" minY="737" maxY="770" name="no-icon-tourism"/>
-  <symbol minX="436" maxX="469" minY="737" maxY="770" name="no-icon"/>
-  <symbol minX="469" maxX="502" minY="737" maxY="770" name="subway-rome-m"/>
-  <symbol minX="502" maxX="535" minY="737" maxY="770" name="no-icon-shop"/>
-  <symbol minX="535" maxX="568" minY="737" maxY="770" name="subway-paris-m"/>
-  <symbol minX="568" maxX="605" minY="737" maxY="770" name="subway-moscow-m"/>
-  <symbol minX="605" maxX="638" minY="737" maxY="770" name="no-icon-leisure"/>
-  <symbol minX="638" maxX="671" minY="737" maxY="770" name="no-icon-amenity"/>
-  <symbol minX="671" maxX="704" minY="737" maxY="770" name="subway-berlin-m"/>
-  <symbol minX="704" maxX="744" minY="737" maxY="769" name="subway-london-l"/>
-  <symbol minX="744" maxX="776" minY="737" maxY="769" name="api-result"/>
-  <symbol minX="776" maxX="808" minY="737" maxY="769" name="search-result"/>
-  <symbol minX="808" maxX="839" minY="737" maxY="768" name="airport-s"/>
-  <symbol minX="839" maxX="869" minY="737" maxY="767" name="npark-s"/>
-  <symbol minX="869" maxX="899" minY="737" maxY="767" name="museum-s"/>
-  <symbol minX="899" maxX="929" minY="737" maxY="767" name="skiing-s"/>
-  <symbol minX="929" maxX="959" minY="737" maxY="767" name="car-repair-s"/>
-  <symbol minX="959" maxX="989" minY="737" maxY="767" name="australian-football-s"/>
-  <symbol minX="989" maxX="1019" minY="737" maxY="767" name="soccer-s"/>
+  <symbol minX="75" maxX="111" minY="737" maxY="773" name="subway-berlin-l"/>
+  <symbol minX="111" maxX="147" minY="737" maxY="773" name="parking-l"/>
+  <symbol minX="147" maxX="183" minY="737" maxY="773" name="subway-rome-l"/>
+  <symbol minX="183" maxX="223" minY="737" maxY="773" name="subway-moscow-l"/>
+  <symbol minX="223" maxX="259" minY="737" maxY="773" name="waste-basket-l"/>
+  <symbol minX="259" maxX="295" minY="737" maxY="773" name="lightrail-berlin-m"/>
+  <symbol minX="295" maxX="331" minY="737" maxY="773" name="bike-parking-l"/>
+  <symbol minX="331" maxX="359" minY="737" maxY="771" name="firehydrant-l"/>
+  <symbol minX="359" maxX="392" minY="737" maxY="770" name="no-icon-leisure"/>
+  <symbol minX="392" maxX="425" minY="737" maxY="770" name="no-icon-shop"/>
+  <symbol minX="425" maxX="458" minY="737" maxY="770" name="no-icon-tourism"/>
+  <symbol minX="458" maxX="491" minY="737" maxY="770" name="no-icon"/>
+  <symbol minX="491" maxX="524" minY="737" maxY="770" name="subway-rome-m"/>
+  <symbol minX="524" maxX="557" minY="737" maxY="770" name="no-icon-amenity"/>
+  <symbol minX="557" maxX="590" minY="737" maxY="770" name="subway-paris-m"/>
+  <symbol minX="590" maxX="627" minY="737" maxY="770" name="subway-moscow-m"/>
+  <symbol minX="627" maxX="660" minY="737" maxY="770" name="waste-basket-s"/>
+  <symbol minX="660" maxX="693" minY="737" maxY="770" name="subway-berlin-m"/>
+  <symbol minX="693" maxX="733" minY="737" maxY="769" name="subway-london-l"/>
+  <symbol minX="733" maxX="765" minY="737" maxY="769" name="api-result"/>
+  <symbol minX="765" maxX="797" minY="737" maxY="769" name="search-result"/>
+  <symbol minX="797" maxX="828" minY="737" maxY="768" name="airport-s"/>
+  <symbol minX="828" maxX="858" minY="737" maxY="767" name="npark-s"/>
+  <symbol minX="858" maxX="888" minY="737" maxY="767" name="museum-s"/>
+  <symbol minX="888" maxX="918" minY="737" maxY="767" name="skiing-s"/>
+  <symbol minX="918" maxX="948" minY="737" maxY="767" name="car-repair-s"/>
+  <symbol minX="948" maxX="978" minY="737" maxY="767" name="australian-football-s"/>
+  <symbol minX="978" maxX="1008" minY="737" maxY="767" name="soccer-s"/>
   <symbol minX="0" maxX="30" minY="776" maxY="806" name="shop-s"/>
   <symbol minX="30" maxX="60" minY="776" maxY="806" name="speedcam-m"/>
   <symbol minX="60" maxX="90" minY="776" maxY="806" name="remains-s"/>
   <symbol minX="90" maxX="120" minY="776" maxY="806" name="peak-s"/>
-  <symbol minX="120" maxX="150" minY="776" maxY="806" name="shop-s copy"/>
-  <symbol minX="150" maxX="180" minY="776" maxY="806" name="restaurant-s"/>
-  <symbol minX="180" maxX="210" minY="776" maxY="806" name="golf-s"/>
-  <symbol minX="210" maxX="240" minY="776" maxY="806" name="grocery-s"/>
-  <symbol minX="240" maxX="270" minY="776" maxY="806" name="alcohol-s"/>
-  <symbol minX="270" maxX="300" minY="776" maxY="806" name="garden-s"/>
-  <symbol minX="300" maxX="336" minY="776" maxY="806" name="subway-barcelona-s"/>
-  <symbol minX="336" maxX="366" minY="776" maxY="806" name="cricket-s"/>
-  <symbol minX="366" maxX="396" minY="776" maxY="806" name="pharmacy-s"/>
-  <symbol minX="396" maxX="426" minY="776" maxY="806" name="gym-s"/>
-  <symbol minX="426" maxX="456" minY="776" maxY="806" name="alpine_hut-s"/>
-  <symbol minX="456" maxX="486" minY="776" maxY="806" name="subway-entrance-2-s"/>
-  <symbol minX="486" maxX="516" minY="776" maxY="806" name="subway-entrance-arrow"/>
-  <symbol minX="516" maxX="546" minY="776" maxY="806" name="curling-s"/>
-  <symbol minX="546" maxX="576" minY="776" maxY="806" name="gallery-s"/>
-  <symbol minX="576" maxX="606" minY="776" maxY="806" name="subway-entrance-s"/>
-  <symbol minX="606" maxX="636" minY="776" maxY="806" name="funicular-s"/>
-  <symbol minX="636" maxX="666" minY="776" maxY="806" name="america-football-s"/>
-  <symbol minX="666" maxX="696" minY="776" maxY="806" name="helipad-s"/>
-  <symbol minX="696" maxX="726" minY="776" maxY="806" name="campsite-s"/>
-  <symbol minX="726" maxX="756" minY="776" maxY="806" name="phone-s"/>
-  <symbol minX="756" maxX="795" minY="776" maxY="806" name="subway-london-m"/>
-  <symbol minX="795" maxX="825" minY="776" maxY="806" name="heliport-s"/>
-  <symbol minX="825" maxX="855" minY="776" maxY="806" name="picnic-s"/>
-  <symbol minX="855" maxX="885" minY="776" maxY="806" name="archery-s"/>
-  <symbol minX="885" maxX="915" minY="776" maxY="806" name="bar-s"/>
-  <symbol minX="915" maxX="945" minY="776" maxY="806" name="fuel-s"/>
-  <symbol minX="945" maxX="975" minY="776" maxY="806" name="atm-s copy 2"/>
-  <symbol minX="975" maxX="1005" minY="776" maxY="806" name="zoo-s"/>
-  <symbol minX="0" maxX="30" minY="806" maxY="836" name="hospital-s"/>
+  <symbol minX="120" maxX="138" minY="776" maxY="806" name="parking-ticket-l"/>
+  <symbol minX="138" maxX="168" minY="776" maxY="806" name="restaurant-s"/>
+  <symbol minX="168" maxX="198" minY="776" maxY="806" name="golf-s"/>
+  <symbol minX="198" maxX="228" minY="776" maxY="806" name="grocery-s"/>
+  <symbol minX="228" maxX="258" minY="776" maxY="806" name="alcohol-s"/>
+  <symbol minX="258" maxX="288" minY="776" maxY="806" name="garden-s"/>
+  <symbol minX="288" maxX="324" minY="776" maxY="806" name="subway-barcelona-s"/>
+  <symbol minX="324" maxX="354" minY="776" maxY="806" name="shop-s copy"/>
+  <symbol minX="354" maxX="384" minY="776" maxY="806" name="cricket-s"/>
+  <symbol minX="384" maxX="414" minY="776" maxY="806" name="gym-s"/>
+  <symbol minX="414" maxX="444" minY="776" maxY="806" name="alpine_hut-s"/>
+  <symbol minX="444" maxX="474" minY="776" maxY="806" name="subway-entrance-2-s"/>
+  <symbol minX="474" maxX="504" minY="776" maxY="806" name="subway-entrance-arrow"/>
+  <symbol minX="504" maxX="534" minY="776" maxY="806" name="curling-s"/>
+  <symbol minX="534" maxX="564" minY="776" maxY="806" name="gallery-s"/>
+  <symbol minX="564" maxX="594" minY="776" maxY="806" name="subway-entrance-s"/>
+  <symbol minX="594" maxX="624" minY="776" maxY="806" name="funicular-s"/>
+  <symbol minX="624" maxX="654" minY="776" maxY="806" name="america-football-s"/>
+  <symbol minX="654" maxX="684" minY="776" maxY="806" name="helipad-s"/>
+  <symbol minX="684" maxX="714" minY="776" maxY="806" name="campsite-s"/>
+  <symbol minX="714" maxX="744" minY="776" maxY="806" name="pharmacy-s"/>
+  <symbol minX="744" maxX="783" minY="776" maxY="806" name="subway-london-m"/>
+  <symbol minX="783" maxX="813" minY="776" maxY="806" name="heliport-s"/>
+  <symbol minX="813" maxX="843" minY="776" maxY="806" name="phone-s"/>
+  <symbol minX="843" maxX="873" minY="776" maxY="806" name="archery-s"/>
+  <symbol minX="873" maxX="903" minY="776" maxY="806" name="bar-s"/>
+  <symbol minX="903" maxX="933" minY="776" maxY="806" name="fuel-s"/>
+  <symbol minX="933" maxX="963" minY="776" maxY="806" name="atm-s copy 2"/>
+  <symbol minX="963" maxX="993" minY="776" maxY="806" name="zoo-s"/>
+  <symbol minX="993" maxX="1023" minY="776" maxY="806" name="hospital-s"/>
+  <symbol minX="0" maxX="30" minY="806" maxY="836" name="picnic-s"/>
   <symbol minX="30" maxX="60" minY="806" maxY="836" name="college-s"/>
-  <symbol minX="60" maxX="90" minY="806" maxY="836" name="pitch-s"/>
-  <symbol minX="90" maxX="120" minY="806" maxY="836" name="fountain-s"/>
-  <symbol minX="120" maxX="150" minY="806" maxY="836" name="park-s"/>
-  <symbol minX="150" maxX="180" minY="806" maxY="836" name="dentist-s"/>
-  <symbol minX="180" maxX="210" minY="806" maxY="836" name="subway-newyork-s"/>
-  <symbol minX="210" maxX="240" minY="806" maxY="836" name="windmill-s"/>
-  <symbol minX="240" maxX="270" minY="806" maxY="836" name="cafe-s"/>
-  <symbol minX="270" maxX="300" minY="806" maxY="836" name="place-of-worship-s"/>
-  <symbol minX="300" maxX="330" minY="806" maxY="836" name="hotel-s"/>
+  <symbol minX="60" maxX="90" minY="806" maxY="836" name="fountain-s"/>
+  <symbol minX="90" maxX="120" minY="806" maxY="836" name="park-s"/>
+  <symbol minX="120" maxX="150" minY="806" maxY="836" name="dentist-s"/>
+  <symbol minX="150" maxX="180" minY="806" maxY="836" name="subway-newyork-s"/>
+  <symbol minX="180" maxX="210" minY="806" maxY="836" name="windmill-s"/>
+  <symbol minX="210" maxX="240" minY="806" maxY="836" name="cafe-s"/>
+  <symbol minX="240" maxX="270" minY="806" maxY="836" name="pitch-s"/>
+  <symbol minX="270" maxX="300" minY="806" maxY="836" name="hotel-s"/>
+  <symbol minX="300" maxX="330" minY="806" maxY="836" name="place-of-worship-s"/>
   <symbol minX="330" maxX="360" minY="806" maxY="836" name="casino-s"/>
-  <symbol minX="360" maxX="390" minY="806" maxY="836" name="police-s"/>
-  <symbol minX="390" maxX="420" minY="806" maxY="836" name="baseball-s"/>
-  <symbol minX="420" maxX="450" minY="806" maxY="836" name="subway-s"/>
-  <symbol minX="450" maxX="480" minY="806" maxY="836" name="office-s"/>
-  <symbol minX="480" maxX="510" minY="806" maxY="836" name="nparkf-s"/>
-  <symbol minX="510" maxX="540" minY="806" maxY="836" name="subway-spb-s"/>
-  <symbol minX="540" maxX="570" minY="806" maxY="836" name="information-s"/>
-  <symbol minX="570" maxX="600" minY="806" maxY="836" name="cemetery-s"/>
-  <symbol minX="600" maxX="630" minY="806" maxY="836" name="fire_station-s"/>
-  <symbol minX="630" maxX="660" minY="806" maxY="836" name="basketball-s"/>
-  <symbol minX="660" maxX="690" minY="806" maxY="836" name="waterfall-s"/>
-  <symbol minX="690" maxX="720" minY="806" maxY="836" name="cable-car-s"/>
-  <symbol minX="720" maxX="750" minY="806" maxY="836" name="diving-s"/>
-  <symbol minX="750" maxX="780" minY="806" maxY="836" name="kindergarten-s"/>
-  <symbol minX="780" maxX="810" minY="806" maxY="836" name="fastfood-s"/>
-  <symbol minX="810" maxX="840" minY="806" maxY="836" name="swimming-s"/>
+  <symbol minX="360" maxX="390" minY="806" maxY="836" name="baseball-s"/>
+  <symbol minX="390" maxX="420" minY="806" maxY="836" name="subway-s"/>
+  <symbol minX="420" maxX="450" minY="806" maxY="836" name="office-s"/>
+  <symbol minX="450" maxX="480" minY="806" maxY="836" name="nparkf-s"/>
+  <symbol minX="480" maxX="510" minY="806" maxY="836" name="subway-spb-s"/>
+  <symbol minX="510" maxX="540" minY="806" maxY="836" name="information-s"/>
+  <symbol minX="540" maxX="570" minY="806" maxY="836" name="cemetery-s"/>
+  <symbol minX="570" maxX="600" minY="806" maxY="836" name="fire_station-s"/>
+  <symbol minX="600" maxX="630" minY="806" maxY="836" name="basketball-s"/>
+  <symbol minX="630" maxX="660" minY="806" maxY="836" name="waterfall-s"/>
+  <symbol minX="660" maxX="690" minY="806" maxY="836" name="cable-car-s"/>
+  <symbol minX="690" maxX="720" minY="806" maxY="836" name="diving-s"/>
+  <symbol minX="720" maxX="750" minY="806" maxY="836" name="kindergarten-s"/>
+  <symbol minX="750" maxX="780" minY="806" maxY="836" name="fastfood-s"/>
+  <symbol minX="780" maxX="810" minY="806" maxY="836" name="swimming-s"/>
+  <symbol minX="810" maxX="840" minY="806" maxY="836" name="police-s"/>
   <symbol minX="840" maxX="870" minY="806" maxY="836" name="climbing-s"/>
-  <symbol minX="870" maxX="900" minY="806" maxY="836" name="cinema-s"/>
-  <symbol minX="900" maxX="930" minY="806" maxY="836" name="bus-s"/>
-  <symbol minX="930" maxX="960" minY="806" maxY="836" name="pub-s"/>
-  <symbol minX="960" maxX="990" minY="806" maxY="836" name="tennis-s"/>
+  <symbol minX="870" maxX="900" minY="806" maxY="836" name="bus-s"/>
+  <symbol minX="900" maxX="930" minY="806" maxY="836" name="cinema-s"/>
+  <symbol minX="930" maxX="960" minY="806" maxY="836" name="tennis-s"/>
+  <symbol minX="960" maxX="990" minY="806" maxY="836" name="pub-s"/>
   <symbol minX="990" maxX="1020" minY="806" maxY="836" name="cave-s"/>
-  <symbol minX="0" maxX="30" minY="836" maxY="866" name="school-s"/>
-  <symbol minX="30" maxX="60" minY="836" maxY="866" name="theatre-s"/>
-  <symbol minX="60" maxX="90" minY="836" maxY="866" name="bowls-s"/>
-  <symbol minX="90" maxX="120" minY="836" maxY="866" name="ship-s"/>
-  <symbol minX="120" maxX="150" minY="836" maxY="866" name="charging-station-s"/>
-  <symbol minX="150" maxX="180" minY="836" maxY="866" name="motel-s"/>
-  <symbol minX="180" maxX="210" minY="836" maxY="866" name="toilets-s"/>
-  <symbol minX="210" maxX="240" minY="836" maxY="866" name="volcano-s"/>
-  <symbol minX="240" maxX="270" minY="836" maxY="866" name="monument-s"/>
-  <symbol minX="270" maxX="300" minY="836" maxY="866" name="toll_booth-s"/>
-  <symbol minX="300" maxX="330" minY="836" maxY="866" name="book-shop-s"/>
-  <symbol minX="330" maxX="360" minY="836" maxY="866" name="viewpoint-s"/>
-  <symbol minX="360" maxX="390" minY="836" maxY="866" name="military-s"/>
-  <symbol minX="390" maxX="420" minY="836" maxY="866" name="atm-s"/>
-  <symbol minX="420" maxX="450" minY="836" maxY="866" name="tourism-s"/>
-  <symbol minX="450" maxX="480" minY="836" maxY="866" name="bcontrol-s"/>
-  <symbol minX="480" maxX="510" minY="836" maxY="866" name="bicycle-s"/>
-  <symbol minX="510" maxX="540" minY="836" maxY="866" name="library-s"/>
-  <symbol minX="540" maxX="570" minY="836" maxY="866" name="embassy-s"/>
-  <symbol minX="570" maxX="600" minY="836" maxY="866" name="townhall-s"/>
-  <symbol minX="600" maxX="630" minY="836" maxY="866" name="beach-s"/>
-  <symbol minX="630" maxX="660" minY="836" maxY="866" name="marketplace-s"/>
-  <symbol minX="660" maxX="690" minY="836" maxY="866" name="beer-s"/>
-  <symbol minX="690" maxX="720" minY="836" maxY="866" name="drinking-water-s"/>
-  <symbol minX="720" maxX="750" minY="836" maxY="866" name="train-s"/>
-  <symbol minX="750" maxX="780" minY="836" maxY="866" name="mail-s"/>
-  <symbol minX="780" maxX="810" minY="836" maxY="866" name="lighthouse-s"/>
-  <symbol minX="810" maxX="840" minY="836" maxY="866" name="tram-s"/>
-  <symbol minX="840" maxX="870" minY="836" maxY="866" name="recycling-s"/>
+  <symbol minX="0" maxX="30" minY="836" maxY="866" name="theatre-s"/>
+  <symbol minX="30" maxX="60" minY="836" maxY="866" name="bowls-s"/>
+  <symbol minX="60" maxX="90" minY="836" maxY="866" name="ship-s"/>
+  <symbol minX="90" maxX="120" minY="836" maxY="866" name="charging-station-s"/>
+  <symbol minX="120" maxX="150" minY="836" maxY="866" name="motel-s"/>
+  <symbol minX="150" maxX="180" minY="836" maxY="866" name="toilets-s"/>
+  <symbol minX="180" maxX="210" minY="836" maxY="866" name="recycling-s"/>
+  <symbol minX="210" maxX="240" minY="836" maxY="866" name="monument-s"/>
+  <symbol minX="240" maxX="270" minY="836" maxY="866" name="toll_booth-s"/>
+  <symbol minX="270" maxX="300" minY="836" maxY="866" name="book-shop-s"/>
+  <symbol minX="300" maxX="330" minY="836" maxY="866" name="volcano-s"/>
+  <symbol minX="330" maxX="360" minY="836" maxY="866" name="military-s"/>
+  <symbol minX="360" maxX="390" minY="836" maxY="866" name="atm-s"/>
+  <symbol minX="390" maxX="420" minY="836" maxY="866" name="tourism-s"/>
+  <symbol minX="420" maxX="450" minY="836" maxY="866" name="school-s"/>
+  <symbol minX="450" maxX="480" minY="836" maxY="866" name="bicycle-s"/>
+  <symbol minX="480" maxX="510" minY="836" maxY="866" name="viewpoint-s"/>
+  <symbol minX="510" maxX="540" minY="836" maxY="866" name="bcontrol-s"/>
+  <symbol minX="540" maxX="570" minY="836" maxY="866" name="townhall-s"/>
+  <symbol minX="570" maxX="600" minY="836" maxY="866" name="library-s"/>
+  <symbol minX="600" maxX="630" minY="836" maxY="866" name="marketplace-s"/>
+  <symbol minX="630" maxX="660" minY="836" maxY="866" name="beer-s"/>
+  <symbol minX="660" maxX="690" minY="836" maxY="866" name="drinking-water-s"/>
+  <symbol minX="690" maxX="720" minY="836" maxY="866" name="train-s"/>
+  <symbol minX="720" maxX="750" minY="836" maxY="866" name="mail-s"/>
+  <symbol minX="750" maxX="780" minY="836" maxY="866" name="embassy-s"/>
+  <symbol minX="780" maxX="810" minY="836" maxY="866" name="tram-s"/>
+  <symbol minX="810" maxX="840" minY="836" maxY="866" name="beach-s"/>
+  <symbol minX="840" maxX="870" minY="836" maxY="866" name="lighthouse-s"/>
   <symbol minX="870" maxX="910" minY="836" maxY="865" name="subway-madrid-l"/>
   <symbol minX="910" maxX="950" minY="836" maxY="865" name="subway-madrid-m"/>
   <symbol minX="950" maxX="990" minY="836" maxY="865" name="subway-barcelona-m"/>
@@ -477,48 +478,47 @@
   <symbol minX="40" maxX="80" minY="866" maxY="895" name="metro-barcelona-m"/>
   <symbol minX="80" maxX="107" minY="866" maxY="894" name="s-arrow"/>
   <symbol minX="107" maxX="135" minY="866" maxY="894" name="parking-m"/>
-  <symbol minX="135" maxX="174" minY="866" maxY="893" name="subway-kiev-m"/>
-  <symbol minX="174" maxX="213" minY="866" maxY="893" name="subway-kiev-l"/>
-  <symbol minX="213" maxX="240" minY="866" maxY="893" name="subway-paris-s"/>
-  <symbol minX="240" maxX="276" minY="866" maxY="893" name="metro-barcelona-s"/>
-  <symbol minX="276" maxX="303" minY="866" maxY="893" name="lightrail-berlin-s"/>
+  <symbol minX="135" maxX="171" minY="866" maxY="893" name="metro-barcelona-s"/>
+  <symbol minX="171" maxX="210" minY="866" maxY="893" name="subway-kiev-l"/>
+  <symbol minX="210" maxX="237" minY="866" maxY="893" name="subway-paris-s"/>
+  <symbol minX="237" maxX="264" minY="866" maxY="893" name="lightrail-berlin-s"/>
+  <symbol minX="264" maxX="303" minY="866" maxY="893" name="subway-kiev-m"/>
   <symbol minX="303" maxX="339" minY="866" maxY="893" name="subway-madrid-s"/>
-  <symbol minX="339" maxX="366" minY="866" maxY="893" name="waste-basket-s"/>
-  <symbol minX="366" maxX="391" minY="866" maxY="891" name="subway-moscow-s"/>
-  <symbol minX="391" maxX="415" minY="866" maxY="890" name="parking-s"/>
-  <symbol minX="415" maxX="445" minY="866" maxY="890" name="subway-london-s"/>
-  <symbol minX="445" maxX="469" minY="866" maxY="890" name="subway-berlin-s"/>
-  <symbol minX="469" maxX="496" minY="866" maxY="890" name="bench"/>
-  <symbol minX="496" maxX="520" minY="866" maxY="890" name="star-l"/>
-  <symbol minX="520" maxX="544" minY="866" maxY="890" name="speedcam-s"/>
-  <symbol minX="544" maxX="568" minY="866" maxY="890" name="subway-rome-s"/>
-  <symbol minX="568" maxX="590" minY="866" maxY="888" name="star-m"/>
-  <symbol minX="590" maxX="614" minY="866" maxY="888" name="peakt-l"/>
-  <symbol minX="614" maxX="653" minY="866" maxY="888" name="subway-minsk-l"/>
-  <symbol minX="653" maxX="675" minY="866" maxY="888" name="survey_point-l"/>
-  <symbol minX="675" maxX="708" minY="866" maxY="887" name="subway-kiev-s"/>
-  <symbol minX="708" maxX="741" minY="866" maxY="885" name="subway-minsk-m"/>
-  <symbol minX="741" maxX="760" minY="866" maxY="885" name="survey_point-m"/>
-  <symbol minX="760" maxX="790" minY="866" maxY="885" name="railway-crossing"/>
-  <symbol minX="790" maxX="809" minY="866" maxY="885" name="subway-newyork-xs"/>
-  <symbol minX="809" maxX="828" minY="866" maxY="885" name="star-s"/>
-  <symbol minX="828" maxX="847" minY="866" maxY="885" name="subway-xs"/>
-  <symbol minX="847" maxX="877" minY="866" maxY="884" name="subway-minsk-s"/>
-  <symbol minX="877" maxX="895" minY="866" maxY="884" name="subway-xs copy"/>
-  <symbol minX="895" maxX="931" minY="866" maxY="882" name="arrow-m"/>
-  <symbol minX="931" maxX="949" minY="866" maxY="882" name="peakt-m"/>
-  <symbol minX="949" maxX="965" minY="866" maxY="882" name="survey_point-s"/>
-  <symbol minX="965" maxX="980" minY="866" maxY="881" name="entrance-s"/>
-  <symbol minX="980" maxX="995" minY="866" maxY="879" name="peakt-s"/>
-  <symbol minX="995" maxX="1008" minY="866" maxY="879" name="dot-m"/>
-  <symbol minX="1008" maxX="1020" minY="866" maxY="878" name="tree-l"/>
-  <symbol minX="0" maxX="12" minY="895" maxY="907" name="none"/>
-  <symbol minX="12" maxX="39" minY="895" maxY="907" name="arrow-s"/>
-  <symbol minX="39" maxX="49" minY="895" maxY="905" name="entrance-xs"/>
-  <symbol minX="49" maxX="59" minY="895" maxY="905" name="dot-s-light"/>
-  <symbol minX="59" maxX="69" minY="895" maxY="905" name="dot-s"/>
-  <symbol minX="69" maxX="79" minY="895" maxY="905" name="tree-m"/>
-  <symbol minX="79" maxX="88" minY="895" maxY="904" name="zero-icon"/>
-  <symbol minX="88" maxX="97" minY="895" maxY="904" name="tree-s"/>
+  <symbol minX="339" maxX="364" minY="866" maxY="891" name="subway-moscow-s"/>
+  <symbol minX="364" maxX="388" minY="866" maxY="890" name="parking-s"/>
+  <symbol minX="388" maxX="418" minY="866" maxY="890" name="subway-london-s"/>
+  <symbol minX="418" maxX="442" minY="866" maxY="890" name="speedcam-s"/>
+  <symbol minX="442" maxX="466" minY="866" maxY="890" name="subway-berlin-s"/>
+  <symbol minX="466" maxX="493" minY="866" maxY="890" name="bench"/>
+  <symbol minX="493" maxX="517" minY="866" maxY="890" name="star-l"/>
+  <symbol minX="517" maxX="541" minY="866" maxY="890" name="subway-rome-s"/>
+  <symbol minX="541" maxX="563" minY="866" maxY="888" name="star-m"/>
+  <symbol minX="563" maxX="587" minY="866" maxY="888" name="peakt-l"/>
+  <symbol minX="587" maxX="626" minY="866" maxY="888" name="subway-minsk-l"/>
+  <symbol minX="626" maxX="648" minY="866" maxY="888" name="survey_point-l"/>
+  <symbol minX="648" maxX="681" minY="866" maxY="887" name="subway-kiev-s"/>
+  <symbol minX="681" maxX="714" minY="866" maxY="885" name="subway-minsk-m"/>
+  <symbol minX="714" maxX="733" minY="866" maxY="885" name="subway-xs"/>
+  <symbol minX="733" maxX="752" minY="866" maxY="885" name="star-s"/>
+  <symbol minX="752" maxX="771" minY="866" maxY="885" name="survey_point-m"/>
+  <symbol minX="771" maxX="801" minY="866" maxY="885" name="railway-crossing"/>
+  <symbol minX="801" maxX="820" minY="866" maxY="885" name="subway-newyork-xs"/>
+  <symbol minX="820" maxX="838" minY="866" maxY="884" name="subway-xs copy"/>
+  <symbol minX="838" maxX="868" minY="866" maxY="884" name="subway-minsk-s"/>
+  <symbol minX="868" maxX="904" minY="866" maxY="882" name="arrow-m"/>
+  <symbol minX="904" maxX="922" minY="866" maxY="882" name="peakt-m"/>
+  <symbol minX="922" maxX="938" minY="866" maxY="882" name="survey_point-s"/>
+  <symbol minX="938" maxX="953" minY="866" maxY="881" name="entrance-s"/>
+  <symbol minX="953" maxX="968" minY="866" maxY="879" name="peakt-s"/>
+  <symbol minX="968" maxX="981" minY="866" maxY="879" name="dot-m"/>
+  <symbol minX="981" maxX="993" minY="866" maxY="878" name="tree-l"/>
+  <symbol minX="993" maxX="1005" minY="866" maxY="878" name="none"/>
+  <symbol minX="0" maxX="27" minY="895" maxY="907" name="arrow-s"/>
+  <symbol minX="27" maxX="37" minY="895" maxY="905" name="dot-s"/>
+  <symbol minX="37" maxX="47" minY="895" maxY="905" name="entrance-xs"/>
+  <symbol minX="47" maxX="57" minY="895" maxY="905" name="dot-s-light"/>
+  <symbol minX="57" maxX="67" minY="895" maxY="905" name="tree-m"/>
+  <symbol minX="67" maxX="76" minY="895" maxY="904" name="zero-icon"/>
+  <symbol minX="76" maxX="85" minY="895" maxY="904" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_legacy/symbols.png b/data/resources-xhdpi_legacy/symbols.png
index 95ef8639e8..0d1085744c 100644
Binary files a/data/resources-xhdpi_legacy/symbols.png and b/data/resources-xhdpi_legacy/symbols.png differ
diff --git a/data/resources-xhdpi_legacy/symbols.sdf b/data/resources-xhdpi_legacy/symbols.sdf
index c45a79adea..d3f5b70d7c 100644
--- a/data/resources-xhdpi_legacy/symbols.sdf
+++ b/data/resources-xhdpi_legacy/symbols.sdf
@@ -1,183 +1,183 @@
 <!DOCTYPE skin>
 <root>
  <file height="512" width="1024">
-  <symbol name="route_to" minX="0" maxX="138" minY="0" maxY="138"/>
-  <symbol name="route-arrow" minX="138" maxX="408" minY="0" maxY="132"/>
-  <symbol name="compass-image" minX="408" maxX="524" minY="0" maxY="116"/>
-  <symbol name="watch-search-result" minX="524" maxX="582" minY="0" maxY="79"/>
-  <symbol name="current-position-compas" minX="582" maxX="640" minY="0" maxY="74"/>
-  <symbol name="current-position-obsolete" minX="640" maxX="698" minY="0" maxY="74"/>
-  <symbol name="current-routing-compas" minX="698" maxX="756" minY="0" maxY="74"/>
-  <symbol name="watch-my-direction" minX="756" maxX="820" minY="0" maxY="70"/>
-  <symbol name="search-result-active" minX="820" maxX="886" minY="0" maxY="66"/>
-  <symbol name="placemark-purple" minX="886" maxX="916" minY="0" maxY="58"/>
-  <symbol name="placemark-orange" minX="916" maxX="946" minY="0" maxY="58"/>
-  <symbol name="placemark-green" minX="946" maxX="976" minY="0" maxY="58"/>
-  <symbol name="placemark-brown" minX="976" maxX="1006" minY="0" maxY="58"/>
-  <symbol name="placemark-blue" minX="0" maxX="30" minY="138" maxY="196"/>
-  <symbol name="placemark-red" minX="30" maxX="60" minY="138" maxY="196"/>
-  <symbol name="placemark-yellow" minX="60" maxX="90" minY="138" maxY="196"/>
-  <symbol name="placemark-pink" minX="90" maxX="120" minY="138" maxY="196"/>
-  <symbol name="watch-my-position" minX="120" maxX="172" minY="138" maxY="190"/>
-  <symbol name="bird" minX="172" maxX="212" minY="138" maxY="178"/>
-  <symbol name="bowls-borderless" minX="212" maxX="252" minY="138" maxY="178"/>
-  <symbol name="bowls" minX="252" maxX="292" minY="138" maxY="178"/>
-  <symbol name="alpine_hut" minX="292" maxX="332" minY="138" maxY="178"/>
-  <symbol name="archery-borderless" minX="332" maxX="372" minY="138" maxY="178"/>
-  <symbol name="bus-mini" minX="372" maxX="412" minY="138" maxY="178"/>
-  <symbol name="bus" minX="412" maxX="452" minY="138" maxY="178"/>
-  <symbol name="bus_sta" minX="452" maxX="492" minY="138" maxY="178"/>
-  <symbol name="cafe" minX="492" maxX="532" minY="138" maxY="178"/>
-  <symbol name="campsite" minX="532" maxX="572" minY="138" maxY="178"/>
-  <symbol name="cannon" minX="572" maxX="612" minY="138" maxY="178"/>
-  <symbol name="car_rental" minX="612" maxX="652" minY="138" maxY="178"/>
-  <symbol name="car_repair" minX="652" maxX="692" minY="138" maxY="178"/>
-  <symbol name="archery" minX="692" maxX="732" minY="138" maxY="178"/>
-  <symbol name="castle" minX="732" maxX="772" minY="138" maxY="178"/>
-  <symbol name="arrow" minX="772" maxX="812" minY="138" maxY="178"/>
-  <symbol name="athletics-borderless" minX="812" maxX="852" minY="138" maxY="178"/>
-  <symbol name="cinema" minX="852" maxX="892" minY="138" maxY="178"/>
-  <symbol name="clothes" minX="892" maxX="932" minY="138" maxY="178"/>
-  <symbol name="cricket-borderless" minX="932" maxX="972" minY="138" maxY="178"/>
-  <symbol name="cricket" minX="972" maxX="1012" minY="138" maxY="178"/>
-  <symbol name="curling-borderless" minX="0" maxX="40" minY="196" maxY="236"/>
-  <symbol name="curling" minX="40" maxX="80" minY="196" maxY="236"/>
-  <symbol name="athletics" minX="80" maxX="120" minY="196" maxY="236"/>
-  <symbol name="diving-borderless" minX="120" maxX="160" minY="196" maxY="236"/>
-  <symbol name="diving" minX="160" maxX="200" minY="196" maxY="236"/>
-  <symbol name="atm" minX="200" maxX="240" minY="196" maxY="236"/>
-  <symbol name="dog_park" minX="240" maxX="280" minY="196" maxY="236"/>
-  <symbol name="bakery" minX="280" maxX="320" minY="196" maxY="236"/>
-  <symbol name="earthquake-camp" minX="320" maxX="360" minY="196" maxY="236"/>
-  <symbol name="bar" minX="360" maxX="400" minY="196" maxY="236"/>
-  <symbol name="equestrian-borderless" minX="400" maxX="440" minY="196" maxY="236"/>
-  <symbol name="equestrian" minX="440" maxX="480" minY="196" maxY="236"/>
-  <symbol name="fastfood" minX="480" maxX="520" minY="196" maxY="236"/>
-  <symbol name="firebrigade" minX="520" maxX="560" minY="196" maxY="236"/>
-  <symbol name="football-borderless" minX="560" maxX="600" minY="196" maxY="236"/>
-  <symbol name="football" minX="600" maxX="640" minY="196" maxY="236"/>
-  <symbol name="fountain" minX="640" maxX="680" minY="196" maxY="236"/>
-  <symbol name="gate" minX="680" maxX="720" minY="196" maxY="236"/>
-  <symbol name="golf-course" minX="720" maxX="760" minY="196" maxY="236"/>
-  <symbol name="gymnastics-borderless" minX="760" maxX="800" minY="196" maxY="236"/>
-  <symbol name="gymnastics" minX="800" maxX="840" minY="196" maxY="236"/>
-  <symbol name="hairdresser" minX="840" maxX="880" minY="196" maxY="236"/>
-  <symbol name="handball-borderless" minX="880" maxX="920" minY="196" maxY="236"/>
-  <symbol name="handball" minX="920" maxX="960" minY="196" maxY="236"/>
-  <symbol name="helipad" minX="960" maxX="1000" minY="196" maxY="236"/>
-  <symbol name="hospital" minX="0" maxX="40" minY="236" maxY="276"/>
-  <symbol name="hostel" minX="40" maxX="80" minY="236" maxY="276"/>
-  <symbol name="hotel" minX="80" maxX="120" minY="236" maxY="276"/>
-  <symbol name="barrier" minX="120" maxX="160" minY="236" maxY="276"/>
-  <symbol name="hunting_closed_high" minX="160" maxX="200" minY="236" maxY="276"/>
-  <symbol name="information-guidepost" minX="200" maxX="240" minY="236" maxY="276"/>
-  <symbol name="information-office" minX="240" maxX="280" minY="236" maxY="276"/>
-  <symbol name="information" minX="280" maxX="320" minY="236" maxY="276"/>
-  <symbol name="baseball-borderless" minX="320" maxX="360" minY="236" maxY="276"/>
-  <symbol name="kindergarten" minX="360" maxX="400" minY="236" maxY="276"/>
-  <symbol name="kindergarten2" minX="400" maxX="440" minY="236" maxY="276"/>
-  <symbol name="kiosk" minX="440" maxX="480" minY="236" maxY="276"/>
-  <symbol name="library" minX="480" maxX="520" minY="236" maxY="276"/>
-  <symbol name="baseball" minX="520" maxX="560" minY="236" maxY="276"/>
-  <symbol name="man-made-halfpipe" minX="560" maxX="600" minY="236" maxY="276"/>
-  <symbol name="memorial" minX="600" maxX="640" minY="236" maxY="276"/>
-  <symbol name="basketball" minX="640" maxX="680" minY="236" maxY="276"/>
-  <symbol name="mountain_pass" minX="680" maxX="720" minY="236" maxY="276"/>
-  <symbol name="museum" minX="720" maxX="760" minY="236" maxY="276"/>
-  <symbol name="bicycle_rental" minX="760" maxX="800" minY="236" maxY="276"/>
-  <symbol name="university" minX="800" maxX="840" minY="236" maxY="276"/>
-  <symbol name="parking-mini" minX="840" maxX="880" minY="236" maxY="276"/>
-  <symbol name="tramway" minX="880" maxX="920" minY="236" maxY="276"/>
-  <symbol name="tramway-mini" minX="920" maxX="960" minY="236" maxY="276"/>
-  <symbol name="parking" minX="960" maxX="1000" minY="236" maxY="276"/>
-  <symbol name="airport" minX="0" maxX="40" minY="276" maxY="316"/>
-  <symbol name="toilets" minX="40" maxX="80" minY="276" maxY="316"/>
-  <symbol name="theatre" minX="80" maxX="120" minY="276" maxY="316"/>
-  <symbol name="parking_roof" minX="120" maxX="160" minY="276" maxY="316"/>
-  <symbol name="tennis" minX="160" maxX="200" minY="276" maxY="316"/>
-  <symbol name="tennis-borderless" minX="200" maxX="240" minY="276" maxY="316"/>
-  <symbol name="peak-mini" minX="240" maxX="280" minY="276" maxY="316"/>
-  <symbol name="peak" minX="280" maxX="320" minY="276" maxY="316"/>
-  <symbol name="petrolstation" minX="320" maxX="360" minY="276" maxY="316"/>
-  <symbol name="pharmacy" minX="360" maxX="400" minY="276" maxY="316"/>
-  <symbol name="telephone" minX="400" maxX="440" minY="276" maxY="316"/>
-  <symbol name="playground" minX="440" maxX="480" minY="276" maxY="316"/>
-  <symbol name="police" minX="480" maxX="520" minY="276" maxY="316"/>
-  <symbol name="postbox" minX="520" maxX="560" minY="276" maxY="316"/>
-  <symbol name="postoffice" minX="560" maxX="600" minY="276" maxY="316"/>
-  <symbol name="taxi" minX="600" maxX="640" minY="276" maxY="316"/>
-  <symbol name="synagogue" minX="640" maxX="680" minY="276" maxY="316"/>
-  <symbol name="swimming" minX="680" maxX="720" minY="276" maxY="316"/>
-  <symbol name="swimming-borderless" minX="720" maxX="760" minY="276" maxY="316"/>
-  <symbol name="supermarket" minX="760" maxX="800" minY="276" maxY="316"/>
-  <symbol name="subway" minX="800" maxX="840" minY="276" maxY="316"/>
-  <symbol name="pub" minX="840" maxX="880" minY="276" maxY="316"/>
-  <symbol name="pubx" minX="880" maxX="920" minY="276" maxY="316"/>
-  <symbol name="railway-crossing-small" minX="920" maxX="960" minY="276" maxY="316"/>
-  <symbol name="railway-crossing" minX="960" maxX="1000" minY="276" maxY="316"/>
-  <symbol name="railway-station-mini" minX="0" maxX="40" minY="316" maxY="356"/>
-  <symbol name="railway-station" minX="40" maxX="80" minY="316" maxY="356"/>
-  <symbol name="recycling" minX="80" maxX="120" minY="316" maxY="356"/>
-  <symbol name="religion" minX="120" maxX="160" minY="316" maxY="356"/>
-  <symbol name="restaurant" minX="160" maxX="200" minY="316" maxY="356"/>
-  <symbol name="subway-station-s" minX="200" maxX="240" minY="316" maxY="356"/>
-  <symbol name="subway-station-m" minX="240" maxX="280" minY="316" maxY="356"/>
-  <symbol name="ruins" minX="280" maxX="320" minY="316" maxY="356"/>
-  <symbol name="school" minX="320" maxX="360" minY="316" maxY="356"/>
-  <symbol name="shelter-fireplace" minX="360" maxX="400" minY="316" maxY="356"/>
-  <symbol name="shelter" minX="400" maxX="440" minY="316" maxY="356"/>
-  <symbol name="shooting-borderless" minX="440" maxX="480" minY="316" maxY="356"/>
-  <symbol name="shooting" minX="480" maxX="520" minY="316" maxY="356"/>
-  <symbol name="slipway" minX="520" maxX="560" minY="316" maxY="356"/>
-  <symbol name="soccer-borderless" minX="560" maxX="600" minY="316" maxY="356"/>
-  <symbol name="soccer" minX="600" maxX="640" minY="316" maxY="356"/>
-  <symbol name="subway-station-l" minX="640" maxX="680" minY="316" maxY="356"/>
-  <symbol name="basketball-borderless" minX="680" maxX="720" minY="316" maxY="354"/>
-  <symbol name="khanda" minX="720" maxX="757" minY="316" maxY="353"/>
-  <symbol name="parking-permissive" minX="757" maxX="791" minY="316" maxY="350"/>
-  <symbol name="parking-private" minX="791" maxX="825" minY="316" maxY="350"/>
-  <symbol name="current-position" minX="825" maxX="857" minY="316" maxY="348"/>
-  <symbol name="drinking_water" minX="857" maxX="888" minY="316" maxY="347"/>
-  <symbol name="bank" minX="888" maxX="919" minY="316" maxY="347"/>
-  <symbol name="embassy" minX="919" maxX="950" minY="316" maxY="347"/>
-  <symbol name="housenumber" minX="950" maxX="981" minY="316" maxY="347"/>
-  <symbol name="roundabout_left" minX="981" maxX="1012" minY="316" maxY="347"/>
-  <symbol name="roundabout_right" minX="0" maxX="31" minY="356" maxY="387"/>
-  <symbol name="doctor" minX="31" maxX="62" minY="356" maxY="387"/>
-  <symbol name="mosque" minX="62" maxX="93" minY="356" maxY="387"/>
-  <symbol name="parking_roof-permissive" minX="93" maxX="124" minY="356" maxY="387"/>
-  <symbol name="windmill" minX="124" maxX="155" minY="356" maxY="387"/>
-  <symbol name="traffic_signal" minX="155" maxX="186" minY="356" maxY="387"/>
-  <symbol name="church" minX="186" maxX="217" minY="356" maxY="387"/>
-  <symbol name="speed_trap" minX="217" maxX="248" minY="356" maxY="387"/>
-  <symbol name="waterfall" minX="248" maxX="276" minY="356" maxY="384"/>
-  <symbol name="bureau_de_change" minX="276" maxX="304" minY="356" maxY="384"/>
-  <symbol name="viewpoint" minX="304" maxX="332" minY="356" maxY="384"/>
-  <symbol name="power_generic" minX="332" maxX="360" minY="356" maxY="384"/>
-  <symbol name="wastewater" minX="360" maxX="388" minY="356" maxY="384"/>
-  <symbol name="power_hydro" minX="388" maxX="416" minY="356" maxY="384"/>
-  <symbol name="cave_entrance" minX="416" maxX="444" minY="356" maxY="384"/>
-  <symbol name="lighthouse" minX="444" maxX="472" minY="356" maxY="384"/>
-  <symbol name="route_from" minX="472" maxX="500" minY="356" maxY="384"/>
-  <symbol name="power_wind" minX="500" maxX="528" minY="356" maxY="384"/>
-  <symbol name="power_photovoltaic" minX="528" maxX="556" minY="356" maxY="384"/>
-  <symbol name="car_sharing" minX="556" maxX="584" minY="356" maxY="383"/>
-  <symbol name="api-result" minX="584" maxX="609" minY="356" maxY="381"/>
-  <symbol name="search-result" minX="609" maxX="633" minY="356" maxY="380"/>
-  <symbol name="parking_fee-permissive" minX="633" maxX="673" minY="356" maxY="378"/>
-  <symbol name="park_and_ride-permissive" minX="673" maxX="713" minY="356" maxY="378"/>
-  <symbol name="picnic" minX="713" maxX="735" minY="356" maxY="378"/>
-  <symbol name="parking_roof_fee" minX="735" maxX="775" minY="356" maxY="378"/>
-  <symbol name="park_and_ride" minX="775" maxX="815" minY="356" maxY="378"/>
-  <symbol name="parking_roof_fee-permissive" minX="815" maxX="855" minY="356" maxY="378"/>
-  <symbol name="parking_fee" minX="855" maxX="895" minY="356" maxY="378"/>
-  <symbol name="bench" minX="895" maxX="917" minY="356" maxY="378"/>
-  <symbol name="power-tower" minX="917" maxX="935" minY="356" maxY="374"/>
-  <symbol name="disused" minX="935" maxX="953" minY="356" maxY="374"/>
-  <symbol name="vulcan" minX="953" maxX="971" minY="356" maxY="374"/>
-  <symbol name="building" minX="971" maxX="989" minY="356" maxY="374"/>
-  <symbol name="survey_point" minX="989" maxX="1005" minY="356" maxY="372"/>
-  <symbol name="power-pole" minX="1005" maxX="1017" minY="356" maxY="368"/>
-  <symbol name="tree" minX="0" maxX="10" minY="387" maxY="397"/>
+  <symbol minX="0" maxX="138" minY="0" maxY="138" name="route_to"/>
+  <symbol minX="138" maxX="408" minY="0" maxY="132" name="route-arrow"/>
+  <symbol minX="408" maxX="524" minY="0" maxY="116" name="compass-image"/>
+  <symbol minX="524" maxX="582" minY="0" maxY="79" name="watch-search-result"/>
+  <symbol minX="582" maxX="640" minY="0" maxY="74" name="current-position-compas"/>
+  <symbol minX="640" maxX="698" minY="0" maxY="74" name="current-position-obsolete"/>
+  <symbol minX="698" maxX="756" minY="0" maxY="74" name="current-routing-compas"/>
+  <symbol minX="756" maxX="820" minY="0" maxY="70" name="watch-my-direction"/>
+  <symbol minX="820" maxX="886" minY="0" maxY="66" name="search-result-active"/>
+  <symbol minX="886" maxX="916" minY="0" maxY="58" name="placemark-purple"/>
+  <symbol minX="916" maxX="946" minY="0" maxY="58" name="placemark-orange"/>
+  <symbol minX="946" maxX="976" minY="0" maxY="58" name="placemark-green"/>
+  <symbol minX="976" maxX="1006" minY="0" maxY="58" name="placemark-brown"/>
+  <symbol minX="0" maxX="30" minY="138" maxY="196" name="placemark-blue"/>
+  <symbol minX="30" maxX="60" minY="138" maxY="196" name="placemark-red"/>
+  <symbol minX="60" maxX="90" minY="138" maxY="196" name="placemark-yellow"/>
+  <symbol minX="90" maxX="120" minY="138" maxY="196" name="placemark-pink"/>
+  <symbol minX="120" maxX="172" minY="138" maxY="190" name="watch-my-position"/>
+  <symbol minX="172" maxX="212" minY="138" maxY="178" name="bird"/>
+  <symbol minX="212" maxX="252" minY="138" maxY="178" name="bowls-borderless"/>
+  <symbol minX="252" maxX="292" minY="138" maxY="178" name="bowls"/>
+  <symbol minX="292" maxX="332" minY="138" maxY="178" name="alpine_hut"/>
+  <symbol minX="332" maxX="372" minY="138" maxY="178" name="archery-borderless"/>
+  <symbol minX="372" maxX="412" minY="138" maxY="178" name="bus-mini"/>
+  <symbol minX="412" maxX="452" minY="138" maxY="178" name="bus"/>
+  <symbol minX="452" maxX="492" minY="138" maxY="178" name="bus_sta"/>
+  <symbol minX="492" maxX="532" minY="138" maxY="178" name="cafe"/>
+  <symbol minX="532" maxX="572" minY="138" maxY="178" name="campsite"/>
+  <symbol minX="572" maxX="612" minY="138" maxY="178" name="cannon"/>
+  <symbol minX="612" maxX="652" minY="138" maxY="178" name="car_rental"/>
+  <symbol minX="652" maxX="692" minY="138" maxY="178" name="car_repair"/>
+  <symbol minX="692" maxX="732" minY="138" maxY="178" name="archery"/>
+  <symbol minX="732" maxX="772" minY="138" maxY="178" name="castle"/>
+  <symbol minX="772" maxX="812" minY="138" maxY="178" name="arrow"/>
+  <symbol minX="812" maxX="852" minY="138" maxY="178" name="athletics-borderless"/>
+  <symbol minX="852" maxX="892" minY="138" maxY="178" name="cinema"/>
+  <symbol minX="892" maxX="932" minY="138" maxY="178" name="clothes"/>
+  <symbol minX="932" maxX="972" minY="138" maxY="178" name="cricket-borderless"/>
+  <symbol minX="972" maxX="1012" minY="138" maxY="178" name="cricket"/>
+  <symbol minX="0" maxX="40" minY="196" maxY="236" name="curling-borderless"/>
+  <symbol minX="40" maxX="80" minY="196" maxY="236" name="curling"/>
+  <symbol minX="80" maxX="120" minY="196" maxY="236" name="athletics"/>
+  <symbol minX="120" maxX="160" minY="196" maxY="236" name="diving-borderless"/>
+  <symbol minX="160" maxX="200" minY="196" maxY="236" name="diving"/>
+  <symbol minX="200" maxX="240" minY="196" maxY="236" name="atm"/>
+  <symbol minX="240" maxX="280" minY="196" maxY="236" name="dog_park"/>
+  <symbol minX="280" maxX="320" minY="196" maxY="236" name="bakery"/>
+  <symbol minX="320" maxX="360" minY="196" maxY="236" name="earthquake-camp"/>
+  <symbol minX="360" maxX="400" minY="196" maxY="236" name="bar"/>
+  <symbol minX="400" maxX="440" minY="196" maxY="236" name="equestrian-borderless"/>
+  <symbol minX="440" maxX="480" minY="196" maxY="236" name="equestrian"/>
+  <symbol minX="480" maxX="520" minY="196" maxY="236" name="fastfood"/>
+  <symbol minX="520" maxX="560" minY="196" maxY="236" name="firebrigade"/>
+  <symbol minX="560" maxX="600" minY="196" maxY="236" name="football-borderless"/>
+  <symbol minX="600" maxX="640" minY="196" maxY="236" name="football"/>
+  <symbol minX="640" maxX="680" minY="196" maxY="236" name="fountain"/>
+  <symbol minX="680" maxX="720" minY="196" maxY="236" name="gate"/>
+  <symbol minX="720" maxX="760" minY="196" maxY="236" name="golf-course"/>
+  <symbol minX="760" maxX="800" minY="196" maxY="236" name="gymnastics-borderless"/>
+  <symbol minX="800" maxX="840" minY="196" maxY="236" name="gymnastics"/>
+  <symbol minX="840" maxX="880" minY="196" maxY="236" name="hairdresser"/>
+  <symbol minX="880" maxX="920" minY="196" maxY="236" name="handball-borderless"/>
+  <symbol minX="920" maxX="960" minY="196" maxY="236" name="handball"/>
+  <symbol minX="960" maxX="1000" minY="196" maxY="236" name="helipad"/>
+  <symbol minX="0" maxX="40" minY="236" maxY="276" name="hospital"/>
+  <symbol minX="40" maxX="80" minY="236" maxY="276" name="hostel"/>
+  <symbol minX="80" maxX="120" minY="236" maxY="276" name="hotel"/>
+  <symbol minX="120" maxX="160" minY="236" maxY="276" name="barrier"/>
+  <symbol minX="160" maxX="200" minY="236" maxY="276" name="hunting_closed_high"/>
+  <symbol minX="200" maxX="240" minY="236" maxY="276" name="information-guidepost"/>
+  <symbol minX="240" maxX="280" minY="236" maxY="276" name="information-office"/>
+  <symbol minX="280" maxX="320" minY="236" maxY="276" name="information"/>
+  <symbol minX="320" maxX="360" minY="236" maxY="276" name="baseball-borderless"/>
+  <symbol minX="360" maxX="400" minY="236" maxY="276" name="kindergarten"/>
+  <symbol minX="400" maxX="440" minY="236" maxY="276" name="kindergarten2"/>
+  <symbol minX="440" maxX="480" minY="236" maxY="276" name="kiosk"/>
+  <symbol minX="480" maxX="520" minY="236" maxY="276" name="library"/>
+  <symbol minX="520" maxX="560" minY="236" maxY="276" name="baseball"/>
+  <symbol minX="560" maxX="600" minY="236" maxY="276" name="man-made-halfpipe"/>
+  <symbol minX="600" maxX="640" minY="236" maxY="276" name="memorial"/>
+  <symbol minX="640" maxX="680" minY="236" maxY="276" name="basketball"/>
+  <symbol minX="680" maxX="720" minY="236" maxY="276" name="mountain_pass"/>
+  <symbol minX="720" maxX="760" minY="236" maxY="276" name="museum"/>
+  <symbol minX="760" maxX="800" minY="236" maxY="276" name="bicycle_rental"/>
+  <symbol minX="800" maxX="840" minY="236" maxY="276" name="university"/>
+  <symbol minX="840" maxX="880" minY="236" maxY="276" name="parking-mini"/>
+  <symbol minX="880" maxX="920" minY="236" maxY="276" name="tramway"/>
+  <symbol minX="920" maxX="960" minY="236" maxY="276" name="tramway-mini"/>
+  <symbol minX="960" maxX="1000" minY="236" maxY="276" name="parking"/>
+  <symbol minX="0" maxX="40" minY="276" maxY="316" name="airport"/>
+  <symbol minX="40" maxX="80" minY="276" maxY="316" name="toilets"/>
+  <symbol minX="80" maxX="120" minY="276" maxY="316" name="theatre"/>
+  <symbol minX="120" maxX="160" minY="276" maxY="316" name="parking_roof"/>
+  <symbol minX="160" maxX="200" minY="276" maxY="316" name="tennis"/>
+  <symbol minX="200" maxX="240" minY="276" maxY="316" name="tennis-borderless"/>
+  <symbol minX="240" maxX="280" minY="276" maxY="316" name="peak-mini"/>
+  <symbol minX="280" maxX="320" minY="276" maxY="316" name="peak"/>
+  <symbol minX="320" maxX="360" minY="276" maxY="316" name="petrolstation"/>
+  <symbol minX="360" maxX="400" minY="276" maxY="316" name="pharmacy"/>
+  <symbol minX="400" maxX="440" minY="276" maxY="316" name="telephone"/>
+  <symbol minX="440" maxX="480" minY="276" maxY="316" name="playground"/>
+  <symbol minX="480" maxX="520" minY="276" maxY="316" name="police"/>
+  <symbol minX="520" maxX="560" minY="276" maxY="316" name="postbox"/>
+  <symbol minX="560" maxX="600" minY="276" maxY="316" name="postoffice"/>
+  <symbol minX="600" maxX="640" minY="276" maxY="316" name="taxi"/>
+  <symbol minX="640" maxX="680" minY="276" maxY="316" name="synagogue"/>
+  <symbol minX="680" maxX="720" minY="276" maxY="316" name="swimming"/>
+  <symbol minX="720" maxX="760" minY="276" maxY="316" name="swimming-borderless"/>
+  <symbol minX="760" maxX="800" minY="276" maxY="316" name="supermarket"/>
+  <symbol minX="800" maxX="840" minY="276" maxY="316" name="subway"/>
+  <symbol minX="840" maxX="880" minY="276" maxY="316" name="pub"/>
+  <symbol minX="880" maxX="920" minY="276" maxY="316" name="pubx"/>
+  <symbol minX="920" maxX="960" minY="276" maxY="316" name="railway-crossing-small"/>
+  <symbol minX="960" maxX="1000" minY="276" maxY="316" name="railway-crossing"/>
+  <symbol minX="0" maxX="40" minY="316" maxY="356" name="railway-station-mini"/>
+  <symbol minX="40" maxX="80" minY="316" maxY="356" name="railway-station"/>
+  <symbol minX="80" maxX="120" minY="316" maxY="356" name="recycling"/>
+  <symbol minX="120" maxX="160" minY="316" maxY="356" name="religion"/>
+  <symbol minX="160" maxX="200" minY="316" maxY="356" name="restaurant"/>
+  <symbol minX="200" maxX="240" minY="316" maxY="356" name="subway-station-s"/>
+  <symbol minX="240" maxX="280" minY="316" maxY="356" name="subway-station-m"/>
+  <symbol minX="280" maxX="320" minY="316" maxY="356" name="ruins"/>
+  <symbol minX="320" maxX="360" minY="316" maxY="356" name="school"/>
+  <symbol minX="360" maxX="400" minY="316" maxY="356" name="shelter-fireplace"/>
+  <symbol minX="400" maxX="440" minY="316" maxY="356" name="shelter"/>
+  <symbol minX="440" maxX="480" minY="316" maxY="356" name="shooting-borderless"/>
+  <symbol minX="480" maxX="520" minY="316" maxY="356" name="shooting"/>
+  <symbol minX="520" maxX="560" minY="316" maxY="356" name="slipway"/>
+  <symbol minX="560" maxX="600" minY="316" maxY="356" name="soccer-borderless"/>
+  <symbol minX="600" maxX="640" minY="316" maxY="356" name="soccer"/>
+  <symbol minX="640" maxX="680" minY="316" maxY="356" name="subway-station-l"/>
+  <symbol minX="680" maxX="720" minY="316" maxY="354" name="basketball-borderless"/>
+  <symbol minX="720" maxX="757" minY="316" maxY="353" name="khanda"/>
+  <symbol minX="757" maxX="791" minY="316" maxY="350" name="parking-permissive"/>
+  <symbol minX="791" maxX="825" minY="316" maxY="350" name="parking-private"/>
+  <symbol minX="825" maxX="857" minY="316" maxY="348" name="current-position"/>
+  <symbol minX="857" maxX="888" minY="316" maxY="347" name="drinking_water"/>
+  <symbol minX="888" maxX="919" minY="316" maxY="347" name="bank"/>
+  <symbol minX="919" maxX="950" minY="316" maxY="347" name="embassy"/>
+  <symbol minX="950" maxX="981" minY="316" maxY="347" name="housenumber"/>
+  <symbol minX="981" maxX="1012" minY="316" maxY="347" name="roundabout_left"/>
+  <symbol minX="0" maxX="31" minY="356" maxY="387" name="roundabout_right"/>
+  <symbol minX="31" maxX="62" minY="356" maxY="387" name="doctor"/>
+  <symbol minX="62" maxX="93" minY="356" maxY="387" name="mosque"/>
+  <symbol minX="93" maxX="124" minY="356" maxY="387" name="parking_roof-permissive"/>
+  <symbol minX="124" maxX="155" minY="356" maxY="387" name="windmill"/>
+  <symbol minX="155" maxX="186" minY="356" maxY="387" name="traffic_signal"/>
+  <symbol minX="186" maxX="217" minY="356" maxY="387" name="church"/>
+  <symbol minX="217" maxX="248" minY="356" maxY="387" name="speed_trap"/>
+  <symbol minX="248" maxX="276" minY="356" maxY="384" name="waterfall"/>
+  <symbol minX="276" maxX="304" minY="356" maxY="384" name="bureau_de_change"/>
+  <symbol minX="304" maxX="332" minY="356" maxY="384" name="viewpoint"/>
+  <symbol minX="332" maxX="360" minY="356" maxY="384" name="power_generic"/>
+  <symbol minX="360" maxX="388" minY="356" maxY="384" name="wastewater"/>
+  <symbol minX="388" maxX="416" minY="356" maxY="384" name="power_hydro"/>
+  <symbol minX="416" maxX="444" minY="356" maxY="384" name="cave_entrance"/>
+  <symbol minX="444" maxX="472" minY="356" maxY="384" name="lighthouse"/>
+  <symbol minX="472" maxX="500" minY="356" maxY="384" name="route_from"/>
+  <symbol minX="500" maxX="528" minY="356" maxY="384" name="power_wind"/>
+  <symbol minX="528" maxX="556" minY="356" maxY="384" name="power_photovoltaic"/>
+  <symbol minX="556" maxX="584" minY="356" maxY="383" name="car_sharing"/>
+  <symbol minX="584" maxX="609" minY="356" maxY="381" name="api-result"/>
+  <symbol minX="609" maxX="633" minY="356" maxY="380" name="search-result"/>
+  <symbol minX="633" maxX="673" minY="356" maxY="378" name="parking_fee-permissive"/>
+  <symbol minX="673" maxX="713" minY="356" maxY="378" name="park_and_ride-permissive"/>
+  <symbol minX="713" maxX="735" minY="356" maxY="378" name="picnic"/>
+  <symbol minX="735" maxX="775" minY="356" maxY="378" name="parking_roof_fee"/>
+  <symbol minX="775" maxX="815" minY="356" maxY="378" name="park_and_ride"/>
+  <symbol minX="815" maxX="855" minY="356" maxY="378" name="parking_roof_fee-permissive"/>
+  <symbol minX="855" maxX="895" minY="356" maxY="378" name="parking_fee"/>
+  <symbol minX="895" maxX="917" minY="356" maxY="378" name="bench"/>
+  <symbol minX="917" maxX="935" minY="356" maxY="374" name="power-tower"/>
+  <symbol minX="935" maxX="953" minY="356" maxY="374" name="disused"/>
+  <symbol minX="953" maxX="971" minY="356" maxY="374" name="vulcan"/>
+  <symbol minX="971" maxX="989" minY="356" maxY="374" name="building"/>
+  <symbol minX="989" maxX="1005" minY="356" maxY="372" name="survey_point"/>
+  <symbol minX="1005" maxX="1017" minY="356" maxY="368" name="power-pole"/>
+  <symbol minX="0" maxX="10" minY="387" maxY="397" name="tree"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 1d64cd4562..847aa027c2 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 57b6797d28..5e34520eed 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file width="2048" height="1024">
+ <file height="1024" width="2048">
   <symbol minX="0" maxX="208" minY="0" maxY="304" name="route_to"/>
   <symbol minX="208" maxX="302" minY="0" maxY="256" name="route_from"/>
   <symbol minX="302" maxX="705" minY="0" maxY="196" name="route-arrow"/>
@@ -260,51 +260,51 @@
   <symbol minX="1400" maxX="1456" minY="652" maxY="708" name="ship-m"/>
   <symbol minX="1456" maxX="1512" minY="652" maxY="708" name="charging-station-m"/>
   <symbol minX="1512" maxX="1568" minY="652" maxY="708" name="marketplace-m"/>
-  <symbol minX="1568" maxX="1624" minY="652" maxY="708" name="volcano-m"/>
-  <symbol minX="1624" maxX="1680" minY="652" maxY="708" name="beach-m"/>
-  <symbol minX="1680" maxX="1736" minY="652" maxY="708" name="beauty-m"/>
+  <symbol minX="1568" maxX="1624" minY="652" maxY="708" name="seafood-shop-m"/>
+  <symbol minX="1624" maxX="1680" minY="652" maxY="708" name="volcano-m"/>
+  <symbol minX="1680" maxX="1736" minY="652" maxY="708" name="beach-m"/>
   <symbol minX="1736" maxX="1792" minY="652" maxY="708" name="embassy-m"/>
   <symbol minX="1792" maxX="1848" minY="652" maxY="708" name="military-m"/>
-  <symbol minX="1848" maxX="1904" minY="652" maxY="708" name="veterinary-m"/>
+  <symbol minX="1848" maxX="1904" minY="652" maxY="708" name="beauty-m"/>
   <symbol minX="1904" maxX="1960" minY="652" maxY="708" name="electronics-m"/>
   <symbol minX="1960" maxX="2016" minY="652" maxY="708" name="mobile_phone-m"/>
   <symbol minX="0" maxX="56" minY="708" maxY="764" name="drugs"/>
   <symbol minX="56" maxX="112" minY="708" maxY="764" name="monument-m"/>
-  <symbol minX="112" maxX="168" minY="708" maxY="764" name="seafood-shop-m"/>
-  <symbol minX="168" maxX="224" minY="708" maxY="764" name="vending-m"/>
-  <symbol minX="224" maxX="280" minY="708" maxY="764" name="tram-m"/>
-  <symbol minX="280" maxX="336" minY="708" maxY="764" name="bicycle-m"/>
+  <symbol minX="112" maxX="168" minY="708" maxY="764" name="veterinary-m"/>
+  <symbol minX="168" maxX="224" minY="708" maxY="764" name="sports-m"/>
+  <symbol minX="224" maxX="280" minY="708" maxY="764" name="vending-m"/>
+  <symbol minX="280" maxX="336" minY="708" maxY="764" name="tram-m"/>
   <symbol minX="336" maxX="392" minY="708" maxY="764" name="drinking-water-m"/>
-  <symbol minX="392" maxX="448" minY="708" maxY="764" name="train-m"/>
+  <symbol minX="392" maxX="448" minY="708" maxY="764" name="bicycle-m"/>
   <symbol minX="448" maxX="504" minY="708" maxY="764" name="museum-m"/>
-  <symbol minX="504" maxX="560" minY="708" maxY="764" name="toys-m"/>
-  <symbol minX="560" maxX="616" minY="708" maxY="764" name="sports-m"/>
-  <symbol minX="616" maxX="672" minY="708" maxY="764" name="school-m"/>
-  <symbol minX="672" maxX="728" minY="708" maxY="764" name="chemist-m"/>
-  <symbol minX="728" maxX="784" minY="708" maxY="764" name="sauna-m"/>
-  <symbol minX="784" maxX="840" minY="708" maxY="764" name="chimney-m"/>
-  <symbol minX="840" maxX="896" minY="708" maxY="764" name="subway-entrance-2-m"/>
-  <symbol minX="896" maxX="952" minY="708" maxY="764" name="townhall-m"/>
+  <symbol minX="504" maxX="560" minY="708" maxY="764" name="train-m"/>
+  <symbol minX="560" maxX="616" minY="708" maxY="764" name="school-m"/>
+  <symbol minX="616" maxX="672" minY="708" maxY="764" name="chemist-m"/>
+  <symbol minX="672" maxX="728" minY="708" maxY="764" name="sauna-m"/>
+  <symbol minX="728" maxX="784" minY="708" maxY="764" name="chimney-m"/>
+  <symbol minX="784" maxX="840" minY="708" maxY="764" name="subway-entrance-2-m"/>
+  <symbol minX="840" maxX="896" minY="708" maxY="764" name="toys-m"/>
+  <symbol minX="896" maxX="952" minY="708" maxY="764" name="restaurant-m"/>
   <symbol minX="952" maxX="1008" minY="708" maxY="764" name="npark-m"/>
-  <symbol minX="1008" maxX="1064" minY="708" maxY="764" name="book-shop-m"/>
-  <symbol minX="1064" maxX="1120" minY="708" maxY="764" name="boundary_stone-m"/>
+  <symbol minX="1008" maxX="1064" minY="708" maxY="764" name="townhall-m"/>
+  <symbol minX="1064" maxX="1120" minY="708" maxY="764" name="book-shop-m"/>
   <symbol minX="1120" maxX="1176" minY="708" maxY="764" name="nparkf-m "/>
   <symbol minX="1176" maxX="1232" minY="708" maxY="764" name="nparkf-m"/>
-  <symbol minX="1232" maxX="1288" minY="708" maxY="764" name="tourism-m"/>
+  <symbol minX="1232" maxX="1288" minY="708" maxY="764" name="boundary_stone-m"/>
   <symbol minX="1288" maxX="1344" minY="708" maxY="764" name="doityourself-m"/>
   <symbol minX="1344" maxX="1400" minY="708" maxY="764" name="dog_park-m"/>
-  <symbol minX="1400" maxX="1456" minY="708" maxY="764" name="restaurant-m"/>
-  <symbol minX="1456" maxX="1512" minY="708" maxY="764" name="bowls-m"/>
+  <symbol minX="1400" maxX="1456" minY="708" maxY="764" name="cinema-m"/>
+  <symbol minX="1456" maxX="1512" minY="708" maxY="764" name="tourism-m"/>
   <symbol minX="1512" maxX="1568" minY="708" maxY="764" name="optician-m"/>
   <symbol minX="1568" maxX="1624" minY="708" maxY="764" name="diving-m"/>
   <symbol minX="1624" maxX="1680" minY="708" maxY="764" name="park-m"/>
-  <symbol minX="1680" maxX="1736" minY="708" maxY="764" name="tomb-m"/>
-  <symbol minX="1736" maxX="1792" minY="708" maxY="764" name="cinema-m"/>
-  <symbol minX="1792" maxX="1848" minY="708" maxY="764" name="toll_booth-m"/>
+  <symbol minX="1680" maxX="1736" minY="708" maxY="764" name="bowls-m"/>
+  <symbol minX="1736" maxX="1792" minY="708" maxY="764" name="caravan_site-m"/>
+  <symbol minX="1792" maxX="1848" minY="708" maxY="764" name="tomb-m"/>
   <symbol minX="1848" maxX="1904" minY="708" maxY="764" name="department_store-m"/>
   <symbol minX="1904" maxX="1960" minY="708" maxY="764" name="parking-meter-m"/>
-  <symbol minX="1960" maxX="2016" minY="708" maxY="764" name="bus-m"/>
-  <symbol minX="0" maxX="56" minY="764" maxY="820" name="caravan_site-m"/>
+  <symbol minX="1960" maxX="2016" minY="708" maxY="764" name="toll_booth-m"/>
+  <symbol minX="0" maxX="56" minY="764" maxY="820" name="bus-m"/>
   <symbol minX="56" maxX="112" minY="764" maxY="820" name="toilets-m"/>
   <symbol minX="112" maxX="168" minY="764" maxY="820" name="ticket-shop-m"/>
   <symbol minX="168" maxX="224" minY="764" maxY="820" name="butcher-m"/>
@@ -342,185 +342,185 @@
   <symbol minX="1960" maxX="2016" minY="764" maxY="820" name="pub-m"/>
   <symbol minX="0" maxX="56" minY="820" maxY="876" name="clothes-m"/>
   <symbol minX="56" maxX="114" minY="820" maxY="871" name="subway-moscow-l"/>
-  <symbol minX="114" maxX="165" minY="820" maxY="871" name="firehydrant-l"/>
+  <symbol minX="114" maxX="165" minY="820" maxY="871" name="bike-parking-l"/>
   <symbol minX="165" maxX="216" minY="820" maxY="871" name="lightrail-berlin-m"/>
   <symbol minX="216" maxX="267" minY="820" maxY="871" name="speedcam-l"/>
   <symbol minX="267" maxX="318" minY="820" maxY="871" name="subway-rome-l"/>
   <symbol minX="318" maxX="369" minY="820" maxY="871" name="waste-basket-l"/>
   <symbol minX="369" maxX="420" minY="820" maxY="871" name="subway-berlin-l"/>
-  <symbol minX="420" maxX="471" minY="820" maxY="871" name="parking-ticket-l"/>
-  <symbol minX="471" maxX="522" minY="820" maxY="871" name="bike-parking-l"/>
-  <symbol minX="522" maxX="573" minY="820" maxY="871" name="parking-l"/>
-  <symbol minX="573" maxX="620" minY="820" maxY="867" name="no-icon-shop"/>
-  <symbol minX="620" maxX="667" minY="820" maxY="867" name="no-icon-leisure"/>
-  <symbol minX="667" maxX="714" minY="820" maxY="867" name="subway-berlin-m"/>
-  <symbol minX="714" maxX="761" minY="820" maxY="867" name="no-icon"/>
-  <symbol minX="761" maxX="808" minY="820" maxY="867" name="no-icon-tourism"/>
-  <symbol minX="808" maxX="862" minY="820" maxY="867" name="subway-moscow-m"/>
-  <symbol minX="862" maxX="909" minY="820" maxY="867" name="subway-paris-m"/>
-  <symbol minX="909" maxX="956" minY="820" maxY="867" name="subway-rome-m"/>
-  <symbol minX="956" maxX="1003" minY="820" maxY="867" name="no-icon-amenity"/>
-  <symbol minX="1003" maxX="1049" minY="820" maxY="866" name="api-result"/>
-  <symbol minX="1049" maxX="1095" minY="820" maxY="866" name="search-result"/>
-  <symbol minX="1095" maxX="1137" minY="820" maxY="865" name="bcontrol-s"/>
-  <symbol minX="1137" maxX="1179" minY="820" maxY="865" name="waterfall-s"/>
-  <symbol minX="1179" maxX="1221" minY="820" maxY="865" name="picnic-s"/>
-  <symbol minX="1221" maxX="1279" minY="820" maxY="865" name="subway-london-l"/>
-  <symbol minX="1279" maxX="1321" minY="820" maxY="865" name="beer-s"/>
-  <symbol minX="1321" maxX="1363" minY="820" maxY="865" name="office-s"/>
-  <symbol minX="1363" maxX="1405" minY="820" maxY="865" name="hunting-tower-s"/>
-  <symbol minX="1405" maxX="1447" minY="820" maxY="865" name="heliport-s"/>
-  <symbol minX="1447" maxX="1489" minY="820" maxY="865" name="remains-s"/>
-  <symbol minX="1489" maxX="1534" minY="820" maxY="865" name="airport-s"/>
-  <symbol minX="1534" maxX="1576" minY="820" maxY="862" name="shop-s"/>
-  <symbol minX="1576" maxX="1618" minY="820" maxY="862" name="skiing-s"/>
-  <symbol minX="1618" maxX="1660" minY="820" maxY="862" name="casino-s"/>
-  <symbol minX="1660" maxX="1702" minY="820" maxY="862" name="cave-s"/>
-  <symbol minX="1702" maxX="1744" minY="820" maxY="862" name="soccer-s"/>
-  <symbol minX="1744" maxX="1786" minY="820" maxY="862" name="cemetery-s"/>
-  <symbol minX="1786" maxX="1828" minY="820" maxY="862" name="speedcam-m"/>
-  <symbol minX="1828" maxX="1886" minY="820" maxY="862" name="metro-barcelona-m"/>
-  <symbol minX="1886" maxX="1928" minY="820" maxY="862" name="ship-s"/>
-  <symbol minX="1928" maxX="1970" minY="820" maxY="862" name="charging-station-s"/>
-  <symbol minX="1970" maxX="2012" minY="820" maxY="862" name="gym-s"/>
-  <symbol minX="0" maxX="42" minY="876" maxY="918" name="golf-s"/>
-  <symbol minX="42" maxX="84" minY="876" maxY="918" name="hand-s"/>
-  <symbol minX="84" maxX="126" minY="876" maxY="918" name="australian-football-s"/>
-  <symbol minX="126" maxX="184" minY="876" maxY="918" name="subway-barcelona-m"/>
-  <symbol minX="184" maxX="235" minY="876" maxY="918" name="subway-barcelona-s"/>
-  <symbol minX="235" maxX="277" minY="876" maxY="918" name="school-s"/>
-  <symbol minX="277" maxX="319" minY="876" maxY="918" name="helipad-s"/>
-  <symbol minX="319" maxX="361" minY="876" maxY="918" name="alcohol-s"/>
-  <symbol minX="361" maxX="403" minY="876" maxY="918" name="restaurant-s"/>
-  <symbol minX="403" maxX="445" minY="876" maxY="918" name="subway-entrance-2-s"/>
-  <symbol minX="445" maxX="487" minY="876" maxY="918" name="subway-entrance-arrow"/>
-  <symbol minX="487" maxX="529" minY="876" maxY="918" name="cinema-s"/>
-  <symbol minX="529" maxX="571" minY="876" maxY="918" name="recycling-s"/>
-  <symbol minX="571" maxX="613" minY="876" maxY="918" name="subway-entrance-s"/>
-  <symbol minX="613" maxX="655" minY="876" maxY="918" name="garden-s"/>
-  <symbol minX="655" maxX="697" minY="876" maxY="918" name="gallery-s"/>
-  <symbol minX="697" maxX="739" minY="876" maxY="918" name="alpine_hut-s"/>
-  <symbol minX="739" maxX="781" minY="876" maxY="918" name="climbing-s"/>
-  <symbol minX="781" maxX="823" minY="876" maxY="918" name="hospital-s"/>
-  <symbol minX="823" maxX="879" minY="876" maxY="918" name="subway-london-m"/>
-  <symbol minX="879" maxX="921" minY="876" maxY="918" name="hotel-s"/>
-  <symbol minX="921" maxX="963" minY="876" maxY="918" name="pub-s"/>
-  <symbol minX="963" maxX="1005" minY="876" maxY="918" name="america-football-s"/>
-  <symbol minX="1005" maxX="1063" minY="876" maxY="918" name="subway-madrid-m"/>
-  <symbol minX="1063" maxX="1105" minY="876" maxY="918" name="funicular-s"/>
-  <symbol minX="1105" maxX="1147" minY="876" maxY="918" name="information-s"/>
-  <symbol minX="1147" maxX="1189" minY="876" maxY="918" name="archery-s"/>
-  <symbol minX="1189" maxX="1231" minY="876" maxY="918" name="bar-s"/>
-  <symbol minX="1231" maxX="1273" minY="876" maxY="918" name="power-s"/>
-  <symbol minX="1273" maxX="1315" minY="876" maxY="918" name="college-s"/>
-  <symbol minX="1315" maxX="1357" minY="876" maxY="918" name="fuel-s"/>
-  <symbol minX="1357" maxX="1399" minY="876" maxY="918" name="car-repair-s"/>
-  <symbol minX="1399" maxX="1441" minY="876" maxY="918" name="police-s"/>
-  <symbol minX="1441" maxX="1483" minY="876" maxY="918" name="subway-newyork-s"/>
-  <symbol minX="1483" maxX="1525" minY="876" maxY="918" name="atm-s"/>
-  <symbol minX="1525" maxX="1567" minY="876" maxY="918" name="place-of-worship-s"/>
-  <symbol minX="1567" maxX="1609" minY="876" maxY="918" name="pitch-s"/>
-  <symbol minX="1609" maxX="1651" minY="876" maxY="918" name="fountain-s"/>
-  <symbol minX="1651" maxX="1693" minY="876" maxY="918" name="cricket-s"/>
-  <symbol minX="1693" maxX="1735" minY="876" maxY="918" name="zoo-s"/>
-  <symbol minX="1735" maxX="1777" minY="876" maxY="918" name="kindergarten-s"/>
-  <symbol minX="1777" maxX="1819" minY="876" maxY="918" name="subway-s"/>
-  <symbol minX="1819" maxX="1861" minY="876" maxY="918" name="campsite-s"/>
-  <symbol minX="1861" maxX="1903" minY="876" maxY="918" name="fire_station-s"/>
-  <symbol minX="1903" maxX="1945" minY="876" maxY="918" name="subway-spb-s"/>
-  <symbol minX="1945" maxX="1987" minY="876" maxY="918" name="windmill-s"/>
-  <symbol minX="1987" maxX="2029" minY="876" maxY="918" name="library-s"/>
-  <symbol minX="0" maxX="42" minY="918" maxY="960" name="baseball-s"/>
-  <symbol minX="42" maxX="84" minY="918" maxY="960" name="fastfood-s"/>
-  <symbol minX="84" maxX="126" minY="918" maxY="960" name="lighthouse-s"/>
-  <symbol minX="126" maxX="168" minY="918" maxY="960" name="phone-s"/>
-  <symbol minX="168" maxX="210" minY="918" maxY="960" name="cafe-s"/>
-  <symbol minX="210" maxX="252" minY="918" maxY="960" name="pharmacy-s"/>
-  <symbol minX="252" maxX="294" minY="918" maxY="960" name="swimming-s"/>
-  <symbol minX="294" maxX="336" minY="918" maxY="960" name="curling-s"/>
-  <symbol minX="336" maxX="378" minY="918" maxY="960" name="dentist-s"/>
-  <symbol minX="378" maxX="420" minY="918" maxY="960" name="cable-car-s"/>
-  <symbol minX="420" maxX="462" minY="918" maxY="960" name="equestrian-s"/>
-  <symbol minX="462" maxX="504" minY="918" maxY="960" name="tennis-s"/>
-  <symbol minX="504" maxX="546" minY="918" maxY="960" name="basketball-s"/>
-  <symbol minX="546" maxX="588" minY="918" maxY="960" name="mail-s"/>
-  <symbol minX="588" maxX="630" minY="918" maxY="960" name="theatre-s"/>
+  <symbol minX="420" maxX="471" minY="820" maxY="871" name="parking-l"/>
+  <symbol minX="471" maxX="511" minY="820" maxY="869" name="firehydrant-l"/>
+  <symbol minX="511" maxX="558" minY="820" maxY="867" name="no-icon-leisure"/>
+  <symbol minX="558" maxX="605" minY="820" maxY="867" name="waste-basket-s"/>
+  <symbol minX="605" maxX="652" minY="820" maxY="867" name="no-icon"/>
+  <symbol minX="652" maxX="699" minY="820" maxY="867" name="subway-berlin-m"/>
+  <symbol minX="699" maxX="746" minY="820" maxY="867" name="no-icon-tourism"/>
+  <symbol minX="746" maxX="793" minY="820" maxY="867" name="no-icon-shop"/>
+  <symbol minX="793" maxX="840" minY="820" maxY="867" name="subway-paris-m"/>
+  <symbol minX="840" maxX="887" minY="820" maxY="867" name="no-icon-amenity"/>
+  <symbol minX="887" maxX="934" minY="820" maxY="867" name="subway-rome-m"/>
+  <symbol minX="934" maxX="988" minY="820" maxY="867" name="subway-moscow-m"/>
+  <symbol minX="988" maxX="1034" minY="820" maxY="866" name="api-result"/>
+  <symbol minX="1034" maxX="1080" minY="820" maxY="866" name="search-result"/>
+  <symbol minX="1080" maxX="1122" minY="820" maxY="865" name="bcontrol-s"/>
+  <symbol minX="1122" maxX="1164" minY="820" maxY="865" name="waterfall-s"/>
+  <symbol minX="1164" maxX="1206" minY="820" maxY="865" name="remains-s"/>
+  <symbol minX="1206" maxX="1264" minY="820" maxY="865" name="subway-london-l"/>
+  <symbol minX="1264" maxX="1306" minY="820" maxY="865" name="picnic-s"/>
+  <symbol minX="1306" maxX="1348" minY="820" maxY="865" name="beer-s"/>
+  <symbol minX="1348" maxX="1390" minY="820" maxY="865" name="hunting-tower-s"/>
+  <symbol minX="1390" maxX="1432" minY="820" maxY="865" name="heliport-s"/>
+  <symbol minX="1432" maxX="1474" minY="820" maxY="865" name="office-s"/>
+  <symbol minX="1474" maxX="1519" minY="820" maxY="865" name="airport-s"/>
+  <symbol minX="1519" maxX="1561" minY="820" maxY="862" name="shop-s"/>
+  <symbol minX="1561" maxX="1603" minY="820" maxY="862" name="skiing-s"/>
+  <symbol minX="1603" maxX="1645" minY="820" maxY="862" name="casino-s"/>
+  <symbol minX="1645" maxX="1687" minY="820" maxY="862" name="cave-s"/>
+  <symbol minX="1687" maxX="1729" minY="820" maxY="862" name="soccer-s"/>
+  <symbol minX="1729" maxX="1771" minY="820" maxY="862" name="cemetery-s"/>
+  <symbol minX="1771" maxX="1813" minY="820" maxY="862" name="speedcam-m"/>
+  <symbol minX="1813" maxX="1871" minY="820" maxY="862" name="metro-barcelona-m"/>
+  <symbol minX="1871" maxX="1913" minY="820" maxY="862" name="ship-s"/>
+  <symbol minX="1913" maxX="1955" minY="820" maxY="862" name="charging-station-s"/>
+  <symbol minX="1955" maxX="1997" minY="820" maxY="862" name="gym-s"/>
+  <symbol minX="1997" maxX="2039" minY="820" maxY="862" name="golf-s"/>
+  <symbol minX="0" maxX="42" minY="876" maxY="918" name="hand-s"/>
+  <symbol minX="42" maxX="84" minY="876" maxY="918" name="australian-football-s"/>
+  <symbol minX="84" maxX="142" minY="876" maxY="918" name="subway-barcelona-m"/>
+  <symbol minX="142" maxX="193" minY="876" maxY="918" name="subway-barcelona-s"/>
+  <symbol minX="193" maxX="235" minY="876" maxY="918" name="school-s"/>
+  <symbol minX="235" maxX="277" minY="876" maxY="918" name="helipad-s"/>
+  <symbol minX="277" maxX="319" minY="876" maxY="918" name="alcohol-s"/>
+  <symbol minX="319" maxX="361" minY="876" maxY="918" name="restaurant-s"/>
+  <symbol minX="361" maxX="403" minY="876" maxY="918" name="subway-entrance-2-s"/>
+  <symbol minX="403" maxX="445" minY="876" maxY="918" name="subway-entrance-arrow"/>
+  <symbol minX="445" maxX="487" minY="876" maxY="918" name="cinema-s"/>
+  <symbol minX="487" maxX="529" minY="876" maxY="918" name="recycling-s"/>
+  <symbol minX="529" maxX="571" minY="876" maxY="918" name="subway-entrance-s"/>
+  <symbol minX="571" maxX="613" minY="876" maxY="918" name="garden-s"/>
+  <symbol minX="613" maxX="655" minY="876" maxY="918" name="gallery-s"/>
+  <symbol minX="655" maxX="697" minY="876" maxY="918" name="alpine_hut-s"/>
+  <symbol minX="697" maxX="739" minY="876" maxY="918" name="climbing-s"/>
+  <symbol minX="739" maxX="781" minY="876" maxY="918" name="hospital-s"/>
+  <symbol minX="781" maxX="837" minY="876" maxY="918" name="subway-london-m"/>
+  <symbol minX="837" maxX="879" minY="876" maxY="918" name="hotel-s"/>
+  <symbol minX="879" maxX="921" minY="876" maxY="918" name="pub-s"/>
+  <symbol minX="921" maxX="963" minY="876" maxY="918" name="america-football-s"/>
+  <symbol minX="963" maxX="1021" minY="876" maxY="918" name="subway-madrid-m"/>
+  <symbol minX="1021" maxX="1063" minY="876" maxY="918" name="funicular-s"/>
+  <symbol minX="1063" maxX="1105" minY="876" maxY="918" name="information-s"/>
+  <symbol minX="1105" maxX="1147" minY="876" maxY="918" name="archery-s"/>
+  <symbol minX="1147" maxX="1189" minY="876" maxY="918" name="bar-s"/>
+  <symbol minX="1189" maxX="1231" minY="876" maxY="918" name="power-s"/>
+  <symbol minX="1231" maxX="1273" minY="876" maxY="918" name="college-s"/>
+  <symbol minX="1273" maxX="1315" minY="876" maxY="918" name="fuel-s"/>
+  <symbol minX="1315" maxX="1357" minY="876" maxY="918" name="car-repair-s"/>
+  <symbol minX="1357" maxX="1399" minY="876" maxY="918" name="police-s"/>
+  <symbol minX="1399" maxX="1441" minY="876" maxY="918" name="subway-newyork-s"/>
+  <symbol minX="1441" maxX="1483" minY="876" maxY="918" name="atm-s"/>
+  <symbol minX="1483" maxX="1525" minY="876" maxY="918" name="place-of-worship-s"/>
+  <symbol minX="1525" maxX="1567" minY="876" maxY="918" name="pitch-s"/>
+  <symbol minX="1567" maxX="1609" minY="876" maxY="918" name="fountain-s"/>
+  <symbol minX="1609" maxX="1651" minY="876" maxY="918" name="cricket-s"/>
+  <symbol minX="1651" maxX="1693" minY="876" maxY="918" name="zoo-s"/>
+  <symbol minX="1693" maxX="1735" minY="876" maxY="918" name="kindergarten-s"/>
+  <symbol minX="1735" maxX="1777" minY="876" maxY="918" name="subway-s"/>
+  <symbol minX="1777" maxX="1819" minY="876" maxY="918" name="campsite-s"/>
+  <symbol minX="1819" maxX="1861" minY="876" maxY="918" name="fire_station-s"/>
+  <symbol minX="1861" maxX="1903" minY="876" maxY="918" name="subway-spb-s"/>
+  <symbol minX="1903" maxX="1945" minY="876" maxY="918" name="windmill-s"/>
+  <symbol minX="1945" maxX="1987" minY="876" maxY="918" name="library-s"/>
+  <symbol minX="1987" maxX="2029" minY="876" maxY="918" name="baseball-s"/>
+  <symbol minX="0" maxX="42" minY="918" maxY="960" name="fastfood-s"/>
+  <symbol minX="42" maxX="84" minY="918" maxY="960" name="lighthouse-s"/>
+  <symbol minX="84" maxX="126" minY="918" maxY="960" name="phone-s"/>
+  <symbol minX="126" maxX="168" minY="918" maxY="960" name="cafe-s"/>
+  <symbol minX="168" maxX="210" minY="918" maxY="960" name="pharmacy-s"/>
+  <symbol minX="210" maxX="252" minY="918" maxY="960" name="swimming-s"/>
+  <symbol minX="252" maxX="294" minY="918" maxY="960" name="curling-s"/>
+  <symbol minX="294" maxX="336" minY="918" maxY="960" name="dentist-s"/>
+  <symbol minX="336" maxX="378" minY="918" maxY="960" name="cable-car-s"/>
+  <symbol minX="378" maxX="420" minY="918" maxY="960" name="equestrian-s"/>
+  <symbol minX="420" maxX="462" minY="918" maxY="960" name="tennis-s"/>
+  <symbol minX="462" maxX="504" minY="918" maxY="960" name="basketball-s"/>
+  <symbol minX="504" maxX="546" minY="918" maxY="960" name="mail-s"/>
+  <symbol minX="546" maxX="588" minY="918" maxY="960" name="theatre-s"/>
+  <symbol minX="588" maxX="630" minY="918" maxY="960" name="marketplace-s"/>
   <symbol minX="630" maxX="672" minY="918" maxY="960" name="volcano-s"/>
-  <symbol minX="672" maxX="714" minY="918" maxY="960" name="marketplace-s"/>
-  <symbol minX="714" maxX="756" minY="918" maxY="960" name="bus-s"/>
-  <symbol minX="756" maxX="798" minY="918" maxY="960" name="embassy-s"/>
-  <symbol minX="798" maxX="840" minY="918" maxY="960" name="toilets-s"/>
-  <symbol minX="840" maxX="882" minY="918" maxY="960" name="viewpoint-s"/>
-  <symbol minX="882" maxX="924" minY="918" maxY="960" name="beach-s"/>
-  <symbol minX="924" maxX="966" minY="918" maxY="960" name="toll_booth-s"/>
-  <symbol minX="966" maxX="1008" minY="918" maxY="960" name="bowls-s"/>
-  <symbol minX="1008" maxX="1050" minY="918" maxY="960" name="park-s"/>
-  <symbol minX="1050" maxX="1092" minY="918" maxY="960" name="diving-s"/>
-  <symbol minX="1092" maxX="1134" minY="918" maxY="960" name="nparkf-s"/>
-  <symbol minX="1134" maxX="1176" minY="918" maxY="960" name="tourism-s"/>
-  <symbol minX="1176" maxX="1218" minY="918" maxY="960" name="military-s"/>
-  <symbol minX="1218" maxX="1260" minY="918" maxY="960" name="book-shop-s"/>
-  <symbol minX="1260" maxX="1302" minY="918" maxY="960" name="npark-s"/>
-  <symbol minX="1302" maxX="1344" minY="918" maxY="960" name="monument-s"/>
-  <symbol minX="1344" maxX="1386" minY="918" maxY="960" name="townhall-s"/>
-  <symbol minX="1386" maxX="1428" minY="918" maxY="960" name="drinking-water-s"/>
-  <symbol minX="1428" maxX="1470" minY="918" maxY="960" name="museum-s"/>
-  <symbol minX="1470" maxX="1512" minY="918" maxY="960" name="bicycle-s"/>
-  <symbol minX="1512" maxX="1554" minY="918" maxY="960" name="tram-s"/>
-  <symbol minX="1554" maxX="1596" minY="918" maxY="960" name="train-s"/>
-  <symbol minX="1596" maxX="1638" minY="918" maxY="960" name="motel-s"/>
-  <symbol minX="1638" maxX="1680" minY="918" maxY="960" name="grocery-s"/>
-  <symbol minX="1680" maxX="1738" minY="918" maxY="959" name="subway-barcelona-l"/>
-  <symbol minX="1738" maxX="1796" minY="918" maxY="959" name="subway-madrid-l"/>
-  <symbol minX="1796" maxX="1834" minY="918" maxY="958" name="s-arrow"/>
-  <symbol minX="1834" maxX="1874" minY="918" maxY="958" name="parking-m"/>
-  <symbol minX="1874" maxX="1930" minY="918" maxY="956" name="subway-kiev-m"/>
-  <symbol minX="1930" maxX="1981" minY="918" maxY="956" name="subway-madrid-s"/>
-  <symbol minX="1981" maxX="2019" minY="918" maxY="956" name="waste-basket-s"/>
-  <symbol minX="0" maxX="38" minY="960" maxY="998" name="subway-paris-s"/>
-  <symbol minX="38" maxX="89" minY="960" maxY="998" name="metro-barcelona-s"/>
-  <symbol minX="89" maxX="145" minY="960" maxY="998" name="subway-kiev-l"/>
-  <symbol minX="145" maxX="183" minY="960" maxY="998" name="lightrail-berlin-s"/>
-  <symbol minX="183" maxX="221" minY="960" maxY="998" name="peak-l"/>
-  <symbol minX="221" maxX="257" minY="960" maxY="996" name="subway-moscow-s"/>
-  <symbol minX="257" maxX="290" minY="960" maxY="993" name="speedcam-s"/>
-  <symbol minX="290" maxX="323" minY="960" maxY="993" name="subway-rome-s"/>
-  <symbol minX="323" maxX="356" minY="960" maxY="993" name="subway-berlin-s"/>
-  <symbol minX="356" maxX="394" minY="960" maxY="993" name="bench"/>
-  <symbol minX="394" maxX="436" minY="960" maxY="993" name="subway-london-s"/>
-  <symbol minX="436" maxX="469" minY="960" maxY="993" name="parking-s"/>
-  <symbol minX="469" maxX="500" minY="960" maxY="991" name="survey_point-l"/>
-  <symbol minX="500" maxX="531" minY="960" maxY="991" name="star-l"/>
-  <symbol minX="531" maxX="564" minY="960" maxY="991" name="peakt-l"/>
-  <symbol minX="564" maxX="620" minY="960" maxY="991" name="subway-minsk-l"/>
-  <symbol minX="620" maxX="649" minY="960" maxY="989" name="star-m"/>
-  <symbol minX="649" maxX="696" minY="960" maxY="989" name="subway-kiev-s"/>
-  <symbol minX="696" maxX="723" minY="960" maxY="987" name="subway-xs"/>
-  <symbol minX="723" maxX="770" minY="960" maxY="987" name="subway-minsk-m"/>
-  <symbol minX="770" maxX="799" minY="960" maxY="987" name="peak-m"/>
-  <symbol minX="799" maxX="841" minY="960" maxY="987" name="railway-crossing"/>
-  <symbol minX="841" maxX="868" minY="960" maxY="987" name="survey_point-m"/>
-  <symbol minX="868" maxX="895" minY="960" maxY="987" name="subway-newyork-xs"/>
-  <symbol minX="895" maxX="919" minY="960" maxY="984" name="star-s"/>
-  <symbol minX="919" maxX="943" minY="960" maxY="984" name="crossing-l"/>
-  <symbol minX="943" maxX="985" minY="960" maxY="984" name="subway-minsk-s"/>
-  <symbol minX="985" maxX="1007" minY="960" maxY="982" name="survey_point-s"/>
-  <symbol minX="1007" maxX="1058" minY="960" maxY="982" name="arrow-m"/>
-  <symbol minX="1058" maxX="1082" minY="960" maxY="982" name="peakt-m"/>
-  <symbol minX="1082" maxX="1106" minY="960" maxY="982" name="peak-s"/>
-  <symbol minX="1106" maxX="1126" minY="960" maxY="980" name="entrance-s"/>
-  <symbol minX="1126" maxX="1146" minY="960" maxY="980" name="crossing-m"/>
-  <symbol minX="1146" maxX="1166" minY="960" maxY="978" name="peakt-s"/>
-  <symbol minX="1166" maxX="1204" minY="960" maxY="975" name="arrow-s"/>
-  <symbol minX="1204" maxX="1219" minY="960" maxY="975" name="dot-m"/>
-  <symbol minX="1219" maxX="1234" minY="960" maxY="975" name="none"/>
-  <symbol minX="1234" maxX="1249" minY="960" maxY="975" name="crossing-s"/>
-  <symbol minX="1249" maxX="1264" minY="960" maxY="975" name="tree-l"/>
-  <symbol minX="1264" maxX="1277" minY="960" maxY="973" name="tree-m"/>
-  <symbol minX="1277" maxX="1290" minY="960" maxY="973" name="entrance-xs"/>
-  <symbol minX="1290" maxX="1301" minY="960" maxY="971" name="dot-s"/>
-  <symbol minX="1301" maxX="1312" minY="960" maxY="971" name="dot-s-light"/>
-  <symbol minX="1312" maxX="1323" minY="960" maxY="971" name="tree-s"/>
-  <symbol minX="1323" maxX="1334" minY="960" maxY="971" name="zero-icon"/>
+  <symbol minX="672" maxX="714" minY="918" maxY="960" name="bus-s"/>
+  <symbol minX="714" maxX="756" minY="918" maxY="960" name="embassy-s"/>
+  <symbol minX="756" maxX="798" minY="918" maxY="960" name="toilets-s"/>
+  <symbol minX="798" maxX="822" minY="918" maxY="960" name="parking-ticket-l"/>
+  <symbol minX="822" maxX="864" minY="918" maxY="960" name="viewpoint-s"/>
+  <symbol minX="864" maxX="906" minY="918" maxY="960" name="toll_booth-s"/>
+  <symbol minX="906" maxX="948" minY="918" maxY="960" name="bowls-s"/>
+  <symbol minX="948" maxX="990" minY="918" maxY="960" name="beach-s"/>
+  <symbol minX="990" maxX="1032" minY="918" maxY="960" name="park-s"/>
+  <symbol minX="1032" maxX="1074" minY="918" maxY="960" name="diving-s"/>
+  <symbol minX="1074" maxX="1116" minY="918" maxY="960" name="tourism-s"/>
+  <symbol minX="1116" maxX="1158" minY="918" maxY="960" name="nparkf-s"/>
+  <symbol minX="1158" maxX="1200" minY="918" maxY="960" name="book-shop-s"/>
+  <symbol minX="1200" maxX="1242" minY="918" maxY="960" name="military-s"/>
+  <symbol minX="1242" maxX="1284" minY="918" maxY="960" name="npark-s"/>
+  <symbol minX="1284" maxX="1326" minY="918" maxY="960" name="townhall-s"/>
+  <symbol minX="1326" maxX="1368" minY="918" maxY="960" name="monument-s"/>
+  <symbol minX="1368" maxX="1410" minY="918" maxY="960" name="drinking-water-s"/>
+  <symbol minX="1410" maxX="1452" minY="918" maxY="960" name="bicycle-s"/>
+  <symbol minX="1452" maxX="1494" minY="918" maxY="960" name="museum-s"/>
+  <symbol minX="1494" maxX="1536" minY="918" maxY="960" name="train-s"/>
+  <symbol minX="1536" maxX="1578" minY="918" maxY="960" name="grocery-s"/>
+  <symbol minX="1578" maxX="1620" minY="918" maxY="960" name="motel-s"/>
+  <symbol minX="1620" maxX="1662" minY="918" maxY="960" name="tram-s"/>
+  <symbol minX="1662" maxX="1720" minY="918" maxY="959" name="subway-madrid-l"/>
+  <symbol minX="1720" maxX="1778" minY="918" maxY="959" name="subway-barcelona-l"/>
+  <symbol minX="1778" maxX="1816" minY="918" maxY="958" name="s-arrow"/>
+  <symbol minX="1816" maxX="1856" minY="918" maxY="958" name="parking-m"/>
+  <symbol minX="1856" maxX="1894" minY="918" maxY="956" name="subway-paris-s"/>
+  <symbol minX="1894" maxX="1945" minY="918" maxY="956" name="subway-madrid-s"/>
+  <symbol minX="1945" maxX="2001" minY="918" maxY="956" name="subway-kiev-m"/>
+  <symbol minX="2001" maxX="2039" minY="918" maxY="956" name="lightrail-berlin-s"/>
+  <symbol minX="0" maxX="38" minY="960" maxY="998" name="peak-l"/>
+  <symbol minX="38" maxX="94" minY="960" maxY="998" name="subway-kiev-l"/>
+  <symbol minX="94" maxX="145" minY="960" maxY="998" name="metro-barcelona-s"/>
+  <symbol minX="145" maxX="181" minY="960" maxY="996" name="subway-moscow-s"/>
+  <symbol minX="181" maxX="214" minY="960" maxY="993" name="speedcam-s"/>
+  <symbol minX="214" maxX="256" minY="960" maxY="993" name="subway-london-s"/>
+  <symbol minX="256" maxX="294" minY="960" maxY="993" name="bench"/>
+  <symbol minX="294" maxX="327" minY="960" maxY="993" name="subway-rome-s"/>
+  <symbol minX="327" maxX="360" minY="960" maxY="993" name="parking-s"/>
+  <symbol minX="360" maxX="393" minY="960" maxY="993" name="subway-berlin-s"/>
+  <symbol minX="393" maxX="424" minY="960" maxY="991" name="survey_point-l"/>
+  <symbol minX="424" maxX="480" minY="960" maxY="991" name="subway-minsk-l"/>
+  <symbol minX="480" maxX="511" minY="960" maxY="991" name="star-l"/>
+  <symbol minX="511" maxX="544" minY="960" maxY="991" name="peakt-l"/>
+  <symbol minX="544" maxX="591" minY="960" maxY="989" name="subway-kiev-s"/>
+  <symbol minX="591" maxX="620" minY="960" maxY="989" name="star-m"/>
+  <symbol minX="620" maxX="647" minY="960" maxY="987" name="subway-xs"/>
+  <symbol minX="647" maxX="674" minY="960" maxY="987" name="survey_point-m"/>
+  <symbol minX="674" maxX="716" minY="960" maxY="987" name="railway-crossing"/>
+  <symbol minX="716" maxX="763" minY="960" maxY="987" name="subway-minsk-m"/>
+  <symbol minX="763" maxX="792" minY="960" maxY="987" name="peak-m"/>
+  <symbol minX="792" maxX="819" minY="960" maxY="987" name="subway-newyork-xs"/>
+  <symbol minX="819" maxX="843" minY="960" maxY="984" name="star-s"/>
+  <symbol minX="843" maxX="867" minY="960" maxY="984" name="crossing-l"/>
+  <symbol minX="867" maxX="909" minY="960" maxY="984" name="subway-minsk-s"/>
+  <symbol minX="909" maxX="933" minY="960" maxY="982" name="peak-s"/>
+  <symbol minX="933" maxX="984" minY="960" maxY="982" name="arrow-m"/>
+  <symbol minX="984" maxX="1006" minY="960" maxY="982" name="survey_point-s"/>
+  <symbol minX="1006" maxX="1030" minY="960" maxY="982" name="peakt-m"/>
+  <symbol minX="1030" maxX="1050" minY="960" maxY="980" name="entrance-s"/>
+  <symbol minX="1050" maxX="1070" minY="960" maxY="980" name="crossing-m"/>
+  <symbol minX="1070" maxX="1090" minY="960" maxY="978" name="peakt-s"/>
+  <symbol minX="1090" maxX="1128" minY="960" maxY="975" name="arrow-s"/>
+  <symbol minX="1128" maxX="1143" minY="960" maxY="975" name="tree-l"/>
+  <symbol minX="1143" maxX="1158" minY="960" maxY="975" name="crossing-s"/>
+  <symbol minX="1158" maxX="1173" minY="960" maxY="975" name="none"/>
+  <symbol minX="1173" maxX="1188" minY="960" maxY="975" name="dot-m"/>
+  <symbol minX="1188" maxX="1201" minY="960" maxY="973" name="entrance-xs"/>
+  <symbol minX="1201" maxX="1214" minY="960" maxY="973" name="tree-m"/>
+  <symbol minX="1214" maxX="1225" minY="960" maxY="971" name="dot-s-light"/>
+  <symbol minX="1225" maxX="1236" minY="960" maxY="971" name="dot-s"/>
+  <symbol minX="1236" maxX="1247" minY="960" maxY="971" name="tree-s"/>
+  <symbol minX="1247" maxX="1258" minY="960" maxY="971" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index ad4962c6d1..76676c8fea 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 f17c85250c..04e509582a 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="1024" width="2048">
+ <file width="2048" height="1024">
   <symbol minX="0" maxX="208" minY="0" maxY="304" name="route_to"/>
   <symbol minX="208" maxX="302" minY="0" maxY="256" name="route_from"/>
   <symbol minX="302" maxX="705" minY="0" maxY="196" name="route-arrow"/>
@@ -346,179 +346,179 @@
   <symbol minX="168" maxX="224" minY="818" maxY="874" name="restaurant-m"/>
   <symbol minX="224" maxX="280" minY="818" maxY="874" name="charging-station-m"/>
   <symbol minX="280" maxX="331" minY="818" maxY="869" name="speedcam-l"/>
-  <symbol minX="331" maxX="382" minY="818" maxY="869" name="parking-ticket-l"/>
-  <symbol minX="382" maxX="433" minY="818" maxY="869" name="subway-berlin-l"/>
-  <symbol minX="433" maxX="484" minY="818" maxY="869" name="firehydrant-l"/>
-  <symbol minX="484" maxX="535" minY="818" maxY="869" name="waste-basket-l"/>
-  <symbol minX="535" maxX="586" minY="818" maxY="869" name="lightrail-berlin-m"/>
-  <symbol minX="586" maxX="637" minY="818" maxY="869" name="bike-parking-l"/>
-  <symbol minX="637" maxX="688" minY="818" maxY="869" name="parking-l"/>
-  <symbol minX="688" maxX="746" minY="818" maxY="869" name="subway-moscow-l"/>
-  <symbol minX="746" maxX="797" minY="818" maxY="869" name="subway-rome-l"/>
-  <symbol minX="797" maxX="844" minY="818" maxY="865" name="no-icon-tourism"/>
-  <symbol minX="844" maxX="891" minY="818" maxY="865" name="no-icon"/>
-  <symbol minX="891" maxX="938" minY="818" maxY="865" name="subway-rome-m"/>
-  <symbol minX="938" maxX="985" minY="818" maxY="865" name="no-icon-shop"/>
-  <symbol minX="985" maxX="1032" minY="818" maxY="865" name="subway-paris-m"/>
-  <symbol minX="1032" maxX="1086" minY="818" maxY="865" name="subway-moscow-m"/>
-  <symbol minX="1086" maxX="1133" minY="818" maxY="865" name="no-icon-leisure"/>
-  <symbol minX="1133" maxX="1180" minY="818" maxY="865" name="no-icon-amenity"/>
-  <symbol minX="1180" maxX="1227" minY="818" maxY="865" name="subway-berlin-m"/>
-  <symbol minX="1227" maxX="1273" minY="818" maxY="864" name="api-result"/>
-  <symbol minX="1273" maxX="1319" minY="818" maxY="864" name="search-result"/>
-  <symbol minX="1319" maxX="1377" minY="818" maxY="863" name="subway-london-l"/>
-  <symbol minX="1377" maxX="1422" minY="818" maxY="863" name="airport-s"/>
-  <symbol minX="1422" maxX="1464" minY="818" maxY="860" name="npark-s"/>
-  <symbol minX="1464" maxX="1506" minY="818" maxY="860" name="museum-s"/>
-  <symbol minX="1506" maxX="1548" minY="818" maxY="860" name="skiing-s"/>
-  <symbol minX="1548" maxX="1590" minY="818" maxY="860" name="car-repair-s"/>
-  <symbol minX="1590" maxX="1632" minY="818" maxY="860" name="australian-football-s"/>
-  <symbol minX="1632" maxX="1674" minY="818" maxY="860" name="soccer-s"/>
-  <symbol minX="1674" maxX="1716" minY="818" maxY="860" name="shop-s"/>
-  <symbol minX="1716" maxX="1758" minY="818" maxY="860" name="speedcam-m"/>
-  <symbol minX="1758" maxX="1800" minY="818" maxY="860" name="remains-s"/>
-  <symbol minX="1800" maxX="1842" minY="818" maxY="860" name="peak-s"/>
-  <symbol minX="1842" maxX="1884" minY="818" maxY="860" name="shop-s copy"/>
-  <symbol minX="1884" maxX="1926" minY="818" maxY="860" name="restaurant-s"/>
-  <symbol minX="1926" maxX="1968" minY="818" maxY="860" name="golf-s"/>
-  <symbol minX="1968" maxX="2010" minY="818" maxY="860" name="grocery-s"/>
-  <symbol minX="0" maxX="42" minY="874" maxY="916" name="alcohol-s"/>
-  <symbol minX="42" maxX="100" minY="874" maxY="916" name="subway-barcelona-m"/>
-  <symbol minX="100" maxX="151" minY="874" maxY="916" name="subway-barcelona-s"/>
+  <symbol minX="331" maxX="382" minY="818" maxY="869" name="subway-berlin-l"/>
+  <symbol minX="382" maxX="433" minY="818" maxY="869" name="parking-l"/>
+  <symbol minX="433" maxX="484" minY="818" maxY="869" name="subway-rome-l"/>
+  <symbol minX="484" maxX="542" minY="818" maxY="869" name="subway-moscow-l"/>
+  <symbol minX="542" maxX="593" minY="818" maxY="869" name="waste-basket-l"/>
+  <symbol minX="593" maxX="644" minY="818" maxY="869" name="lightrail-berlin-m"/>
+  <symbol minX="644" maxX="695" minY="818" maxY="869" name="bike-parking-l"/>
+  <symbol minX="695" maxX="735" minY="818" maxY="867" name="firehydrant-l"/>
+  <symbol minX="735" maxX="782" minY="818" maxY="865" name="no-icon-leisure"/>
+  <symbol minX="782" maxX="829" minY="818" maxY="865" name="no-icon-shop"/>
+  <symbol minX="829" maxX="876" minY="818" maxY="865" name="no-icon-tourism"/>
+  <symbol minX="876" maxX="923" minY="818" maxY="865" name="no-icon"/>
+  <symbol minX="923" maxX="970" minY="818" maxY="865" name="subway-rome-m"/>
+  <symbol minX="970" maxX="1017" minY="818" maxY="865" name="no-icon-amenity"/>
+  <symbol minX="1017" maxX="1064" minY="818" maxY="865" name="subway-paris-m"/>
+  <symbol minX="1064" maxX="1118" minY="818" maxY="865" name="subway-moscow-m"/>
+  <symbol minX="1118" maxX="1165" minY="818" maxY="865" name="waste-basket-s"/>
+  <symbol minX="1165" maxX="1212" minY="818" maxY="865" name="subway-berlin-m"/>
+  <symbol minX="1212" maxX="1258" minY="818" maxY="864" name="api-result"/>
+  <symbol minX="1258" maxX="1304" minY="818" maxY="864" name="search-result"/>
+  <symbol minX="1304" maxX="1362" minY="818" maxY="863" name="subway-london-l"/>
+  <symbol minX="1362" maxX="1407" minY="818" maxY="863" name="airport-s"/>
+  <symbol minX="1407" maxX="1449" minY="818" maxY="860" name="npark-s"/>
+  <symbol minX="1449" maxX="1491" minY="818" maxY="860" name="museum-s"/>
+  <symbol minX="1491" maxX="1533" minY="818" maxY="860" name="skiing-s"/>
+  <symbol minX="1533" maxX="1575" minY="818" maxY="860" name="car-repair-s"/>
+  <symbol minX="1575" maxX="1617" minY="818" maxY="860" name="australian-football-s"/>
+  <symbol minX="1617" maxX="1659" minY="818" maxY="860" name="soccer-s"/>
+  <symbol minX="1659" maxX="1701" minY="818" maxY="860" name="shop-s"/>
+  <symbol minX="1701" maxX="1743" minY="818" maxY="860" name="speedcam-m"/>
+  <symbol minX="1743" maxX="1785" minY="818" maxY="860" name="remains-s"/>
+  <symbol minX="1785" maxX="1827" minY="818" maxY="860" name="peak-s"/>
+  <symbol minX="1827" maxX="1851" minY="818" maxY="860" name="parking-ticket-l"/>
+  <symbol minX="1851" maxX="1893" minY="818" maxY="860" name="restaurant-s"/>
+  <symbol minX="1893" maxX="1935" minY="818" maxY="860" name="golf-s"/>
+  <symbol minX="1935" maxX="1977" minY="818" maxY="860" name="grocery-s"/>
+  <symbol minX="1977" maxX="2019" minY="818" maxY="860" name="alcohol-s"/>
+  <symbol minX="0" maxX="58" minY="874" maxY="916" name="subway-barcelona-m"/>
+  <symbol minX="58" maxX="109" minY="874" maxY="916" name="subway-barcelona-s"/>
+  <symbol minX="109" maxX="151" minY="874" maxY="916" name="shop-s copy"/>
   <symbol minX="151" maxX="193" minY="874" maxY="916" name="cricket-s"/>
-  <symbol minX="193" maxX="235" minY="874" maxY="916" name="pharmacy-s"/>
-  <symbol minX="235" maxX="277" minY="874" maxY="916" name="garden-s"/>
-  <symbol minX="277" maxX="319" minY="874" maxY="916" name="gym-s"/>
-  <symbol minX="319" maxX="361" minY="874" maxY="916" name="subway-entrance-2-s"/>
-  <symbol minX="361" maxX="403" minY="874" maxY="916" name="subway-entrance-arrow"/>
-  <symbol minX="403" maxX="445" minY="874" maxY="916" name="curling-s"/>
-  <symbol minX="445" maxX="487" minY="874" maxY="916" name="alpine_hut-s"/>
-  <symbol minX="487" maxX="529" minY="874" maxY="916" name="subway-entrance-s"/>
-  <symbol minX="529" maxX="571" minY="874" maxY="916" name="gallery-s"/>
-  <symbol minX="571" maxX="613" minY="874" maxY="916" name="funicular-s"/>
-  <symbol minX="613" maxX="655" minY="874" maxY="916" name="america-football-s"/>
-  <symbol minX="655" maxX="697" minY="874" maxY="916" name="campsite-s"/>
-  <symbol minX="697" maxX="739" minY="874" maxY="916" name="phone-s"/>
-  <symbol minX="739" maxX="795" minY="874" maxY="916" name="subway-london-m"/>
-  <symbol minX="795" maxX="837" minY="874" maxY="916" name="helipad-s"/>
-  <symbol minX="837" maxX="879" minY="874" maxY="916" name="picnic-s"/>
-  <symbol minX="879" maxX="921" minY="874" maxY="916" name="heliport-s"/>
-  <symbol minX="921" maxX="979" minY="874" maxY="916" name="subway-madrid-m"/>
-  <symbol minX="979" maxX="1021" minY="874" maxY="916" name="archery-s"/>
-  <symbol minX="1021" maxX="1063" minY="874" maxY="916" name="bar-s"/>
-  <symbol minX="1063" maxX="1105" minY="874" maxY="916" name="fuel-s"/>
-  <symbol minX="1105" maxX="1147" minY="874" maxY="916" name="atm-s copy 2"/>
+  <symbol minX="193" maxX="235" minY="874" maxY="916" name="garden-s"/>
+  <symbol minX="235" maxX="277" minY="874" maxY="916" name="gym-s"/>
+  <symbol minX="277" maxX="319" minY="874" maxY="916" name="subway-entrance-2-s"/>
+  <symbol minX="319" maxX="361" minY="874" maxY="916" name="subway-entrance-arrow"/>
+  <symbol minX="361" maxX="403" minY="874" maxY="916" name="curling-s"/>
+  <symbol minX="403" maxX="445" minY="874" maxY="916" name="alpine_hut-s"/>
+  <symbol minX="445" maxX="487" minY="874" maxY="916" name="subway-entrance-s"/>
+  <symbol minX="487" maxX="529" minY="874" maxY="916" name="gallery-s"/>
+  <symbol minX="529" maxX="571" minY="874" maxY="916" name="funicular-s"/>
+  <symbol minX="571" maxX="613" minY="874" maxY="916" name="america-football-s"/>
+  <symbol minX="613" maxX="655" minY="874" maxY="916" name="campsite-s"/>
+  <symbol minX="655" maxX="697" minY="874" maxY="916" name="pharmacy-s"/>
+  <symbol minX="697" maxX="753" minY="874" maxY="916" name="subway-london-m"/>
+  <symbol minX="753" maxX="795" minY="874" maxY="916" name="helipad-s"/>
+  <symbol minX="795" maxX="837" minY="874" maxY="916" name="phone-s"/>
+  <symbol minX="837" maxX="879" minY="874" maxY="916" name="heliport-s"/>
+  <symbol minX="879" maxX="937" minY="874" maxY="916" name="subway-madrid-m"/>
+  <symbol minX="937" maxX="979" minY="874" maxY="916" name="archery-s"/>
+  <symbol minX="979" maxX="1021" minY="874" maxY="916" name="bar-s"/>
+  <symbol minX="1021" maxX="1063" minY="874" maxY="916" name="fuel-s"/>
+  <symbol minX="1063" maxX="1105" minY="874" maxY="916" name="atm-s copy 2"/>
+  <symbol minX="1105" maxX="1147" minY="874" maxY="916" name="picnic-s"/>
   <symbol minX="1147" maxX="1189" minY="874" maxY="916" name="college-s"/>
-  <symbol minX="1189" maxX="1231" minY="874" maxY="916" name="pitch-s"/>
-  <symbol minX="1231" maxX="1273" minY="874" maxY="916" name="zoo-s"/>
-  <symbol minX="1273" maxX="1315" minY="874" maxY="916" name="park-s"/>
-  <symbol minX="1315" maxX="1357" minY="874" maxY="916" name="dentist-s"/>
-  <symbol minX="1357" maxX="1399" minY="874" maxY="916" name="subway-newyork-s"/>
-  <symbol minX="1399" maxX="1441" minY="874" maxY="916" name="hospital-s"/>
-  <symbol minX="1441" maxX="1483" minY="874" maxY="916" name="cafe-s"/>
-  <symbol minX="1483" maxX="1525" minY="874" maxY="916" name="place-of-worship-s"/>
-  <symbol minX="1525" maxX="1567" minY="874" maxY="916" name="fountain-s"/>
+  <symbol minX="1189" maxX="1231" minY="874" maxY="916" name="zoo-s"/>
+  <symbol minX="1231" maxX="1273" minY="874" maxY="916" name="park-s"/>
+  <symbol minX="1273" maxX="1315" minY="874" maxY="916" name="dentist-s"/>
+  <symbol minX="1315" maxX="1357" minY="874" maxY="916" name="subway-newyork-s"/>
+  <symbol minX="1357" maxX="1399" minY="874" maxY="916" name="hospital-s"/>
+  <symbol minX="1399" maxX="1441" minY="874" maxY="916" name="cafe-s"/>
+  <symbol minX="1441" maxX="1483" minY="874" maxY="916" name="pitch-s"/>
+  <symbol minX="1483" maxX="1525" minY="874" maxY="916" name="fountain-s"/>
+  <symbol minX="1525" maxX="1567" minY="874" maxY="916" name="place-of-worship-s"/>
   <symbol minX="1567" maxX="1609" minY="874" maxY="916" name="casino-s"/>
-  <symbol minX="1609" maxX="1651" minY="874" maxY="916" name="police-s"/>
-  <symbol minX="1651" maxX="1693" minY="874" maxY="916" name="windmill-s"/>
-  <symbol minX="1693" maxX="1735" minY="874" maxY="916" name="subway-s"/>
-  <symbol minX="1735" maxX="1777" minY="874" maxY="916" name="office-s"/>
-  <symbol minX="1777" maxX="1819" minY="874" maxY="916" name="nparkf-s"/>
-  <symbol minX="1819" maxX="1861" minY="874" maxY="916" name="subway-spb-s"/>
-  <symbol minX="1861" maxX="1903" minY="874" maxY="916" name="hotel-s"/>
-  <symbol minX="1903" maxX="1945" minY="874" maxY="916" name="baseball-s"/>
-  <symbol minX="1945" maxX="1987" minY="874" maxY="916" name="information-s"/>
-  <symbol minX="1987" maxX="2029" minY="874" maxY="916" name="cemetery-s"/>
-  <symbol minX="0" maxX="42" minY="916" maxY="958" name="fire_station-s"/>
-  <symbol minX="42" maxX="84" minY="916" maxY="958" name="cable-car-s"/>
-  <symbol minX="84" maxX="126" minY="916" maxY="958" name="diving-s"/>
-  <symbol minX="126" maxX="168" minY="916" maxY="958" name="basketball-s"/>
-  <symbol minX="168" maxX="210" minY="916" maxY="958" name="waterfall-s"/>
-  <symbol minX="210" maxX="252" minY="916" maxY="958" name="swimming-s"/>
+  <symbol minX="1609" maxX="1651" minY="874" maxY="916" name="windmill-s"/>
+  <symbol minX="1651" maxX="1693" minY="874" maxY="916" name="subway-s"/>
+  <symbol minX="1693" maxX="1735" minY="874" maxY="916" name="office-s"/>
+  <symbol minX="1735" maxX="1777" minY="874" maxY="916" name="nparkf-s"/>
+  <symbol minX="1777" maxX="1819" minY="874" maxY="916" name="subway-spb-s"/>
+  <symbol minX="1819" maxX="1861" minY="874" maxY="916" name="hotel-s"/>
+  <symbol minX="1861" maxX="1903" minY="874" maxY="916" name="baseball-s"/>
+  <symbol minX="1903" maxX="1945" minY="874" maxY="916" name="information-s"/>
+  <symbol minX="1945" maxX="1987" minY="874" maxY="916" name="cemetery-s"/>
+  <symbol minX="1987" maxX="2029" minY="874" maxY="916" name="fire_station-s"/>
+  <symbol minX="0" maxX="42" minY="916" maxY="958" name="cable-car-s"/>
+  <symbol minX="42" maxX="84" minY="916" maxY="958" name="diving-s"/>
+  <symbol minX="84" maxX="126" minY="916" maxY="958" name="basketball-s"/>
+  <symbol minX="126" maxX="168" minY="916" maxY="958" name="waterfall-s"/>
+  <symbol minX="168" maxX="210" minY="916" maxY="958" name="swimming-s"/>
+  <symbol minX="210" maxX="252" minY="916" maxY="958" name="police-s"/>
   <symbol minX="252" maxX="294" minY="916" maxY="958" name="climbing-s"/>
-  <symbol minX="294" maxX="336" minY="916" maxY="958" name="cinema-s"/>
-  <symbol minX="336" maxX="378" minY="916" maxY="958" name="bus-s"/>
-  <symbol minX="378" maxX="420" minY="916" maxY="958" name="pub-s"/>
-  <symbol minX="420" maxX="462" minY="916" maxY="958" name="tennis-s"/>
+  <symbol minX="294" maxX="336" minY="916" maxY="958" name="bus-s"/>
+  <symbol minX="336" maxX="378" minY="916" maxY="958" name="cinema-s"/>
+  <symbol minX="378" maxX="420" minY="916" maxY="958" name="tennis-s"/>
+  <symbol minX="420" maxX="462" minY="916" maxY="958" name="pub-s"/>
   <symbol minX="462" maxX="504" minY="916" maxY="958" name="cave-s"/>
-  <symbol minX="504" maxX="546" minY="916" maxY="958" name="school-s"/>
-  <symbol minX="546" maxX="588" minY="916" maxY="958" name="theatre-s"/>
-  <symbol minX="588" maxX="630" minY="916" maxY="958" name="bowls-s"/>
-  <symbol minX="630" maxX="672" minY="916" maxY="958" name="ship-s"/>
-  <symbol minX="672" maxX="714" minY="916" maxY="958" name="kindergarten-s"/>
-  <symbol minX="714" maxX="756" minY="916" maxY="958" name="motel-s"/>
-  <symbol minX="756" maxX="798" minY="916" maxY="958" name="toilets-s"/>
-  <symbol minX="798" maxX="840" minY="916" maxY="958" name="fastfood-s"/>
-  <symbol minX="840" maxX="882" minY="916" maxY="958" name="monument-s"/>
-  <symbol minX="882" maxX="924" minY="916" maxY="958" name="toll_booth-s"/>
-  <symbol minX="924" maxX="966" minY="916" maxY="958" name="book-shop-s"/>
-  <symbol minX="966" maxX="1008" minY="916" maxY="958" name="charging-station-s"/>
-  <symbol minX="1008" maxX="1050" minY="916" maxY="958" name="military-s"/>
-  <symbol minX="1050" maxX="1092" minY="916" maxY="958" name="atm-s"/>
-  <symbol minX="1092" maxX="1134" minY="916" maxY="958" name="tourism-s"/>
-  <symbol minX="1134" maxX="1176" minY="916" maxY="958" name="volcano-s"/>
-  <symbol minX="1176" maxX="1218" minY="916" maxY="958" name="bicycle-s"/>
-  <symbol minX="1218" maxX="1260" minY="916" maxY="958" name="viewpoint-s"/>
-  <symbol minX="1260" maxX="1318" minY="916" maxY="958" name="metro-barcelona-m"/>
-  <symbol minX="1318" maxX="1360" minY="916" maxY="958" name="townhall-s"/>
-  <symbol minX="1360" maxX="1402" minY="916" maxY="958" name="bcontrol-s"/>
-  <symbol minX="1402" maxX="1444" minY="916" maxY="958" name="marketplace-s"/>
-  <symbol minX="1444" maxX="1486" minY="916" maxY="958" name="beer-s"/>
-  <symbol minX="1486" maxX="1528" minY="916" maxY="958" name="drinking-water-s"/>
-  <symbol minX="1528" maxX="1570" minY="916" maxY="958" name="train-s"/>
-  <symbol minX="1570" maxX="1612" minY="916" maxY="958" name="mail-s"/>
-  <symbol minX="1612" maxX="1654" minY="916" maxY="958" name="library-s"/>
-  <symbol minX="1654" maxX="1696" minY="916" maxY="958" name="tram-s"/>
-  <symbol minX="1696" maxX="1738" minY="916" maxY="958" name="embassy-s"/>
-  <symbol minX="1738" maxX="1780" minY="916" maxY="958" name="beach-s"/>
-  <symbol minX="1780" maxX="1822" minY="916" maxY="958" name="lighthouse-s"/>
-  <symbol minX="1822" maxX="1864" minY="916" maxY="958" name="recycling-s"/>
-  <symbol minX="1864" maxX="1922" minY="916" maxY="957" name="subway-barcelona-l"/>
-  <symbol minX="1922" maxX="1980" minY="916" maxY="957" name="subway-madrid-l"/>
+  <symbol minX="504" maxX="546" minY="916" maxY="958" name="theatre-s"/>
+  <symbol minX="546" maxX="588" minY="916" maxY="958" name="bowls-s"/>
+  <symbol minX="588" maxX="630" minY="916" maxY="958" name="ship-s"/>
+  <symbol minX="630" maxX="672" minY="916" maxY="958" name="kindergarten-s"/>
+  <symbol minX="672" maxX="714" minY="916" maxY="958" name="motel-s"/>
+  <symbol minX="714" maxX="756" minY="916" maxY="958" name="toilets-s"/>
+  <symbol minX="756" maxX="798" minY="916" maxY="958" name="fastfood-s"/>
+  <symbol minX="798" maxX="840" minY="916" maxY="958" name="monument-s"/>
+  <symbol minX="840" maxX="882" minY="916" maxY="958" name="toll_booth-s"/>
+  <symbol minX="882" maxX="924" minY="916" maxY="958" name="book-shop-s"/>
+  <symbol minX="924" maxX="966" minY="916" maxY="958" name="charging-station-s"/>
+  <symbol minX="966" maxX="1008" minY="916" maxY="958" name="military-s"/>
+  <symbol minX="1008" maxX="1050" minY="916" maxY="958" name="atm-s"/>
+  <symbol minX="1050" maxX="1092" minY="916" maxY="958" name="tourism-s"/>
+  <symbol minX="1092" maxX="1134" minY="916" maxY="958" name="school-s"/>
+  <symbol minX="1134" maxX="1176" minY="916" maxY="958" name="bicycle-s"/>
+  <symbol minX="1176" maxX="1218" minY="916" maxY="958" name="recycling-s"/>
+  <symbol minX="1218" maxX="1276" minY="916" maxY="958" name="metro-barcelona-m"/>
+  <symbol minX="1276" maxX="1318" minY="916" maxY="958" name="townhall-s"/>
+  <symbol minX="1318" maxX="1360" minY="916" maxY="958" name="volcano-s"/>
+  <symbol minX="1360" maxX="1402" minY="916" maxY="958" name="marketplace-s"/>
+  <symbol minX="1402" maxX="1444" minY="916" maxY="958" name="beer-s"/>
+  <symbol minX="1444" maxX="1486" minY="916" maxY="958" name="drinking-water-s"/>
+  <symbol minX="1486" maxX="1528" minY="916" maxY="958" name="train-s"/>
+  <symbol minX="1528" maxX="1570" minY="916" maxY="958" name="mail-s"/>
+  <symbol minX="1570" maxX="1612" minY="916" maxY="958" name="viewpoint-s"/>
+  <symbol minX="1612" maxX="1654" minY="916" maxY="958" name="tram-s"/>
+  <symbol minX="1654" maxX="1696" minY="916" maxY="958" name="bcontrol-s"/>
+  <symbol minX="1696" maxX="1738" minY="916" maxY="958" name="library-s"/>
+  <symbol minX="1738" maxX="1780" minY="916" maxY="958" name="embassy-s"/>
+  <symbol minX="1780" maxX="1822" minY="916" maxY="958" name="beach-s"/>
+  <symbol minX="1822" maxX="1864" minY="916" maxY="958" name="lighthouse-s"/>
+  <symbol minX="1864" maxX="1922" minY="916" maxY="957" name="subway-madrid-l"/>
+  <symbol minX="1922" maxX="1980" minY="916" maxY="957" name="subway-barcelona-l"/>
   <symbol minX="1980" maxX="2018" minY="916" maxY="956" name="s-arrow"/>
   <symbol minX="0" maxX="40" minY="958" maxY="998" name="parking-m"/>
-  <symbol minX="40" maxX="96" minY="958" maxY="996" name="subway-kiev-l"/>
-  <symbol minX="96" maxX="147" minY="958" maxY="996" name="metro-barcelona-s"/>
-  <symbol minX="147" maxX="203" minY="958" maxY="996" name="subway-kiev-m"/>
-  <symbol minX="203" maxX="254" minY="958" maxY="996" name="subway-madrid-s"/>
-  <symbol minX="254" maxX="292" minY="958" maxY="996" name="subway-paris-s"/>
-  <symbol minX="292" maxX="330" minY="958" maxY="996" name="lightrail-berlin-s"/>
-  <symbol minX="330" maxX="368" minY="958" maxY="996" name="waste-basket-s"/>
-  <symbol minX="368" maxX="404" minY="958" maxY="994" name="subway-moscow-s"/>
-  <symbol minX="404" maxX="437" minY="958" maxY="991" name="subway-berlin-s"/>
-  <symbol minX="437" maxX="470" minY="958" maxY="991" name="parking-s"/>
-  <symbol minX="470" maxX="512" minY="958" maxY="991" name="subway-london-s"/>
-  <symbol minX="512" maxX="545" minY="958" maxY="991" name="speedcam-s"/>
-  <symbol minX="545" maxX="578" minY="958" maxY="991" name="subway-rome-s"/>
-  <symbol minX="578" maxX="616" minY="958" maxY="991" name="bench"/>
-  <symbol minX="616" maxX="649" minY="958" maxY="991" name="star-l"/>
-  <symbol minX="649" maxX="680" minY="958" maxY="989" name="survey_point-l"/>
-  <symbol minX="680" maxX="736" minY="958" maxY="989" name="subway-minsk-l"/>
-  <symbol minX="736" maxX="767" minY="958" maxY="989" name="star-m"/>
-  <symbol minX="767" maxX="800" minY="958" maxY="989" name="peakt-l"/>
-  <symbol minX="800" maxX="847" minY="958" maxY="987" name="subway-kiev-s"/>
-  <symbol minX="847" maxX="874" minY="958" maxY="985" name="subway-newyork-xs"/>
-  <symbol minX="874" maxX="901" minY="958" maxY="985" name="subway-xs"/>
-  <symbol minX="901" maxX="943" minY="958" maxY="985" name="railway-crossing"/>
-  <symbol minX="943" maxX="990" minY="958" maxY="985" name="subway-minsk-m"/>
-  <symbol minX="990" maxX="1017" minY="958" maxY="985" name="survey_point-m"/>
-  <symbol minX="1017" maxX="1044" minY="958" maxY="985" name="star-s"/>
-  <symbol minX="1044" maxX="1086" minY="958" maxY="982" name="subway-minsk-s"/>
-  <symbol minX="1086" maxX="1110" minY="958" maxY="982" name="subway-xs copy"/>
-  <symbol minX="1110" maxX="1161" minY="958" maxY="980" name="arrow-m"/>
-  <symbol minX="1161" maxX="1185" minY="958" maxY="980" name="peakt-m"/>
-  <symbol minX="1185" maxX="1207" minY="958" maxY="980" name="survey_point-s"/>
-  <symbol minX="1207" maxX="1227" minY="958" maxY="978" name="entrance-s"/>
-  <symbol minX="1227" maxX="1247" minY="958" maxY="976" name="peakt-s"/>
-  <symbol minX="1247" maxX="1265" minY="958" maxY="976" name="dot-m"/>
-  <symbol minX="1265" maxX="1280" minY="958" maxY="973" name="tree-l"/>
-  <symbol minX="1280" maxX="1295" minY="958" maxY="973" name="none"/>
-  <symbol minX="1295" maxX="1333" minY="958" maxY="973" name="arrow-s"/>
-  <symbol minX="1333" maxX="1346" minY="958" maxY="971" name="dot-s"/>
-  <symbol minX="1346" maxX="1359" minY="958" maxY="971" name="entrance-xs"/>
-  <symbol minX="1359" maxX="1372" minY="958" maxY="971" name="dot-s-light"/>
-  <symbol minX="1372" maxX="1385" minY="958" maxY="971" name="tree-m"/>
-  <symbol minX="1385" maxX="1396" minY="958" maxY="969" name="zero-icon"/>
-  <symbol minX="1396" maxX="1407" minY="958" maxY="969" name="tree-s"/>
+  <symbol minX="40" maxX="78" minY="958" maxY="996" name="lightrail-berlin-s"/>
+  <symbol minX="78" maxX="116" minY="958" maxY="996" name="subway-paris-s"/>
+  <symbol minX="116" maxX="167" minY="958" maxY="996" name="subway-madrid-s"/>
+  <symbol minX="167" maxX="223" minY="958" maxY="996" name="subway-kiev-m"/>
+  <symbol minX="223" maxX="274" minY="958" maxY="996" name="metro-barcelona-s"/>
+  <symbol minX="274" maxX="330" minY="958" maxY="996" name="subway-kiev-l"/>
+  <symbol minX="330" maxX="366" minY="958" maxY="994" name="subway-moscow-s"/>
+  <symbol minX="366" maxX="399" minY="958" maxY="991" name="speedcam-s"/>
+  <symbol minX="399" maxX="432" minY="958" maxY="991" name="subway-berlin-s"/>
+  <symbol minX="432" maxX="465" minY="958" maxY="991" name="parking-s"/>
+  <symbol minX="465" maxX="498" minY="958" maxY="991" name="star-l"/>
+  <symbol minX="498" maxX="540" minY="958" maxY="991" name="subway-london-s"/>
+  <symbol minX="540" maxX="573" minY="958" maxY="991" name="subway-rome-s"/>
+  <symbol minX="573" maxX="611" minY="958" maxY="991" name="bench"/>
+  <symbol minX="611" maxX="644" minY="958" maxY="989" name="peakt-l"/>
+  <symbol minX="644" maxX="675" minY="958" maxY="989" name="survey_point-l"/>
+  <symbol minX="675" maxX="731" minY="958" maxY="989" name="subway-minsk-l"/>
+  <symbol minX="731" maxX="762" minY="958" maxY="989" name="star-m"/>
+  <symbol minX="762" maxX="809" minY="958" maxY="987" name="subway-kiev-s"/>
+  <symbol minX="809" maxX="851" minY="958" maxY="985" name="railway-crossing"/>
+  <symbol minX="851" maxX="878" minY="958" maxY="985" name="subway-newyork-xs"/>
+  <symbol minX="878" maxX="905" minY="958" maxY="985" name="subway-xs"/>
+  <symbol minX="905" maxX="952" minY="958" maxY="985" name="subway-minsk-m"/>
+  <symbol minX="952" maxX="979" minY="958" maxY="985" name="star-s"/>
+  <symbol minX="979" maxX="1006" minY="958" maxY="985" name="survey_point-m"/>
+  <symbol minX="1006" maxX="1048" minY="958" maxY="982" name="subway-minsk-s"/>
+  <symbol minX="1048" maxX="1072" minY="958" maxY="982" name="subway-xs copy"/>
+  <symbol minX="1072" maxX="1123" minY="958" maxY="980" name="arrow-m"/>
+  <symbol minX="1123" maxX="1145" minY="958" maxY="980" name="survey_point-s"/>
+  <symbol minX="1145" maxX="1169" minY="958" maxY="980" name="peakt-m"/>
+  <symbol minX="1169" maxX="1189" minY="958" maxY="978" name="entrance-s"/>
+  <symbol minX="1189" maxX="1209" minY="958" maxY="976" name="peakt-s"/>
+  <symbol minX="1209" maxX="1227" minY="958" maxY="976" name="dot-m"/>
+  <symbol minX="1227" maxX="1242" minY="958" maxY="973" name="none"/>
+  <symbol minX="1242" maxX="1257" minY="958" maxY="973" name="tree-l"/>
+  <symbol minX="1257" maxX="1295" minY="958" maxY="973" name="arrow-s"/>
+  <symbol minX="1295" maxX="1308" minY="958" maxY="971" name="dot-s"/>
+  <symbol minX="1308" maxX="1321" minY="958" maxY="971" name="dot-s-light"/>
+  <symbol minX="1321" maxX="1334" minY="958" maxY="971" name="tree-m"/>
+  <symbol minX="1334" maxX="1347" minY="958" maxY="971" name="entrance-xs"/>
+  <symbol minX="1347" maxX="1358" minY="958" maxY="969" name="zero-icon"/>
+  <symbol minX="1358" maxX="1369" minY="958" maxY="969" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_legacy/symbols.png b/data/resources-xxhdpi_legacy/symbols.png
index cd2abfbb1f..7dd0af63a2 100644
Binary files a/data/resources-xxhdpi_legacy/symbols.png and b/data/resources-xxhdpi_legacy/symbols.png differ
diff --git a/data/styles/clear/style-clear/symbols/firehydrant-l.svg b/data/styles/clear/style-clear/symbols/firehydrant-l.svg
index 8f61851839..f42885f383 100644
--- a/data/styles/clear/style-clear/symbols/firehydrant-l.svg
+++ b/data/styles/clear/style-clear/symbols/firehydrant-l.svg
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="16px" height="20px" viewBox="0 0 16 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>firehydrant-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-2" transform="translate(2.000000, 1.000000)" fill="#717065">
-            <path d="M1,10 L1,8.99077797 C1,8.45097518 1.44771525,8 2,8 L3,8 L3,14 L2,14 C1.44386482,14 1,13.5564136 1,13.009222 L1,12 C0.44771525,12 0,11.5561352 0,11 C0,10.4477153 0.443864822,10 1,10 Z M15,10 L15,8.99077797 C15,8.45097518 14.5522847,8 14,8 L13,8 L13,14 L14,14 C14.5561352,14 15,13.5564136 15,13.009222 L15,12 C15.5561352,12 16,11.5522847 16,11 C16,10.4438648 15.5522847,10 15,10 Z M8.99243941,1.12407944 C10.7215016,1.56548716 12,3.13343893 12,5 C8,5 8,5 4,5 C4,3.1334495 5.27848395,1.56550493 7.0075312,1.12408695 C7.00255985,1.08346212 7,1.04205202 7,1 C7,0.44771525 7.44386482,0 8,0 C8.55228475,0 9,0.443864822 9,1 C9,1.04201537 8.99743114,1.08342555 8.99243941,1.12407944 Z M11,8 L11,6 L5,6 L5,8 L4,8 L4,14 L5,14 L5,20 L11,20 L11,14 L12,14 L12,8 L11,8 Z M8,14 C9.65685425,14 11,12.6568542 11,11 C11,9.34314575 9.65685425,8 8,8 C6.34314575,8 5,9.34314575 5,11 C5,12.6568542 6.34314575,14 8,14 Z M7,11 C7,10.4477153 7.44386482,10 8,10 C8.55228475,10 9,10.4438648 9,11 C9,11.5522847 8.55613518,12 8,12 C7.44771525,12 7,11.5561352 7,11 Z" id="Combined-Shape"></path>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="firehydrant-l" fill="#717065">
+            <g id="POI">
+                <g>
+                    <g id="Group-2">
+                        <path d="M1,10 L1,8.99077797 C1,8.45097518 1.44771525,8 2,8 L3,8 L3,14 L2,14 C1.44386482,14 1,13.5564136 1,13.009222 L1,12 C0.44771525,12 0,11.5561352 0,11 C0,10.4477153 0.443864822,10 1,10 L1,10 Z M15,10 L15,8.99077797 C15,8.45097518 14.5522847,8 14,8 L13,8 L13,14 L14,14 C14.5561352,14 15,13.5564136 15,13.009222 L15,12 C15.5561352,12 16,11.5522847 16,11 C16,10.4438648 15.5522847,10 15,10 L15,10 Z M8.99243941,1.12407944 C10.7215016,1.56548716 12,3.13343893 12,5 L4,5 C4,3.1334495 5.27848395,1.56550493 7.0075312,1.12408695 C7.00255985,1.08346212 7,1.04205202 7,1 C7,0.44771525 7.44386482,0 8,0 C8.55228475,0 9,0.443864822 9,1 C9,1.04201537 8.99743114,1.08342555 8.99243941,1.12407944 L8.99243941,1.12407944 Z M11,8 L11,6 L5,6 L5,8 L4,8 L4,14 L5,14 L5,20 L11,20 L11,14 L12,14 L12,8 L11,8 L11,8 Z M8,14 C9.65685425,14 11,12.6568542 11,11 C11,9.34314575 9.65685425,8 8,8 C6.34314575,8 5,9.34314575 5,11 C5,12.6568542 6.34314575,14 8,14 L8,14 Z M7,11 C7,10.4477153 7.44386482,10 8,10 C8.55228475,10 9,10.4438648 9,11 C9,11.5522847 8.55613518,12 8,12 C7.44771525,12 7,11.5561352 7,11 L7,11 Z" id="Combined-Shape"></path>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/parking-ticket-l.svg b/data/styles/clear/style-clear/symbols/parking-ticket-l.svg
index 0b033c1c55..56021b61e9 100644
--- a/data/styles/clear/style-clear/symbols/parking-ticket-l.svg
+++ b/data/styles/clear/style-clear/symbols/parking-ticket-l.svg
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="9px" height="17px" viewBox="0 0 9 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>parking-ticket-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M6,4.59949948 C6,3.16383556 7.10357666,2 8.45928955,2 L12.5407104,2 C13.8989386,2 15,3.16510397 15,4.59949948 L15,12.4005005 C15,13.8361644 13.8964233,15 12.5407104,15 L8.45928955,15 C7.10106144,15 6,13.834896 6,12.4005005 L6,4.59949948 Z M9.5490457,6.84841736 L9.99698833,6.54638427 C10.2460071,6.37847902 10.7565947,6.38328425 11.0079151,6.55802165 L11.4541674,6.8682907 C11.9076205,7.18356633 12.5307983,7.07155134 12.8460739,6.61809823 C13.1613495,6.16464512 13.0493345,5.54146735 12.5958814,5.22619172 L12.1496292,4.91592267 C11.2220193,4.27097663 9.81381805,4.25772379 8.87887739,4.88812376 L8.43093476,5.19015685 C7.97301877,5.49891466 7.85210217,6.12042658 8.16085998,6.57834258 C8.46961779,7.03625858 9.09112971,7.15717518 9.5490457,6.84841736 Z M9,15 L12,15 L12,19 L9,19 L9,15 Z" id="Combined-Shape" fill="#717065"></path>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="parking-ticket-l" fill="#717065">
+            <g id="POI">
+                <g>
+                    <path d="M0,2.59949948 C0,1.16383556 1.10357666,0 2.45928955,0 L6.5407104,0 C7.8989386,0 9,1.16510397 9,2.59949948 L9,10.4005005 C9,11.8361644 7.8964233,13 6.5407104,13 L2.45928955,13 C1.10106144,13 0,11.834896 0,10.4005005 L0,2.59949948 L0,2.59949948 Z M3.5490457,4.84841736 L3.99698833,4.54638427 C4.2460071,4.37847902 4.7565947,4.38328425 5.0079151,4.55802165 L5.4541674,4.8682907 C5.9076205,5.18356633 6.5307983,5.07155134 6.8460739,4.61809823 C7.1613495,4.16464512 7.0493345,3.54146735 6.5958814,3.22619172 L6.1496292,2.91592267 C5.2220193,2.27097663 3.81381805,2.25772379 2.87887739,2.88812376 L2.43093476,3.19015685 C1.97301877,3.49891466 1.85210217,4.12042658 2.16085998,4.57834258 C2.46961779,5.03625858 3.09112971,5.15717518 3.5490457,4.84841736 L3.5490457,4.84841736 Z M3,13 L6,13 L6,17 L3,17 L3,13 L3,13 Z" id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-l.svg b/data/styles/clear/style-clear/symbols/seafood-shop-l.svg
index 02dddec92f..fce957ca20 100644
--- a/data/styles/clear/style-clear/symbols/seafood-shop-l.svg
+++ b/data/styles/clear/style-clear/symbols/seafood-shop-l.svg
@@ -4,11 +4,17 @@
     <title>seefood-shop-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="lighthouse-l">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="seefood-shop-l">
+            <g id="POI">
+                <g>
+                    <g id="lighthouse-l">
+                        <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                        <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+                    </g>
+                    <path d="M16,9.0752622 L16,9 C15.6517335,8.19587519 12.8482116,6.52786081 12.8482116,6.52786081 C12.3797991,6.23308443 12.1083794,6.43351749 12.2420721,6.96828842 L12.8362083,9.34483333 C10.5176401,10.0699078 8.62482629,11.7666939 7.6708292,12.7531219 L4,10 L4,17 L7.6708292,14.2468781 C8.33849202,14.937238 9.46598886,15.9755324 10.8774462,16.7851618 C10.4008537,16.9527844 10.1493633,17.4480898 10.3164062,17.9492188 L10.6835938,19.0507812 C10.8583401,19.5750203 11.3210526,19.6789474 11.7109581,19.2890419 L13.2318804,17.7681196 C13.8006755,17.9149054 14.3924281,18 15,18 C19.418278,18 23,13.5 23,13.5 C23,13.5 19.9463116,9.66341025 16,9.0752622 L16,9.0752622 Z M18,14 C18.5522847,14 19,13.5522847 19,13 C19,12.4477153 18.5522847,12 18,12 C17.4477153,12 17,12.4477153 17,13 C17,13.5522847 17.4477153,14 18,14 L18,14 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+                </g>
+            </g>
         </g>
-        <path d="M16,9.0752622 L16,9 C15.6517335,8.19587519 12.8482116,6.52786081 12.8482116,6.52786081 C12.3797991,6.23308443 12.1083794,6.43351749 12.2420721,6.96828842 L12.8362083,9.34483333 C10.5176401,10.0699078 8.62482629,11.7666939 7.6708292,12.7531219 L4,10 L4,17 L7.6708292,14.2468781 C8.33849202,14.937238 9.46598886,15.9755324 10.8774462,16.7851618 C10.4008537,16.9527844 10.1493633,17.4480898 10.3164062,17.9492188 L10.6835938,19.0507812 C10.8583401,19.5750203 11.3210526,19.6789474 11.7109581,19.2890419 L13.2318804,17.7681196 C13.8006755,17.9149054 14.3924281,18 15,18 C19.418278,18 23,13.5 23,13.5 C23,13.5 19.9463116,9.66341025 16,9.0752622 Z M18,14 C18.5522847,14 19,13.5522847 19,13 C19,12.4477153 18.5522847,12 18,12 C17.4477153,12 17,12.4477153 17,13 C17,13.5522847 17.4477153,14 18,14 Z" id="Combined-Shape" fill="#FFFFFF"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg b/data/styles/clear/style-clear/symbols/seafood-shop-m.svg
index 043eb18cca..4199e676fc 100644
--- a/data/styles/clear/style-clear/symbols/seafood-shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/seafood-shop-m.svg
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>seefood-shop-l</title>
+    <title>seefood-shop-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="lighthouse-l">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="seefood-shop-l">
+            <g id="POI">
+                <g>
+                    <g id="lighthouse-l">
+                        <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="11.5" cy="11.5" r="11.5"></circle>
+                        <circle id="Oval-1-Copy-38" fill="#717065" cx="11.5" cy="11.5" r="10.5"></circle>
+                    </g>
+                    <path d="M15,8 C14.6517335,7.19587519 11.8482116,5.52786081 11.8482116,5.52786081 C11.3797991,5.23308443 11.1083794,5.43351749 11.2420721,5.96828842 L11.8362083,8.34483333 C9.5176401,9.0699078 7.62482629,9.7666939 6.6708292,10.7531219 L4,9 L4,14 L6.6708292,12.2468781 C7.33849202,12.937238 8.46598886,12.9755324 9.8774462,13.7851618 C9.4008537,13.9527844 9.1493633,14.4480898 9.3164062,14.9492188 L9.6835938,16.0507812 C9.8583401,16.5750203 10.3210526,16.6789474 10.7109581,16.2890419 L12.2318804,14.7681196 C12.8006755,14.9149054 13.3924281,15 14,15 C18.418278,15 20,11.5 20,11.5 C20,11.5 18.9463116,8.66341025 15,8.0752622 L15,8 Z M16,12 C16.5522847,12 17,11.5522847 17,11 C17,10.4477153 16.5522847,10 16,10 C15.4477153,10 15,10.4477153 15,11 C15,11.5522847 15.4477153,12 16,12 L16,12 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+                </g>
+            </g>
         </g>
-        <path d="M16,9.0752622 L16,9 C15.6517335,8.19587519 12.8482116,6.52786081 12.8482116,6.52786081 C12.3797991,6.23308443 12.1083794,6.43351749 12.2420721,6.96828842 L12.8362083,9.34483333 C10.5176401,10.0699078 8.62482629,11.7666939 7.6708292,12.7531219 L4,10 L4,17 L7.6708292,14.2468781 C8.33849202,14.937238 9.46598886,15.9755324 10.8774462,16.7851618 C10.4008537,16.9527844 10.1493633,17.4480898 10.3164062,17.9492188 L10.6835938,19.0507812 C10.8583401,19.5750203 11.3210526,19.6789474 11.7109581,19.2890419 L13.2318804,17.7681196 C13.8006755,17.9149054 14.3924281,18 15,18 C19.418278,18 23,13.5 23,13.5 C23,13.5 19.9463116,9.66341025 16,9.0752622 Z M18,14 C18.5522847,14 19,13.5522847 19,13 C19,12.4477153 18.5522847,12 18,12 C17.4477153,12 17,12.4477153 17,13 C17,13.5522847 17.4477153,14 18,14 Z" id="Combined-Shape" fill="#FFFFFF"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/waste-basket-l.svg b/data/styles/clear/style-clear/symbols/waste-basket-l.svg
index cc313d7d27..749795ed48 100644
--- a/data/styles/clear/style-clear/symbols/waste-basket-l.svg
+++ b/data/styles/clear/style-clear/symbols/waste-basket-l.svg
@@ -4,10 +4,20 @@
     <title>waste-basket-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="waste-basket-L">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="10.5" cy="10.5" r="10.5"></circle>
-            <path d="M8.5,2 C8.223,2 8,2.223 8,2.5 L8,4 L5,4 C4.446,4 4,4.446 4,5 C4,5.554 4.446,6 5,6 L16,6 C16.554,6 17,5.554 17,5 C17,4.446 16.554,4 16,4 L13,4 L13,2.5 C13,2.223 12.77701,2 12.5,2 L8.5,2 Z M9,3 L12,3 L12,4 L9,4 L9,3 Z M5,7 C4.446,7 3.92453,7.4212 4.01563,7.92857143 L6,19.0714286 C6.0904,19.5788929 6.446,20 7,20 L14,20 C14.554,20 14.9089,19.5788 15,19.0714286 L16.98437,7.92857143 C17.07477,7.42110714 16.554,7 16,7 L5,7 Z" id="rect5636-copy" fill="#717065"></path>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="waste-basket-l">
+            <g id="POI">
+                <g>
+                    <g id="waste-basket-l">
+                        <g id="POI">
+                            <g id="waste-basket-L">
+                                <circle id="Oval-1-Copy-39" cx="10.5" cy="10.5" r="10.5"></circle>
+                                <path d="M8.5,2 C8.223,2 8,2.223 8,2.5 L8,4 L5,4 C4.446,4 4,4.446 4,5 C4,5.554 4.446,6 5,6 L16,6 C16.554,6 17,5.554 17,5 C17,4.446 16.554,4 16,4 L13,4 L13,2.5 C13,2.223 12.77701,2 12.5,2 L8.5,2 L8.5,2 L8.5,2 Z M9,3 L12,3 L12,4 L9,4 L9,3 L9,3 L9,3 Z M5,7 C4.446,7 3.92453,7.4212 4.01563,7.92857143 L6,19.0714286 C6.0904,19.5788929 6.446,20 7,20 L14,20 C14.554,20 14.9089,19.5788 15,19.0714286 L16.98437,7.92857143 C17.07477,7.42110714 16.554,7 16,7 L5,7 L5,7 L5,7 Z" id="rect5636-copy" fill="#717065"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/waste-basket-s.svg b/data/styles/clear/style-clear/symbols/waste-basket-s.svg
index 8e966f5703..132a871aee 100644
--- a/data/styles/clear/style-clear/symbols/waste-basket-s.svg
+++ b/data/styles/clear/style-clear/symbols/waste-basket-s.svg
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="15px" height="15px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>waste-basket-l</title>
+    <title>waste-basket-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="waste-basket-L">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="10.5" cy="10.5" r="10.5"></circle>
-            <path d="M8.5,2 C8.223,2 8,2.223 8,2.5 L8,4 L5,4 C4.446,4 4,4.446 4,5 C4,5.554 4.446,6 5,6 L16,6 C16.554,6 17,5.554 17,5 C17,4.446 16.554,4 16,4 L13,4 L13,2.5 C13,2.223 12.77701,2 12.5,2 L8.5,2 Z M9,3 L12,3 L12,4 L9,4 L9,3 Z M5,7 C4.446,7 3.92453,7.4212 4.01563,7.92857143 L6,19.0714286 C6.0904,19.5788929 6.446,20 7,20 L14,20 C14.554,20 14.9089,19.5788 15,19.0714286 L16.98437,7.92857143 C17.07477,7.42110714 16.554,7 16,7 L5,7 Z" id="rect5636-copy" fill="#717065"></path>
+    <g id="Booking.com" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="waste-basket-s" transform="translate(4.000000, 2.000000)" fill="#717065">
+            <g id="waste-basket-l">
+                <g id="POI">
+                    <g id="waste-basket-L">
+                        <path d="M3.80769231,0 C3.57330769,0 3.38461538,0.188692308 3.38461538,0.423076923 L3.38461538,1.69230769 L0.846153846,1.69230769 C0.377384615,1.69230769 0,2.06969231 0,2.53846154 C0,3.00723077 0.377384615,3.38461538 0.846153846,3.38461538 L10.1538462,3.38461538 C10.6226154,3.38461538 11,3.00723077 11,2.53846154 C11,2.06969231 10.6226154,1.69230769 10.1538462,1.69230769 L7.61538462,1.69230769 L7.61538462,0.423076923 C7.61538462,0.188692308 7.42670077,0 7.19230769,0 L3.80769231,0 L3.80769231,0 Z M4.23076923,0.846153846 L6.76923077,0.846153846 L6.76923077,1.69230769 L4.23076923,1.69230769 L4.23076923,0.846153846 L4.23076923,0.846153846 Z M0.846153846,4.23076923 C0.377384615,4.23076923 -0.0638592308,4.58716923 0.0132253846,5.01648352 L1.69230769,14.445055 C1.7688,14.8744478 2.06969231,15.2307692 2.53846154,15.2307692 L8.46153846,15.2307692 C8.93030769,15.2307692 9.23060769,14.8743692 9.30769231,14.445055 L10.9867746,5.01648352 C11.0632669,4.58709066 10.6226154,4.23076923 10.1538462,4.23076923 L0.846153846,4.23076923 L0.846153846,4.23076923 Z" id="rect5636-copy"></path>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/firehydrant-l.svg b/data/styles/clear/style-night/symbols/firehydrant-l.svg
index fdcadf2908..a27806c74b 100644
--- a/data/styles/clear/style-night/symbols/firehydrant-l.svg
+++ b/data/styles/clear/style-night/symbols/firehydrant-l.svg
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="16px" height="20px" viewBox="0 0 16 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>firehydrant-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-2" transform="translate(2.000000, 1.000000)" fill="#33332E">
-            <path d="M1,10 L1,8.99077797 C1,8.45097518 1.44771525,8 2,8 L3,8 L3,14 L2,14 C1.44386482,14 1,13.5564136 1,13.009222 L1,12 C0.44771525,12 0,11.5561352 0,11 C0,10.4477153 0.443864822,10 1,10 Z M15,10 L15,8.99077797 C15,8.45097518 14.5522847,8 14,8 L13,8 L13,14 L14,14 C14.5561352,14 15,13.5564136 15,13.009222 L15,12 C15.5561352,12 16,11.5522847 16,11 C16,10.4438648 15.5522847,10 15,10 Z M8.99243941,1.12407944 C10.7215016,1.56548716 12,3.13343893 12,5 C8,5 8,5 4,5 C4,3.1334495 5.27848395,1.56550493 7.0075312,1.12408695 C7.00255985,1.08346212 7,1.04205202 7,1 C7,0.44771525 7.44386482,0 8,0 C8.55228475,0 9,0.443864822 9,1 C9,1.04201537 8.99743114,1.08342555 8.99243941,1.12407944 Z M11,8 L11,6 L5,6 L5,8 L4,8 L4,14 L5,14 L5,20 L11,20 L11,14 L12,14 L12,8 L11,8 Z M8,14 C9.65685425,14 11,12.6568542 11,11 C11,9.34314575 9.65685425,8 8,8 C6.34314575,8 5,9.34314575 5,11 C5,12.6568542 6.34314575,14 8,14 Z M7,11 C7,10.4477153 7.44386482,10 8,10 C8.55228475,10 9,10.4438648 9,11 C9,11.5522847 8.55613518,12 8,12 C7.44771525,12 7,11.5561352 7,11 Z" id="Combined-Shape"></path>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="firehydrant-l" fill="#C2C2C0">
+            <g id="POI">
+                <g>
+                    <g id="Group-2">
+                        <path d="M1,10 L1,8.99077797 C1,8.45097518 1.44771525,8 2,8 L3,8 L3,14 L2,14 C1.44386482,14 1,13.5564136 1,13.009222 L1,12 C0.44771525,12 0,11.5561352 0,11 C0,10.4477153 0.443864822,10 1,10 L1,10 Z M15,10 L15,8.99077797 C15,8.45097518 14.5522847,8 14,8 L13,8 L13,14 L14,14 C14.5561352,14 15,13.5564136 15,13.009222 L15,12 C15.5561352,12 16,11.5522847 16,11 C16,10.4438648 15.5522847,10 15,10 L15,10 Z M8.99243941,1.12407944 C10.7215016,1.56548716 12,3.13343893 12,5 L4,5 C4,3.1334495 5.27848395,1.56550493 7.0075312,1.12408695 C7.00255985,1.08346212 7,1.04205202 7,1 C7,0.44771525 7.44386482,0 8,0 C8.55228475,0 9,0.443864822 9,1 C9,1.04201537 8.99743114,1.08342555 8.99243941,1.12407944 L8.99243941,1.12407944 Z M11,8 L11,6 L5,6 L5,8 L4,8 L4,14 L5,14 L5,20 L11,20 L11,14 L12,14 L12,8 L11,8 L11,8 Z M8,14 C9.65685425,14 11,12.6568542 11,11 C11,9.34314575 9.65685425,8 8,8 C6.34314575,8 5,9.34314575 5,11 C5,12.6568542 6.34314575,14 8,14 L8,14 Z M7,11 C7,10.4477153 7.44386482,10 8,10 C8.55228475,10 9,10.4438648 9,11 C9,11.5522847 8.55613518,12 8,12 C7.44771525,12 7,11.5561352 7,11 L7,11 Z" id="Combined-Shape"></path>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/parking-ticket-l.svg b/data/styles/clear/style-night/symbols/parking-ticket-l.svg
index e8e4399da0..0b6bc23bf2 100644
--- a/data/styles/clear/style-night/symbols/parking-ticket-l.svg
+++ b/data/styles/clear/style-night/symbols/parking-ticket-l.svg
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="9px" height="17px" viewBox="0 0 9 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
     <title>parking-ticket-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M6,4.59949948 C6,3.16383556 7.10357666,2 8.45928955,2 L12.5407104,2 C13.8989386,2 15,3.16510397 15,4.59949948 L15,12.4005005 C15,13.8361644 13.8964233,15 12.5407104,15 L8.45928955,15 C7.10106144,15 6,13.834896 6,12.4005005 L6,4.59949948 Z M9.5490457,6.84841736 L9.99698833,6.54638427 C10.2460071,6.37847902 10.7565947,6.38328425 11.0079151,6.55802165 L11.4541674,6.8682907 C11.9076205,7.18356633 12.5307983,7.07155134 12.8460739,6.61809823 C13.1613495,6.16464512 13.0493345,5.54146735 12.5958814,5.22619172 L12.1496292,4.91592267 C11.2220193,4.27097663 9.81381805,4.25772379 8.87887739,4.88812376 L8.43093476,5.19015685 C7.97301877,5.49891466 7.85210217,6.12042658 8.16085998,6.57834258 C8.46961779,7.03625858 9.09112971,7.15717518 9.5490457,6.84841736 Z M9,15 L12,15 L12,19 L9,19 L9,15 Z" id="Combined-Shape" fill="#33332E"></path>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="parking-ticket-l" fill="#C2C2C0">
+            <g id="POI">
+                <g>
+                    <path d="M0,2.59949948 C0,1.16383556 1.10357666,0 2.45928955,0 L6.5407104,0 C7.8989386,0 9,1.16510397 9,2.59949948 L9,10.4005005 C9,11.8361644 7.8964233,13 6.5407104,13 L2.45928955,13 C1.10106144,13 0,11.834896 0,10.4005005 L0,2.59949948 L0,2.59949948 Z M3.5490457,4.84841736 L3.99698833,4.54638427 C4.2460071,4.37847902 4.7565947,4.38328425 5.0079151,4.55802165 L5.4541674,4.8682907 C5.9076205,5.18356633 6.5307983,5.07155134 6.8460739,4.61809823 C7.1613495,4.16464512 7.0493345,3.54146735 6.5958814,3.22619172 L6.1496292,2.91592267 C5.2220193,2.27097663 3.81381805,2.25772379 2.87887739,2.88812376 L2.43093476,3.19015685 C1.97301877,3.49891466 1.85210217,4.12042658 2.16085998,4.57834258 C2.46961779,5.03625858 3.09112971,5.15717518 3.5490457,4.84841736 L3.5490457,4.84841736 Z M3,13 L6,13 L6,17 L3,17 L3,13 L3,13 Z" id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/seafood-shop-l.svg b/data/styles/clear/style-night/symbols/seafood-shop-l.svg
index 0f01b889f5..85bd527f70 100644
--- a/data/styles/clear/style-night/symbols/seafood-shop-l.svg
+++ b/data/styles/clear/style-night/symbols/seafood-shop-l.svg
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>seefood-shop-l copy</title>
+    <title>seefood-shop-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="lighthouse-l">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#33332E" cx="13.5" cy="13.5" r="12.5"></circle>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="seefood-shop-l-copy" transform="translate(1.000000, 1.000000)">
+            <g id="POI">
+                <g>
+                    <g id="lighthouse-l" fill="#33332E">
+                        <circle id="Oval-1-Copy-38" cx="12.5" cy="12.5" r="12.5"></circle>
+                    </g>
+                    <path d="M15,8.0752622 L15,8 C14.6517335,7.19587519 11.8482116,5.52786081 11.8482116,5.52786081 C11.3797991,5.23308443 11.1083794,5.43351749 11.2420721,5.96828842 L11.8362083,8.34483333 C9.5176401,9.0699078 7.62482629,10.7666939 6.6708292,11.7531219 L3,9 L3,16 L6.6708292,13.2468781 C7.33849202,13.937238 8.46598886,14.9755324 9.8774462,15.7851618 C9.4008537,15.9527844 9.1493633,16.4480898 9.3164062,16.9492188 L9.6835938,18.0507812 C9.8583401,18.5750203 10.3210526,18.6789474 10.7109581,18.2890419 L12.2318804,16.7681196 C12.8006755,16.9149054 13.3924281,17 14,17 C18.418278,17 22,12.5 22,12.5 C22,12.5 18.9463116,8.66341025 15,8.0752622 L15,8.0752622 Z M17,13 C17.5522847,13 18,12.5522847 18,12 C18,11.4477153 17.5522847,11 17,11 C16.4477153,11 16,11.4477153 16,12 C16,12.5522847 16.4477153,13 17,13 L17,13 Z" id="Combined-Shape" fill="#C2C2C0"></path>
+                </g>
+            </g>
         </g>
-        <path d="M16,9.0752622 L16,9 C15.6517335,8.19587519 12.8482116,6.52786081 12.8482116,6.52786081 C12.3797991,6.23308443 12.1083794,6.43351749 12.2420721,6.96828842 L12.8362083,9.34483333 C10.5176401,10.0699078 8.62482629,11.7666939 7.6708292,12.7531219 L4,10 L4,17 L7.6708292,14.2468781 C8.33849202,14.937238 9.46598886,15.9755324 10.8774462,16.7851618 C10.4008537,16.9527844 10.1493633,17.4480898 10.3164062,17.9492188 L10.6835938,19.0507812 C10.8583401,19.5750203 11.3210526,19.6789474 11.7109581,19.2890419 L13.2318804,17.7681196 C13.8006755,17.9149054 14.3924281,18 15,18 C19.418278,18 23,13.5 23,13.5 C23,13.5 19.9463116,9.66341025 16,9.0752622 Z M18,14 C18.5522847,14 19,13.5522847 19,13 C19,12.4477153 18.5522847,12 18,12 C17.4477153,12 17,12.4477153 17,13 C17,13.5522847 17.4477153,14 18,14 Z" id="Combined-Shape" fill="#C2C2C0"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/seafood-shop-m.svg b/data/styles/clear/style-night/symbols/seafood-shop-m.svg
index 8e9504429c..1ee611dc83 100644
--- a/data/styles/clear/style-night/symbols/seafood-shop-m.svg
+++ b/data/styles/clear/style-night/symbols/seafood-shop-m.svg
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>seefood-shop-l copy</title>
+    <title>seafood-shop-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="lighthouse-l">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#33332E" cx="13.5" cy="13.5" r="12.5"></circle>
+    <g id="Booking.com" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="seafood-shop-m">
+            <g id="seefood-shop-l-copy">
+                <g id="POI">
+                    <g id="lighthouse-l" fill="#33332E">
+                        <circle id="Oval-1-Copy-38" cx="11.5" cy="11.5" r="11.5"></circle>
+                    </g>
+                    <path d="M13.8,7.42924122 L13.8,7.36 C13.4795948,6.62020517 10.9003547,5.08563195 10.9003547,5.08563195 C10.4694152,4.81443768 10.219709,4.99883609 10.3427063,5.49082535 L10.8893116,7.67724666 C8.75622889,8.34431518 7.01484019,9.90535839 6.13716286,10.8128721 L2.76,8.28 L2.76,14.72 L6.13716286,12.1871279 C6.75141266,12.822259 7.78870975,13.7774898 9.0872505,14.5223489 C8.6487854,14.6765616 8.41741424,15.1322426 8.5710937,15.5932813 L8.9089063,16.6067187 C9.06967289,17.0890187 9.49536839,17.1846316 9.85408145,16.8259185 L11.25333,15.42667 C11.7766215,15.561713 12.3210339,15.64 12.88,15.64 C16.9448158,15.64 20.24,11.5 20.24,11.5 C20.24,11.5 17.4306067,7.97033743 13.8,7.42924122 L13.8,7.42924122 Z M15.64,11.96 C16.1481019,11.96 16.56,11.5481019 16.56,11.04 C16.56,10.5318981 16.1481019,10.12 15.64,10.12 C15.1318981,10.12 14.72,10.5318981 14.72,11.04 C14.72,11.5481019 15.1318981,11.96 15.64,11.96 L15.64,11.96 Z" id="Combined-Shape" fill="#C2C2C0"></path>
+                </g>
+            </g>
         </g>
-        <path d="M16,9.0752622 L16,9 C15.6517335,8.19587519 12.8482116,6.52786081 12.8482116,6.52786081 C12.3797991,6.23308443 12.1083794,6.43351749 12.2420721,6.96828842 L12.8362083,9.34483333 C10.5176401,10.0699078 8.62482629,11.7666939 7.6708292,12.7531219 L4,10 L4,17 L7.6708292,14.2468781 C8.33849202,14.937238 9.46598886,15.9755324 10.8774462,16.7851618 C10.4008537,16.9527844 10.1493633,17.4480898 10.3164062,17.9492188 L10.6835938,19.0507812 C10.8583401,19.5750203 11.3210526,19.6789474 11.7109581,19.2890419 L13.2318804,17.7681196 C13.8006755,17.9149054 14.3924281,18 15,18 C19.418278,18 23,13.5 23,13.5 C23,13.5 19.9463116,9.66341025 16,9.0752622 Z M18,14 C18.5522847,14 19,13.5522847 19,13 C19,12.4477153 18.5522847,12 18,12 C17.4477153,12 17,12.4477153 17,13 C17,13.5522847 17.4477153,14 18,14 Z" id="Combined-Shape" fill="#C2C2C0"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/waste-basket-l.svg b/data/styles/clear/style-night/symbols/waste-basket-l.svg
index a860c9dfb0..487c74e8d7 100644
--- a/data/styles/clear/style-night/symbols/waste-basket-l.svg
+++ b/data/styles/clear/style-night/symbols/waste-basket-l.svg
@@ -4,10 +4,15 @@
     <title>waste-basket-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="waste-basket-L">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="10.5" cy="10.5" r="10.5"></circle>
-            <path d="M8.5,2 C8.223,2 8,2.223 8,2.5 L8,4 L5,4 C4.446,4 4,4.446 4,5 C4,5.554 4.446,6 5,6 L16,6 C16.554,6 17,5.554 17,5 C17,4.446 16.554,4 16,4 L13,4 L13,2.5 C13,2.223 12.77701,2 12.5,2 L8.5,2 Z M9,3 L12,3 L12,4 L9,4 L9,3 Z M5,7 C4.446,7 3.92453,7.4212 4.01563,7.92857143 L6,19.0714286 C6.0904,19.5788929 6.446,20 7,20 L14,20 C14.554,20 14.9089,19.5788 15,19.0714286 L16.98437,7.92857143 C17.07477,7.42110714 16.554,7 16,7 L5,7 Z" id="rect5636-copy" fill="#33332E"></path>
+    <g id="Page-6" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="waste-basket-l" transform="translate(4.000000, 2.000000)" fill="#C2C2C0">
+            <g id="POI">
+                <g>
+                    <g id="waste-basket-L">
+                        <path d="M4.5,0 C4.223,0 4,0.223 4,0.5 L4,2 L1,2 C0.446,2 0,2.446 0,3 C0,3.554 0.446,4 1,4 L12,4 C12.554,4 13,3.554 13,3 C13,2.446 12.554,2 12,2 L9,2 L9,0.5 C9,0.223 8.77701,0 8.5,0 L4.5,0 L4.5,0 Z M5,1 L8,1 L8,2 L5,2 L5,1 L5,1 Z M1,5 C0.446,5 -0.07547,5.4212 0.01563,5.92857143 L2,17.0714286 C2.0904,17.5788929 2.446,18 3,18 L10,18 C10.554,18 10.9089,17.5788 11,17.0714286 L12.98437,5.92857143 C13.07477,5.42110714 12.554,5 12,5 L1,5 L1,5 Z" id="rect5636-copy"></path>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/waste-basket-s.svg b/data/styles/clear/style-night/symbols/waste-basket-s.svg
index ea271d8d28..e1ee1370be 100644
--- a/data/styles/clear/style-night/symbols/waste-basket-s.svg
+++ b/data/styles/clear/style-night/symbols/waste-basket-s.svg
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="15px" height="15px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>waste-basket-l</title>
+    <title>waste-basket-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="waste-basket-L">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="10.5" cy="10.5" r="10.5"></circle>
-            <path d="M8.5,2 C8.223,2 8,2.223 8,2.5 L8,4 L5,4 C4.446,4 4,4.446 4,5 C4,5.554 4.446,6 5,6 L16,6 C16.554,6 17,5.554 17,5 C17,4.446 16.554,4 16,4 L13,4 L13,2.5 C13,2.223 12.77701,2 12.5,2 L8.5,2 Z M9,3 L12,3 L12,4 L9,4 L9,3 Z M5,7 C4.446,7 3.92453,7.4212 4.01563,7.92857143 L6,19.0714286 C6.0904,19.5788929 6.446,20 7,20 L14,20 C14.554,20 14.9089,19.5788 15,19.0714286 L16.98437,7.92857143 C17.07477,7.42110714 16.554,7 16,7 L5,7 Z" id="rect5636-copy" fill="#33332E"></path>
+    <g id="Booking.com" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="waste-basket-s" transform="translate(4.000000, 2.000000)" fill="#C2C2C0">
+            <g id="waste-basket-l">
+                <g id="POI">
+                    <g id="waste-basket-L">
+                        <path d="M3.80769231,0 C3.57330769,0 3.38461538,0.188692308 3.38461538,0.423076923 L3.38461538,1.69230769 L0.846153846,1.69230769 C0.377384615,1.69230769 0,2.06969231 0,2.53846154 C0,3.00723077 0.377384615,3.38461538 0.846153846,3.38461538 L10.1538462,3.38461538 C10.6226154,3.38461538 11,3.00723077 11,2.53846154 C11,2.06969231 10.6226154,1.69230769 10.1538462,1.69230769 L7.61538462,1.69230769 L7.61538462,0.423076923 C7.61538462,0.188692308 7.42670077,0 7.19230769,0 L3.80769231,0 L3.80769231,0 Z M4.23076923,0.846153846 L6.76923077,0.846153846 L6.76923077,1.69230769 L4.23076923,1.69230769 L4.23076923,0.846153846 L4.23076923,0.846153846 Z M0.846153846,4.23076923 C0.377384615,4.23076923 -0.0638592308,4.58716923 0.0132253846,5.01648352 L1.69230769,14.445055 C1.7688,14.8744478 2.06969231,15.2307692 2.53846154,15.2307692 L8.46153846,15.2307692 C8.93030769,15.2307692 9.23060769,14.8743692 9.30769231,14.445055 L10.9867746,5.01648352 C11.0632669,4.58709066 10.6226154,4.23076923 10.1538462,4.23076923 L0.846153846,4.23076923 L0.846153846,4.23076923 Z" id="rect5636-copy"></path>
+                    </g>
+                </g>
+            </g>
         </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp
index ba836c9e59..e4dab7b1af 100644
--- a/drape/vertex_array_buffer.cpp
+++ b/drape/vertex_array_buffer.cpp
@@ -79,14 +79,14 @@ void VertexArrayBuffer::RenderRange(IndicesRange const & range)
     ASSERT(m_program != nullptr, ("Somebody not call Build. It's very bad. Very very bad"));
     /// if OES_vertex_array_object is supported than all bindings already saved in VAO
     /// and we need only bind VAO.
-    if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
-      Bind();
-    else
+    if (!Bind())
       BindStaticBuffers();
 
     BindDynamicBuffers();
     GetIndexBuffer()->Bind();
     GLFunctions::glDrawElements(dp::IndexStorage::SizeOfIndex(), range.m_idxCount, range.m_idxStart);
+
+    Unbind();
   }
 }
 
@@ -111,6 +111,7 @@ void VertexArrayBuffer::Build(ref_ptr<GpuProgram> program)
   m_VAO = GLFunctions::glGenVertexArray();
   Bind();
   BindStaticBuffers();
+  Unbind();
 }
 
 void VertexArrayBuffer::UploadData(BindingInfo const & bindingInfo, void const * data, uint32_t count)
@@ -232,8 +233,7 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
 {
   /// We need to bind current VAO before calling glBindBuffer if OES_vertex_array_object is supported.
   /// Otherwise we risk affecting a previously binded VAO.
-  if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
-    Bind();
+  Bind();
 
   if (indexMutator != nullptr)
   {
@@ -247,7 +247,10 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
   }
 
   if (attrMutator == nullptr)
+  {
+    Unbind();
     return;
+  }
 
   typedef AttributeBufferMutator::TMutateData TMutateData;
   typedef AttributeBufferMutator::TMutateNodes TMutateNodes;
@@ -266,12 +269,25 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
       mapper.UpdateData(node.m_data.get(), node.m_region.m_offset, node.m_region.m_count);
     }
   }
+
+  Unbind();
 }
 
-void VertexArrayBuffer::Bind() const
+bool VertexArrayBuffer::Bind() const
 {
-  ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render"));
-  GLFunctions::glBindVertexArray(m_VAO);
+  if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
+  {
+    ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render"));
+    GLFunctions::glBindVertexArray(m_VAO);
+    return true;
+  }
+  return false;
+}
+
+void VertexArrayBuffer::Unbind() const
+{
+  if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
+    GLFunctions::glBindVertexArray(0);
 }
 
 void VertexArrayBuffer::BindStaticBuffers() const
diff --git a/drape/vertex_array_buffer.hpp b/drape/vertex_array_buffer.hpp
index 2ac9c1fb09..8ba2db50f2 100644
--- a/drape/vertex_array_buffer.hpp
+++ b/drape/vertex_array_buffer.hpp
@@ -76,7 +76,8 @@ private:
 
   ref_ptr<DataBuffer> GetOrCreateBuffer(BindingInfo const & bindingInfo, bool isDynamic);
   ref_ptr<DataBuffer> GetBuffer(BindingInfo const & bindingInfo, bool isDynamic) const;
-  void Bind() const;
+  bool Bind() const;
+  void Unbind() const;
   void BindStaticBuffers() const;
   void BindDynamicBuffers() const;
   void BindBuffers(TBuffersMap const & buffers) const;
diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp
index 46d3b00dd6..ea764146d5 100644
--- a/drape_frontend/animation_system.cpp
+++ b/drape_frontend/animation_system.cpp
@@ -93,12 +93,16 @@ Interpolator::Interpolator(double duration, double delay)
   : m_elapsedTime(0.0)
   , m_duration(duration)
   , m_delay(delay)
+  , m_isActive(false)
 {
   ASSERT_GREATER_OR_EQUAL(m_duration, 0.0, ());
 }
 
 bool Interpolator::IsFinished() const
 {
+  if (!IsActive())
+    return true;
+
   return m_elapsedTime > (m_duration + m_delay);
 }
 
@@ -112,6 +116,16 @@ void Interpolator::Finish()
   m_elapsedTime = m_duration + m_delay + 1.0;
 }
 
+bool Interpolator::IsActive() const
+{
+  return m_isActive;
+}
+
+void Interpolator::SetActive(bool active)
+{
+  m_isActive = active;
+}
+
 void Interpolator::SetMaxDuration(double maxDuration)
 {
   m_duration = min(m_duration, maxDuration);
@@ -140,6 +154,10 @@ double Interpolator::GetDuration() const
   return m_duration;
 }
 
+PositionInterpolator::PositionInterpolator()
+  : PositionInterpolator(0.0 /* duration */, 0.0 /* delay */, m2::PointD(), m2::PointD())
+{}
+
 PositionInterpolator::PositionInterpolator(double duration, double delay,
                                            m2::PointD const & startPosition,
                                            m2::PointD const & endPosition)
@@ -162,7 +180,9 @@ PositionInterpolator::PositionInterpolator(double delay, m2::PointD const & star
   , m_startPosition(startPosition)
   , m_endPosition(endPosition)
   , m_position(startPosition)
-{}
+{
+  SetActive(m_startPosition != m_endPosition);
+}
 
 PositionInterpolator::PositionInterpolator(m2::PointD const & startPosition,
                                            m2::PointD const & endPosition,
@@ -176,7 +196,9 @@ PositionInterpolator::PositionInterpolator(double delay, m2::PointD const & star
   , m_startPosition(startPosition)
   , m_endPosition(endPosition)
   , m_position(startPosition)
-{}
+{
+  SetActive(m_startPosition != m_endPosition);
+}
 
 //static
 double PositionInterpolator::GetMoveDuration(m2::PointD const & startPosition,
@@ -221,6 +243,10 @@ void PositionInterpolator::Finish()
   m_position = m_endPosition;
 }
 
+ScaleInterpolator::ScaleInterpolator()
+  : ScaleInterpolator(1.0 /* startScale */, 1.0 /* endScale */)
+{}
+
 ScaleInterpolator::ScaleInterpolator(double startScale, double endScale)
   : ScaleInterpolator(0.0 /* delay */, startScale, endScale)
 {}
@@ -230,13 +256,15 @@ ScaleInterpolator::ScaleInterpolator(double delay, double startScale, double end
   , m_startScale(startScale)
   , m_endScale(endScale)
   , m_scale(startScale)
-{}
+{
+  SetActive(m_startScale != m_endScale);
+}
 
 // static
 double ScaleInterpolator::GetScaleDuration(double startScale, double endScale)
 {
-  // Resize 2.0 times should be done for 0.3 seconds.
-  double constexpr kPixelSpeed = 2.0 / 0.3;
+  // Resize 2.0 times should be done for 0.2 seconds.
+  double constexpr kPixelSpeed = 2.0 / 0.2;
 
   if (startScale > endScale)
     swap(startScale, endScale);
@@ -256,6 +284,10 @@ void ScaleInterpolator::Finish()
   m_scale = m_endScale;
 }
 
+AngleInterpolator::AngleInterpolator()
+  : AngleInterpolator(0.0 /* startAngle */, 0.0 /* endAngle */)
+{}
+
 AngleInterpolator::AngleInterpolator(double startAngle, double endAngle)
   : AngleInterpolator(0.0 /* delay */, startAngle, endAngle)
 {}
@@ -265,14 +297,18 @@ AngleInterpolator::AngleInterpolator(double delay, double startAngle, double end
   , m_startAngle(ang::AngleIn2PI(startAngle))
   , m_endAngle(ang::AngleIn2PI(endAngle))
   , m_angle(m_startAngle)
-{}
+{
+  SetActive(m_startAngle != m_endAngle);
+}
 
 AngleInterpolator::AngleInterpolator(double delay, double duration, double startAngle, double endAngle)
   : Interpolator(duration, delay)
   , m_startAngle(ang::AngleIn2PI(startAngle))
   , m_endAngle(ang::AngleIn2PI(endAngle))
   , m_angle(m_startAngle)
-{}
+{
+  SetActive(m_startAngle != m_endAngle);
+}
 
 // static
 double AngleInterpolator::GetRotateDuration(double startAngle, double endAngle)
@@ -299,11 +335,20 @@ MapLinearAnimation::MapLinearAnimation(m2::PointD const & startPos, m2::PointD c
                                        double startAngle, double endAngle,
                                        double startScale, double endScale, ScreenBase const & convertor)
   : Animation(true /* couldBeInterrupted */, false /* couldBeBlended */)
+  , m_angleInterpolator(startAngle, endAngle)
+  , m_positionInterpolator(startPos, endPos, convertor)
+  , m_scaleInterpolator(startScale, endScale)
 {
   m_objects.insert(Animation::MapPlane);
-  SetMove(startPos, endPos, convertor);
-  SetRotate(startAngle, endAngle);
-  SetScale(startScale, endScale);
+
+  if (m_positionInterpolator.IsActive())
+    m_properties.insert(Animation::Position);
+
+  if (m_angleInterpolator.IsActive())
+    m_properties.insert(Animation::Angle);
+
+  if (m_scaleInterpolator.IsActive())
+    m_properties.insert(Animation::Scale);
 }
 
 MapLinearAnimation::MapLinearAnimation()
@@ -315,29 +360,23 @@ MapLinearAnimation::MapLinearAnimation()
 void MapLinearAnimation::SetMove(m2::PointD const & startPos, m2::PointD const & endPos,
                                  ScreenBase const & convertor)
 {
-  if (startPos != endPos)
-  {
-    m_positionInterpolator = make_unique_dp<PositionInterpolator>(startPos, endPos, convertor);
+  m_positionInterpolator = PositionInterpolator(startPos, endPos, convertor);
+  if (m_positionInterpolator.IsActive())
     m_properties.insert(Animation::Position);
-  }
 }
 
 void MapLinearAnimation::SetRotate(double startAngle, double endAngle)
 {
-  if (startAngle != endAngle)
-  {
-    m_angleInterpolator = make_unique_dp<AngleInterpolator>(startAngle, endAngle);
+  m_angleInterpolator = AngleInterpolator(startAngle, endAngle);
+  if (m_angleInterpolator.IsActive())
     m_properties.insert(Animation::Angle);
-  }
 }
 
 void MapLinearAnimation::SetScale(double startScale, double endScale)
 {
-  if (startScale != endScale)
-  {
-    m_scaleInterpolator = make_unique_dp<ScaleInterpolator>(startScale, endScale);
+  m_scaleInterpolator = ScaleInterpolator(startScale, endScale);
+  if (m_scaleInterpolator.IsActive())
     m_properties.insert(Animation::Scale);
-  }
 }
 
 Animation::TObjectProperties const & MapLinearAnimation::GetProperties(TObject object) const
@@ -353,58 +392,63 @@ bool MapLinearAnimation::HasProperty(TObject object, TProperty property) const
 
 void MapLinearAnimation::Advance(double elapsedSeconds)
 {
-  if (m_angleInterpolator != nullptr)
-    m_angleInterpolator->Advance(elapsedSeconds);
-  if (m_scaleInterpolator != nullptr)
-    m_scaleInterpolator->Advance(elapsedSeconds);
-  if (m_positionInterpolator != nullptr)
-    m_positionInterpolator->Advance(elapsedSeconds);
+  if (m_angleInterpolator.IsActive())
+    m_angleInterpolator.Advance(elapsedSeconds);
+
+  if (m_scaleInterpolator.IsActive())
+    m_scaleInterpolator.Advance(elapsedSeconds);
+
+  if (m_positionInterpolator.IsActive())
+    m_positionInterpolator.Advance(elapsedSeconds);
 }
 
 void MapLinearAnimation::Finish()
 {
-  if (m_angleInterpolator != nullptr)
-    m_angleInterpolator->Finish();
-  if (m_scaleInterpolator != nullptr)
-    m_scaleInterpolator->Finish();
-  if (m_positionInterpolator != nullptr)
-    m_positionInterpolator->Finish();
+  if (m_angleInterpolator.IsActive())
+    m_angleInterpolator.Finish();
+
+  if (m_scaleInterpolator.IsActive())
+    m_scaleInterpolator.Finish();
+
+  if (m_positionInterpolator.IsActive())
+    m_positionInterpolator.Finish();
+
   Animation::Finish();
 }
 
 void MapLinearAnimation::SetMaxDuration(double maxDuration)
 {
-  if (m_angleInterpolator != nullptr)
-    m_angleInterpolator->SetMaxDuration(maxDuration);
-  if (m_scaleInterpolator != nullptr)
-    m_scaleInterpolator->SetMaxDuration(maxDuration);
-  if (m_positionInterpolator != nullptr)
-    m_positionInterpolator->SetMaxDuration(maxDuration);
+  if (m_angleInterpolator.IsActive())
+    m_angleInterpolator.SetMaxDuration(maxDuration);
+
+  if (m_positionInterpolator.IsActive())
+    m_positionInterpolator.SetMaxDuration(maxDuration);
+
+  SetMaxScaleDuration(maxDuration);
 }
 
 void MapLinearAnimation::SetMaxScaleDuration(double maxDuration)
 {
-  if (m_scaleInterpolator != nullptr)
-    m_scaleInterpolator->SetMaxDuration(maxDuration);
+  if (m_scaleInterpolator.IsActive())
+    m_scaleInterpolator.SetMaxDuration(maxDuration);
 }
 
 double MapLinearAnimation::GetDuration() const
 {
   double duration = 0.0;
-  if (m_angleInterpolator != nullptr)
-    duration = m_angleInterpolator->GetDuration();
-  if (m_scaleInterpolator != nullptr)
-    duration = max(duration, m_scaleInterpolator->GetDuration());
-  if (m_positionInterpolator != nullptr)
-    duration = max(duration, m_positionInterpolator->GetDuration());
+  if (m_angleInterpolator.IsActive())
+    duration = m_angleInterpolator.GetDuration();
+  if (m_scaleInterpolator.IsActive())
+    duration = max(duration, m_scaleInterpolator.GetDuration());
+  if (m_positionInterpolator.IsActive())
+    duration = max(duration, m_positionInterpolator.GetDuration());
   return duration;
 }
 
 bool MapLinearAnimation::IsFinished() const
 {
-  return ((m_angleInterpolator == nullptr || m_angleInterpolator->IsFinished()) &&
-          (m_scaleInterpolator == nullptr || m_scaleInterpolator->IsFinished()) &&
-          (m_positionInterpolator == nullptr || m_positionInterpolator->IsFinished()));
+  return m_angleInterpolator.IsFinished() && m_scaleInterpolator.IsFinished() &&
+         m_positionInterpolator.IsFinished();
 }
 
 bool MapLinearAnimation::GetProperty(TObject object, TProperty property, PropertyValue & value) const
@@ -414,26 +458,23 @@ bool MapLinearAnimation::GetProperty(TObject object, TProperty property, Propert
   switch (property)
   {
   case Animation::Position:
-    ASSERT(m_positionInterpolator != nullptr, ());
-    if (m_positionInterpolator != nullptr)
+    if (m_positionInterpolator.IsActive())
     {
-      value = PropertyValue(m_positionInterpolator->GetPosition());
+      value = PropertyValue(m_positionInterpolator.GetPosition());
       return true;
     }
     return false;
   case Animation::Scale:
-    ASSERT(m_scaleInterpolator != nullptr, ());
-    if (m_scaleInterpolator != nullptr)
+    if (m_scaleInterpolator.IsActive())
     {
-      value = PropertyValue(m_scaleInterpolator->GetScale());
+      value = PropertyValue(m_scaleInterpolator.GetScale());
       return true;
     }
     return false;
   case Animation::Angle:
-    ASSERT(m_angleInterpolator != nullptr, ());
-    if (m_angleInterpolator != nullptr)
+    if (m_angleInterpolator.IsActive())
     {
-      value = PropertyValue(m_angleInterpolator->GetAngle());
+      value = PropertyValue(m_angleInterpolator.GetAngle());
       return true;
     }
     return false;
@@ -626,8 +667,13 @@ bool MapFollowAnimation::GetProperty(TObject object, TProperty property, Propert
   return false;
 }
 
+bool MapFollowAnimation::HasScale() const
+{
+  return m_scaleInterpolator.IsActive();
+}
+
 PerspectiveSwitchAnimation::PerspectiveSwitchAnimation(double startAngle, double endAngle, double angleFOV)
-  : Animation(false /* couldBeInterrupted */, true /* couldBeBlended */)
+  : Animation(false /* couldBeInterrupted */, false /* couldBeBlended */)
   , m_angleInterpolator(GetRotateDuration(startAngle, endAngle), startAngle, endAngle)
   , m_startAngle(startAngle)
   , m_endAngle(endAngle)
@@ -794,6 +840,16 @@ SequenceAnimation::SequenceAnimation()
 {
 }
 
+string const & SequenceAnimation::GetCustomType() const
+{
+  return m_customType;
+}
+
+void SequenceAnimation::SetCustomType(string const & type)
+{
+  m_customType = type;
+}
+
 Animation::TAnimObjects const & SequenceAnimation::GetObjects() const
 {
   return m_objects;
@@ -878,8 +934,10 @@ void SequenceAnimation::Advance(double elapsedSeconds)
 void SequenceAnimation::Finish()
 {
   for (auto & anim : m_animations)
+  {
     anim->Finish();
-  AnimationSystem::Instance().SaveAnimationResult(*m_animations.back());
+    AnimationSystem::Instance().SaveAnimationResult(*anim);
+  }
   m_animations.clear();
   ObtainObjectProperties();
   Animation::Finish();
@@ -902,10 +960,6 @@ void SequenceAnimation::ObtainObjectProperties()
   }
 }
 
-AnimationSystem::AnimationSystem()
-{
-}
-
 bool AnimationSystem::GetRect(ScreenBase const & currentScreen, m2::AnyRectD & rect)
 {
   m_lastScreen = currentScreen;
@@ -987,7 +1041,7 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> animation)
 {
   for (auto & lst : m_animationChain)
   {
-    bool couldBeBlended = true;
+    bool couldBeBlended = animation->CouldBeBlended();
     for (auto it = lst.begin(); it != lst.end();)
     {
       auto & anim = *it;
@@ -1013,14 +1067,18 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> animation)
         ++it;
       }
     }
+
     if (couldBeBlended)
     {
       animation->OnStart();
       lst.emplace_back(move(animation));
       return;
     }
+    else if (m_animationChain.size() > 1 && animation->CouldBeInterrupted())
+    {
+      return;
+    }
   }
-
   PushAnimation(move(animation));
 }
 
@@ -1035,7 +1093,8 @@ void AnimationSystem::PushAnimation(drape_ptr<Animation> animation)
   m_animationChain.emplace_back(move(list));
 }
 
-void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind)
+void AnimationSystem::FinishAnimations(function<bool(drape_ptr<Animation> const &)> const & predicate,
+                                       bool rewind, bool finishAll)
 {
   if (m_animationChain.empty())
     return;
@@ -1044,7 +1103,7 @@ void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind)
   for (auto it = frontList.begin(); it != frontList.end();)
   {
     auto & anim = *it;
-    if (anim->GetType() == type)
+    if (predicate(anim))
     {
       if (rewind)
         anim->Finish();
@@ -1056,33 +1115,35 @@ void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind)
       ++it;
     }
   }
+
+  if (finishAll)
+  {
+    for (auto & lst : m_animationChain)
+    {
+      for (auto it = lst.begin(); it != lst.end();)
+      {
+        if (predicate(*it))
+          it = lst.erase(it);
+        else
+          ++it;
+      }
+    }
+  }
+
   if (frontList.empty())
     StartNextAnimations();
 }
 
-void AnimationSystem::FinishObjectAnimations(Animation::TObject object, bool rewind)
+void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind, bool finishAll)
 {
-  if (m_animationChain.empty())
-    return;
+  FinishAnimations([&type](drape_ptr<Animation> const & anim) { return anim->GetType() == type; },
+                   rewind, finishAll);
+}
 
-  TAnimationList & frontList = m_animationChain.front();
-  for (auto it = frontList.begin(); it != frontList.end();)
-  {
-    auto & anim = *it;
-    if (anim->HasObject(object))
-    {
-      if (rewind)
-        anim->Finish();
-      SaveAnimationResult(*anim);
-      it = frontList.erase(it);
-    }
-    else
-    {
-      ++it;
-    }
-  }
-  if (frontList.empty())
-    StartNextAnimations();
+void AnimationSystem::FinishObjectAnimations(Animation::TObject object, bool rewind, bool finishAll)
+{
+  FinishAnimations([&object](drape_ptr<Animation> const & anim) { return anim->HasObject(object); },
+                   rewind, finishAll);
 }
 
 void AnimationSystem::Advance(double elapsedSeconds)
diff --git a/drape_frontend/animation_system.hpp b/drape_frontend/animation_system.hpp
index 32c9306258..735e79d0c9 100644
--- a/drape_frontend/animation_system.hpp
+++ b/drape_frontend/animation_system.hpp
@@ -6,6 +6,7 @@
 
 #include "std/deque.hpp"
 #include "std/noncopyable.hpp"
+#include "std/string.hpp"
 #include "std/unordered_set.hpp"
 
 namespace df
@@ -134,12 +135,16 @@ public:
   void SetOnFinishAction(TAction const & action) { m_onFinishAction = action; }
   void SetOnInterruptAction(TAction const & action) { m_onInterruptAction = action; }
 
+  bool CouldBeBlended() const { return m_couldBeBlended; }
   bool CouldBeInterrupted() const { return m_couldBeInterrupted; }
   bool CouldBeBlendedWith(Animation const & animation) const;
-
+  
   void SetInterruptedOnCombine(bool enable) { m_interruptedOnCombine = enable; }
   bool GetInterruptedOnCombine() const { return m_interruptedOnCombine; }
 
+  void SetCouldBeInterrupted(bool enable) { m_couldBeInterrupted = enable; }
+  void SetCouldBeBlended(bool enable) { m_couldBeBlended = enable; }
+
 protected:
   TAction m_onStartAction;
   TAction m_onFinishAction;
@@ -162,6 +167,8 @@ public:
   virtual void Advance(double elapsedSeconds);
   virtual void Finish();
 
+  bool IsActive() const;
+
   bool IsFinished() const;
   void SetMaxDuration(double maxDuration);
   void SetMinDuration(double minDuration);
@@ -170,11 +177,13 @@ public:
 protected:
   double GetT() const;
   double GetElapsedTime() const;
+  void SetActive(bool active);
 
 private:
   double m_elapsedTime;
   double m_duration;
   double m_delay;
+  bool m_isActive;
 };
 
 class PositionInterpolator: public Interpolator
@@ -182,6 +191,7 @@ class PositionInterpolator: public Interpolator
   using TBase = Interpolator;
 
 public:
+  PositionInterpolator();
   PositionInterpolator(double duration, double delay,
                        m2::PointD const & startPosition,
                        m2::PointD const & endPosition);
@@ -207,7 +217,7 @@ public:
   void Advance(double elapsedSeconds) override;
   void Finish() override;
 
-  virtual m2::PointD GetPosition() const { return m_position; }
+  m2::PointD GetPosition() const { return m_position; }
 
 private:
   m2::PointD m_startPosition;
@@ -220,6 +230,7 @@ class ScaleInterpolator: public Interpolator
   using TBase = Interpolator;
 
 public:
+  ScaleInterpolator();
   ScaleInterpolator(double startScale, double endScale);
   ScaleInterpolator(double delay, double startScale, double endScale);
 
@@ -229,11 +240,11 @@ public:
   void Advance(double elapsedSeconds) override;
   void Finish() override;
 
-  virtual double GetScale() const { return m_scale; }
+  double GetScale() const { return m_scale; }
 
 private:
-  double const m_startScale;
-  double const m_endScale;
+  double m_startScale;
+  double m_endScale;
   double m_scale;
 };
 
@@ -242,6 +253,7 @@ class AngleInterpolator: public Interpolator
   using TBase = Interpolator;
 
 public:
+  AngleInterpolator();
   AngleInterpolator(double startAngle, double endAngle);
   AngleInterpolator(double delay, double startAngle, double endAngle);
   AngleInterpolator(double delay, double duration, double startAngle, double endAngle);
@@ -252,11 +264,11 @@ public:
   void Advance(double elapsedSeconds) override;
   void Finish() override;
 
-  virtual double GetAngle() const { return m_angle; }
+  double GetAngle() const { return m_angle; }
 
 private:
-  double const m_startAngle;
-  double const m_endAngle;
+  double m_startAngle;
+  double m_endAngle;
   double m_angle;
 };
 
@@ -385,9 +397,9 @@ public:
   void SetMaxScaleDuration(double maxDuration);
 
 private:
-  drape_ptr<AngleInterpolator> m_angleInterpolator;
-  drape_ptr<PositionInterpolator> m_positionInterpolator;
-  drape_ptr<ScaleInterpolator> m_scaleInterpolator;
+  AngleInterpolator m_angleInterpolator;
+  PositionInterpolator m_positionInterpolator;
+  ScaleInterpolator m_scaleInterpolator;
   TObjectProperties m_properties;
   TAnimObjects m_objects;
 };
@@ -470,6 +482,8 @@ public:
 
   bool GetProperty(TObject object, TProperty property, PropertyValue & value) const override;
 
+  bool HasScale() const;
+
 private:
   double CalculateDuration() const;
 
@@ -493,6 +507,9 @@ public:
   TObjectProperties const & GetProperties(TObject object) const override;
   bool HasProperty(TObject object, TProperty property) const override;
 
+  string const & GetCustomType() const;
+  void SetCustomType(string const & type);
+
   void SetMaxDuration(double maxDuration) override;
   double GetDuration() const override;
   bool IsFinished() const override;
@@ -513,6 +530,8 @@ private:
   deque<drape_ptr<Animation>> m_animations;
   TAnimObjects m_objects;
   map<TObject, TObjectProperties> m_properties;
+
+  string m_customType;
 };
 
 class ParallelAnimation : public Animation
@@ -565,21 +584,57 @@ public:
   void CombineAnimation(drape_ptr<Animation> animation);
   void PushAnimation(drape_ptr<Animation> animation);
 
-  void FinishAnimations(Animation::Type type, bool rewind);
-  void FinishObjectAnimations(Animation::TObject object, bool rewind);
+  void FinishAnimations(Animation::Type type, bool rewind, bool finishAll);
+  void FinishObjectAnimations(Animation::TObject object, bool rewind, bool finishAll);
+
+  template<typename T> T const * FindAnimation(Animation::Type type) const
+  {
+    for (auto & animations : m_animationChain)
+    {
+      for (auto const & anim : animations)
+      {
+        if (anim->GetType() == type)
+        {
+          ASSERT(dynamic_cast<T const *>(anim.get()) != nullptr, ());
+          return static_cast<T const *>(anim.get());
+        }
+      }
+    }
+    return nullptr;
+  }
+
+  template<typename T> T const * FindAnimation(Animation::Type type, string const & customType) const
+  {
+    for (auto & animations : m_animationChain)
+    {
+      for (auto const & anim : animations)
+      {
+        if (anim->GetType() == type)
+        {
+          ASSERT(dynamic_cast<T const *>(anim.get()) != nullptr, ());
+          T const * customAnim = static_cast<T const *>(anim.get());
+          if (customAnim->GetCustomType() == customType)
+            return customAnim;
+        }
+      }
+    }
+    return nullptr;
+  }
 
   void Advance(double elapsedSeconds);
 
   ScreenBase const & GetLastScreen() { return m_lastScreen; }
   void SaveAnimationResult(Animation const & animation);
 
-private:
-  bool GetProperty(Animation::TObject object, Animation::TProperty property, Animation::PropertyValue & value) const;
+private:  
+  AnimationSystem() = default;
+
+  bool GetProperty(Animation::TObject object, Animation::TProperty property,
+                   Animation::PropertyValue & value) const;
   void StartNextAnimations();
+  void FinishAnimations(function<bool(drape_ptr<Animation> const &)> const & predicate,
+                        bool rewind, bool finishAll);
 
-  AnimationSystem();
-
-private:
   using TAnimationList = list<drape_ptr<Animation>>;
   using TAnimationChain = deque<TAnimationList>;
   using TPropertyCache = map<pair<Animation::TObject, Animation::TProperty>, Animation::PropertyValue>;
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 992c35ec54..d176bbcda5 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -55,7 +55,7 @@ DrapeEngine::DrapeEngine(Params && params)
                                     bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2),
                                     mode, make_ref(m_requestedTiles), timeInBackground,
                                     params.m_allow3dBuildings, params.m_blockTapEvents,
-                                    params.m_isFirstLaunch);
+                                    params.m_isFirstLaunch, params.m_isRoutingActive);
 
   m_frontend = make_unique_dp<FrontendRenderer>(frParams);
 
diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp
index dbfecf1933..d8be9f54db 100644
--- a/drape_frontend/drape_engine.hpp
+++ b/drape_frontend/drape_engine.hpp
@@ -45,7 +45,8 @@ public:
            bool blockTapEvents,
            bool showChoosePositionMark,
            vector<m2::TriangleD> && boundAreaTriangles,
-           bool firstLaunch)
+           bool firstLaunch,
+           bool isRoutingActive)
       : m_factory(factory)
       , m_stringsBundle(stringBundle)
       , m_viewport(viewport)
@@ -58,6 +59,7 @@ public:
       , m_showChoosePositionMark(showChoosePositionMark)
       , m_boundAreaTriangles(move(boundAreaTriangles))
       , m_isFirstLaunch(firstLaunch)
+      , m_isRoutingActive(isRoutingActive)
     {}
 
     ref_ptr<dp::OGLContextFactory> m_factory;
@@ -72,6 +74,7 @@ public:
     bool m_showChoosePositionMark;
     vector<m2::TriangleD> m_boundAreaTriangles;
     bool m_isFirstLaunch;
+    bool m_isRoutingActive;
   };
 
   DrapeEngine(Params && params);
diff --git a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp b/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
index 91865064ab..590a1318bd 100644
--- a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
+++ b/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
@@ -37,6 +37,8 @@ public:
   void CorrectGlobalScalePoint(m2::PointD & pt) const override {}
   void OnScaleEnded() override {}
   void OnAnimationStarted(ref_ptr<df::Animation> /* anim */) override {}
+  void OnPerspectiveSwitchRejected() override {}
+  void OnTouchMapAction() override {}
 
   void AddUserEvent(df::TouchEvent const & event)
   {
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index ac074b0adc..b93ddf24c1 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -140,8 +140,8 @@ FrontendRenderer::FrontendRenderer(Params const & params)
   ASSERT(m_tapEventInfoFn, ());
   ASSERT(m_userPositionChangedFn, ());
 
-  m_myPositionController.reset(new MyPositionController(params.m_initMyPositionMode,
-                                                        params.m_timeInBackground, params.m_firstLaunch));
+  m_myPositionController.reset(new MyPositionController(params.m_initMyPositionMode, params.m_timeInBackground,
+                                                        params.m_firstLaunch, params.m_isRoutingActive));
   m_myPositionController->SetModeListener(params.m_myPositionModeCallback);
 
   StartThread();
@@ -374,6 +374,11 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
       ref_ptr<MapShapesMessage> msg = message;
       m_myPositionController->SetRenderShape(msg->AcceptShape());
       m_selectionShape = msg->AcceptSelection();
+      if (m_selectObjectMessage != nullptr)
+      {
+        ProcessSelection(make_ref(m_selectObjectMessage));
+        m_selectObjectMessage.reset();
+      }
     }
     break;
 
@@ -383,7 +388,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
       switch (msg->GetChangeType())
       {
       case ChangeMyPositionModeMessage::SwitchNextMode:
-        m_myPositionController->NextMode();
+        m_myPositionController->NextMode(m_userEventStream.GetCurrentScreen());
         break;
       case ChangeMyPositionModeMessage::StopFollowing:
         m_myPositionController->StopLocationFollow();
@@ -430,28 +435,13 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
   case Message::SelectObject:
     {
       ref_ptr<SelectObjectMessage> msg = message;
-
       if (m_selectionShape == nullptr)
+      {
+        m_selectObjectMessage = make_unique_dp<SelectObjectMessage>(msg->GetSelectedObject(), msg->GetPosition(),
+                                                                    msg->IsAnim());
         break;
-
-      if (msg->IsDismiss())
-      {
-        m_selectionShape->Hide();
-      }
-      else
-      {
-        double offsetZ = 0.0;
-        if (m_userEventStream.GetCurrentScreen().isPerspective())
-        {
-          dp::TOverlayContainer selectResult;
-          if (m_overlayTree->IsNeedUpdate())
-            BuildOverlayTree(m_userEventStream.GetCurrentScreen());
-          m_overlayTree->Select(msg->GetPosition(), selectResult);
-          for (ref_ptr<dp::OverlayHandle> handle : selectResult)
-            offsetZ = max(offsetZ, handle->GetPivotZ());
-        }
-        m_selectionShape->Show(msg->GetSelectedObject(), msg->GetPosition(), offsetZ, msg->IsAnim());
       }
+      ProcessSelection(msg);
       break;
     }
 
@@ -729,7 +719,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
 
   case Message::Invalidate:
     {
-      // Do nothing here, new frame will be rendered because of this message processing.
+      m_myPositionController->ResetRoutingNotFollowTimer();
       break;
     }
 
@@ -927,11 +917,35 @@ void FrontendRenderer::PullToBoundArea(bool randomPlace, bool applyZoom)
   {
     m2::PointD const dest = randomPlace ? m2::GetRandomPointInsideTriangles(m_dragBoundArea) :
                                           m2::ProjectPointToTriangles(center, m_dragBoundArea);
-    int const zoom = applyZoom ? scales::GetAddNewPlaceScale() : m_currentZoomLevel;
+    int zoom = kDoNotChangeZoom;
+    if (applyZoom && m_currentZoomLevel < scales::GetAddNewPlaceScale())
+      zoom = scales::GetAddNewPlaceScale();
     AddUserEvent(SetCenterEvent(dest, zoom, true));
   }
 }
 
+void FrontendRenderer::ProcessSelection(ref_ptr<SelectObjectMessage> msg)
+{
+  if (msg->IsDismiss())
+  {
+    m_selectionShape->Hide();
+  }
+  else
+  {
+    double offsetZ = 0.0;
+    if (m_userEventStream.GetCurrentScreen().isPerspective())
+    {
+      dp::TOverlayContainer selectResult;
+      if (m_overlayTree->IsNeedUpdate())
+        BuildOverlayTree(m_userEventStream.GetCurrentScreen());
+      m_overlayTree->Select(msg->GetPosition(), selectResult);
+      for (ref_ptr<dp::OverlayHandle> handle : selectResult)
+        offsetZ = max(offsetZ, handle->GetPivotZ());
+    }
+    m_selectionShape->Show(msg->GetSelectedObject(), msg->GetPosition(), offsetZ, msg->IsAnim());
+  }
+}
+
 void FrontendRenderer::BeginUpdateOverlayTree(ScreenBase const & modelView)
 {
   if (m_overlayTree->Frame())
@@ -1396,6 +1410,17 @@ void FrontendRenderer::OnAnimationStarted(ref_ptr<Animation> anim)
   m_myPositionController->AnimationStarted(anim);
 }
 
+void FrontendRenderer::OnPerspectiveSwitchRejected()
+{
+   if (m_perspectiveDiscarded)
+     m_perspectiveDiscarded = false;
+}
+
+void FrontendRenderer::OnTouchMapAction()
+{
+  m_myPositionController->ResetRoutingNotFollowTimer();
+}
+
 TTilesCollection FrontendRenderer::ResolveTileKeys(ScreenBase const & screen)
 {
   m2::RectD const & rect = screen.ClipRect();
@@ -1609,7 +1634,7 @@ void FrontendRenderer::ChangeModelView(double azimuth)
 
 void FrontendRenderer::ChangeModelView(m2::RectD const & rect)
 {
-  AddUserEvent(SetRectEvent(rect, true, -1, true));
+  AddUserEvent(SetRectEvent(rect, true, kDoNotChangeZoom, true));
 }
 
 void FrontendRenderer::ChangeModelView(m2::PointD const & userPos, double azimuth,
diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp
index 79e1baf00b..d76a94acfc 100755
--- a/drape_frontend/frontend_renderer.hpp
+++ b/drape_frontend/frontend_renderer.hpp
@@ -50,6 +50,7 @@ namespace df
 class SelectionShape;
 class Framebuffer;
 class TransparentLayer;
+class SelectObjectMessage;
 
 struct TapInfo
 {
@@ -83,7 +84,8 @@ public:
            double timeInBackground,
            bool allow3dBuildings,
            bool blockTapEvents,
-           bool firstLaunch)
+           bool firstLaunch,
+           bool isRoutingActive)
       : BaseRenderer::Params(commutator, factory, texMng)
       , m_viewport(viewport)
       , m_modelViewChangedFn(modelViewChangedFn)
@@ -96,6 +98,7 @@ public:
       , m_allow3dBuildings(allow3dBuildings)
       , m_blockTapEvents(blockTapEvents)
       , m_firstLaunch(firstLaunch)
+      , m_isRoutingActive(isRoutingActive)
     {}
 
     Viewport m_viewport;
@@ -109,6 +112,7 @@ public:
     bool m_allow3dBuildings;
     bool m_blockTapEvents;
     bool m_firstLaunch;
+    bool m_isRoutingActive;
   };
 
   FrontendRenderer(Params const & params);
@@ -190,6 +194,8 @@ private:
   void CorrectGlobalScalePoint(m2::PointD & pt) const override;
   void OnScaleEnded() override;
   void OnAnimationStarted(ref_ptr<Animation> anim) override;
+  void OnPerspectiveSwitchRejected() override;
+  void OnTouchMapAction() override;
 
   class Routine : public threads::IRoutine
   {
@@ -233,7 +239,8 @@ private:
 
   void PullToBoundArea(bool randomPlace, bool applyZoom);
 
-private:
+  void ProcessSelection(ref_ptr<SelectObjectMessage> msg);
+
   drape_ptr<dp::GpuProgramManager> m_gpuProgramManager;
 
   struct RenderLayer
@@ -317,6 +324,8 @@ private:
 
   vector<m2::TriangleD> m_dragBoundArea;
 
+  drape_ptr<SelectObjectMessage> m_selectObjectMessage;
+
 #ifdef DEBUG
   bool m_isTeardowned;
 #endif
diff --git a/drape_frontend/kinetic_scroller.cpp b/drape_frontend/kinetic_scroller.cpp
index f54f82510d..9a0edd14ff 100644
--- a/drape_frontend/kinetic_scroller.cpp
+++ b/drape_frontend/kinetic_scroller.cpp
@@ -38,7 +38,6 @@ public:
     , m_elapsedTime(0.0)
   {
     SetInterruptedOnCombine(true);
-
     m_objects.insert(Animation::MapPlane);
     m_properties.insert(Animation::Position);
   }
diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index 259ff04dd9..33ecf55650 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -2,9 +2,12 @@
 #include "drape_frontend/animation_system.hpp"
 #include "drape_frontend/animation_utils.hpp"
 #include "drape_frontend/visual_params.hpp"
+#include "drape_frontend/user_event_stream.hpp"
 #include "drape_frontend/animation/base_interpolator.hpp"
 #include "drape_frontend/animation/interpolations.hpp"
 
+#include "indexer/scales.hpp"
+
 #include "geometry/mercator.hpp"
 
 #include "base/math.hpp"
@@ -26,9 +29,9 @@ double const kMaxPendingLocationTimeSec = 60.0;
 double const kMaxTimeInBackgroundSec = 60.0 * 60;
 double const kMaxNotFollowRoutingTimeSec = 10.0;
 double const kMaxUpdateLocationInvervalSec = 30.0;
-double const kMaxWaitStartLocationSec = 5.0;
 
-int const kDoNotChangeZoom = -1;
+int const kZoomThreshold = 10;
+int const kMaxScaleZoomLevel = 16;
 
 string LocationModeStatisticsName(location::EMyPositionMode mode)
 {
@@ -48,6 +51,19 @@ string LocationModeStatisticsName(location::EMyPositionMode mode)
   return "@UnknownMode";
 }
 
+int GetZoomLevel(ScreenBase const & screen)
+{
+  return my::clamp(fabs(log(screen.GetScale()) / log(2.0)), 1, scales::GetUpperStyleScale());
+}
+
+int GetZoomLevel(ScreenBase const & screen, m2::PointD const & position, double errorRadius)
+{
+  ScreenBase s = screen;
+  m2::PointD const size(errorRadius, errorRadius);
+  s.SetFromRect(m2::AnyRectD(position, screen.GetAngle(), m2::RectD(position - size, position + size)));
+  return GetZoomLevel(s);
+}
+
 } // namespace
 
 class MyPositionController::MyPositionAnim : public BaseInterpolator
@@ -89,11 +105,12 @@ private:
   double m_rotateDuration;
 };
 
-MyPositionController::MyPositionController(location::EMyPositionMode initMode,
-                                           double timeInBackground, bool isFirstLaunch)
-  : m_mode(initMode)
+MyPositionController::MyPositionController(location::EMyPositionMode initMode, double timeInBackground,
+                                           bool isFirstLaunch, bool isRoutingActive)
+  : m_mode(location::PendingPosition)
+  , m_desiredInitMode(initMode)
   , m_isFirstLaunch(isFirstLaunch)
-  , m_isInRouting(false)
+  , m_isInRouting(isRoutingActive)
   , m_needBlockAnimation(false)
   , m_wasRotationInScaling(false)
   , m_errorRadius(0.0)
@@ -109,13 +126,17 @@ MyPositionController::MyPositionController(location::EMyPositionMode initMode,
   , m_isPendingAnimation(false)
   , m_isPositionAssigned(false)
   , m_isDirectionAssigned(false)
+  , m_notFollowAfterPending(false)
 {
-  if (isFirstLaunch)
+  if (m_isFirstLaunch)
+  {
     m_mode = location::NotFollowNoPosition;
+    m_desiredInitMode = location::NotFollowNoPosition;
+  }
   else if (timeInBackground >= kMaxTimeInBackgroundSec)
-    m_mode = location::Follow;
-
-  m_startLocationTimer.Reset();
+  {
+    m_desiredInitMode = location::Follow;
+  }
 }
 
 MyPositionController::~MyPositionController()
@@ -125,7 +146,7 @@ MyPositionController::~MyPositionController()
 
 void MyPositionController::OnNewPixelRect()
 {
-  UpdateViewport();
+  UpdateViewport(kDoNotChangeZoom);
 }
 
 void MyPositionController::UpdatePixelPosition(ScreenBase const & screen)
@@ -173,7 +194,7 @@ void MyPositionController::DragEnded(m2::PointD const & distance)
   if (distance.Length() > kBindingDistance * min(m_pixelRect.SizeX(), m_pixelRect.SizeY()))
     StopLocationFollow();
 
-  UpdateViewport();
+  UpdateViewport(kDoNotChangeZoom);
 }
 
 void MyPositionController::ScaleStarted()
@@ -190,7 +211,7 @@ void MyPositionController::ScaleEnded()
     StopLocationFollow();
   }
 
-  UpdateViewport();
+  UpdateViewport(kDoNotChangeZoom);
 }
 
 void MyPositionController::Rotated()
@@ -199,6 +220,12 @@ void MyPositionController::Rotated()
     m_wasRotationInScaling = true;
 }
 
+void MyPositionController::ResetRoutingNotFollowTimer()
+{
+  if (m_isInRouting)
+    m_routingNotFollowTimer.Reset();
+}
+
 void MyPositionController::CorrectScalePoint(m2::PointD & pt) const
 {
   if (IsModeChangeViewport())
@@ -226,7 +253,7 @@ void MyPositionController::SetRenderShape(drape_ptr<MyPosition> && shape)
   m_shape = move(shape);
 }
 
-void MyPositionController::NextMode()
+void MyPositionController::NextMode(ScreenBase const & screen)
 {
   string const kAlohalyticsClickEvent = "$onClick";
 
@@ -248,11 +275,17 @@ void MyPositionController::NextMode()
     return;
   }
 
+  // Calculate preferred zoom level.
+  int const currentZoom = GetZoomLevel(screen);
+  int preferredZoomLevel = kDoNotChangeZoom;
+  if (currentZoom < kZoomThreshold)
+    preferredZoomLevel = min(GetZoomLevel(screen, m_position, m_errorRadius), kMaxScaleZoomLevel);
+
   // In routing not-follow -> follow-and-rotate, otherwise not-follow -> follow.
   if (m_mode == location::NotFollow)
   {
     ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow);
-    UpdateViewport();
+    UpdateViewport(preferredZoomLevel);
     return;
   }
 
@@ -263,7 +296,7 @@ void MyPositionController::NextMode()
     if (IsRotationAvailable() || m_isInRouting)
     {
       ChangeMode(location::FollowAndRotate);
-      UpdateViewport();
+      UpdateViewport(preferredZoomLevel);
     }
     return;
   }
@@ -274,7 +307,7 @@ void MyPositionController::NextMode()
     if (!m_isInRouting)
     {
       ChangeMode(location::Follow);
-      UpdateViewport();
+      ChangeModelView(m_position, 0.0, m_centerPixelPosition, preferredZoomLevel);
     }
   }
 }
@@ -309,28 +342,53 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
     m_isDirtyViewport = true;
   }
 
-  if (m_mode == location::PendingPosition || m_mode == location::NotFollowNoPosition)
+  if (m_notFollowAfterPending && m_mode == location::PendingPosition)
   {
-    ChangeMode(location::Follow);
-    if (!m_isFirstLaunch)
-    {
-      m2::PointD const size(m_errorRadius, m_errorRadius);
-      ChangeModelView(m2::RectD(m_position - size, m_position + size));
-    }
-    else
-    {
-      if (!AnimationSystem::Instance().AnimationExists(Animation::MapPlane))
-        ChangeModelView(m_position, kDoNotChangeZoom);
-    }
+    ChangeMode(location::NotFollow);
+    if (m_isInRouting)
+      m_routingNotFollowTimer.Reset();
+    m_notFollowAfterPending = false;
   }
   else if (!m_isPositionAssigned)
   {
-    ChangeMode(m_mode);
-    if (m_mode == location::Follow)
-      ChangeModelView(m_position, kDoNotChangeZoom);
-    else if (m_mode == location::FollowAndRotate)
-      ChangeModelView(m_position, m_drawDirection,
-                      m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom);
+    ChangeMode(m_isFirstLaunch ? location::Follow : m_desiredInitMode);
+    if (!m_isFirstLaunch || !AnimationSystem::Instance().AnimationExists(Animation::MapPlane))
+    {
+      if (m_mode == location::Follow)
+        ChangeModelView(m_position, kDoNotChangeZoom);
+      else if (m_mode == location::FollowAndRotate)
+        ChangeModelView(m_position, m_drawDirection,
+                        m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom);
+    }
+  }
+  else if (m_mode == location::PendingPosition || m_mode == location::NotFollowNoPosition)
+  {
+    if (m_isInRouting)
+    {
+      ChangeMode(location::FollowAndRotate);
+      UpdateViewport(kMaxScaleZoomLevel);
+    }
+    else
+    {
+      ChangeMode(location::Follow);
+      if (!m_isFirstLaunch)
+      {
+        if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel)
+        {
+          m2::PointD const size(m_errorRadius, m_errorRadius);
+          ChangeModelView(m2::RectD(m_position - size, m_position + size));
+        }
+        else
+        {
+          ChangeModelView(m_position, kMaxScaleZoomLevel);
+        }
+      }
+      else
+      {
+        if (!AnimationSystem::Instance().AnimationExists(Animation::MapPlane))
+          ChangeModelView(m_position, kDoNotChangeZoom);
+      }
+    }
   }
 
   m_isPositionAssigned = true;
@@ -398,27 +456,18 @@ void MyPositionController::Render(uint32_t renderMode, ScreenBase const & screen
       ChangeMode(location::NotFollowNoPosition);
   }
 
-  // We do not have assigned position but mode requires location.
-  // Go to Pending state if the time is up.
-  if (!m_isPositionAssigned && IsInStateWithPosition() &&
-      m_startLocationTimer.ElapsedSeconds() >= kMaxWaitStartLocationSec)
-  {
-    m_pendingTimer.Reset();
-    ChangeMode(location::PendingPosition);
-  }
-
   if (IsInRouting() && m_mode == location::NotFollow &&
       m_routingNotFollowTimer.ElapsedSeconds() >= kMaxNotFollowRoutingTimeSec)
   {
     ChangeMode(location::FollowAndRotate);
-    UpdateViewport();
+    UpdateViewport(kDoNotChangeZoom);
   }
 
   if (m_shape != nullptr && IsVisible() && IsModeHasPosition())
   {
     if (m_isDirtyViewport && !m_needBlockAnimation)
     {
-      UpdateViewport();
+      UpdateViewport(kDoNotChangeZoom);
       m_isDirtyViewport = false;
     }
 
@@ -494,6 +543,10 @@ void MyPositionController::StopLocationFollow()
 {
   if (m_mode == location::Follow || m_mode == location::FollowAndRotate)
     ChangeMode(location::NotFollow);
+  m_desiredInitMode = location::NotFollow;
+
+  if (m_mode == location::PendingPosition)
+    m_notFollowAfterPending = true;
   
   if (m_isInRouting)
     m_routingNotFollowTimer.Reset();
@@ -503,8 +556,8 @@ void MyPositionController::SetTimeInBackground(double time)
 {
   if (time >= kMaxTimeInBackgroundSec && m_mode == location::NotFollow)
   {
-    ChangeMode(location::Follow);
-    UpdateViewport();
+    ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow);
+    UpdateViewport(kDoNotChangeZoom);
   }
 }
 
@@ -512,11 +565,14 @@ void MyPositionController::OnCompassTapped()
 {
   alohalytics::LogEvent("$compassClicked", {{"mode", LocationModeStatisticsName(m_mode)},
                                             {"routing", strings::to_string(IsInRouting())}});
-  ChangeModelView(0.0);
   if (m_mode == location::FollowAndRotate)
   {
     ChangeMode(location::Follow);
-    UpdateViewport();
+    ChangeModelView(m_position, 0.0, m_centerPixelPosition, kDoNotChangeZoom);
+  }
+  else
+  {
+    ChangeModelView(0.0);
   }
 }
 
@@ -545,16 +601,16 @@ void MyPositionController::ChangeModelView(m2::PointD const & userPos, double az
     m_listener->ChangeModelView(userPos, azimuth, pxZero, zoomLevel);
 }
 
-void MyPositionController::UpdateViewport()
+void MyPositionController::UpdateViewport(int zoomLevel)
 {
   if (IsWaitingForLocation())
     return;
   
   if (m_mode == location::Follow)
-    ChangeModelView(m_position, kDoNotChangeZoom);
+    ChangeModelView(m_position, zoomLevel);
   else if (m_mode == location::FollowAndRotate)
     ChangeModelView(m_position, m_drawDirection,
-                    m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, kDoNotChangeZoom);
+                    m_isInRouting ? m_centerPixelPositionRouting : m_centerPixelPosition, zoomLevel);
 }
 
 m2::PointD MyPositionController::GetRotationPixelCenter() const
@@ -641,6 +697,7 @@ void MyPositionController::ActivateRouting(int zoomLevel)
   if (!m_isInRouting)
   {
     m_isInRouting = true;
+    m_routingNotFollowTimer.Reset();
 
     if (IsRotationAvailable())
     {
diff --git a/drape_frontend/my_position_controller.hpp b/drape_frontend/my_position_controller.hpp
index 788f2616c7..3d350dc302 100644
--- a/drape_frontend/my_position_controller.hpp
+++ b/drape_frontend/my_position_controller.hpp
@@ -43,7 +43,8 @@ public:
     RenderMyPosition = 0x2
   };
 
-  MyPositionController(location::EMyPositionMode initMode, double timeInBackground, bool isFirstLaunch);
+  MyPositionController(location::EMyPositionMode initMode, double timeInBackground,
+                       bool isFirstLaunch, bool isRoutingActive);
   ~MyPositionController();
 
   void OnNewPixelRect();
@@ -65,6 +66,8 @@ public:
 
   void Rotated();
 
+  void ResetRoutingNotFollowTimer();
+
   void CorrectScalePoint(m2::PointD & pt) const;
   void CorrectScalePoint(m2::PointD & pt1, m2::PointD & pt2) const;
   void CorrectGlobalScalePoint(m2::PointD & pt) const;
@@ -75,7 +78,7 @@ public:
   void DeactivateRouting();
 
   void StopLocationFollow();
-  void NextMode();
+  void NextMode(ScreenBase const & screen);
   void LoseLocation();
 
   void SetTimeInBackground(double time);
@@ -113,7 +116,7 @@ private:
   void ChangeModelView(m2::RectD const & rect);
   void ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero, int zoomLevel);
 
-  void UpdateViewport();
+  void UpdateViewport(int zoomLevel);
   m2::PointD GetRotationPixelCenter() const;
   m2::PointD GetRoutingRotationPixelCenter() const;
 
@@ -126,6 +129,7 @@ private:
 
 private:
   location::EMyPositionMode m_mode;
+  location::EMyPositionMode m_desiredInitMode;
   bool m_isFirstLaunch;
 
   bool m_isInRouting;
@@ -147,7 +151,6 @@ private:
   my::Timer m_pendingTimer;
   my::Timer m_routingNotFollowTimer;
   my::Timer m_updateLocationTimer;
-  my::Timer m_startLocationTimer;
   double m_lastLocationTimestamp;
 
   m2::RectD m_pixelRect;
@@ -167,6 +170,8 @@ private:
 
   bool m_isPositionAssigned;
   bool m_isDirectionAssigned;
+
+  bool m_notFollowAfterPending;
 };
 
 }
diff --git a/drape_frontend/navigator.cpp b/drape_frontend/navigator.cpp
index 4344db1950..3544e57fab 100644
--- a/drape_frontend/navigator.cpp
+++ b/drape_frontend/navigator.cpp
@@ -537,8 +537,8 @@ void Navigator::SetRotationIn3dMode(double rotationAngle)
 
 void Navigator::Disable3dMode()
 {
-  ASSERT(m_Screen.isPerspective(), ());
-  m_Screen.ResetPerspective();
+  if (m_Screen.isPerspective())
+    m_Screen.ResetPerspective();
 }
 
 m2::AnyRectD ToRotated(Navigator const & navigator, m2::RectD const & rect)
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 9126fd7419..a9ef796943 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -29,7 +29,7 @@ uint64_t const kKineticDelayMs = 500;
 
 float const kForceTapThreshold = 0.75;
 
-int const kDoNotChangeZoom = -1;
+string const kPrettyMoveAnim = "PrettyMove";
 
 size_t GetValidTouchesCount(array<Touch, 2> const & touches)
 {
@@ -50,6 +50,8 @@ drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const screen, dou
   double const scaleFactor = moveDuration / kMaxAnimationTimeSec * 2.0;
 
   drape_ptr<SequenceAnimation> sequenceAnim = make_unique_dp<SequenceAnimation>();
+  sequenceAnim->SetCustomType(kPrettyMoveAnim);
+
   drape_ptr<MapLinearAnimation> zoomOutAnim = make_unique_dp<MapLinearAnimation>();
   zoomOutAnim->SetScale(startScale, startScale * scaleFactor);
   zoomOutAnim->SetMaxDuration(kMaxAnimationTimeSec * 0.5);
@@ -171,11 +173,8 @@ void UserEventStream::AddEvent(UserEvent const & event)
   m_events.push_back(event);
 }
 
-ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool & viewportChanged)
+ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChanged, bool & viewportChanged)
 {
-  modelViewChange = false;
-  viewportChanged = false;
-
   list<UserEvent> events;
 
   {
@@ -184,7 +183,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
     swap(m_events, events);
   }
 
-  modelViewChange = !events.empty() || m_state == STATE_SCALE || m_state == STATE_DRAG;
+  m_modelViewChanged = !events.empty() || m_state == STATE_SCALE || m_state == STATE_DRAG;
   for (UserEvent const & e : events)
   {
     if (m_perspectiveAnimation && FilterEventWhile3dAnimation(e.m_type))
@@ -200,7 +199,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
       break;
     case UserEvent::EVENT_RESIZE:
       m_navigator.OnSize(e.m_resize.m_width, e.m_resize.m_height);
-      viewportChanged = true;
+      m_viewportChanged = true;
       breakAnim = true;
       TouchCancel(m_touches);
       if (m_state == STATE_DOUBLE_TAP_HOLD)
@@ -254,8 +253,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
       m_discardedFOV = m_discardedAngle = 0.0;
       break;
     case UserEvent::EVENT_DISABLE_PERSPECTIVE:
-      if (m_navigator.Screen().isPerspective())
-        SetDisable3dModeAnimation();
+      SetDisable3dModeAnimation();
       m_discardedFOV = m_discardedAngle = 0.0;
       break;
     case UserEvent::EVENT_SWITCH_VIEW_MODE:
@@ -277,10 +275,10 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
     }
 
     if (breakAnim)
-      modelViewChange = true;
+      m_modelViewChanged = true;
   }
 
-  ApplyAnimations(modelViewChange, viewportChanged);
+  ApplyAnimations();
 
   if (m_perspectiveAnimation)
   {
@@ -293,7 +291,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
       SetRect(m_pendingEvent->m_rectEvent.m_rect, m_pendingEvent->m_rectEvent.m_zoom,
               m_pendingEvent->m_rectEvent.m_applyRotation, m_pendingEvent->m_rectEvent.m_isAnim);
       m_pendingEvent.reset();
-      modelViewChange = true;
+      m_modelViewChanged = true;
     }
   }
 
@@ -305,10 +303,15 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
       DetectLongTap(m_touches[0]);
   }
 
+  modelViewChanged = m_modelViewChanged;
+  viewportChanged = m_viewportChanged;
+  m_modelViewChanged = false;
+  m_viewportChanged = false;
+
   return m_navigator.Screen();
 }
 
-void UserEventStream::ApplyAnimations(bool & modelViewChanged, bool & viewportChanged)
+void UserEventStream::ApplyAnimations()
 {
   if (m_animationSystem.AnimationExists(Animation::MapPlane))
   {
@@ -328,7 +331,7 @@ void UserEventStream::ApplyAnimations(bool & modelViewChanged, bool & viewportCh
       {
         m_navigator.Disable3dMode();
       }
-      viewportChanged = true;
+      m_viewportChanged = true;
     }
 
     double perspectiveAngle;
@@ -338,7 +341,7 @@ void UserEventStream::ApplyAnimations(bool & modelViewChanged, bool & viewportCh
       m_navigator.SetRotationIn3dMode(perspectiveAngle);
     }
 
-    modelViewChanged = true;
+    m_modelViewChanged = true;
   }
 }
 
@@ -368,6 +371,12 @@ bool UserEventStream::SetScale(m2::PointD const & pxScaleCenter, double factor,
     auto anim = make_unique_dp<MapScaleAnimation>(startScreen.GetScale(), endScreen.GetScale(),
                                                   glbScaleCenter, offset);
     anim->SetMaxDuration(kMaxAnimationTimeSec);
+
+    // Reset follow animation with scaling if we apply scale explicitly.
+    auto const & followAnim = m_animationSystem.FindAnimation<MapFollowAnimation>(Animation::MapFollow);
+    if (followAnim != nullptr && followAnim->HasScale())
+      ResetAnimations(Animation::MapFollow);
+
     m_animationSystem.CombineAnimation(move(anim));
     return false;
   }
@@ -511,6 +520,23 @@ bool UserEventStream::SetRect(m2::AnyRectD const & rect, bool isAnim)
   return true;
 }
 
+bool UserEventStream::InterruptFollowAnimations()
+{
+  Animation const * followAnim = m_animationSystem.FindAnimation<MapFollowAnimation>(Animation::MapFollow);
+
+  if (followAnim == nullptr)
+    followAnim = m_animationSystem.FindAnimation<SequenceAnimation>(Animation::Sequence, kPrettyMoveAnim);
+
+  if (followAnim != nullptr)
+  {
+    if (followAnim->CouldBeInterrupted())
+      ResetAnimations(followAnim->GetType());
+    else
+      return false;
+  }
+  return true;
+}
+
 bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD const & pixelPos,
                                          double azimuth, int preferredZoomLevel, bool isAnim)
 {
@@ -542,6 +568,10 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
     };
     
     double const startScale = CalculateScale(screen, GetCurrentRect());
+    
+    // Reset current follow-and-rotate animation if possible.
+    if (!InterruptFollowAnimations())
+      return false;
 
     // Run pretty move animation if we are far from userPos.
     m2::PointD const startPt = GetCurrentRect().GlobalCenter();
@@ -570,6 +600,11 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
     auto anim = make_unique_dp<MapFollowAnimation>(userPos, startScale, targetScale,
                                                    screen.GlobalRect().Angle().val(), -azimuth,
                                                    screen.GtoP(userPos), pixelPos, screen.PixelRect());
+    if (preferredZoomLevel != kDoNotChangeZoom)
+    {
+      anim->SetCouldBeInterrupted(false);
+      anim->SetCouldBeBlended(false);
+    }
     anim->SetMaxDuration(kMaxAnimationTimeSec);
     anim->SetOnStartAction(onStartHandler);
     m_animationSystem.CombineAnimation(move(anim));
@@ -584,14 +619,19 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
 
 bool UserEventStream::FilterEventWhile3dAnimation(UserEvent::EEventType type) const
 {
-  return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT;
+  return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT &&
+         type != UserEvent::EVENT_ENABLE_PERSPECTIVE &&
+         type != UserEvent::EVENT_DISABLE_PERSPECTIVE &&
+         type != UserEvent::EVENT_SWITCH_VIEW_MODE;
 }
 
 void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV,
                                       bool isAnim, bool immediatelyStart)
 {
-  ResetCurrentAnimations(Animation::MapLinear);
-  ResetCurrentAnimations(Animation::MapScale);
+  ResetAnimationsBeforeSwitch3D();
+
+  if (immediatelyStart)
+    ResetAnimations(Animation::MapFollow);
 
   double const startAngle = isAnim ? 0.0 : maxRotationAngle;
   double const endAngle = maxRotationAngle;
@@ -613,8 +653,15 @@ void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV,
 
 void UserEventStream::SetDisable3dModeAnimation()
 {
-  ResetCurrentAnimations(Animation::MapLinear);
-  ResetCurrentAnimations(Animation::MapScale);
+  ResetAnimationsBeforeSwitch3D();
+  ResetAnimations(Animation::MapFollow);
+
+  if (m_discardedFOV > 0.0 && IsScaleAllowableIn3d(GetDrawTileScale(GetCurrentScreen())))
+  {
+    m_discardedFOV = m_discardedAngle = 0.0;
+    m_listener->OnPerspectiveSwitchRejected();
+    return;
+  }
 
   double const startAngle = m_navigator.Screen().GetRotationAngle();
   double const endAngle = 0.0;
@@ -631,28 +678,28 @@ void UserEventStream::SetDisable3dModeAnimation()
   m_animationSystem.CombineAnimation(move(anim));
 }
 
-void UserEventStream::ResetCurrentAnimations(Animation::Type animType)
+void UserEventStream::ResetAnimations(Animation::Type animType, bool finishAll)
 {
   bool const hasAnimations = m_animationSystem.HasAnimations();
-  m_animationSystem.FinishAnimations(animType, true /* rewind */);
+  m_animationSystem.FinishAnimations(animType, true /* rewind */, finishAll);
   if (hasAnimations)
-  {
-    m2::AnyRectD rect;
-    if (m_animationSystem.GetRect(GetCurrentScreen(), rect))
-      m_navigator.SetFromRect(rect);
-  }
+    ApplyAnimations();
 }
 
 void UserEventStream::ResetMapPlaneAnimations()
 {
   bool const hasAnimations = m_animationSystem.HasAnimations();
-  m_animationSystem.FinishObjectAnimations(Animation::MapPlane, false /* finishAll */);
+  m_animationSystem.FinishObjectAnimations(Animation::MapPlane, false /* rewind */, false /* finishAll */);
   if (hasAnimations)
-  {
-    m2::AnyRectD rect;
-    if (m_animationSystem.GetRect(GetCurrentScreen(), rect))
-      m_navigator.SetFromRect(rect);
-  }
+    ApplyAnimations();
+}
+
+void UserEventStream::ResetAnimationsBeforeSwitch3D()
+{
+  ResetAnimations(Animation::MapLinear);
+  ResetAnimations(Animation::MapScale);
+  ResetAnimations(Animation::Sequence);
+  ResetAnimations(Animation::MapPerspective, true /* finishAll */);
 }
 
 m2::AnyRectD UserEventStream::GetCurrentRect() const
@@ -698,11 +745,14 @@ bool UserEventStream::ProcessTouch(TouchEvent const & touch)
 
 bool UserEventStream::TouchDown(array<Touch, 2> const & touches)
 {
+  if (m_listener)
+    m_listener->OnTouchMapAction();
+
   size_t touchCount = GetValidTouchesCount(touches);
   bool isMapTouch = true;
-
+  
   // Interrupt kinetic scroll on touch down.
-  m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */);
+  m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */, true /* finishAll */);
 
   if (touchCount == 1)
   {
@@ -758,6 +808,9 @@ bool UserEventStream::TouchDown(array<Touch, 2> const & touches)
 
 bool UserEventStream::TouchMove(array<Touch, 2> const & touches, double timestamp)
 {
+  if (m_listener)
+    m_listener->OnTouchMapAction();
+
   double const kDragThreshold = my::sq(VisualParams::Instance().GetDragThreshold());
   size_t touchCount = GetValidTouchesCount(touches);
   bool isMapTouch = true;
@@ -839,6 +892,9 @@ bool UserEventStream::TouchMove(array<Touch, 2> const & touches, double timestam
 
 bool UserEventStream::TouchCancel(array<Touch, 2> const & touches)
 {
+  if (m_listener)
+    m_listener->OnTouchMapAction();
+
   size_t touchCount = GetValidTouchesCount(touches);
   UNUSED_VALUE(touchCount);
   bool isMapTouch = true;
@@ -880,6 +936,9 @@ bool UserEventStream::TouchCancel(array<Touch, 2> const & touches)
 
 bool UserEventStream::TouchUp(array<Touch, 2> const & touches)
 {
+  if (m_listener)
+    m_listener->OnTouchMapAction();
+
   size_t touchCount = GetValidTouchesCount(touches);
   bool isMapTouch = true;
   switch (m_state)
diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp
index e36318e777..cc93262563 100644
--- a/drape_frontend/user_event_stream.hpp
+++ b/drape_frontend/user_event_stream.hpp
@@ -20,6 +20,8 @@
 namespace df
 {
 
+int const kDoNotChangeZoom = -1;
+
 struct Touch
 {
   m2::PointF m_location = m2::PointF::Zero();
@@ -256,11 +258,14 @@ public:
     virtual void OnScaleEnded() = 0;
 
     virtual void OnAnimationStarted(ref_ptr<Animation> anim) = 0;
+    virtual void OnPerspectiveSwitchRejected() = 0;
+
+    virtual void OnTouchMapAction() = 0;
   };
 
   UserEventStream();
   void AddEvent(UserEvent const & event);
-  ScreenBase const & ProcessEvents(bool & modelViewChange, bool & viewportChanged);
+  ScreenBase const & ProcessEvents(bool & modelViewChanged, bool & viewportChanged);
   ScreenBase const & GetCurrentScreen() const;
 
   m2::AnyRectD GetTargetRect() const;
@@ -349,9 +354,11 @@ private:
   void EndFilter(Touch const & t);
   void CancelFilter(Touch const & t);
 
-  void ApplyAnimations(bool & modelViewChanged, bool & viewportChanged);
-  void ResetCurrentAnimations(Animation::Type animType);
+  void ApplyAnimations();
+  void ResetAnimations(Animation::Type animType, bool finishAll = false);
   void ResetMapPlaneAnimations();
+  void ResetAnimationsBeforeSwitch3D();
+  bool InterruptFollowAnimations();
 
   list<UserEvent> m_events;
   mutable mutex m_lock;
@@ -375,6 +382,9 @@ private:
 
   AnimationSystem & m_animationSystem;
 
+  bool m_modelViewChanged = false;
+  bool m_viewportChanged = false;
+
   bool m_perspectiveAnimation = false;
   unique_ptr<UserEvent> m_pendingEvent;
   double m_discardedFOV = 0.0;
diff --git a/editor/editor_tests/osm_feature_matcher_test.cpp b/editor/editor_tests/osm_feature_matcher_test.cpp
index d0a8361b6c..8299ca4754 100644
--- a/editor/editor_tests/osm_feature_matcher_test.cpp
+++ b/editor/editor_tests/osm_feature_matcher_test.cpp
@@ -263,6 +263,8 @@ char const * const osmRawResponseRelation = R"SEP(
 )SEP";
 }  // namespace
 
+// Note: Geometry should not contain duplicates.
+
 UNIT_TEST(GetBestOsmNode_Test)
 {
   {
@@ -277,8 +279,8 @@ UNIT_TEST(GetBestOsmNode_Test)
     pugi::xml_document osmResponse;
     TEST(osmResponse.load_buffer(osmRawResponseNode, ::strlen(osmRawResponseNode)), ());
 
-    auto const bestNode = osm::GetBestOsmNode(osmResponse, ms::LatLon(53.8978398, 27.5579251));
-    TEST(bestNode, ());
+    auto const bestNode = osm::GetBestOsmNode(osmResponse, ms::LatLon(53.8977254, 27.5578377));
+    TEST_EQUAL(bestNode.attribute("id").value(), string("277172019"), ());
   }
 }
 
@@ -352,3 +354,64 @@ UNIT_TEST(GetBestOsmRealtion_Test)
   auto const bestWay = osm::GetBestOsmWayOrRelation(osmResponse, geometry);
   TEST_EQUAL(bestWay.attribute("id").value(), string("365808"), ());
 }
+
+namespace
+{
+char const * const osmResponseBuildingMiss = R"SEP(
+<osm version="0.6" generator="CGImap 0.4.0 (8662 thorn-01.openstreetmap.org)">
+ <bounds minlat="51.5342700" minlon="-0.2047000" maxlat="51.5343200" maxlon="-0.2046300"/>
+ <node id="861357349" visible="true" version="3" changeset="31214483" timestamp="2015-05-16T23:10:03Z" user="Derick Rethans" uid="37137" lat="51.5342451" lon="-0.2046356"/>
+ <node id="3522706827" visible="true" version="1" changeset="31214483" timestamp="2015-05-16T23:09:47Z" user="Derick Rethans" uid="37137" lat="51.5342834" lon="-0.2046544">
+  <tag k="addr:housenumber" v="26a"/>
+  <tag k="addr:street" v="Salusbury Road"/>
+ </node>
+ <node id="3522707171" visible="true" version="1" changeset="31214483" timestamp="2015-05-16T23:09:50Z" user="Derick Rethans" uid="37137" lat="51.5342161" lon="-0.2047884"/>
+ <node id="3522707175" visible="true" version="1" changeset="31214483" timestamp="2015-05-16T23:09:50Z" user="Derick Rethans" uid="37137" lat="51.5342627" lon="-0.2048113"/>
+ <node id="3522707179" visible="true" version="1" changeset="31214483" timestamp="2015-05-16T23:09:50Z" user="Derick Rethans" uid="37137" lat="51.5342918" lon="-0.2046585"/>
+ <node id="3522707180" visible="true" version="1" changeset="31214483" timestamp="2015-05-16T23:09:50Z" user="Derick Rethans" uid="37137" lat="51.5343060" lon="-0.2048326"/>
+ <node id="3522707185" visible="true" version="1" changeset="31214483" timestamp="2015-05-16T23:09:50Z" user="Derick Rethans" uid="37137" lat="51.5343350" lon="-0.2046798"/>
+ <way id="345630057" visible="true" version="3" changeset="38374962" timestamp="2016-04-07T09:19:02Z" user="Derick Rethans" uid="37137">
+  <nd ref="3522707179"/>
+  <nd ref="3522707185"/>
+  <nd ref="3522707180"/>
+  <nd ref="3522707175"/>
+  <nd ref="3522707179"/>
+  <tag k="addr:housenumber" v="26"/>
+  <tag k="addr:street" v="Salusbury Road"/>
+  <tag k="building" v="yes"/>
+  <tag k="building:levels" v="1"/>
+  <tag k="name" v="Londis"/>
+  <tag k="shop" v="convenience"/>
+ </way>
+ <way id="345630019" visible="true" version="2" changeset="38374962" timestamp="2016-04-07T09:19:02Z" user="Derick Rethans" uid="37137">
+  <nd ref="861357349"/>
+  <nd ref="3522706827"/>
+  <nd ref="3522707179"/>
+  <nd ref="3522707175"/>
+  <nd ref="3522707171"/>
+  <nd ref="861357349"/>
+  <tag k="addr:housenumber" v="26"/>
+  <tag k="addr:street" v="Salusbury Road"/>
+  <tag k="building" v="yes"/>
+  <tag k="building:levels" v="2"/>
+  <tag k="name" v="Shampoo Hair Salon"/>
+  <tag k="shop" v="hairdresser"/>
+ </way>
+</osm>
+)SEP";
+}  // namespace
+
+UNIT_TEST(HouseBuildingMiss_test)
+{
+  pugi::xml_document osmResponse;
+  TEST(osmResponse.load_buffer(osmResponseBuildingMiss, ::strlen(osmResponseBuildingMiss)), ());
+  vector<m2::PointD> const geometry = {
+    {-0.2048121407986514, 60.333984198674443},
+    {-0.20478800091734684,  60.333909096821458},
+    {-0.20465925488366565,  60.334029796228037},
+    {-0.20463511500236109,  60.333954694375052},
+  };
+
+  auto const bestWay = osm::GetBestOsmWayOrRelation(osmResponse, geometry);
+  TEST_EQUAL(bestWay.attribute("id").value(), string("345630019"), ());
+}
diff --git a/editor/osm_feature_matcher.cpp b/editor/osm_feature_matcher.cpp
index fac7dc7305..fe421ba47e 100644
--- a/editor/osm_feature_matcher.cpp
+++ b/editor/osm_feature_matcher.cpp
@@ -11,7 +11,7 @@ namespace osm
 {
 using editor::XMLFeature;
 
-constexpr double kPointDiffEps = MercatorBounds::GetCellID2PointAbsEpsilon();
+constexpr double kPointDiffEps = 1e-5;
 
 bool PointsEqual(m2::PointD const & a, m2::PointD const & b)
 {
diff --git a/indexer/edits_migration.cpp b/indexer/edits_migration.cpp
index c1577b786f..bf56ec971f 100644
--- a/indexer/edits_migration.cpp
+++ b/indexer/edits_migration.cpp
@@ -10,23 +10,12 @@
 #include "std/algorithm.hpp"
 #include "std/unique_ptr.hpp"
 
-namespace
-{
-m2::PointD CalculateCenter(vector<m2::PointD> const & geometry)
-{
-  ASSERT(!geometry.empty() && geometry.size() % 3 == 0,
-         ("Invalid geometry should be handled in caller. geometry.size() =", geometry.size()));
-
-  auto const boundingBox = ApplyCalculator(begin(geometry), end(geometry),
-                                           m2::CalculateBoundingBox());
-  return ApplyCalculator(begin(geometry), end(geometry), m2::CalculatePointOnSurface(boundingBox));
-}
-}  // namespace
-
 namespace editor
 {
 FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach,
-                                  XMLFeature const & xml)
+                                  XMLFeature const & xml,
+                                  osm::Editor::FeatureStatus const featureStatus,
+                                  TGenerateIDFn const & generateID)
 {
   unique_ptr<FeatureType> feature;
   auto count = 0;
@@ -40,8 +29,12 @@ FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEac
         ++count;
       },
       MercatorBounds::FromLatLon(xml.GetCenter()));
-  if (!feature)
+
+  if (!feature && featureStatus != osm::Editor::FeatureStatus::Created)
     MYTHROW(MigrationError, ("No pointed features returned."));
+  if (featureStatus == osm::Editor::FeatureStatus::Created)
+    return generateID();
+
   if (count > 1)
   {
     LOG(LWARNING,
@@ -50,17 +43,20 @@ FeatureID MigrateNodeFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEac
   return feature->GetID();
 }
 
-FeatureID MigrateWayFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach,
-                                 XMLFeature const & xml)
+FeatureID MigrateWayFeatureIndex(
+    osm::Editor::TForEachFeaturesNearByFn & forEach, XMLFeature const & xml,
+    osm::Editor::FeatureStatus const /* Unused for now (we don't create/delete area features)*/,
+    TGenerateIDFn const & /*Unused for the same reason*/)
 {
   unique_ptr<FeatureType> feature;
   auto bestScore = 0.6;  // initial score is used as a threshold.
   auto geometry = xml.GetGeometry();
 
-  if (geometry.empty() || geometry.size() % 3 != 0)
+  if (geometry.empty())
     MYTHROW(MigrationError, ("Feature has invalid geometry", xml));
 
-  auto const someFeaturePoint = CalculateCenter(geometry);
+  // This can be any point on a feature.
+  auto const someFeaturePoint = geometry[0];
 
   sort(begin(geometry), end(geometry));  // Sort to use in set_intersection.
   auto count = 0;
@@ -113,12 +109,16 @@ FeatureID MigrateWayFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach
 }
 
 FeatureID MigrateFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach,
-                              XMLFeature const & xml)
+                              XMLFeature const & xml,
+                              osm::Editor::FeatureStatus const featureStatus,
+                              TGenerateIDFn const & generateID)
 {
   switch (xml.GetType())
   {
-  case XMLFeature::Type::Node: return MigrateNodeFeatureIndex(forEach, xml);
-  case XMLFeature::Type::Way: return MigrateWayFeatureIndex(forEach, xml);
+  case XMLFeature::Type::Node:
+    return MigrateNodeFeatureIndex(forEach, xml, featureStatus, generateID);
+  case XMLFeature::Type::Way:
+    return MigrateWayFeatureIndex(forEach, xml, featureStatus, generateID);
   }
 }
 }  // namespace editor
diff --git a/indexer/edits_migration.hpp b/indexer/edits_migration.hpp
index 53e6ba9f8e..c36c74e697 100644
--- a/indexer/edits_migration.hpp
+++ b/indexer/edits_migration.hpp
@@ -7,12 +7,18 @@
 
 #include "base/exception.hpp"
 
+#include "std/functional.hpp"
+
 namespace editor
 {
 DECLARE_EXCEPTION(MigrationError, RootException);
 
+using TGenerateIDFn = function<FeatureID()>;
+
 /// Tries to match xml feature with one on a new mwm and retruns FeatrueID
 /// of a found feature, thows MigrationError if migration fails.
 FeatureID MigrateFeatureIndex(osm::Editor::TForEachFeaturesNearByFn & forEach,
-                              XMLFeature const & xml);
+                              XMLFeature const & xml,
+                              osm::Editor::FeatureStatus const featureStatus,
+                              TGenerateIDFn const & generateID);
 }  // namespace editor
diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index 473e402545..2efd94b1b8 100644
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -243,7 +243,8 @@ UNIT_TEST(CategoriesIndex_AllCategories)
   CategoriesIndex index;
 
   index.AddAllCategoriesInAllLangs();
-  TEST_LESS(index.GetNumTrieNodes(), 250000, ());
+  // Consider deprecating this method if this bound rises as high as a million.
+  TEST_LESS(index.GetNumTrieNodes(), 400000, ());
 }
 #endif
 
diff --git a/indexer/new_feature_categories.cpp b/indexer/new_feature_categories.cpp
index 42cc6a2b7c..cded82d8f2 100644
--- a/indexer/new_feature_categories.cpp
+++ b/indexer/new_feature_categories.cpp
@@ -60,10 +60,8 @@ void NewFeatureCategories::AddLanguage(string lang)
   m_categoriesByLang[lang] = names;
 }
 
-NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query,
-                                                          string const & queryLang) const
+NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, string lang) const
 {
-  string lang = queryLang;
   auto langCode = CategoriesHolder::MapLocaleToInteger(lang);
   if (langCode == CategoriesHolder::kUnsupportedLocaleCode)
   {
@@ -83,7 +81,7 @@ NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query,
   my::SortUnique(result);
 
   alohalytics::TStringMap const stats = {
-      {"query", query}, {"queryLang", queryLang}, {"lang", lang}};
+      {"query", query}, {"lang", lang}};
   alohalytics::LogEvent("searchNewFeatureCategory", stats);
 
   return result;
diff --git a/indexer/new_feature_categories.hpp b/indexer/new_feature_categories.hpp
index 81f7aa7036..4148b87854 100644
--- a/indexer/new_feature_categories.hpp
+++ b/indexer/new_feature_categories.hpp
@@ -38,9 +38,9 @@ public:
 
   // Returns names (in language |queryLang|) and types of categories that have a synonym containing
   // the substring |query| (in any language that was added before).
-  // If |queryLang| is not supported, "en" is used.
+  // If |lang| is not supported, "en" is used.
   // The returned list is sorted.
-  TNames Search(string const & query, string const & queryLang) const;
+  TNames Search(string const & query, string lang) const;
 
   // Returns all registered names of categories in language |lang| and
   // types corresponding to these names. The language must have been added before.
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 868a108f90..9d7a9ee6f0 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -40,6 +40,7 @@
 
 #include "3party/Alohalytics/src/alohalytics.h"
 #include "3party/pugixml/src/pugixml.hpp"
+#include "3party/opening_hours/opening_hours.hpp"
 
 using namespace pugi;
 using feature::EGeomType;
@@ -137,6 +138,7 @@ namespace osm
 // (e.g. insert/remove spaces after ';' delimeter);
 
 Editor::Editor() : m_notes(editor::Notes::MakeNotes()) {}
+
 Editor & Editor::Instance()
 {
   static Editor instance;
@@ -173,6 +175,8 @@ void Editor::LoadMapEdits()
 
   bool needRewriteEdits = false;
 
+  // TODO(mgsergio): synchronize access to m_features.
+  m_features.clear();
   for (xml_node mwm : doc.child(kXmlRootNode).children(kXmlMwmNode))
   {
     string const mapName = mwm.attribute("name").as_string("");
@@ -191,11 +195,14 @@ void Editor::LoadMapEdits()
         {
           XMLFeature const xml(nodeOrWay.node());
 
+          // TODO(mgsergio): Deleted features are not properly handled yet.
           auto const fid = needMigrateEdits
-                               ? editor::MigrateFeatureIndex(m_forEachFeatureAtPointFn, xml)
+                               ? editor::MigrateFeatureIndex(
+                                     m_forEachFeatureAtPointFn, xml, section.first,
+                                     [this, &mwmId] { return GenerateNewFeatureId(mwmId); })
                                : FeatureID(mwmId, xml.GetMWMFeatureIndex());
 
-          // Remove obsolete edit during migration.
+          // Remove obsolete changes during migration.
           if (needMigrateEdits && IsObsolete(xml, fid))
             continue;
 
@@ -474,7 +481,7 @@ bool Editor::RollBackChanges(FeatureID const & fid)
 
   RemoveFeatureFromStorageIfExists(fid.m_mwmId, fid.m_index);
   Invalidate();
-  return true;
+  return Save(GetEditorFilePath());
 }
 
 void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
@@ -563,8 +570,27 @@ EditableProperties Editor::GetEditableProperties(FeatureType const & feature) co
   // Disable editor for old data.
   if (!version::IsSingleMwm(feature.GetID().m_mwmId.GetInfo()->m_version.GetVersion()))
     return {};
+
   // TODO(mgsergio): Check if feature is in the area where editing is disabled in the config.
-  return GetEditablePropertiesForTypes(feature::TypesHolder(feature));
+  auto editableProperties = GetEditablePropertiesForTypes(feature::TypesHolder(feature));
+
+  // Disable opening hours editing if opening hours cannot be parsed.
+  if (GetFeatureStatus(feature.GetID()) != FeatureStatus::Created)
+  {
+    auto const & originalFeature = m_getOriginalFeatureFn(feature.GetID());
+    auto const & metadata = originalFeature->GetMetadata();
+    auto const & featureOpeningHours = metadata.Get(feature::Metadata::FMD_OPEN_HOURS);
+    // Note: empty string is parsed as a valid opening hours rule.
+    if (!osmoh::OpeningHours(featureOpeningHours).IsValid())
+    {
+      auto & meta = editableProperties.m_metadata;
+      auto const toBeRemoved = remove(begin(meta), end(meta), feature::Metadata::FMD_OPEN_HOURS);
+      if (toBeRemoved != end(meta))
+        meta.erase(toBeRemoved);
+    }
+  }
+
+  return editableProperties;
 }
 // private
 EditableProperties Editor::GetEditablePropertiesForTypes(feature::TypesHolder const & types) const
diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp
index 62c71ddf07..8098ea077d 100644
--- a/indexer/osm_editor.hpp
+++ b/indexer/osm_editor.hpp
@@ -22,7 +22,7 @@
 
 namespace osm
 {
-class Editor final
+class Editor final : public MwmSet::Observer
 {
   Editor();
 
@@ -64,6 +64,12 @@ public:
   /// Resets editor to initial state: no any edits or created/deleted features.
   void ClearAllLocalEdits();
 
+  void OnMapUpdated(platform::LocalCountryFile const &,
+                    platform::LocalCountryFile const &) override
+  {
+    LoadMapEdits();
+  }
+
   using TFeatureIDFunctor = function<void(FeatureID const &)>;
   void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
                                        TFeatureIDFunctor const & f,
diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
index 8110da1735..de2cb4762c 100644
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
@@ -22,9 +22,10 @@
 - (void)presentDisabledLocationAlert;
 - (void)presentLocationAlert;
 - (void)presentLocationServiceNotSupportedAlert;
-- (void)presentLocationNotFoundAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock cancelBlock:(nonnull TMWMVoidBlock)cancelBlock;
+- (void)presentLocationNotFoundAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock;
 - (void)presentNoConnectionAlert;
 - (void)presentMigrationProhibitedAlert;
+- (void)presentDeleteMapProhibitedAlert;
 - (void)presentUnsavedEditsAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock;
 - (void)presentNoWiFiAlertWithOkBlock:(nullable TMWMVoidBlock)okBlock;
 - (void)presentPedestrianToastAlert:(BOOL)isFirstLaunch;
diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
index 85b3b8b60c..590b32c452 100644
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
@@ -54,9 +54,9 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
   [self displayAlert:MWMAlert.locationServiceNotSupportedAlert];
 }
 
-- (void)presentLocationNotFoundAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock cancelBlock:(nonnull TMWMVoidBlock)cancelBlock
+- (void)presentLocationNotFoundAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock
 {
-  [self displayAlert:[MWMAlert locationNotFoundAlertWithOkBlock:okBlock cancelBlock:cancelBlock]];
+  [self displayAlert:[MWMAlert locationNotFoundAlertWithOkBlock:okBlock]];
 }
 
 - (void)presentNoConnectionAlert
@@ -69,6 +69,11 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
   [self displayAlert:[MWMAlert migrationProhibitedAlert]];
 }
 
+- (void)presentDeleteMapProhibitedAlert
+{
+  [self displayAlert:[MWMAlert deleteMapProhibitedAlert]];
+}
+
 - (void)presentUnsavedEditsAlertWithOkBlock:(nonnull TMWMVoidBlock)okBlock
 {
   [self displayAlert:[MWMAlert unsavedEditsAlertWithOkBlock:okBlock]];
diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
index 848a525275..1aa49aeb4a 100644
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
@@ -23,9 +23,10 @@ using TMWMDownloadBlock = void (^)(storage::TCountriesVec const &, TMWMVoidBlock
 + (MWMAlert *)noWiFiAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (MWMAlert *)noConnectionAlert;
 + (MWMAlert *)migrationProhibitedAlert;
++ (MWMAlert *)deleteMapProhibitedAlert;
 + (MWMAlert *)unsavedEditsAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (MWMAlert *)locationServiceNotSupportedAlert;
-+ (MWMAlert *)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock;
++ (MWMAlert *)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (MWMAlert *)pedestrianToastShareAlert:(BOOL)isFirstLaunch;
 + (MWMAlert *)incorrectFeauturePositionAlert;
 + (MWMAlert *)internalErrorAlert;
diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
index 57888718b6..9ed24e00e3 100644
--- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
@@ -59,6 +59,11 @@
   return [MWMDefaultAlert migrationProhibitedAlert];
 }
 
++ (MWMAlert *)deleteMapProhibitedAlert
+{
+  return [MWMDefaultAlert deleteMapProhibitedAlert];
+}
+
 + (MWMAlert *)unsavedEditsAlertWithOkBlock:(TMWMVoidBlock)okBlock
 {
   return [MWMDefaultAlert unsavedEditsAlertWithOkBlock:okBlock];
@@ -69,9 +74,9 @@
   return [MWMDefaultAlert locationServiceNotSupportedAlert];
 }
 
-+ (MWMAlert *)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock
++ (MWMAlert *)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock
 {
-  return [MWMDefaultAlert locationNotFoundAlertWithOkBlock:okBlock cancelBlock:cancelBlock];
+  return [MWMDefaultAlert locationNotFoundAlertWithOkBlock:okBlock];
 }
 
 + (MWMAlert *)routingMigrationAlertWithOkBlock:(TMWMVoidBlock)okBlock
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
index b10ba45bb9..94665a8754 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
@@ -17,9 +17,10 @@
 + (instancetype)noWiFiAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (instancetype)noConnectionAlert;
 + (instancetype)migrationProhibitedAlert;
++ (instancetype)deleteMapProhibitedAlert;
 + (instancetype)unsavedEditsAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (instancetype)locationServiceNotSupportedAlert;
-+ (instancetype)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock;
++ (instancetype)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (instancetype)point2PointAlertWithOkBlock:(TMWMVoidBlock)okBlock needToRebuild:(BOOL)needToRebuild;
 + (instancetype)disableAutoDownloadAlertWithOkBlock:(TMWMVoidBlock)okBlock;
 + (instancetype)downloaderNoConnectionAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock;
diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
index 58ecf8b28b..1b379403f8 100644
--- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
@@ -63,7 +63,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
                    rightButtonAction:nil];
 }
 
-+ (instancetype)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock cancelBlock:(TMWMVoidBlock)cancelBlock
++ (instancetype)locationNotFoundAlertWithOkBlock:(TMWMVoidBlock)okBlock
 {
   kStatisticsEvent = @"Location Not Found Alert";
   MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"current_location_unknown_title"
@@ -71,7 +71,6 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
                                        rightButtonTitle:@"current_location_unknown_continue_button"
                                         leftButtonTitle:@"current_location_unknown_stop_button"
                                       rightButtonAction:okBlock];
-  alert.leftButtonAction = cancelBlock;
   [alert setNeedsCloseAlertAfterEnterBackground];
   return alert;
 }
@@ -100,6 +99,18 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
   return alert;
 }
 
++ (instancetype)deleteMapProhibitedAlert
+{
+  kStatisticsEvent = @"Delete Map Prohibited Alert";
+  MWMDefaultAlert * alert = [self defaultAlertWithTitle:@"downloader_delete_map"
+                                                message:@"downloader_delete_map_while_routing_dialog"
+                                       rightButtonTitle:@"ok"
+                                        leftButtonTitle:nil
+                                      rightButtonAction:nil];
+  [alert setNeedsCloseAlertAfterEnterBackground];
+  return alert;
+}
+
 + (instancetype)unsavedEditsAlertWithOkBlock:(TMWMVoidBlock)okBlock
 {
   kStatisticsEvent = @"Editor unsaved changes on delete";
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
index 2a58982d63..73a8ccb3fb 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
@@ -263,5 +263,4 @@ string translatedTwine(string const & twine)
   else
     return "";
 }
-
 } // namespace tts
diff --git a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
index 95c9efab2e..dceae2db16 100644
--- a/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/Classes/Editor/MWMEditorViewController.mm
@@ -817,14 +817,9 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
                                                                    kStatEditorMWMName : @(fid.GetMwmName().c_str()),
                                                                    kStatEditorMWMVersion : @(fid.GetMwmVersion()),
                                                                    kStatLat : @(latLon.lat), kStatLon : @(latLon.lon)}];
-    if (!osm::Editor::Instance().RollBackChanges(fid))
-      NSAssert(false, @"We shouldn't call this if we can't roll back!");
-
     auto & f = GetFramework();
-    if (isCreated)
-      f.DeactivateMapSelection(true);
-    else
-      f.UpdatePlacePageInfoForCurrentSelection();
+    if (!f.RollBackChanges(fid))
+      NSAssert(false, @"We shouldn't call this if we can't roll back!");
 
     [self backTap];
   };
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
index f5ef84d8f4..166d9fd8b7 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
+++ b/iphone/Maps/Classes/Editor/OpeningHours/Cells/MWMOpeningHoursAddClosedTableViewCell.xib
@@ -16,16 +16,14 @@
                 <subviews>
                     <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DPW-UE-5UN">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="42"/>
-                        <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
-                        <state key="normal" title="Add Hours Closed">
-                            <color key="titleColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                        </state>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <state key="normal" title="Add Hours Closed"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_time_add_closed"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="linkBlueHighlighted"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="textColorDisabledName" value="linkBlueHighlighted"/>
                         </userDefinedRuntimeAttributes>
                         <connections>
                             <action selector="addClosedTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="HxR-3Y-SiG"/>
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm
index 5377325447..e498efb299 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm
@@ -118,31 +118,42 @@ using namespace osmoh;
   return dateComponentsFromTime(isStart ? span.GetStart() : span.GetEnd());
 }
 
-- (void)setTime:(NSDateComponents *)time isStart:(BOOL)isStart isClosed:(BOOL)isClosed
+- (void)setStartTime:(NSDateComponents *)startTime endTime:(NSDateComponents *)endTime isClosed:(BOOL)isClosed
 {
-  if (!time)
+  if (!startTime && !endTime)
     return;
 
-  HourMinutes hm;
-  hm.SetHours(HourMinutes::THours(time.hour));
-  hm.SetMinutes(HourMinutes::TMinutes(time.minute));
-
   TTimeTableProxy tt = [self getTimeTableProxy];
   NSUInteger const row = self.selectedRow.unsignedIntegerValue;
   NSUInteger const index = isClosed ? [self closedTimeIndex:row] : 0;
   Timespan span = isClosed ? tt.GetExcludeTime()[index] : tt.GetOpeningTime();
 
-  if (isStart)
-    span.SetStart(hm);
-  else
-    span.SetEnd(hm);
+  if (startTime)
+  {
+    HourMinutes startHM;
+    startHM.SetHours(HourMinutes::THours(startTime.hour));
+    startHM.SetMinutes(HourMinutes::TMinutes(startTime.minute));
+    span.SetStart(startHM);
+  }
+  if (endTime)
+  {
+    HourMinutes endHM;
+    endHM.SetHours(HourMinutes::THours(endTime.hour));
+    endHM.SetMinutes(HourMinutes::TMinutes(endTime.minute));
+    span.SetEnd(endHM);
+  }
 
   NSUInteger const closedTimesCountBeforeUpdate = [self closedTimesCount];
 
   if (isClosed)
-    tt.ReplaceExcludeTime(span, index);
+  {
+    if (!tt.ReplaceExcludeTime(span, index))
+      tt.RemoveExcludeTime(index);
+  }
   else
+  {
     tt.SetOpeningTime(span);
+  }
   tt.Commit();
 
   [self refresh:closedTimesCountBeforeUpdate != [self closedTimesCount]];
@@ -378,12 +389,10 @@ using namespace osmoh;
     switch ([self cellKeyForRow:self.selectedRow.unsignedIntegerValue])
     {
       case MWMOpeningHoursEditorTimeSpanCell:
-        [self setTime:self.cachedStartTime isStart:YES isClosed:NO];
-        [self setTime:self.cachedEndTime isStart:NO isClosed:NO];
+        [self setStartTime:self.cachedStartTime endTime:self.cachedEndTime isClosed:NO];
         break;
       case MWMOpeningHoursEditorClosedSpanCell:
-        [self setTime:self.cachedStartTime isStart:YES isClosed:YES];
-        [self setTime:self.cachedEndTime isStart:NO isClosed:YES];
+        [self setStartTime:self.cachedStartTime endTime:self.cachedEndTime isClosed:YES];
         break;
       default:
         NSAssert(false, @"Invalid case");
diff --git a/iphone/Maps/Classes/LocaleTranslator.mm b/iphone/Maps/Classes/LocaleTranslator.mm
index 0b10049ebd..d3908308df 100644
--- a/iphone/Maps/Classes/LocaleTranslator.mm
+++ b/iphone/Maps/Classes/LocaleTranslator.mm
@@ -20,5 +20,4 @@ string bcp47ToTwineLanguage(NSString const * bcp47LangName)
   // Taking two first symbols of a language name. For example ru-RU -> ru
   return [[bcp47LangName substringToIndex:2] UTF8String];
 }
-
 } // namespace locale_translator
diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm
index 272df0e853..1d057ee07f 100644
--- a/iphone/Maps/Classes/MWMPlacePageEntity.mm
+++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm
@@ -1,7 +1,8 @@
-#import "MWMFrameworkListener.h"
+#import "MapsAppDelegate.h"
+#import "MapViewController.h"
+#import "MWMMapViewControlsManager.h"
 #import "MWMPlacePageEntity.h"
 #import "MWMPlacePageViewManager.h"
-#import "MapViewController.h"
 
 #include "Framework.h"
 
@@ -140,7 +141,9 @@ void initFieldsMap()
 
 - (NSString *)getCellValue:(MWMPlacePageCellType)cellType
 {
-  bool const isNewMWM = version::IsSingleMwm(GetFramework().Storage().GetCurrentDataVersion());
+  auto const s = MapsAppDelegate.theApp.mapViewController.controlsManager.navigationState;
+  BOOL const editOrAddAreAvailable = version::IsSingleMwm(GetFramework().Storage().GetCurrentDataVersion()) &&
+                                     s == MWMNavigationDashboardStateHidden;
   switch (cellType)
   {
     case MWMPlacePageCellTypeName:
@@ -148,14 +151,14 @@ void initFieldsMap()
     case MWMPlacePageCellTypeCoordinate:
       return [self coordinate];
     case MWMPlacePageCellTypeAddPlaceButton:
-      return m_info.ShouldShowAddPlace() && isNewMWM ? @"" : nil;
+      return editOrAddAreAvailable && m_info.ShouldShowAddPlace() ? @"" : nil;
     case MWMPlacePageCellTypeBookmark:
       return m_info.IsBookmark() ? @"" : nil;
     case MWMPlacePageCellTypeEditButton:
       // TODO(Vlad): It's a really strange way to "display" cell if returned text is not nil.
-      return isNewMWM && !m_info.IsMyPosition() && m_info.IsFeature() ? @"": nil;
+      return editOrAddAreAvailable && !m_info.IsMyPosition() && m_info.IsFeature() ? @"": nil;
     case MWMPlacePageCellTypeAddBusinessButton:
-      return m_info.IsBuilding() ? @"" : nil;
+      return editOrAddAreAvailable && m_info.IsBuilding() ? @"" : nil;
     default:
     {
       auto const it = m_values.find(cellType);
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 0fd400c05b..86b513c99f 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -586,13 +586,10 @@ BOOL gIsFirstMyPositionMode = YES;
         BOOL const isMapVisible = (self.navigationController.visibleViewController == self);
         if (isLocationManagerStarted && isMapVisible && ![Alohalytics isFirstSession])
         {
+          [[MapsAppDelegate theApp].locationManager stop:self];
           [self.alertController presentLocationNotFoundAlertWithOkBlock:^
           {
             GetFramework().SwitchMyPositionNextMode();
-          }
-          cancelBlock:^
-          {
-            [[MapsAppDelegate theApp].locationManager stop:self];
           }];
         }
       }
diff --git a/iphone/Maps/Classes/Storage/MWMStorage.mm b/iphone/Maps/Classes/Storage/MWMStorage.mm
index 3ac42821c2..7fa7c3c887 100644
--- a/iphone/Maps/Classes/Storage/MWMStorage.mm
+++ b/iphone/Maps/Classes/Storage/MWMStorage.mm
@@ -53,7 +53,14 @@ using namespace storage;
 
 + (void)deleteNode:(TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController
 {
-  if (GetFramework().HasUnsavedEdits(countryId))
+  auto & f = GetFramework();
+  if (f.IsRoutingActive())
+  {
+    [alertController presentDeleteMapProhibitedAlert];
+    return;
+  }
+
+  if (f.HasUnsavedEdits(countryId))
   {
     [alertController presentUnsavedEditsAlertWithOkBlock:[countryId]
     {
@@ -62,7 +69,7 @@ using namespace storage;
   }
   else
   {
-    GetFramework().Storage().DeleteNode(countryId);
+    f.Storage().DeleteNode(countryId);
   }
 }
 
diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index 358c2437bc..3ea3e29912 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -15,12 +15,18 @@
 
 #include "platform/local_country_file_utils.hpp"
 
+extern char const * kAutoDownloadEnabledKey;
+
 namespace
 {
 CGSize constexpr kInitialDialogSize = {200, 200};
 
 BOOL canAutoDownload(TCountryId const & countryId)
 {
+  bool autoDownloadEnabled = true;
+  (void)settings::Get(kAutoDownloadEnabledKey, autoDownloadEnabled);
+  if (!autoDownloadEnabled)
+    return NO;
   LocationManager * locationManager = MapsAppDelegate.theApp.locationManager;
   if (![locationManager lastLocationIsValid])
     return NO;
@@ -167,6 +173,9 @@ using namespace storage;
   {
     [self removeFromSuperview];
   }
+
+  if (self.superview)
+    [self setNeedsLayout];
 }
 
 - (void)addToSuperview
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 6e55913d7a..037831967e 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -4276,7 +4276,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.1;
+				CURRENT_PROJECT_VERSION = 6.1.3;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -4395,7 +4395,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.1;
+				CURRENT_PROJECT_VERSION = 6.1.3;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4515,7 +4515,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 6.1;
+				CURRENT_PROJECT_VERSION = 6.1.3;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4639,7 +4639,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 6.1;
+				CURRENT_PROJECT_VERSION = 6.1.3;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4763,7 +4763,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.1;
+				CURRENT_PROJECT_VERSION = 6.1.3;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -4885,7 +4885,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.1;
+				CURRENT_PROJECT_VERSION = 6.1.3;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm
index 344d745204..237ff53431 100644
--- a/iphone/Maps/Platform/LocationManager.mm
+++ b/iphone/Maps/Platform/LocationManager.mm
@@ -166,7 +166,7 @@ map<GeoMode, GeoModeSettings> const kGeoSettings{
       }
     }
     else
-      [self observer:observer onLocationError:location::EDenied];
+      [self observer:observer onLocationError:location::EGPSIsOff];
   }
   else
   {
diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm
index 040de6cad2..cc756001fc 100644
--- a/iphone/Maps/Settings/SettingsViewController.mm
+++ b/iphone/Maps/Settings/SettingsViewController.mm
@@ -21,6 +21,7 @@
 extern char const * kStatisticsEnabledSettingsKey;
 char const * kAdForbiddenSettingsKey = "AdForbidden";
 char const * kAdServerForbiddenKey = "AdServerForbidden";
+char const * kAutoDownloadEnabledKey = "AutoDownloadEnabled";
 extern NSString * const kTTSStatusWasChangedNotification = @"TTFStatusWasChangedFromSettingsNotification";
 
 typedef NS_ENUM(NSUInteger, Section)
@@ -75,7 +76,7 @@ typedef NS_ENUM(NSUInteger, Section)
   case SectionRouting:
     return 3;
   case SectionMap:
-    return 4;
+    return 5;
   }
 }
 
@@ -131,7 +132,20 @@ typedef NS_ENUM(NSUInteger, Section)
       customCell.titleLabel.text = indexPath.row == 0 ? L(@"pref_map_style_title") : L(@"pref_track_record_title");
       break;
     }
+    // Auto download
     case 2:
+    {
+      bool autoDownloadEnabled = true;
+      (void)settings::Get(kAutoDownloadEnabledKey, autoDownloadEnabled);
+      cell = [tableView dequeueReusableCellWithIdentifier:[SwitchCell className]];
+      SwitchCell * customCell = static_cast<SwitchCell *>(cell);
+      customCell.titleLabel.text = L(@"autodownload");
+      customCell.switchButton.on = autoDownloadEnabled;
+      customCell.delegate = self;
+      break;
+    }
+    // 3D buildings
+    case 3:
     {
       cell = [tableView dequeueReusableCellWithIdentifier:[SwitchCell className]];
       SwitchCell * customCell = static_cast<SwitchCell *>(cell);
@@ -143,7 +157,7 @@ typedef NS_ENUM(NSUInteger, Section)
       break;
     }
     // Zoom buttons
-    case 3:
+    case 4:
     {
       cell = [tableView dequeueReusableCellWithIdentifier:[SwitchCell className]];
       SwitchCell * customCell = static_cast<SwitchCell *>(cell);
@@ -228,7 +242,7 @@ typedef NS_ENUM(NSUInteger, Section)
   case SectionAd:
     [Statistics logEvent:kStatSettings
       withParameters:@{kStatAction : kStatMoreApps, kStatValue : (value ? kStatOn : kStatOff)}];
-    settings::Set(kAdForbiddenSettingsKey, (bool)!value);
+    settings::Set(kAdForbiddenSettingsKey, static_cast<bool>(!value));
     break;
 
   case SectionStatistics:
@@ -248,8 +262,16 @@ typedef NS_ENUM(NSUInteger, Section)
       case 0:
       case 1:
         break;
-      // 3D buildings
+      // Auto download
       case 2:
+      {
+        [Statistics logEvent:kStatEventName(kStatSettings, kStatAutoDownload)
+              withParameters:@{kStatValue : (value ? kStatOn : kStatOff)}];
+        settings::Set(kAutoDownloadEnabledKey, static_cast<bool>(value));
+        break;
+      }
+      // 3D buildings
+      case 3:
       {
         [Statistics logEvent:kStatEventName(kStatSettings, kStat3DBuildings)
                          withParameters:@{kStatValue : (value ? kStatOn : kStatOff)}];
@@ -262,11 +284,11 @@ typedef NS_ENUM(NSUInteger, Section)
         break;
       }
       // Zoom buttons
-      case 3:
+      case 4:
       {
         [Statistics logEvent:kStatEventName(kStatSettings, kStatToggleZoomButtonsVisibility)
             withParameters:@{kStatValue : (value ? kStatVisible : kStatHidden)}];
-        settings::Set("ZoomButtonsEnabled", (bool)value);
+        settings::Set("ZoomButtonsEnabled", static_cast<bool>(value));
         [MapsAppDelegate theApp].mapViewController.controlsManager.zoomHidden = !value;
         break;
       }
@@ -276,7 +298,7 @@ typedef NS_ENUM(NSUInteger, Section)
   case SectionCalibration:
     [Statistics logEvent:kStatEventName(kStatSettings, kStatToggleCompassCalibration)
         withParameters:@{kStatValue : (value ? kStatOn : kStatOff)}];
-    settings::Set("CompassCalibrationEnabled", (bool)value);
+    settings::Set("CompassCalibrationEnabled", static_cast<bool>(value));
     break;
 
   case SectionRouting:
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 3662098720..85c3b9526c 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -1376,7 +1376,7 @@
 
 "error_enter_correct_house_number" = "Richtige Hausnummer eingeben";
 
-"editor_storey_number" = "Anzahl der Etagen (%2d maximal)";
+"editor_storey_number" = "Anzahl der Etagen (%d maximal)";
 
 "error_enter_correct_storey_number" = "Bearbeiten Sie die Gebäude mit maximal 25 Etagen";
 
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index 80bec8febb..a3ba8f0aa1 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -1429,7 +1429,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occured while searching for 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.";
 
 "whatsnew_update_editor_title" = "We've updated the map editor";
 
diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings
index 95e024b437..23ef88818a 100644
--- a/iphone/Maps/fi.lproj/Localizable.strings
+++ b/iphone/Maps/fi.lproj/Localizable.strings
@@ -1376,7 +1376,7 @@
 
 "error_enter_correct_house_number" = "Syötä oikea talon numero";
 
-"editor_storey_number" = "Kerrosten määrä (maks. %2d)";
+"editor_storey_number" = "Kerrosten määrä (maks. %d)";
 
 "error_enter_correct_storey_number" = "Muokkaa kerroksia, enintään 25 kerrosta";
 
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index 1dd247a4f6..3d5214b844 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -1429,7 +1429,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occured while searching for 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.";
 
 "whatsnew_update_editor_title" = "We've updated the map editor";
 
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index 069788dfcd..ffc6391a85 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -1429,7 +1429,7 @@
 
 "current_location_unknown_error_title" = "Current location is unknown.";
 
-"current_location_unknown_error_message" = "An error occured while searching for 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.";
 
 "whatsnew_update_editor_title" = "We've updated the map editor";
 
diff --git a/map/framework.cpp b/map/framework.cpp
index a756028db0..d3dca24409 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -338,6 +338,7 @@ Framework::Framework()
   m_storage.Init(
                  bind(&Framework::OnCountryFileDownloaded, this, _1, _2),
                  bind(&Framework::OnCountryFileDelete, this, _1, _2));
+  m_storage.SetDownloadingPolicy(&m_storageDownloadingPolicy);
   LOG(LDEBUG, ("Storage initialized"));
 
   auto const routingStatisticsFn = [](map<string, string> const & statistics)
@@ -388,8 +389,14 @@ Framework::Framework()
       return streets.first[streets.second].m_name;
     return {};
   });
-  editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2));
+  // Due to floating points accuracy issues (geometry is saved in editor up to 7 digits
+  // after dicimal poin) some feature vertexes are threated as external to a given feature.
+  auto const pointToFeatureDistanceToleranceInMeters = 1e-3;
+  editor.SetForEachFeatureAtPointFn(bind(&Framework::ForEachFeatureAtPoint, this, _1, _2,
+                                         pointToFeatureDistanceToleranceInMeters));
   editor.LoadMapEdits();
+
+  m_model.GetIndex().AddObserver(editor);
 }
 
 Framework::~Framework()
@@ -1490,7 +1497,8 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
                             params.m_visualScale, move(params.m_widgetsInitInfo),
                             make_pair(params.m_initialMyPositionState, params.m_hasMyPositionState),
                             allow3dBuildings, params.m_isChoosePositionMode,
-                            params.m_isChoosePositionMode, GetSelectedFeatureTriangles(), params.m_isFirstLaunch);
+                            params.m_isChoosePositionMode, GetSelectedFeatureTriangles(), params.m_isFirstLaunch,
+                            m_routingSession.IsActive() && m_routingSession.IsFollowing());
 
   m_drapeEngine = make_unique_dp<df::DrapeEngine>(move(p));
   AddViewportListener([this](ScreenBase const & screen)
@@ -1739,7 +1747,8 @@ bool Framework::ShowMapForURL(string const & url)
   return false;
 }
 
-void Framework::ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator) const
+void Framework::ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator,
+                                      double featureDistanceToleranceInMeters) const
 {
   constexpr double kSelectRectWidthInMeters = 1.1;
   constexpr double kMetersToLinearFeature = 3;
@@ -1758,10 +1767,17 @@ void Framework::ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & m
         fn(ft);
       break;
     case feature::GEOM_AREA:
-      if (ft.GetLimitRect(kScale).IsPointInside(mercator) &&
-          feature::GetMinDistanceMeters(ft, mercator) == 0.0)
       {
-        fn(ft);
+        auto limitRect = ft.GetLimitRect(kScale);
+        // Be a little more tolerant. When used by editor mercator is given
+        // with some error, so we must extend limit rect a bit.
+        limitRect.Inflate(MercatorBounds::GetCellID2PointAbsEpsilon(),
+                          MercatorBounds::GetCellID2PointAbsEpsilon());
+        if (limitRect.IsPointInside(mercator) &&
+            feature::GetMinDistanceMeters(ft, mercator) <= featureDistanceToleranceInMeters)
+        {
+          fn(ft);
+        }
       }
       break;
     case feature::GEOM_UNDEFINED:
@@ -2742,6 +2758,11 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
     // and emo.SetHouseNumber("") will be called in the following code. So OSM ends up
     // with incorrect data.
 
+    // There is (almost) always a street and/or house number set in emo. We must keep them from
+    // saving to editor and pushing to OSM if they ware not overidden. To be saved to editor
+    // emo is first converted to FeatureType and FeatureType is then saved to a file and editor.
+    // To keep street and house number from penetrating to FeatureType we set them to be empty.
+
     // Do not save street if it was taken from hosting building.
     if ((originalFeatureStreet.empty() || isCreatedFeature) && !isStreetOverridden)
         emo.SetStreet({});
@@ -2763,12 +2784,12 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
       // Such a notification have been already sent. I.e at least one of
       // street of house number should differ in emo and editor.
       shouldNotify = !isCreatedFeature &&
-                     (editor.GetEditedFeature(emo.GetID(), editedFeature) &&
-                      !editedFeature.GetHouseNumber().empty() &&
-                      editedFeature.GetHouseNumber() != emo.GetHouseNumber()) ||
-                     (editor.GetEditedFeatureStreet(emo.GetID(), editedFeatureStreet) &&
-                      !editedFeatureStreet.empty() &&
-                      editedFeatureStreet != emo.GetStreet().m_defaultName);
+                     ((editor.GetEditedFeature(emo.GetID(), editedFeature) &&
+                       !editedFeature.GetHouseNumber().empty() &&
+                       editedFeature.GetHouseNumber() != emo.GetHouseNumber()) ||
+                      (editor.GetEditedFeatureStreet(emo.GetID(), editedFeatureStreet) &&
+                       !editedFeatureStreet.empty() &&
+                       editedFeatureStreet != emo.GetStreet().m_defaultName));
     }
   } while (0);
 
@@ -2789,9 +2810,23 @@ void Framework::DeleteFeature(FeatureID const & fid) const
 {
   // TODO(AlexZ): Use FeatureID in the editor interface.
   osm::Editor::Instance().DeleteFeature(*GetFeatureByID(fid));
+  if (m_selectedFeature == fid)
+    m_selectedFeature = FeatureID();
 }
 
 osm::NewFeatureCategories Framework::GetEditorCategories() const
 {
   return osm::Editor::Instance().GetNewFeatureCategories();
 }
+
+bool Framework::RollBackChanges(FeatureID const & fid)
+{
+  if (m_selectedFeature == fid) // reset selected feature since it becomes invalid after rollback
+    m_selectedFeature = FeatureID();
+  auto & editor = osm::Editor::Instance();
+  if (editor.GetFeatureStatus(fid) == osm::Editor::FeatureStatus::Created)
+    DeactivateMapSelection(true);
+  else
+    UpdatePlacePageInfoForCurrentSelection();
+  return editor.RollBackChanges(fid);
+}
diff --git a/map/framework.hpp b/map/framework.hpp
index 9cb23b34d5..8869518c1f 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -523,7 +523,8 @@ public:
   /// @returns nullptr if no feature was found at the given mercator point.
   unique_ptr<FeatureType> GetFeatureAtPoint(m2::PointD const & mercator) const;
   using TFeatureTypeFn = function<void(FeatureType &)>;
-  void ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator) const;
+  void ForEachFeatureAtPoint(TFeatureTypeFn && fn, m2::PointD const & mercator,
+                             double featureDistanceToleranceInMeters = 0.0) const;
   /// Set parse to false if you don't need all feature fields ready.
   /// TODO(AlexZ): Refactor code which uses this method to get rid of it.
   /// FeatureType instances shoud not be used outside ForEach* core methods.
@@ -647,6 +648,7 @@ public:
   osm::Editor::SaveResult SaveEditedMapObject(osm::EditableMapObject emo);
   void DeleteFeature(FeatureID const & fid) const;
   osm::NewFeatureCategories GetEditorCategories() const;
+  bool RollBackChanges(FeatureID const & fid);
   //@}
 
 private:
diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp
index 7e105b9fba..f9e39a5eea 100644
--- a/qt/editor_dialog.cpp
+++ b/qt/editor_dialog.cpp
@@ -85,6 +85,10 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
     grid->addWidget(new QLabel(kStreetObjectName), row, 0);
     QComboBox * cmb = new QComboBox();
     cmb->setEditable(true);
+
+    if (emo.GetStreet().m_defaultName.empty())
+      cmb->addItem("");
+
     for (int i = 0; i < nearbyStreets.size(); ++i)
     {
       string street = nearbyStreets[i].m_defaultName;
@@ -199,7 +203,10 @@ void EditorDialog::OnSave()
     QString const editedStreet = findChild<QComboBox *>(kStreetObjectName)->currentText();
     QStringList const names = editedStreet.split(" / ", QString::SkipEmptyParts);
     QString const localized = names.size() > 1 ? names.at(1) : QString();
-    m_feature.SetStreet({names.at(0).toStdString(), localized.toStdString()});
+    if (!names.empty())
+      m_feature.SetStreet({names.at(0).toStdString(), localized.toStdString()});
+    else
+      m_feature.SetStreet({});
     m_feature.SetPostcode(findChild<QLineEdit *>(kPostcodeObjectName)->text().toStdString());
   }
 
diff --git a/search/result.cpp b/search/result.cpp
index 7ff49c5a54..0eaa4ed449 100644
--- a/search/result.cpp
+++ b/search/result.cpp
@@ -320,13 +320,8 @@ string DebugPrint(AddressInfo const & info)
 
 string DebugPrint(Result const & r)
 {
-  string s;
-  s.append(r.GetString());
-  s.append("|");
-  s.append(r.GetFeatureType());
-  s.append("|");
-  s.append(r.IsSuggest() ? "1" : "0");
-  return s;
+  return "Result { Name: " + r.GetString() + "; Type: " + r.GetFeatureType() +
+         "; Info: " + DebugPrint(r.GetRankingInfo()) + " }";
 }
 
 }  // namespace search
diff --git a/search/search_integration_tests/search_query_v2_test.cpp b/search/search_integration_tests/search_query_v2_test.cpp
index eacd9af05e..c61131dd76 100644
--- a/search/search_integration_tests/search_query_v2_test.cpp
+++ b/search/search_integration_tests/search_query_v2_test.cpp
@@ -334,7 +334,7 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestRankingInfo)
     for (auto const & result : request.Results())
     {
       auto const & info = result.GetRankingInfo();
-      TEST_EQUAL(NAME_SCORE_FULL_MATCH, info.m_nameScore, ());
+      TEST_EQUAL(NAME_SCORE_FULL_MATCH, info.m_nameScore, (result));
       TEST(my::AlmostEqualAbs(1.0, info.m_nameCoverage, 1e-6), (info.m_nameCoverage));
     }
   }
diff --git a/storage/downloading_policy.cpp b/storage/downloading_policy.cpp
index a51567f178..6903a778d1 100644
--- a/storage/downloading_policy.cpp
+++ b/storage/downloading_policy.cpp
@@ -8,8 +8,8 @@ bool StorageDownloadingPolicy::IsDownloadingAllowed() const
            !IsCellularDownloadEnabled());
 }
 
-void StorageDownloadingPolicy::ScheduleRetry(
-    storage::TCountriesSet const & failedCountries, TProcessFunc const & func)
+void StorageDownloadingPolicy::ScheduleRetry(storage::TCountriesSet const & failedCountries,
+                                             TProcessFunc const & func)
 {
   if (IsDownloadingAllowed() && !failedCountries.empty() && m_autoRetryCounter > 0)
   {
diff --git a/storage/downloading_policy.hpp b/storage/downloading_policy.hpp
index 1322ecb345..9b72c56941 100644
--- a/storage/downloading_policy.hpp
+++ b/storage/downloading_policy.hpp
@@ -11,7 +11,6 @@ class DownloadingPolicy
 {
 public:
   using TProcessFunc = function<void(storage::TCountriesSet const &)>;
-
   virtual bool IsDownloadingAllowed() const { return true; }
   virtual void ScheduleRetry(storage::TCountriesSet const &, TProcessFunc const &) {}
 };
@@ -19,14 +18,13 @@ public:
 class StorageDownloadingPolicy : public DownloadingPolicy
 {
   bool m_cellularDownloadEnabled = false;
-
   static size_t constexpr kAutoRetryCounterMax = 3;
   size_t m_autoRetryCounter = kAutoRetryCounterMax;
   my::DeferredTask m_autoRetryWorker;
-
+  
 public:
   StorageDownloadingPolicy() : m_autoRetryWorker(seconds(20)) {}
-
+  
   inline void EnableCellularDownload(bool value) { m_cellularDownloadEnabled = value; }
   inline bool IsCellularDownloadEnabled() const { return m_cellularDownloadEnabled; }
   inline bool IsAutoRetryDownloadFailed() const { return m_autoRetryCounter == 0; }
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 5a8f4b1ac1..79f2b55fea 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -1198,10 +1198,7 @@ void Storage::GetChildrenInGroups(TCountryId const & parent,
     for (auto const & disputed : disputedTerritoriesAndStatus)
       allDisputedTerritories.push_back(disputed.first);
 
-    if (childStatus.status != NodeStatus::NotDownloaded)
-      downloadedChildren.push_back(childValue);
-
-    if (keepAvailableChildren || childStatus.status == NodeStatus::NotDownloaded)
+    if (childStatus.status == NodeStatus::NotDownloaded)
     {
       availChildren.push_back(childValue);
       for (auto const & disputed : disputedTerritoriesAndStatus)
@@ -1210,6 +1207,12 @@ void Storage::GetChildrenInGroups(TCountryId const & parent,
           disputedTerritoriesWithoutSiblings.push_back(disputed.first);
       }
     }
+    else
+    {
+      downloadedChildren.push_back(childValue);
+      if (keepAvailableChildren)
+        availChildren.push_back(childValue);
+    }
   });
 
   TCountriesVec uniqueDisputed(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end());
diff --git a/storage/storage.hpp b/storage/storage.hpp
index f22381cefc..4201552ee6 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -187,7 +187,6 @@ private:
 
   DownloadingPolicy m_defaultDownloadingPolicy;
   DownloadingPolicy * m_downloadingPolicy = &m_defaultDownloadingPolicy;
-
   /// @name Communicate with GUI
   //@{
 
@@ -289,7 +288,7 @@ public:
           unique_ptr<MapFilesDownloader> mapDownloaderForTesting);
 
   void Init(TUpdateCallback const & didDownload, TDeleteCallback const & willDelete);
-
+  
   inline void SetDownloadingPolicy(DownloadingPolicy * policy) { m_downloadingPolicy = policy; }
 
   /// @name Interface with clients (Android/iOS).
diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp
index f5bd747ef8..9c4f1b87ce 100644
--- a/storage/storage_tests/storage_tests.cpp
+++ b/storage/storage_tests/storage_tests.cpp
@@ -1107,12 +1107,12 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap)
 
   storage.GetChildrenInGroups(rootCountryId, downloaded, available);
   TEST_EQUAL(downloaded.size(), 1, (downloaded));
-  TEST_EQUAL(available.size(), 224, ());
+  TEST_EQUAL(available.size(), 223, ());
 
   storage.GetChildrenInGroups(rootCountryId, downloadedWithKeep,
                               availableWithKeep, true /* keepAvailableChildren*/);
   TEST_EQUAL(downloadedWithKeep.size(), 1, (downloadedWithKeep));
-  TEST_EQUAL(availableWithKeep.size(), 225, ());
+  TEST_EQUAL(availableWithKeep.size(), 224, ());
 
   storage.GetChildrenInGroups("Algeria", downloaded, available);
   TEST_EQUAL(downloaded.size(), 2, (downloaded));
diff --git a/strings.txt b/strings.txt
index 48091fcb93..f429129aa0 100644
--- a/strings.txt
+++ b/strings.txt
@@ -16258,8 +16258,8 @@
     uk = Кількість поверхів (максимум %d)
     vi = Số tầng (tối đa %d)
     hu = Az emeletek száma (legfeljebb %d)
-    de = Anzahl der Etagen (%2d maximal)
-    fi = Kerrosten määrä (maks. %2d)
+    de = Anzahl der Etagen (%d maximal)
+    fi = Kerrosten määrä (maks. %d)
     cs = Počet poschodí (max. %d)
     it = Numero di piani (massimo %d)
     nb = Antall etasjer (maks. %d)
@@ -16932,7 +16932,7 @@
     nl = Huidige locatie is onbekend.
 
   [current_location_unknown_error_message]
-    en = An error occured while searching for 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.
     ru = При поиске местоположения произошла неизвестная ошибка. Проверьте работоспособность устройства и попробуйте найти местоположение позднее.
     fr = Une erreur est survenue lors de la recherche de votre emplacement. Vérifiez que le périphérique fonctionne correctement et réessayez ultérieurement
     da = Der opstod en fejl under søgning efter din position. Kontrollér at din enhed fungerer korrekt, og prøv igen senere.