diff --git a/.github/workflows/android-beta.yaml b/.github/workflows/android-beta.yaml
index 6c4585478e..3ce35b7574 100644
--- a/.github/workflows/android-beta.yaml
+++ b/.github/workflows/android-beta.yaml
@@ -42,7 +42,7 @@ jobs:
           sudo apt-get install -y ninja-build
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100 # enough to get all commits for the current day
 
@@ -51,7 +51,7 @@ jobs:
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Checkout private keys
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.PRIVATE_REPO }}
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
diff --git a/.github/workflows/android-check-metadata.yaml b/.github/workflows/android-check-metadata.yaml
index c24f893c2a..5e460e2a79 100644
--- a/.github/workflows/android-check-metadata.yaml
+++ b/.github/workflows/android-check-metadata.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Check metadata
         run: ./tools/python/check_store_metadata.py android
diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml
index 8513c19964..89a5d74bc2 100644
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get install -y ninja-build
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 200 # enough to get all commits for the current day
 
diff --git a/.github/workflows/android-monkey.yaml b/.github/workflows/android-monkey.yaml
index 99c499ed20..9ee7a9f590 100644
--- a/.github/workflows/android-monkey.yaml
+++ b/.github/workflows/android-monkey.yaml
@@ -48,7 +48,7 @@ jobs:
         uses: google-github-actions/setup-gcloud@v0
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100 # enough to get all commits for the current day
 
@@ -57,7 +57,7 @@ jobs:
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Checkout private keys
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.PRIVATE_REPO }}
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
diff --git a/.github/workflows/android-release-metadata.yaml b/.github/workflows/android-release-metadata.yaml
index 2ee0892465..0cb6e93e6a 100644
--- a/.github/workflows/android-release-metadata.yaml
+++ b/.github/workflows/android-release-metadata.yaml
@@ -19,7 +19,7 @@ jobs:
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Checkout screenshots
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.SCREENSHOTS_REPO }}
           ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
@@ -27,7 +27,7 @@ jobs:
           path: screenshots
 
       - name: Checkout private keys
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.PRIVATE_REPO }}
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
index 975438749a..9d0e21fee4 100644
--- a/.github/workflows/android-release.yaml
+++ b/.github/workflows/android-release.yaml
@@ -14,7 +14,7 @@ jobs:
     environment: production
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100  # Enough to get all commits for the last day.
           ssh-key: ${{ secrets.RELEASE_SSH_KEY }}
@@ -76,7 +76,7 @@ jobs:
           sudo apt-get install -y ninja-build
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100 # enough to get all commits for the current day
           ref: 'refs/tags/${{ needs.tag.outputs.tag }}'
@@ -93,7 +93,7 @@ jobs:
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
       - name: Checkout screenshots
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.SCREENSHOTS_REPO }}
           ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
@@ -101,7 +101,7 @@ jobs:
           path: screenshots
 
       - name: Checkout private keys
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.PRIVATE_REPO }}
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
diff --git a/.github/workflows/appstream-check.yaml b/.github/workflows/appstream-check.yaml
index f74a49fc4f..8e80ebbbc6 100644
--- a/.github/workflows/appstream-check.yaml
+++ b/.github/workflows/appstream-check.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Install appstream validator
         shell: bash
diff --git a/.github/workflows/cleanup_caches.yml b/.github/workflows/cleanup_caches.yml
index 23b866a2d6..708cb2dba0 100644
--- a/.github/workflows/cleanup_caches.yml
+++ b/.github/workflows/cleanup_caches.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Cleanup
         env:
diff --git a/.github/workflows/ios-beta.yaml b/.github/workflows/ios-beta.yaml
index eac1a35fa1..66647bc71d 100644
--- a/.github/workflows/ios-beta.yaml
+++ b/.github/workflows/ios-beta.yaml
@@ -39,7 +39,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100 # enough to get all commits for the current day
 
@@ -47,7 +47,7 @@ jobs:
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
       - name: Checkout private keys
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.PRIVATE_REPO }}
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
diff --git a/.github/workflows/ios-check-metadata.yaml b/.github/workflows/ios-check-metadata.yaml
index a0944680b3..e5922c070a 100644
--- a/.github/workflows/ios-check-metadata.yaml
+++ b/.github/workflows/ios-check-metadata.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Check metadata
         run: ./tools/python/check_store_metadata.py ios
diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml
index 30d7d9ab13..8624d546b9 100644
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Parallel submodules checkout
         shell: bash
diff --git a/.github/workflows/ios-release.yaml b/.github/workflows/ios-release.yaml
index e82c2dca5a..55c8af2e98 100644
--- a/.github/workflows/ios-release.yaml
+++ b/.github/workflows/ios-release.yaml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Checkout private keys
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.PRIVATE_REPO }}
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
@@ -31,7 +31,7 @@ jobs:
           rm -rf ./private.git
 
       - name: Checkout screenshots
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.SCREENSHOTS_REPO }}
           ssh-key: ${{ secrets.SCREENSHOTS_SSH_KEY }}
@@ -39,7 +39,7 @@ jobs:
           path: screenshots
 
       - name: Checkout keywords
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: ${{ secrets.KEYWORDS_REPO }}
           ssh-key: ${{ secrets.KEYWORDS_SSH_KEY }}
diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml
index da29e28fbb..aa9e977fba 100644
--- a/.github/workflows/linux-check.yaml
+++ b/.github/workflows/linux-check.yaml
@@ -39,7 +39,7 @@ jobs:
           sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 100 # enough to get all commits for the current day
 
@@ -107,7 +107,7 @@ jobs:
           sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Parallel submodules checkout
         shell: bash
diff --git a/.github/workflows/macos-check.yaml b/.github/workflows/macos-check.yaml
index 80c6aae9a5..3f5c672cb9 100644
--- a/.github/workflows/macos-check.yaml
+++ b/.github/workflows/macos-check.yaml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Parallel submodules checkout
         shell: bash
diff --git a/.github/workflows/strings-check.yaml b/.github/workflows/strings-check.yaml
index a33797c922..84637a4835 100644
--- a/.github/workflows/strings-check.yaml
+++ b/.github/workflows/strings-check.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: '3'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a506404a0a..01464196b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,9 +209,9 @@ if (PLATFORM_LINUX OR PLATFORM_ANDROID)
 endif()
 
 if (NOT SKIP_TESTS)
+  set(SKIP_TESTS FALSE)
   enable_testing()
-  # Enables ctest -T memcheck with valgrind
-  include(CTest)
+  set(CTEST_CONFIGURATION_TYPE ${CMAKE_BUILD_TYPE})
 endif()
 
 if (NOT PYTHON_VERSION)
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
index e564c6b985..00d0dad176 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
@@ -94,7 +94,7 @@ public class DrivingOptionsScreen extends BaseMapScreen
   {
     final Header.Builder builder = new Header.Builder();
     builder.setStartHeaderAction(Action.BACK);
-    builder.setTitle(getCarContext().getString(R.string.driving_options_title));
+    builder.setTitle(getCarContext().getString(R.string.driving_options_subheader));
     return builder.build();
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/intent/Factory.java b/android/app/src/main/java/app/organicmaps/intent/Factory.java
index 38c1cb7018..6b6a128bfe 100644
--- a/android/app/src/main/java/app/organicmaps/intent/Factory.java
+++ b/android/app/src/main/java/app/organicmaps/intent/Factory.java
@@ -210,25 +210,22 @@ public class Factory
     {
       final ParsingResult result = Framework.nativeParseAndSetApiUrl(getUrl());
 
-      final Uri uri = Uri.parse(getUrl());
-      if (uri.isHierarchical())
-      {
-        final String backUrl = uri.getQueryParameter("backurl");
-        if (!TextUtils.isEmpty(backUrl))
-        {
-          final Intent intent = target.getIntent();
-          if (intent != null)
-            intent.putExtra(MwmActivity.EXTRA_BACK_URL, backUrl);
-        }
-      }
-
-      // TODO: Kernel recognizes "om://", "mapsme://", "mwm://" and "mapswithme://" schemas only!!!
+      // TODO: Kernel recognizes "mapsme://", "mwm://" and "mapswithme://" schemas only!!!
       if (result.getUrlType() == ParsingResult.TYPE_INCORRECT)
         return Map.showMapForUrl(getUrl());
 
       if (!result.isSuccess())
         return false;
 
+      final Uri uri = Uri.parse(getUrl());
+      final String backUrl = uri.getQueryParameter("backurl");
+      if (!TextUtils.isEmpty(backUrl))
+      {
+        Intent intent = target.getIntent();
+        if (intent != null)
+          intent.putExtra(MwmActivity.EXTRA_BACK_URL, backUrl);
+      }
+
       switch (result.getUrlType())
       {
         case ParsingResult.TYPE_INCORRECT:
diff --git a/android/app/src/main/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml
index 0d30468b92..1b019e34e3 100644
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -16,6 +16,16 @@
     android:theme="@style/MwmWidget.ToolbarTheme"
     tools:ignore="UnusedAttribute">
   </androidx.appcompat.widget.Toolbar>
+  <TextView
+    android:text="@string/driving_options_subheader"
+    android:textAppearance="?android:attr/textAppearance"
+    android:textColor="?colorAccent"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:layout_marginTop="@dimen/margin_half_double_plus"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingStart="@dimen/margin_base"/>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 141432b1f9..dffd2f5ecc 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -646,10 +646,11 @@
 	<string name="enable_logging_warning_message">هذا الخيار يقوم ببدأ تسجيل سجلات التطبيق لإغراض التشخيصة. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا لحل المشاكل التي تواجهكم داخل التطبيق. قم بتفعيل هذا الخيار بشكل مؤقت فقط في حالة طلب الدعم من Organic Maps.</string>
 	<string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
 	<string name="driving_options_title">خيارات رسم المسار</string>
-	<string name="avoid_tolls">تجنب الطرق ذات الرسوم</string>
-	<string name="avoid_unpaved">تجنب الطرق الترابية</string>
-	<string name="avoid_ferry">تجنب معابر العبارات</string>
-	<string name="avoid_motorways">تجنب الطريق السريع</string>
+	<string name="driving_options_subheader">تجنبها على جميع الطرق</string>
+	<string name="avoid_tolls">الطرق ذات الرسوم</string>
+	<string name="avoid_unpaved">الطرق غير المعبدة</string>
+	<string name="avoid_ferry">استخدام العبّارات</string>
+	<string name="avoid_motorways">الطرق السريعة</string>
 	<string name="unable_to_calc_alert_title">لا يمكن حساب الطريق</string>
 	<string name="unable_to_calc_alert_subtitle">نأسف، لم نعثر على الطريق ربما بسبب الخيارات التي قمت بتحديدها. يرجى تغيير الإعدادات والمحاولة مجددًا</string>
 	<string name="define_to_avoid_btn">حدد الطرق التي يجب تجنبها</string>
@@ -1368,7 +1369,6 @@
 	<string name="type.leisure.garden">حديقة</string>
 	<string name="type.leisure.garden.residential">حديقة</string>
 	<string name="type.leisure.golf_course">ملعب غولف</string>
-	<string name="type.leisure.marina">مرسى</string>
 	<string name="type.leisure.nature_reserve">محمية طبيعية</string>
 	<string name="type.leisure.outdoor_seating">جلوس في الهواء الطلق</string>
 	<string name="type.leisure.park">متنزه</string>
@@ -1772,7 +1772,6 @@
 	<string name="type.shop.car_parts">محل أجزاء سيارات</string>
 	<string name="type.shop.car_repair">محل صيانة السيارات</string>
 	<string name="type.shop.car_repair.tyres">إصلاح إطارات</string>
-	<string name="type.shop.caravan">معرض سيارات التخييم</string>
 	<string name="type.shop.carpet">متجر سجادات</string>
 	<string name="type.shop.chemist">متجر كيماويات</string>
 	<string name="type.shop.chocolate">متجر شوكولاتة</string>
@@ -1800,7 +1799,6 @@
 	<string name="type.shop.gas">متجر غاز</string>
 	<string name="type.shop.gift">متجر هدايا</string>
 	<string name="type.shop.greengrocer">محل خضار</string>
-	<string name="type.shop.grocery">محل بقالة</string>
 	<string name="type.shop.hairdresser">حلاق</string>
 	<string name="type.shop.hardware">محل معدات</string>
 	<string name="type.shop.health_food">متجر أغذية صحية</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index d79d865d7f..2aadd157e5 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -638,10 +638,11 @@
 	<string name="enable_logging_warning_message">Опцыя ўключае запіс журнала падзей для мэтаў дыягностыкі. Гэта можа дапамагчы нашай камандзе вырашаць праблемы з праграмай. Уключайце гэтую опцыю часова, каб запісаць і паслаць нам дэталёвую інфармацыю, пра знойденую вамі праблему.</string>
 	<string name="access_rules_author_only">Рэдагаванне анлайн</string>
 	<string name="driving_options_title">Налады пракладкі маршрута</string>
-	<string name="avoid_tolls">Пазбягаць платныя дарогі</string>
-	<string name="avoid_unpaved">Пазбягаць грунтавыя дарогі</string>
-	<string name="avoid_ferry">Пазбягаць паромныя пераправы</string>
-	<string name="avoid_motorways">Пазбягаць аўтамагістралі</string>
+	<string name="driving_options_subheader">Пазбягаць на кожным маршруце</string>
+	<string name="avoid_tolls">Платныя дарогі</string>
+	<string name="avoid_unpaved">Грунтовыя дарогі</string>
+	<string name="avoid_ferry">Паромныя пераправы</string>
+	<string name="avoid_motorways">Аўтамагістралі</string>
 	<string name="unable_to_calc_alert_title">Не атрымалася пракласці маршрут</string>
 	<string name="unable_to_calc_alert_subtitle">Нажаль, мы не змаглі пракласці маршрут, магчыма з-за абраных вамі налад. Змяніце налады і паспрабуйце зноў.</string>
 	<string name="define_to_avoid_btn">Задаць дарогі, якіх пазбягаць</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 9ecb9cc843..3b1addded2 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -600,10 +600,11 @@
 	<string name="enable_logging_warning_message">Тази настройка е разрешена, за да се записват действия за диагностични цели, които помагат на нашия екип да идентифицира проблеми с приложението. Временно активирайте тази настройка само за изпращане на подробна информация за проблема, който сте открили с приложението.</string>
 	<string name="access_rules_author_only">Онлайн редактиране</string>
 	<string name="driving_options_title">Опции за маршрутизация</string>
-	<string name="avoid_tolls">Избягвайте платените пътища</string>
-	<string name="avoid_unpaved">Избягвайте неасфалтирани пътища</string>
-	<string name="avoid_ferry">Избягвайте преминаването с ферибот</string>
-	<string name="avoid_motorways">Избягвайте магистралата</string>
+	<string name="driving_options_subheader">Избягване при всеки маршрут</string>
+	<string name="avoid_tolls">Платени пътища</string>
+	<string name="avoid_unpaved">Неасфалтирани пътища</string>
+	<string name="avoid_ferry">Преходи с ферибот</string>
+	<string name="avoid_motorways">Магистрали</string>
 	<string name="unable_to_calc_alert_title">Не е възможнос изчисляване на маршрут</string>
 	<string name="unable_to_calc_alert_subtitle">За съжаление не успяхме да намерим маршрут, вероятно поради избраните от вас параметри. Моля, променете настройките и опитайте отново.</string>
 	<string name="define_to_avoid_btn">Определяне пътищата, които да се избягват</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 3db54ac9d9..120a87c1ee 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -634,10 +634,11 @@
 	<string name="enable_logging_warning_message">L\'opció activa el registre amb finalitats de diagnòstic. Pot ser útil per al nostre equip per a identificar problemes amb l\'aplicació. Activeu aquesta opció temporalment per a enregistgrar i enviar-nos informes detallats sobre el vostre problema.</string>
 	<string name="access_rules_author_only">Edició en línia</string>
 	<string name="driving_options_title">Opcions de la ruta</string>
-	<string name="avoid_tolls">Eviteu les autopistes de peatge</string>
-	<string name="avoid_unpaved">Eviteu els camins de terra</string>
-	<string name="avoid_ferry">Eviteu les travessies en ferri</string>
-	<string name="avoid_motorways">Eviteu l\'autopista</string>
+	<string name="driving_options_subheader">Evita-ho en totes les rutes</string>
+	<string name="avoid_tolls">Vies de peatge</string>
+	<string name="avoid_unpaved">Vies sense pavimentar</string>
+	<string name="avoid_ferry">Transbordaments en ferri</string>
+	<string name="avoid_motorways">Autopistes</string>
 	<string name="unable_to_calc_alert_title">No s\'ha pogut calcular la ruta</string>
 	<string name="unable_to_calc_alert_subtitle">Malauradament, no hem pogut trobar cap ruta. Probablement per les opcions que heu triat. Canvieu-les i torneu a intentar-ho.</string>
 	<string name="define_to_avoid_btn">Definiu les vies a evitar</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 86e8c7de26..3976abc68e 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -616,10 +616,11 @@
 	<string name="enable_logging_warning_message">Možnost zapne odesílání dat za diagnostickými účely. To nám pomáhá při řešení problémů s aplikací. Dočasně povolte pro nahrávání a odesílání logů našemu týmu o vašem problému.</string>
 	<string name="access_rules_author_only">Upravujte on-line</string>
 	<string name="driving_options_title">Možnosti trasy</string>
-	<string name="avoid_tolls">Vyhněte se zpoplatněným silnicím</string>
-	<string name="avoid_unpaved">Vyhněte se nezpevněným cestám</string>
-	<string name="avoid_ferry">Vyhněte se přejezdům trajektů</string>
-	<string name="avoid_motorways">Vyhněte se dálnici</string>
+	<string name="driving_options_subheader">Vyhněte se na každé trase</string>
+	<string name="avoid_tolls">Silnice s mýtným</string>
+	<string name="avoid_unpaved">Nezpevněná silnice</string>
+	<string name="avoid_ferry">Přejezdy trajektů</string>
+	<string name="avoid_motorways">Dálnice</string>
 	<string name="unable_to_calc_alert_title">Nelze vypočítat trasu</string>
 	<string name="unable_to_calc_alert_subtitle">Bohužel jsme nemohli nalézt trasu pravděpodobně kvůli vámi definovaným možnostem. Změňte prosím nastavení a zkuste to znovu</string>
 	<string name="define_to_avoid_btn">Definovat silnice, kterým se vyhnout</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 3708222f69..baba8eaccb 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -611,10 +611,11 @@
 	<string name="enable_logging_warning_message">Indstillingen aktiverer logning til diagnostiske formål. Det kan være nyttigt for vores supportere, der fejlfinder problemer med appen. Aktiver kun denne mulighed på anmodning fra Organic Maps support.</string>
 	<string name="access_rules_author_only">Online redigering</string>
 	<string name="driving_options_title">Køre muligheder</string>
-	<string name="avoid_tolls">Undgå betalingsveje</string>
-	<string name="avoid_unpaved">Undgå uasfalterede veje</string>
-	<string name="avoid_ferry">Undgå færgeoverfarter</string>
-	<string name="avoid_motorways">Undgå motorvejen</string>
+	<string name="driving_options_subheader">Undgå på enhver rute</string>
+	<string name="avoid_tolls">Betalingsveje</string>
+	<string name="avoid_unpaved">Grusveje</string>
+	<string name="avoid_ferry">Færgeoverfarter</string>
+	<string name="avoid_motorways">Motorveje</string>
 	<string name="unable_to_calc_alert_title">Det er ikke muligt at beregne rute</string>
 	<string name="unable_to_calc_alert_subtitle">Desværre kunne vi ikke finde en rute med den aktuelle opsætning. Ændre opsætningen, og prøv igen</string>
 	<string name="define_to_avoid_btn">Definer veje du vil undgå</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index e936570a18..5eba66caa2 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -641,10 +641,11 @@
 	<string name="enable_logging_warning_message">Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik aufzuzeichnen. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des Organic Maps-Supports.</string>
 	<string name="access_rules_author_only">Online bearbeiten</string>
 	<string name="driving_options_title">Routenbeschränkungen</string>
-	<string name="avoid_tolls">Mautstraßen vermeiden</string>
-	<string name="avoid_unpaved">Unbefestigte Straßen vermeiden</string>
-	<string name="avoid_ferry">Fähren vermeiden</string>
-	<string name="avoid_motorways">Autobahnen vermeiden</string>
+	<string name="driving_options_subheader">In jeder Reiseroute vermeiden</string>
+	<string name="avoid_tolls">Mautstraßen</string>
+	<string name="avoid_unpaved">Unbefestigte Straßen</string>
+	<string name="avoid_ferry">Fährstellen</string>
+	<string name="avoid_motorways">Autobahnen</string>
 	<string name="unable_to_calc_alert_title">Route kann nicht berechnet werden</string>
 	<string name="unable_to_calc_alert_subtitle">Leider konnten wir keine Route mit den gewählten Optionen erstellen. Ändern Sie die Einstellungen und versuchen Sie es erneut</string>
 	<string name="define_to_avoid_btn">Umwege einstellen</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index f2aab6d890..d5b767f085 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -602,10 +602,11 @@
 	<string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του Organic Maps.</string>
 	<string name="access_rules_author_only">Επεξεργάζεται online</string>
 	<string name="driving_options_title">Ρυθμίσεις παράκαμψης</string>
-	<string name="avoid_tolls">Αποφύγετε τους δρόμους με διόδια</string>
-	<string name="avoid_unpaved">Αποφύγετε μη ασφαλτοστρωμένους δρόμους</string>
-	<string name="avoid_ferry">Αποφύγετε τις διασταυρώσεις πλοίων</string>
-	<string name="avoid_motorways">Αποφύγετε τον αυτοκινητόδρομο</string>
+	<string name="driving_options_subheader">Αποφυγή σε κάθε διαδρομή</string>
+	<string name="avoid_tolls">Δρόμοι με διόδια</string>
+	<string name="avoid_unpaved">Χωματόδρομοι</string>
+	<string name="avoid_ferry">Πορθμεία</string>
+	<string name="avoid_motorways">Αυτοκινητόδρομοι</string>
 	<string name="unable_to_calc_alert_title">Δεν είναι δυνατή η δημιουργία διαδρομής</string>
 	<string name="unable_to_calc_alert_subtitle">Δυστυχώς, δεν μπορούσαμε να δημιουργήσουμε μια διαδρομή με τις καθορισμένες επιλογές. Αλλάξτε τις ρυθμίσεις και δοκιμάστε πάλι</string>
 	<string name="define_to_avoid_btn">Ρύθμιση της διαδρομής παράκαμψης</string>
diff --git a/android/app/src/main/res/values-en-rGB/strings.xml b/android/app/src/main/res/values-en-rGB/strings.xml
index d016f50b28..5daefbad75 100644
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -27,7 +27,6 @@
 	<string name="error_enter_correct_zip_code">Enter a valid postcode</string>
 	<string name="button_layer_subway">Metro</string>
 	<string name="subway_data_unavailable">Metro map is unavailable</string>
-	<string name="avoid_motorways">Avoid motorways</string>
 
 	<!-- SECTION: Bookmark types used for sorting -->
 	<string name="fuel_places">Petrol Stations</string>
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index 8a178abcbc..81a87de9af 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -117,6 +117,11 @@
 	<string name="enable_logging_warning_message">Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de Organic Maps.</string>
 	<string name="access_rules_author_only">Se edita en línea</string>
 	<string name="driving_options_title">Ajustes de desvío</string>
+	<string name="driving_options_subheader">Evitar en cada ruta</string>
+	<string name="avoid_tolls">Carreteras de peaje</string>
+	<string name="avoid_unpaved">Caminos de tierra</string>
+	<string name="avoid_ferry">Cruces de ferri</string>
+	<string name="avoid_motorways">Autopistas</string>
 	<string name="unable_to_calc_alert_title">No se puede construir una ruta</string>
 	<string name="unable_to_calc_alert_subtitle">Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo</string>
 	<string name="define_to_avoid_btn">Configurar rutas de desvío</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 790bd11f53..d6ca3bf135 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -645,10 +645,11 @@
 	<string name="enable_logging_warning_message">Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de Organic Maps.</string>
 	<string name="access_rules_author_only">Edición en línea</string>
 	<string name="driving_options_title">Opciones de enrutamiento</string>
-	<string name="avoid_tolls">Evitar peajes</string>
-	<string name="avoid_unpaved">Evitar caminos sin pavimentar</string>
-	<string name="avoid_ferry">Evitar ferris</string>
-	<string name="avoid_motorways">Evitar autopistas</string>
+	<string name="driving_options_subheader">Evitar en todas las rutas</string>
+	<string name="avoid_tolls">Carreteras de pago</string>
+	<string name="avoid_unpaved">Caminos sin pavimento</string>
+	<string name="avoid_ferry">Cruces de ferri</string>
+	<string name="avoid_motorways">Autopistas</string>
 	<string name="unable_to_calc_alert_title">No se puede calcular la ruta</string>
 	<string name="unable_to_calc_alert_subtitle">Desafortunadamente, no pudimos encontrar una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo</string>
 	<string name="define_to_avoid_btn">Defina las carreteras a evitar</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 7c18d0f70a..4ec1625dd5 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -632,10 +632,11 @@
 	<string name="enable_logging_warning_message">See valik lülitab sisse logimise diagnostilistel eesmärkidel. Meie meeskonnale võib olla abi rakendusega seotud probleemide tõrkeotsingul. Lubage see valik ajutiselt, et salvestada ja saata meile oma probleemi üksikasjalikud logid.</string>
 	<string name="access_rules_author_only">Online muutmine</string>
 	<string name="driving_options_title">Marsruutimise valikud</string>
-	<string name="avoid_tolls">Vältige tasulisi teid</string>
-	<string name="avoid_unpaved">Vältige sillutamata teid</string>
-	<string name="avoid_ferry">Vältige parvlaevade ületamist</string>
-	<string name="avoid_motorways">Vältige kiirteed</string>
+	<string name="driving_options_subheader">Väldi igal marsruudil</string>
+	<string name="avoid_tolls">Tasulised teed</string>
+	<string name="avoid_unpaved">Katteta teed</string>
+	<string name="avoid_ferry">Praamiületused</string>
+	<string name="avoid_motorways">Kiirteed</string>
 	<string name="unable_to_calc_alert_title">Marsruudi arvutamine ei õnnestu</string>
 	<string name="unable_to_calc_alert_subtitle">Kahjuks ei leidnud me marsruuti tõenäoliselt teie valitud võimaluste tõttu. Muutke seadeid ja proovige uuesti.</string>
 	<string name="define_to_avoid_btn">Määra välditavad teed</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index cd83fd41d5..866ac7cd1b 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -643,10 +643,11 @@
 	<string name="enable_logging_warning_message">Aukera hau diagnostiko helburua duten erregistro ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera Organic Maps laguntzari eskatuta soilik.</string>
 	<string name="access_rules_author_only">Sarean editatzen</string>
 	<string name="driving_options_title">Bideratzeko aukerak</string>
-	<string name="avoid_tolls">Saihestu ordainpeko errepideak</string>
-	<string name="avoid_unpaved">Saihestu lurrezko bideak</string>
-	<string name="avoid_ferry">Saihestu ferry-pasatzeak</string>
-	<string name="avoid_motorways">Saihestu autobidea</string>
+	<string name="driving_options_subheader">Ibilbide guztietan saihestu</string>
+	<string name="avoid_tolls">Ordainpeko errepideak</string>
+	<string name="avoid_unpaved">Asfaltatu gabeko errepideak</string>
+	<string name="avoid_ferry">Ferry pasabideak</string>
+	<string name="avoid_motorways">Autobideak</string>
 	<string name="unable_to_calc_alert_title">Ezin da ibilbidea proposatu</string>
 	<string name="unable_to_calc_alert_subtitle">Zoritxarrez, ezin izan dugu aukeratutako aukerekin ibilbiderik proposatu. Aldatu ezarpenak eta saiatu berriro</string>
 	<string name="define_to_avoid_btn">Zehaztu saihestu beharreko bideak</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 7b82dd9062..6b15f1f6de 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -609,10 +609,11 @@
 	<string name="enable_logging_warning_message">این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی Organic Maps فعال کنید.</string>
 	<string name="access_rules_author_only">ویرایش آنلاین</string>
 	<string name="driving_options_title">گزینه‌های رانندگی</string>
-	<string name="avoid_tolls">از جاده های عوارضی خودداری کنید</string>
-	<string name="avoid_unpaved">از جاده های خاکی خودداری کنید</string>
-	<string name="avoid_ferry">از عبور کشتی ها خودداری کنید</string>
-	<string name="avoid_motorways">از بزرگراه دوری کنید</string>
+	<string name="driving_options_subheader">اجتناب از تمامی مسیرها</string>
+	<string name="avoid_tolls">جاده‌های دارای عوارض</string>
+	<string name="avoid_unpaved">جاده‌های آسفالت نشده</string>
+	<string name="avoid_ferry">گذرگاه‌های جاده‌ای</string>
+	<string name="avoid_motorways">بزرگراه‌ها</string>
 	<string name="unable_to_calc_alert_title">امکان محاسبه مسیر نیست</string>
 	<string name="unable_to_calc_alert_subtitle">متأسفانه، احتمالاً به دلیل گزینه‌های تعریف شده شما، مسیری پیدا نشد. لطفاً تنظیمات را تغییر داده و مجدد تلاش کنید</string>
 	<string name="define_to_avoid_btn">جاده‌های لغو شده را تعریف نمایید</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 0188e9e287..63fb14364f 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -645,10 +645,11 @@
 	<string name="enable_logging_warning_message">Valinta ottaa käyttöön lokikirjaukset diagnostiikkaa varten. Se voi auttaa tukihenkilöstöämme, kun he korjaavat sovelluksen ongelmia. Ota tämä ominaisuus käyttöön vain, jos Organic Maps:n tuki pyytää.</string>
 	<string name="access_rules_author_only">Nettimuokkaus</string>
 	<string name="driving_options_title">Reititysvalinnat</string>
-	<string name="avoid_tolls">Vältä maksullisia teitä</string>
-	<string name="avoid_unpaved">Vältä päällystämättömiä teitä</string>
-	<string name="avoid_ferry">Vältä lauttaristeyksiä</string>
-	<string name="avoid_motorways">Vältä moottoritietä</string>
+	<string name="driving_options_subheader">Vältettävä kaikissa reiteissä</string>
+	<string name="avoid_tolls">Maksulliset tiet</string>
+	<string name="avoid_unpaved">Päällystämättömät tiet</string>
+	<string name="avoid_ferry">Lauttaliikenne</string>
+	<string name="avoid_motorways">Valtatiet</string>
 	<string name="unable_to_calc_alert_title">Reittiä ei voi luoda</string>
 	<string name="unable_to_calc_alert_subtitle">Valitettavasti emme voineet luoda reittiä valituilla vaihtoehdoilla. Vaihda asetuksia ja yritä uudelleen</string>
 	<string name="define_to_avoid_btn">Määritä vältettävät tiet</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 484762a191..8c50a8069b 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -646,10 +646,11 @@
 	<string name="enable_logging_warning_message">Cette option est activée pour l\'identification des actions à des fins de diagnostic. Cela aide l’équipe à identifier les problèmes liés à l’application. Activez cette option uniquement à la demande du support Organic Maps.</string>
 	<string name="access_rules_author_only">Édition en ligne</string>
 	<string name="driving_options_title">Paramètres des itinéraires</string>
-	<string name="avoid_tolls">Éviter les routes à péage</string>
-	<string name="avoid_unpaved">Éviter les routes non pavées</string>
-	<string name="avoid_ferry">Éviter les traversées en ferry</string>
-	<string name="avoid_motorways">Éviter les autoroutes</string>
+	<string name="driving_options_subheader">Éviter sur tous les itinéraires</string>
+	<string name="avoid_tolls">Routes à péage</string>
+	<string name="avoid_unpaved">Routes non revêtues</string>
+	<string name="avoid_ferry">Traversées en ferry</string>
+	<string name="avoid_motorways">Autoroutes</string>
 	<string name="unable_to_calc_alert_title">Impossible de calculer l\'itinéraire</string>
 	<string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez</string>
 	<string name="define_to_avoid_btn">Définissez les routes à éviter</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 0bfb8a98f3..d67018d43d 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -623,10 +623,11 @@
 	<string name="enable_logging_warning_message">Az opció bekapcsolja a diagnosztikai célú naplózást. Hasznos lehet a support csapatunknak, akik elhárítják az alkalmazás hibáit. Csak a Organic Maps support kérésére kapcsold be ezt az opciót.</string>
 	<string name="access_rules_author_only">Online szerkesztés</string>
 	<string name="driving_options_title">Útvonaltervezési lehetőségek</string>
-	<string name="avoid_tolls">Kerülje a fizetős utakat</string>
-	<string name="avoid_unpaved">Kerülje a burkolatlan utakat</string>
-	<string name="avoid_ferry">Kerülje a kompátkelést</string>
-	<string name="avoid_motorways">Kerülje az autópályát</string>
+	<string name="driving_options_subheader">Elkerülés minden útvonalon</string>
+	<string name="avoid_tolls">Díjköteles utak</string>
+	<string name="avoid_unpaved">Burkolatlan utak</string>
+	<string name="avoid_ferry">Kompátkelők</string>
+	<string name="avoid_motorways">Autópályák</string>
 	<string name="unable_to_calc_alert_title">Nem lehet útvonalat számítani</string>
 	<string name="unable_to_calc_alert_subtitle">Sajnos nem találunk útvonalat, valószínűleg az általad meghatározott lehetőségek miatt. Kérjük változtass a beállításokon és próbáld újra</string>
 	<string name="define_to_avoid_btn">Elkerülendő utak meghatározása</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index cee7bace75..f5a5b2307c 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -611,10 +611,11 @@
 	<string name="enable_logging_warning_message">Opsi ini mengaktifkan pencatatan untuk tujuan diagnostik. Bisa amat membantu bagi staf dukungan kami yang memecahkan masalah dalam aplikasi. Aktifkan opsi ini hanya saat diminta oleh dukungan Organic Maps.</string>
 	<string name="access_rules_author_only">Pengeditan online</string>
 	<string name="driving_options_title">Pilihan berkendara</string>
-	<string name="avoid_tolls">Hindari jalan tol</string>
-	<string name="avoid_unpaved">Hindari jalan yang tidak beraspal</string>
-	<string name="avoid_ferry">Hindari penyeberangan feri</string>
-	<string name="avoid_motorways">Hindari jalan raya</string>
+	<string name="driving_options_subheader">Hindari di setiap rute</string>
+	<string name="avoid_tolls">Jalan tol</string>
+	<string name="avoid_unpaved">Jalan tanah</string>
+	<string name="avoid_ferry">Penyeberangan kapal feri</string>
+	<string name="avoid_motorways">Jalur motor</string>
 	<string name="unable_to_calc_alert_title">Tidak dapat menghitung rute</string>
 	<string name="unable_to_calc_alert_subtitle">Sayangnya kami tidak dapat menemukan rute karena opsi pilihan Anda. Harap ubah pengaturan lalu coba lagi</string>
 	<string name="define_to_avoid_btn">Tentukan jalan yang dihindari</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index bc82b31269..68cd4c08da 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -626,10 +626,11 @@
 	<string name="enable_logging_warning_message">L\'opzione attiva i registri per scopi diagnostici. Può essere utile al nostro team per risolvere i problemi dell\'app. Abilita temporaneamente questa opzione per registrare e inviarci registri dettagliati sul tuo problema.</string>
 	<string name="access_rules_author_only">Modifica online</string>
 	<string name="driving_options_title">Impostazioni di deviazione</string>
-	<string name="avoid_tolls">Evita le strade a pedaggio</string>
-	<string name="avoid_unpaved">Evita le strade non asfaltate</string>
-	<string name="avoid_ferry">Evita le traversate in traghetto</string>
-	<string name="avoid_motorways">Evita l\'autostrada</string>
+	<string name="driving_options_subheader">Evitare in tutti i percorsi</string>
+	<string name="avoid_tolls">Strade a pedaggio</string>
+	<string name="avoid_unpaved">Strade non asfaltate</string>
+	<string name="avoid_ferry">Traghetti</string>
+	<string name="avoid_motorways">Autostrade</string>
 	<string name="unable_to_calc_alert_title">Impossibile elaborare il percorso</string>
 	<string name="unable_to_calc_alert_subtitle">Purtroppo non siamo riusciti a trovare un percorso, probabilmente a causa delle opzioni che hai scelto. Si prega di cambiare le impostazioni e riprovare.</string>
 	<string name="define_to_avoid_btn">Definire le strade da evitare</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 8c617f24fe..adce264354 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -255,10 +255,6 @@
 	<string name="transliteration_title">תעתיק ללטינית</string>
 	<!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
 	<string name="bookmarks_import">ייבוא סימניות ורצועות</string>
-	<string name="avoid_tolls">הימנעו מכבישי אגרה</string>
-	<string name="avoid_unpaved">הימנע מדרכי עפר</string>
-	<string name="avoid_ferry">הימנעו ממעברי מעבורת</string>
-	<string name="avoid_motorways">הימנע מהכביש המהיר</string>
 	<!-- E.g. "WiFi:Yes" -->
 	<string name="yes_available">כן</string>
 
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index b9f8fc16e1..6ab0640bc1 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -606,10 +606,11 @@
 	<string name="enable_logging_warning_message">このオプションは診断目的でのデータ記録を有効にします。これはこのアプリケーションのトラブルシューティングを担当する当社のサポートスタッフの助けになります。このオプションはOrganic Mapsにリクエストされた場合にのみ有効にしてください。</string>
 	<string name="access_rules_author_only">オンライン編集</string>
 	<string name="driving_options_title">運転オプション</string>
-	<string name="avoid_tolls">有料道路を避ける</string>
-	<string name="avoid_unpaved">舗装されていない道路を避ける</string>
-	<string name="avoid_ferry">フェリー乗船を避ける</string>
-	<string name="avoid_motorways">高速道路を避ける</string>
+	<string name="driving_options_subheader">すべてのルートで回避</string>
+	<string name="avoid_tolls">有料道路</string>
+	<string name="avoid_unpaved">未舗装道路</string>
+	<string name="avoid_ferry">フェリー航路</string>
+	<string name="avoid_motorways">高速道路</string>
 	<string name="unable_to_calc_alert_title">ルートを計算できません</string>
 	<string name="unable_to_calc_alert_subtitle">残念ながら恐らく設定されたオプションのためにルートが見つけられませんでした。設定を変更し、もう一度お試しください</string>
 	<string name="define_to_avoid_btn">回避するために道を設定</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 9fb8c8f8a8..df59bee233 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -608,10 +608,11 @@
 	<string name="enable_logging_warning_message">이 옵션은 진단을 목적으로 로그를 엽니다 이를 통해 앱에 대한 문제를 분석하는 우리의 스탭을 도울 수 있습니다 이 옵션은 오직 Organic Maps 지원 요청에서만 가능합니다.</string>
 	<string name="access_rules_author_only">온라인 수정</string>
 	<string name="driving_options_title">운전 옵션</string>
-	<string name="avoid_tolls">유료 도로 피하기</string>
-	<string name="avoid_unpaved">비포장 도로 피하기</string>
-	<string name="avoid_ferry">페리 횡단 피하기</string>
-	<string name="avoid_motorways">고속도로를 피하세요</string>
+	<string name="driving_options_subheader">모든 길에서 피하기</string>
+	<string name="avoid_tolls">유로 도로</string>
+	<string name="avoid_unpaved">비포장 도로</string>
+	<string name="avoid_ferry">여객선 교차로</string>
+	<string name="avoid_motorways">고속도로</string>
 	<string name="unable_to_calc_alert_title">루트를 계산할 수 없습니다</string>
 	<string name="unable_to_calc_alert_subtitle">아쉽게도 귀하가 정의한 옵션으로는 루트를 찾을 수가 없습니다. 설정을 바꾸신다음 다시 시도해주세요</string>
 	<string name="define_to_avoid_btn">피할 도로 정의하기</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 5d2975330b..fd5ffdb4a6 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -607,10 +607,11 @@
 	<string name="enable_logging_warning_message">निदान करण्याकरिता हा पर्याय लॉगिंग चालू करतो. ह्याने ऍपच्या समस्यांचे निवारण करणे आम्हाला उपयुक्त ठरू शकते. तुमच्या समस्येबद्दल तपशीलवार नोंदी रेकॉर्ड करण्यासाठी आणि आम्हाला पाठवण्यासाठी हा पर्याय तात्पुरता चालू करा.</string>
 	<string name="access_rules_author_only">ऑनलाइन संपादन</string>
 	<string name="driving_options_title">मार्गशोधी पर्याय</string>
-	<string name="avoid_tolls">टोल रस्ते टाळा</string>
-	<string name="avoid_unpaved">मातीचे रस्ते टाळा</string>
-	<string name="avoid_ferry">फेरी क्रॉसिंग टाळा</string>
-	<string name="avoid_motorways">मोटरवे टाळा</string>
+	<string name="driving_options_subheader">प्रत्येक मार्गावर टाळा</string>
+	<string name="avoid_tolls">टोल मार्ग</string>
+	<string name="avoid_unpaved">कच्चे मार्ग</string>
+	<string name="avoid_ferry">जल मार्ग</string>
+	<string name="avoid_motorways">महामार्ग</string>
 	<string name="unable_to_calc_alert_title">मार्गाची गणना करण्यात अक्षम</string>
 	<string name="unable_to_calc_alert_subtitle">दुर्दैवाने, आम्ही मार्ग शोधू शकलो नाही. ह्याचे कारण कदाचित तुम्ही निवडलेले पर्याय असावे. कृपया सेटिंग बदला आणि पुन्हा प्रयत्न करा.</string>
 	<string name="define_to_avoid_btn">टाळण्याचे मार्ग निवडा</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index a79e01f3c9..c144c26c42 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -642,10 +642,11 @@
 	<string name="enable_logging_warning_message">Alternativet slår på logging for diagnostiske formål. Det kan være nyttig for våre supportpersonale som feilsøker problemer med appen. Aktiver dette alternativet bare på forespørsel fra Organic Maps-brukerstøtte.</string>
 	<string name="access_rules_author_only">Redigering på nett</string>
 	<string name="driving_options_title">Kjørealternativer</string>
-	<string name="avoid_tolls">Unngå bompenger</string>
-	<string name="avoid_unpaved">Unngå asfalterte veier</string>
-	<string name="avoid_ferry">Unngå fergeoverganger</string>
-	<string name="avoid_motorways">Unngå motorveien</string>
+	<string name="driving_options_subheader">Unngå ved hver rute</string>
+	<string name="avoid_tolls">Bompengeveier</string>
+	<string name="avoid_unpaved">Uasfaltert vei</string>
+	<string name="avoid_ferry">Fergeoverganger</string>
+	<string name="avoid_motorways">Motorvei</string>
 	<string name="unable_to_calc_alert_title">Kan ikke beregne rute</string>
 	<string name="unable_to_calc_alert_subtitle">Dessverre kunne vi ikke finne en rute sannsynligvis på grunn av dine definerte alternativer. Vennligst endre innstillingene og prøv igjen</string>
 	<string name="define_to_avoid_btn">Definer veier som skal unngås</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 15a613310b..998b567c82 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -638,10 +638,11 @@
 	<string name="enable_logging_warning_message">Deze optie is ingeschakeld voor logboekregistraties voor diagnostische doeleinden. Het helpt bij het identificeren van problemen met de applicatie. Schakel de optie alleen in op verzoek van Organic Maps-ondersteuning.</string>
 	<string name="access_rules_author_only">Wordt online bewerkt</string>
 	<string name="driving_options_title">Route instellingen</string>
-	<string name="avoid_tolls">Vermijd tolwegen</string>
-	<string name="avoid_unpaved">Vermijd onverharde wegen</string>
-	<string name="avoid_ferry">Vermijd overtochten met de veerboot</string>
-	<string name="avoid_motorways">Vermijd de snelweg</string>
+	<string name="driving_options_subheader">Vermijden op elke route</string>
+	<string name="avoid_tolls">Tolwegen</string>
+	<string name="avoid_unpaved">Onverharde wegen</string>
+	<string name="avoid_ferry">Veerdiensten</string>
+	<string name="avoid_motorways">Autosnelwegen</string>
 	<string name="unable_to_calc_alert_title">Kan route niet opbouwen</string>
 	<string name="unable_to_calc_alert_subtitle">Helaas konden we geen route opbouwen met de gekozen opties. Wijzig de instellingen en probeer het opnieuw</string>
 	<string name="define_to_avoid_btn">Omwegen configureren</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index bb8c6cbd03..c46df02f47 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -643,10 +643,11 @@
 	<string name="enable_logging_warning_message">Ta opcja zostaje włączona do zbierania danych działań w celach diagnostycznych. Pomaga to zespołowi zidentyfikować problemy z aplikacją. Włączaj opcję tylko na żądanie wsparcia technicznego Organic Maps.</string>
 	<string name="access_rules_author_only">Edytowane online</string>
 	<string name="driving_options_title">Ustawienia nawigacji</string>
-	<string name="avoid_tolls">Unikaj płatnych dróg</string>
-	<string name="avoid_unpaved">Unikaj nieutwardzonych dróg</string>
-	<string name="avoid_ferry">Unikaj przepraw promowych</string>
-	<string name="avoid_motorways">Unikaj autostrad</string>
+	<string name="driving_options_subheader">Unikaj na każdej trasie</string>
+	<string name="avoid_tolls">Drogi płatne</string>
+	<string name="avoid_unpaved">Drogi gruntowe</string>
+	<string name="avoid_ferry">Przeprawy promowe</string>
+	<string name="avoid_motorways">Autostrady</string>
 	<string name="unable_to_calc_alert_title">Brak możliwości zbudowania trasy</string>
 	<string name="unable_to_calc_alert_subtitle">Wyznaczanie trasy nie powiodło się. Przyczyną mogą być ustawienia nawigacji lub niekompletne dane OpenStreetMap. Zmień ustawienia i spróbuj ponownie</string>
 	<string name="define_to_avoid_btn">Dostosuj ścieżkę objazdu</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 4d784dc05d..4fe3d17a18 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -622,10 +622,11 @@
 	<string name="enable_logging_warning_message">A opção ativa logging para realizar diagnósticos. Pode ser útil para nossa equipe de suporte que estão solucionando problemas com o aplicativo. Ative esta opção apenas ao ser solicitado pelo suporte do Organic Maps.</string>
 	<string name="access_rules_author_only">Edição online</string>
 	<string name="driving_options_title">Opções de direção</string>
-	<string name="avoid_tolls">Evitar pedágios</string>
-	<string name="avoid_unpaved">Evitar estradas não-pavimentadas</string>
-	<string name="avoid_ferry">Evitar balsas</string>
-	<string name="avoid_motorways">Evitar rodovias</string>
+	<string name="driving_options_subheader">Evitar em todas as rotas</string>
+	<string name="avoid_tolls">Pedágios</string>
+	<string name="avoid_unpaved">Pistas sem pavimentação</string>
+	<string name="avoid_ferry">Balsa</string>
+	<string name="avoid_motorways">Autoestradas</string>
 	<string name="unable_to_calc_alert_title">Incapaz de calcular rota</string>
 	<string name="unable_to_calc_alert_subtitle">Infelizmente, não conseguimos encontrar uma rota, provavelmente por causa das opções escolhidas. Por favor, altere as configurações e tente novamente</string>
 	<string name="define_to_avoid_btn">Definir as estradas a serem evitadas</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 168b0eeed1..4de565c6e6 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -619,10 +619,11 @@
 	<string name="enable_logging_warning_message">Esta opção ativa o registo das ações para diagnóstico. Pode ser útil para os programadores descobrirem o problema na aplicação. Ative esta opção apenas a pedido dos programadores do Organic Maps.</string>
 	<string name="access_rules_author_only">Edição online</string>
 	<string name="driving_options_title">Configurações de direção</string>
-	<string name="avoid_tolls">Evitar portagens</string>
-	<string name="avoid_unpaved">Evitar estradas não-pavimentadas</string>
-	<string name="avoid_ferry">Evitar balsas</string>
-	<string name="avoid_motorways">Evitar autoestradas</string>
+	<string name="driving_options_subheader">Evitar em todos os percursos</string>
+	<string name="avoid_tolls">Estradas com portagem</string>
+	<string name="avoid_unpaved">Estradas não pavimentadas</string>
+	<string name="avoid_ferry">Ferry</string>
+	<string name="avoid_motorways">Autoestradas</string>
 	<string name="unable_to_calc_alert_title">Não foi possível calcular a rota</string>
 	<string name="unable_to_calc_alert_subtitle">Infelizmente não foi possível criar o percurso com as opções selecionadas. Altere as opções e tente novamente</string>
 	<string name="define_to_avoid_btn">Definir as estradas a evitar</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 0ab97145fe..e0b3df2825 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -626,10 +626,11 @@
 	<string name="enable_logging_warning_message">Opțiunea activează jurnalizarea în scopuri de diagnosticare. Aceasta poate fi utilă echipei noastre pentru a rezolva problemele cu aplicația. Activează temporar această opțiune pentru a înregistra și a ne trimite jurnale detaliate despre problema ta.</string>
 	<string name="access_rules_author_only">Modifică online</string>
 	<string name="driving_options_title">Opțiuni de ocolire</string>
-	<string name="avoid_tolls">Evitați drumurile cu taxă</string>
-	<string name="avoid_unpaved">Evitați drumurile neasfaltate</string>
-	<string name="avoid_ferry">Evitați traversările cu feribotul</string>
-	<string name="avoid_motorways">Evitați autostrada</string>
+	<string name="driving_options_subheader">De evitat pe orice traseu</string>
+	<string name="avoid_tolls">Drumuri cu plată</string>
+	<string name="avoid_unpaved">Drumuri neasfaltate</string>
+	<string name="avoid_ferry">Treceri cu bac</string>
+	<string name="avoid_motorways">Autostrăzi</string>
 	<string name="unable_to_calc_alert_title">Nu poate fi creat un traseu</string>
 	<string name="unable_to_calc_alert_subtitle">Din păcate, nu putem elabora un traseu cu opțiunile alese. Modifică-le și încearcă din nou.</string>
 	<string name="define_to_avoid_btn">Stabilește drumurile de evitat</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 8d6120e755..f2b43b1b03 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -652,10 +652,11 @@
 	<string name="enable_logging_warning_message">Данная настройка включается для записи действий в целях диагностики, чтобы помочь нашей команде выявить проблемы с приложением. Временно включайте эту настройку только для отправки детальной информации о найденной вами проблеме в приложении.</string>
 	<string name="access_rules_author_only">Редактируется онлайн</string>
 	<string name="driving_options_title">Настройки объезда</string>
-	<string name="avoid_tolls">Избегать платных дорог</string>
-	<string name="avoid_unpaved">Избегать грунтовых дорог</string>
-	<string name="avoid_ferry">Избегать паромных переправ</string>
-	<string name="avoid_motorways">Избегать автомагистралей</string>
+	<string name="driving_options_subheader">Избегать в каждом маршруте</string>
+	<string name="avoid_tolls">Платные дороги</string>
+	<string name="avoid_unpaved">Грунтовые дороги</string>
+	<string name="avoid_ferry">Паромные переправы</string>
+	<string name="avoid_motorways">Магистрали</string>
 	<string name="unable_to_calc_alert_title">Невозможно построить маршрут</string>
 	<string name="unable_to_calc_alert_subtitle">К сожалению, мы не смогли построить маршрут с выбранными опциями. Измените настройки и повторите попытку</string>
 	<string name="define_to_avoid_btn">Настроить пути объезда</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 6a5641ca23..8e29919f54 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -608,10 +608,11 @@
 	<string name="enable_logging_warning_message">Táto možnosť zapína zaznamenávanie na diagnostické účely. Môže to byť užitočné pre našu technickú podporu, ktorá rieši problémy s aplikáciou. Povoliť túto možnosť iba na požiadanie podpory Organic Maps.</string>
 	<string name="access_rules_author_only">Online úprava</string>
 	<string name="driving_options_title">Možnosti jazdy</string>
-	<string name="avoid_tolls">Vyhnite sa spoplatneným cestám</string>
-	<string name="avoid_unpaved">Vyhnite sa nespevneným cestám</string>
-	<string name="avoid_ferry">Vyhnite sa prejazdom trajektom</string>
-	<string name="avoid_motorways">Vyhnite sa diaľnici</string>
+	<string name="driving_options_subheader">Vyhnúť sa na každej trase</string>
+	<string name="avoid_tolls">Spoplatnené cesty</string>
+	<string name="avoid_unpaved">Nespevnené cesty</string>
+	<string name="avoid_ferry">Prechody trajektom</string>
+	<string name="avoid_motorways">Diaľnice</string>
 	<string name="unable_to_calc_alert_title">Nepodarilo sa vypočítať trasu</string>
 	<string name="unable_to_calc_alert_subtitle">Bohužiaľ sme nemohli nájsť trasu pravdepodobne z dôvodu definovaných možností. Zmeňte nastavenia a skúste to prosím znova</string>
 	<string name="define_to_avoid_btn">Definovať cesty, ktorým sa treba vyhnúť</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 11e4b0a821..50e0500ddd 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -609,10 +609,11 @@
 	<string name="enable_logging_warning_message">Denna funktion aktiveras för loggning av åtgärder för diagnostiska ändamål. Detta hjälper laget att identifiera problem med applikationen. Slå på funktionen endast på begäran av Organic Maps supporttjänst.</string>
 	<string name="access_rules_author_only">Redigeras online</string>
 	<string name="driving_options_title">Omvägsinställningar</string>
-	<string name="avoid_tolls">Undvik avgiftsbelagda vägar</string>
-	<string name="avoid_unpaved">Undvik oasfalterade vägar</string>
-	<string name="avoid_ferry">Undvik färjeöverfarter</string>
-	<string name="avoid_motorways">Undvik motorvägen</string>
+	<string name="driving_options_subheader">Undvik på varje rutten</string>
+	<string name="avoid_tolls">Betalväg</string>
+	<string name="avoid_unpaved">Kärrväg</string>
+	<string name="avoid_ferry">Färjetrafik</string>
+	<string name="avoid_motorways">Motorväg</string>
 	<string name="unable_to_calc_alert_title">Det går inte att bygga ruttenen</string>
 	<string name="unable_to_calc_alert_subtitle">Tyvärr kunde vi inte bygga en rutt med de valda alternativen. Ändra inställningar och försök igen</string>
 	<string name="define_to_avoid_btn">Anpassa omvägsbana</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 2597377d3d..5219bb726f 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -168,10 +168,11 @@
 	<string name="enable_logging_warning_message">Chaguo huwasha data kwa madhumuni ya uchunguzi. Itakuwa muhimu kwa wafanyakazi wetu ambao wanatatua matatizo ya programu. Washa chaguo hili kwa maombi ya mhudumu wa Organic Maps tu.</string>
 	<string name="access_rules_author_only">Uhariri mtandaoni</string>
 	<string name="driving_options_title">Machaguo ya njia</string>
-	<string name="avoid_tolls">Epuka barabara za ushuru</string>
-	<string name="avoid_unpaved">Epuka barabara za uchafu</string>
-	<string name="avoid_ferry">Epuka vivuko vya feri</string>
-	<string name="avoid_motorways">Epuka barabara</string>
+	<string name="driving_options_subheader">Epuka kwenye kila njia</string>
+	<string name="avoid_tolls">Barabara za kulipia</string>
+	<string name="avoid_unpaved">Barabara za vumbi</string>
+	<string name="avoid_ferry">Vivuko cha feri</string>
+	<string name="avoid_motorways">Barabara za mwendo kasi</string>
 	<string name="unable_to_calc_alert_title">Haiwezi kukokotoa njia</string>
 	<string name="unable_to_calc_alert_subtitle">Bahati mbaya hatukuweza kupata njia labda kwa sababu ya machaguo msingi. Tafadhali badili mipangilio na jaribu tena</string>
 	<string name="define_to_avoid_btn">Fafanua njia za kuziepuka</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index ddbb451b5d..c405bbf61d 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -610,10 +610,11 @@
 	<string name="enable_logging_warning_message">ออปชันเพื่อเปิดการบันทึกประวัติการทำงานเพื่อการวินิจฉัย ประวัติดังกล่าวอาจเป็นประโยชน์กับทีมงานช่วยเหลือของเราที่คอยจัดการกับปัญหาที่เจอระหว่างแอปทำงาน โปรดเปิดออปชันดังกล่าวจากการร้องข้อการสนับสนุนจาก Organic Maps เท่านั้น</string>
 	<string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
 	<string name="driving_options_title">ทางเลือกเส้นทางขับขี่</string>
-	<string name="avoid_tolls">หลีกเลี่ยงถนนที่เก็บค่าผ่านทาง</string>
-	<string name="avoid_unpaved">หลีกเลี่ยงถนนลูกรัง</string>
-	<string name="avoid_ferry">หลีกเลี่ยงการข้ามเรือข้ามฟาก</string>
-	<string name="avoid_motorways">หลีกเลี่ยงมอเตอร์เวย์</string>
+	<string name="driving_options_subheader">หลีกเลี่ยงในทุกเส้นทาง</string>
+	<string name="avoid_tolls">ถนนแบบเสียค่าผ่านทาง</string>
+	<string name="avoid_unpaved">ถนนดิน</string>
+	<string name="avoid_ferry">เรือข้ามฟาก</string>
+	<string name="avoid_motorways">ทางด่วน</string>
 	<string name="unable_to_calc_alert_title">ไม่สามารถคำนวณเส้นทาง</string>
 	<string name="unable_to_calc_alert_subtitle">ขออภัย เราไม่สามารถค้นหาเส้นทาง โดยสาเหตุอาจมาจากทางเลือกที่คุณกำหนดไว้ โปรดเปลี่ยนการตั้งค่าทางเลือกและลองใหม่อีกครั้ง</string>
 	<string name="define_to_avoid_btn">กำหนดถนนที่ต้องการเลี่ยง</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 8b09e7b39c..980485907b 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -641,10 +641,11 @@
 	<string name="enable_logging_warning_message">Bu seçenek tanılama amacıyla günlüğe kaydetmeyi açar. Ekibimizin uygulamayla ilgili sorunları gidermesine yardımcı olabilir. Sorununuzla ilgili ayrıntılı günlükleri kaydetmek ve bize göndermek için bu seçeneği geçici olarak etkinleştirin.</string>
 	<string name="access_rules_author_only">Çevrimiçi düzenleme</string>
 	<string name="driving_options_title">Yönlendirme seçenekleri</string>
-	<string name="avoid_tolls">Ücretli yollardan kaçının</string>
-	<string name="avoid_unpaved">Asfaltsız yollardan kaçının</string>
-	<string name="avoid_ferry">Feribot geçişlerinden kaçının</string>
-	<string name="avoid_motorways">Otoyoldan kaçının</string>
+	<string name="driving_options_subheader">Her rotada kaçının</string>
+	<string name="avoid_tolls">Paralı yollar</string>
+	<string name="avoid_unpaved">Asfaltsız yollar</string>
+	<string name="avoid_ferry">Feribot geçişleri</string>
+	<string name="avoid_motorways">Otoyollar</string>
 	<string name="unable_to_calc_alert_title">Rota hesaplanamıyor</string>
 	<string name="unable_to_calc_alert_subtitle">Maalesef, muhtemelen belirlediğiniz seçeneklerden dolayı bir rota bulamadık. Lütfen seçenekleri değiştirin ve tekrar deneyin</string>
 	<string name="define_to_avoid_btn">Kaçınılması gereken yolları tanımlayın</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 17e25f6816..6fcd22dc9a 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -638,10 +638,11 @@
 	<string name="enable_logging_warning_message">Дана опція вмикається для логування дій з метою діагностики. Це допомагає команді виявити проблеми з додатком. Тимчасово включайте цю настройку тільки для відправки детальної інформації про знайдену вами проблему в додатку.</string>
 	<string name="access_rules_author_only">Редагується онлайн</string>
 	<string name="driving_options_title">Налаштування об’їзду</string>
-	<string name="avoid_tolls">Уникати платних доріг</string>
-	<string name="avoid_unpaved">Уникати ґрунтових доріг</string>
-	<string name="avoid_ferry">Уникати поромних переправ</string>
-	<string name="avoid_motorways">Уникати автострад</string>
+	<string name="driving_options_subheader">Уникати в кожному маршруті</string>
+	<string name="avoid_tolls">Платні дороги</string>
+	<string name="avoid_unpaved">Ґрунтові дороги</string>
+	<string name="avoid_ferry">Поромні переправи</string>
+	<string name="avoid_motorways">Магістралі</string>
 	<string name="unable_to_calc_alert_title">Неможливо побудувати маршрут</string>
 	<string name="unable_to_calc_alert_subtitle">На жаль, ми не змогли побудувати маршрут з вибраними опціями. Змініть налаштування та спробуйте ще раз</string>
 	<string name="define_to_avoid_btn">Налаштувати шляхи об’їзду</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 461943b779..19396c0f29 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -609,10 +609,11 @@
 	<string name="enable_logging_warning_message">Tùy chọn này được kích hoạt để ghi nhật ký đăng nhập cho mục đích chẩn đoán. Điều này sẽ giúp nhóm chúng tôi làm rõ các vấn đề liên quan đến ứng dụng. Hãy bật tùy chọn này chỉ khi nào có yêu cầu hỗ trợ từ Organic Maps.</string>
 	<string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
 	<string name="driving_options_title">Thiết lập đi vòng</string>
-	<string name="avoid_tolls">Tránh đường thu phí</string>
-	<string name="avoid_unpaved">Tránh đường đất</string>
-	<string name="avoid_ferry">Tránh qua phà</string>
-	<string name="avoid_motorways">Tránh xa lộ</string>
+	<string name="driving_options_subheader">Tránh trên mỗi tuyến</string>
+	<string name="avoid_tolls">Đường trả phí</string>
+	<string name="avoid_unpaved">Đường đất</string>
+	<string name="avoid_ferry">Bến phà</string>
+	<string name="avoid_motorways">Đường cao tốc</string>
 	<string name="unable_to_calc_alert_title">Không thể tạo tuyến đường</string>
 	<string name="unable_to_calc_alert_subtitle">Rất tiếc, chúng không thể tạo tuyến đường với những tùy chọn đã chọn. Hãy thay đổi thiết lập và thử lại</string>
 	<string name="define_to_avoid_btn">Thiết lập đường đi vòng</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 803704d527..0291293a77 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -626,10 +626,11 @@
 	<string name="enable_logging_warning_message">此選項啟用以記錄操作來進行診斷。這有助於團隊辨別 app 的問題。請僅在Organic Maps支援請求時開啟該選項。</string>
 	<string name="access_rules_author_only">線上編輯</string>
 	<string name="driving_options_title">繞行設定</string>
-	<string name="avoid_tolls">避開收費公路</string>
-	<string name="avoid_unpaved">避開土路</string>
-	<string name="avoid_ferry">避免渡口</string>
-	<string name="avoid_motorways">避開高速公路</string>
+	<string name="driving_options_subheader">在每條線路上規避</string>
+	<string name="avoid_tolls">收費公路</string>
+	<string name="avoid_unpaved">土路</string>
+	<string name="avoid_ferry">渡輪渡口</string>
+	<string name="avoid_motorways">高速公路</string>
 	<string name="unable_to_calc_alert_title">無法規劃路線</string>
 	<string name="unable_to_calc_alert_subtitle">很遺憾，我們無法使用所選選項規劃路線。請更改設定，然後重試</string>
 	<string name="define_to_avoid_btn">設定繞行路徑</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index d2490c0e1d..23287eab79 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -618,10 +618,11 @@
 	<string name="enable_logging_warning_message">此选项启用以记录操作来进行诊断。这有助于团队识别应用程序的问题。请仅在Organic Maps支持请求时开启该选项。</string>
 	<string name="access_rules_author_only">在线编辑</string>
 	<string name="driving_options_title">绕行设置</string>
-	<string name="avoid_tolls">避免使用收费公路</string>
-	<string name="avoid_unpaved">避免使用未铺设路面的道路</string>
-	<string name="avoid_ferry">避免渡轮过境</string>
-	<string name="avoid_motorways">避开高速公路</string>
+	<string name="driving_options_subheader">在每条线路上规避</string>
+	<string name="avoid_tolls">收费公路</string>
+	<string name="avoid_unpaved">土路</string>
+	<string name="avoid_ferry">渡轮渡口</string>
+	<string name="avoid_motorways">高速公路</string>
 	<string name="unable_to_calc_alert_title">无法规划路线</string>
 	<string name="unable_to_calc_alert_subtitle">很遗憾，我们无法使用所选选项规划路线。请更改设置，然后重试</string>
 	<string name="define_to_avoid_btn">设置绕行路径</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 7ed0a94cb8..c3d5fee64b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -670,10 +670,11 @@
 	<string name="enable_logging_warning_message">Enable this option temporarily to record and manually send detailed diagnostic logs about your issue to us using \"Report a bug\" in the Help dialog. Logs may include location info.</string>
 	<string name="access_rules_author_only">Online editing</string>
 	<string name="driving_options_title">Routing options</string>
-	<string name="avoid_tolls">Avoid tolls</string>
-	<string name="avoid_unpaved">Avoid unpaved roads</string>
-	<string name="avoid_ferry">Avoid ferry crossings</string>
-	<string name="avoid_motorways">Avoid freeways</string>
+	<string name="driving_options_subheader">Avoid on every route</string>
+	<string name="avoid_tolls">Toll roads</string>
+	<string name="avoid_unpaved">Unpaved roads</string>
+	<string name="avoid_ferry">Ferry crossings</string>
+	<string name="avoid_motorways">Motorways</string>
 	<string name="unable_to_calc_alert_title">Unable to calculate route</string>
 	<string name="unable_to_calc_alert_subtitle">A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.</string>
 	<string name="define_to_avoid_btn">Define roads to avoid</string>
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0f0fda0303..a0c7a15367 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 9ff63e41b9..4ba7821db5 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -9075,7 +9075,7 @@ cont {
     scale: 15
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9085,14 +9085,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 16
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9102,14 +9102,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 17
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9119,14 +9119,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 18
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9136,14 +9136,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 19
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9153,7 +9153,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f7d0b9f454..6d6463fe4e 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 3dfec91b63..5abd0681fb 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -8949,7 +8949,7 @@ cont {
     scale: 15
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -8959,14 +8959,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 16
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -8976,14 +8976,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 17
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -8993,14 +8993,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 18
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9010,14 +9010,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 19
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9027,7 +9027,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index ce209a189b..80faff99d1 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index d07289d356..a3ac1e6917 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -8949,7 +8949,7 @@ cont {
     scale: 15
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -8959,14 +8959,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 16
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -8976,14 +8976,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 17
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -8993,14 +8993,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 18
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9010,14 +9010,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
   element {
     scale: 19
     symbol {
       name: "dump-station-m"
-      priority: 1950
+      priority: 3750
       min_distance: 20
     }
     caption {
@@ -9027,7 +9027,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -8050
+      priority: -6250
     }
   }
 }
diff --git a/data/faq.html b/data/faq.html
index 61f8cb348e..b09609d941 100644
--- a/data/faq.html
+++ b/data/faq.html
@@ -90,9 +90,9 @@
       }
 
       // TODO: Update this list with a new translation.
-      var translations = ['en', 'ru', 'de', 'es', 'fr', 'pt', 'pl', 'tr'];
+      var translations = ['en', 'ru', 'de', 'es', 'fr', 'pt', 'pl', 'tr', 'uk'];
       // Show Russian for browsers with this language codes.
-      var canReadRussian = ['ab', 'be', 'kk', 'ky', 'tg', 'uk', 'uz'];
+      var canReadRussian = ['ab', 'be', 'kk', 'ky', 'tg', 'uz'];
 
       // TODO: Properly handle be-EN, he-RU or similar cases.
       function showLanguage() {
@@ -124,6 +124,7 @@
       <h2 lang="pt-BR">Perguntas frequentes</h2>
       <h2 lang="pl">FAQ</h2>
       <h2 lang="tr">SSS</h2>
+      <h2 lang="uk">Часті питання</h2>
 
       <ul>
         <li>
@@ -155,6 +156,7 @@
           <a lang="tr" href="#osm"
             >Haritada bazı yerler eksik veya yanlış adlara sahip</a
           >
+          <a href="#osm" class="link" lang="uk">Деякі місця відсутні на карті або мають неправильні назви</a>
         </li>
         <li>
           <a href="#no_location" class="link" lang="en"
@@ -184,6 +186,7 @@
           <a lang="tr" href="#no_location"
             >Uygulama konumumu haritada bulamıyor</a
           >
+          <a href="#no_location" class="link" lang="uk">Додаток не може визначити моє місцезнаходження на карті</a>
         </li>
         <li>
           <a href="#cant_download_maps" class="link" lang="en"
@@ -213,6 +216,7 @@
           <a lang="tr" href="#cant_download_maps"
             >Haritaları indiremiyorum/güncelleyemiyorum</a
           >
+          <a href="#cant_download_maps" class="link" lang="uk">Я не можу завантажити (оновити) карти</a>
         </li>
         <li>
           <a href="#cant_find_a_place" class="link" lang="en"
@@ -242,6 +246,7 @@
           <a lang="tr" href="#cant_find_a_place"
             >Arama, haritada bir yer bulamıyor</a
           >
+          <a href="#cant_find_a_place" class="link" lang="uk">Пошук не може знайти місце на карті</a>
         </li>
         <li>
           <a href="#crash" class="link" lang="en"
@@ -271,11 +276,10 @@
           <a lang="tr" href="#crash"
             >Uygulama çalışmayı durdurduysa (çöktüyse) ne yapmalıyım</a
           >
+          <a href="#crash" class="link" lang="uk">Що робити, якщо додаток несподівано закрився або вийшов з ладу</a>
         </li>
         <li>
-          <a href="#create_route" class="link" lang="en"
-            >How to create a route</a
-          >
+          <a href="#create_route" class="link" lang="en">How to create a route</a>
           <a lang="ru" href="#create_route">Как проложить маршрут</a>
           <a lang="de" href="#create_route">Wie erstelle ich eine Route</a>
           <a lang="es" href="#create_route">Cómo crear una ruta</a>
@@ -284,6 +288,7 @@
           <a lang="pt-BR" href="#create_route">Como criar uma rota</a>
           <a lang="pl" href="#create_route">Jak utworzyć trasę</a>
           <a lang="tr" href="#create_route">Nasıl rota oluşturulur</a>
+          <a href="#create_route" class="link" lang="uk">Як побудувати маршрут</a>
         </li>
         <li>
           <a href="#no_voice" class="link" lang="en"
@@ -299,6 +304,7 @@
           <a lang="pt-BR" href="#no_voice">Não consigo ouvir instruções de voz</a>
           <a lang="pl" href="#no_voice">Nie słyszę instrukcji głosowych</a>
           <a lang="tr" href="#no_voice">Sesli yönergeleri duyamıyorum</a>
+          <a href="#no_voice" class="link" lang="uk">Я не чую голосових підказок</a>
         </li>
         <li>
           <a lang="en" href="#bookmarks_export" class="link"
@@ -314,6 +320,7 @@
           <a lang="pt-BR" href="#bookmarks_export">Como exportar favoritos</a>
           <a lang="pl" href="#bookmarks_export">Jak eksportować zakładki</a>
           <a lang="tr" href="#bookmarks_export">Yer imleri nasıl dışa aktarılır</a>
+          <a lang="uk" href="#bookmarks_export" class="link">Як поділитися (експортувати) мітками</a>
         </li>
         <li>
           <a lang="en" href="#bookmarks_import" class="link"
@@ -329,6 +336,7 @@
           <a lang="pt-BR" href="#bookmarks_import">Como importar favoritos</a>
           <a lang="pl" href="#bookmarks_import">Jak importować zakładki</a>
           <a lang="tr" href="#bookmarks_export">Yer imleri nasıl içe aktarılır</a>
+          <a lang="uk" href="#bookmarks_import" class="link">Як імпортувати мітки</a>
         </li>
       </ul>
 
@@ -369,6 +377,10 @@
         <a href="https://organicmaps.app/tr/">organicmaps.app/tr/</a>
         web sitemizi ziyaret edin.
       </h4>
+      <h4 lang="uk">
+        Для отримання додаткової інформації, будь ласка, відвідайте наш веб-сайт
+        <a href="https://organicmaps.app/">organicmaps.app</a>
+      </h4>
     </div>
 
     <dl id="osm">
@@ -400,6 +412,9 @@
         <h3 lang="tr">
           Haritada bazı yerler eksik veya yanlış adlara sahip
         </h3>
+        <h3 lang="uk">
+          Деякі місця відсутні на карті або мають неправильні назви
+        </h3>
       </dt>
 
       <dd lang="en">
@@ -826,6 +841,52 @@
           </li>
         </ul>
       </dd>
+    
+      <dd lang="uk">
+        <p>
+          Джерелом наших картографічних даних є
+          <a href="https://welcome.openstreetmap.org/">OpenStreetMap</a> (OSM).
+          Це картографічний проект, подібний до Вікіпедії, але для мап, де
+          будь-хто може створювати та редагувати мапи.
+        </p>
+
+        <p>
+          Якщо ви побачили невірну інформацію або виявили, що деякі об'єкти
+          відсутні на карті, ви можете
+          <a href="https://www.openstreetmap.org/note/new">залишити повідомлення</a> для
+          редакторів OSM або
+          <a href="https://www.openstreetmap.org/user/new">реєструватися</a> і редагувати
+          мапу.
+        </p>
+
+        <p>
+          Чим більше людей долучається, тим детальніші стають карти. Ми віримо,
+          що найдетальніша карта всього світу, створена відкритою
+          спільнотою - це лише питання часу.
+        </p>
+
+        <p><b>Примітки:</b></p>
+
+        <ul>
+          <li>
+            <p>
+              Ви також можете додавати нові місця, редагувати існуючі POI та інформацію про будівлі
+              (адреси, години роботи, назви) безпосередньо в Organic Maps. Після того, як
+              ви ввійдете за допомогою облікового запису OSM, ваші правки будуть автоматично
+              завантажені на OSM. Будь ласка, будьте обережні при редагуванні, оскільки ваші правки
+              будуть видимі всім іншим користувачам.
+            </p>
+          </li>
+          <li>
+            <p>
+              База даних OpenStreetMap змінюється щохвилини. Ми прагнемо
+              оновлювати карти в додатку 1-4 рази на місяць. Якщо ви змінили
+              щось в OSM, ваші правки з'являться в наступних оновленнях мап.
+            </p>
+          </li>
+        </ul>
+      </dd>
+    </dl>
 
 
     <dl id="no_location">
@@ -839,6 +900,7 @@
         <h3 lang="pt-BR">O aplicativo não pode determinar minha localização</h3>
         <h3 lang="pl">Aplikacja nie może określić mojej lokalizacji</h3>
         <h3 lang="tr">Uygulama konumumu haritada bulamıyor</h3>
+        <h3 lang="uk">Додаток не може визначити моє місцезнаходження на карті</h3>
       </dt>
 
       <dt></dt>
@@ -1412,6 +1474,65 @@
           </li>
         </ul>
       </dd>
+    
+      <dd lang="uk">
+        <p>
+          Будь ласка, переконайтеся, що на вашому пристрої ввімкнено GPS та активовані
+          налаштування місцезнаходження.
+        </p>
+        <p><b>Android</b></p>
+        <p>
+          На вашому пристрої відкрийте Налаштування → Місцезнаходження. Краще
+          увімкнути режим високої точності.
+        </p>
+        <p>
+          Якщо у вас виникають труднощі з визначенням вашого місцезнаходження за допомогою GPS, увімкніть
+          (вимкніть, якщо увімкнено) "Сервіси Google Play" в налаштуваннях програми.
+        </p>
+        <p>
+          Примітка: ви можете побачити його, лише якщо на вашому пристрої встановлені
+          та увімкнені служби Google Play Android. Ці служби використовуються для
+          більш точного визначення місцезнаходження. Якщо у вас виникли проблеми з
+          з точністю визначення місцезнаходження після вимкнення цієї опції,
+          увімкніть її назад.
+        </p>
+        <p><b>iOS</b></p>
+        Якщо ви користувач iPhone або iPad, перевірте налаштування iOS → Конфіденційність →
+        Служби визначення місцезнаходження. Обмін геолокаційними даними слід увімкнути для
+        Organic Maps.
+        <p><b>Примітки:</b></p>
+        <ul>
+          <li>
+            <p>
+              Щоб уникнути небажаних даних у роумінгу, ви можете вимкнути всі мобільні
+              дані, активувати режим польоту або вимкнути мобільні дані для Organic
+              Maps у налаштуваннях вашого пристрою. Пристрої на Android та iOS можуть використовувати GPS
+              в режимі польоту.
+          </li>
+          <li>
+            <p>
+              Деякі мобільні пристрої не мають вбудованих GPS-приймачів, наприклад
+              iPod Touch, iPad з підтримкою Wi-Fi, Amazon Kindle Fire/Kindle Fire HD
+              7 та деякі планшети Android. На цих пристроях наш додаток буде
+              показуватиме ваше приблизне місцезнаходження за умови підключення до
+              до Інтернету.
+            </p>
+          </li>
+          <li>
+            <p>
+              Насамкінець, будь ласка, пам'ятайте, що визначення місцезнаходження
+              за допомогою GPS (з використанням WiFi але без мобільної мережи) може
+              зайняти деякий час. Чим довше GPS не використовувався, тим більше часу це займе. Швидкість
+              визначення місцезнаходження залежить від пристрою, а не від програми.
+              На роботу GPS приймача також впливає погода - він працює
+              найкраще на відкритому повітрі, коли небо чисте. Проблеми можуть виникнути при
+              при спробі визначити своє місцезнаходження в приміщенні, на вузькій вулиці
+              або за кермом автомобіля.
+            </p>
+          </li>
+        </ul>
+      </dd>
+    </dl>
 
     <dl id="cant_download_maps">
       <dt>
@@ -1424,6 +1545,7 @@
         <h3 lang="pt-BR">Não consigo baixar (atualizar) mapas</h3>
         <h3 lang="pl">Nie mogę pobrać (zaktualizować) map</h3>
         <h3 lang="tr">Haritaları indiremiyorum/güncelleyemiyorum</h3>
+        <h3 lang="uk">Я не можу завантажити (оновити) карти</h3>
       </dt>
 
       <dd lang="en">
@@ -1609,6 +1731,26 @@
 	  eski haritaları silip yeniden indirmek yardımcı olabilir.
         </p>
       </dd>
+    
+      <dd lang="uk">
+        <p>
+          Завантаження може завершитися невдало через тимчасову помилку мережі
+          або певні проблеми провайдера/маршрутизатора. Будь ласка, повторіть
+          спробу пізніше або використовуйте іншу точку доступу Wi-Fi. Крім того,
+          переконайтеся, що у вас є достатньо вільного місця для завантаження карт.
+        </p>
+
+        <p>
+          На Android, будь ласка, переконайтеся, що ви надали доступ до мережі для
+          Organic Maps і системний менеджер завантажень (провайдер завантажень).
+        </p>
+
+        <p>
+          Крім того, якщо у вас дуже застарілі карти, і програма не може їх оновити,
+          вам може допомогти видалення всіх карт і повторне їх завантаження.
+        </p>
+      </dd>
+    </dl>
 
     <dl id="cant_find_a_place">
       <h3 lang="en">Search cannot find a place on the map</h3>
@@ -1620,6 +1762,7 @@
       <h3 lang="pt-BR">A pesquisa não pode encontrar um lugar no mapa</h3>
       <h3 lang="pl">Wyszukiwanie nie może znaleźć miejsca na mapie</h3>
       <h3 lang="tr">Arama, haritada bir yer bulamıyor</h3>
+      <h3 lang="uk">Пошук не може знайти місце на карті</h3>
 
       <dd lang="en">
         Remember that to search for a place in a specific area, you will need to
@@ -1848,6 +1991,31 @@
           <a href="mailto:support@organicmaps.app">bize bildirin</a>.
         </p>
       </dd>
+      <dd lang="uk">
+        <p>
+          Пам'ятайте, що для пошуку місця в певному районі вам потрібно
+          завантажити відповідну мапу і збільшити масштаб карти до цієї області.
+          Або ж ваше місцезнаходження має бути поблизу цієї області, перш ніж
+          ви почнете пошук. Наприклад, якщо ви хочете знайти місце у В'єтнамі,
+          а ваше місцезнаходження десь в іншому місці, вам слід спочатку
+          завантажити і відкрити мапу В'єтнаму.
+        </p>
+
+        <p>
+          Крім того, місце може бути ще не додано на мапу в базі
+          <a href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, нашому
+          джерелі картографічних даних. Якщо ви хочете допомогти і покращити мапу, перевірте
+          <a href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">цей путівник</a>.
+        </p>
+
+        <p>
+          Якщо місце відображається на мапі в Organic Maps, але наш пошук
+          не може його знайти,
+          <a href="mailto:support@organicmaps.app">повідомте нам</a> координати
+          місця та приклад вашого пошукового запиту.
+        </p> 
+      </dd>
+    </dl>
 
     <dl id="crash">
       <dt>
@@ -1862,10 +2030,9 @@
         <h3 lang="fr">Pourquoi l'application s'arrête ou crash</h3>
         <h3 lang="pt">O que fazer se a aplicação parar de funcionar (bloquear)</h3>
         <h3 lang="pt-BR">O que posso fazer se o aplicativo parar (travar)</h3>
-        <h3 lang="pl">
-          Co mogę zrobić, jeśli aplikacja nie odpowiada/uległa awarii
-        </h3>
-	<h3 lang="tr">Uygulama durdurulursa/çökerse ne yapabilirim</h3>
+        <h3 lang="pl">Co mogę zrobić, jeśli aplikacja nie odpowiada/uległa awarii</h3>
+        <h3 lang="tr">Uygulama durdurulursa/çökerse ne yapabilirim</h3>
+        <h3 lang="uk">Що робити, якщо додаток несподівано закрився або вийшов з ладу</h3>
       </dt>
 
       <dd lang="en">
@@ -2122,6 +2289,32 @@
           <li>cihaz modeli ve İşletim Sistemi sürümü (Android veya iOS).</li>
         </ul>
       </dd>
+    
+      <dd lang="uk">
+        <p>
+          Ймовірно, це наша помилка, і ми будемо раді виправити її в наступному
+          оновленні.
+        </p>
+
+        <p>
+          Для Android пристроїв, якщо ви зберігаєте карти на SD-карті, найімовірнішою
+          причиною є несправна SD-карта. Ви можете відформатувати SD-карту, а ще краще
+          замінити її на нову. Якщо ви перемістили саму програму на SD-карту,
+          будь ласка, поверніть його назад у внутрішню пам'ять пристрою.
+        </p>
+
+        <p>
+          Якщо проблема не зникне, будь ласка
+          <a href="mailto:support@organicmaps.app">зв'яжіться з нами</a> і повідомте:
+        </p>
+
+        <ul>
+          <li>короткий опис проблеми</li>
+          <li>версію Organic Maps</li>
+          <li>модель пристрою та версія ОС (Android або iOS).</li>
+        </ul>
+      </dd>
+    </dl>
 
     <dl id="create_route">
       <dt>
@@ -2134,6 +2327,7 @@
         <h3 lang="pt-BR">Como criar uma rota</h3>
         <h3 lang="pl">Jak utworzyć trasę</h3>
         <h3 lang="tr">Nasıl rota oluşturulur</h3>
+        <h3 lang="uk">Як побудувати маршрут</h3>
       </dt>
 
       <dd lang="en">
@@ -2554,7 +2748,50 @@
 	  ayarlarını açın → Sürüş seçenekleri → gerekli seçenekleri açın.
         </p>
       </dd>
+    
+   <dd lang="uk">
+        <p>
+          Після того, як ваше місцезнаходження визначено на карті, оберіть пункт призначення.
+          Ви можете скористатися одним із наступних способів:
+        </p>
 
+        <ul>
+          <li>торкніться кнопки пошуку</li>
+          <li>торкніться кнопки закладок</li>
+          <li>торкніться будь-якого місця на карті (торкніться і утримуйте для порожніх областей)</li>
+        </p>
+        
+        <p>
+          Після того, як ви обрали пункт призначення, натисніть кнопку "Прокласти маршрут" на
+          нижній панелі. Маршрут буде створено, і ви побачите відстань
+          та приблизний час у дорозі. Ви можете змінити тип маршруту, натиснувши
+          іконку Автомобіль, Пішохід, Метро, Велосипед або Лінійка у верхній частині
+          екрана. Щоб почати рух за маршрутом, натисніть кнопку "Почати". Під час навігацію
+          натисніть на значок у правому нижньому куті екрана і натисніть кнопку "Зупинити"
+          щоб завершити маршрут.
+        </p>
+       
+        <p>
+          На iOS пристроях щоб спланувати маршрут, ви можете натиснути іконку "Маршрут" на
+          нижній панелі меню. Такоже ви можете вибрати іншу початкову точку (кнопка
+          "Маршрут від") для попереднього перегляду маршруту, але навігація доступна лише
+          з вашого поточного місцезнаходження.
+        </p>
+
+        <p>
+          До маршруту можна додати до 100 проміжних пунктів. Щоб додати
+          проміжний пункт: створіть маршрут між пунктом відправлення та пунктом
+          призначення → потім торкніться точки на мапі і натисніть "Додати зупинку".
+        </p>
+
+        <p>
+          Ви можете змінити налаштування автомобільного маршруту і вибрати типи доріг
+          які ви хотіли б уникати (платні дороги, ґрунтові дороги, автомагістралі,
+          пороми). Відкрийте налаштування програми → Налаштування обʼїзду → увімкніть
+          потрібні опції.
+        </p>
+      </dd>
+    </dl>
 
     <dl id="no_voice">
       <dt>
@@ -2567,6 +2804,7 @@
         <h3 lang="pt-BR">Não consigo ouvir instruções de voz</h3>
         <h3 lang="pl">Nie słyszę instrukcji głosowych</h3>
         <h3 lang="tr">Sesli yönlendirmeyi duyamıyorum</h3>
+        <h3 lang="uk">Я не чую голосових підказок</h3>
       </dt>
 
       <dd lang="en">
@@ -2963,6 +3201,67 @@
 	  Slovakça, Tayca, Yunanca.
         </p>
       </dd>
+    
+      <dd lang="uk">
+        <p>
+          <b>Зауваження:</b> голосові підказки доступні для автомобільних та велосипедних
+          маршрутів. Наразі ви можете чути голосові підказки лише під час руху
+          і коли екран увімкнено.
+        </p>
+
+        <p>Якщо ви не чуєте голосові підказки:</p>
+
+        <ul>
+          <li>
+            <p>
+              Переконайтеся, що на вашому пристрої не вимкнено звук. Ви можете
+              змінити рівень гучності за допомогою кнопок гучності вашого пристрою.
+              Щоб це зробити вам, можливо, доведеться вимкнути опцію "Змінювати кнопками"
+              (якщо її увімкнено) у Налаштуваннях пристрою → Звуки.
+             </p>
+          </li>
+
+          <li>
+            <p>
+              Коли ви вмикаєте Bluetooth, він не повинен відображати голосові
+              інструкції. Однак ми не тестували голосові підказки з автомобільним
+              аудіо, це може спричинити проблеми. У такому разі ви можете вимкнути
+              Bluetooth.
+            </p>
+          </li>
+
+          <li>
+            <p>
+              Якщо ви користувач Android і ця опція вимкнена (або деякі з
+              з підтримуваних мов недоступні), перевірте системні налаштування TTS.
+            </p>
+          </li>
+        </ul>
+
+        <p>
+          На Android голосові інструкції доступні 27 мовами: Англійська,
+          арабська, китайська (традиційна та спрощена), чеська, данська, голландська, чеська, датська,
+          фінська, французька, німецька, грецька, хінді, угорська, індонезійська, італійська, німецька, італійська, угорська, хінді,
+          японська, корейська, перська, польська, португальська, румунська, російська, французька, чеська, японська,
+          іспанська, тайська, турецька, українська, французька, в'єтнамська.
+        </p>
+
+        <p>
+          Google TTS підтримує всі перелічені мови, окрім арабської та перської
+          (фарсі). Для цих мов вам може знадобитися встановити сторонній TTS
+          (наприклад, eSpeak TTS, Vocalizer TTS або SVOX Classic TTS) і
+          мовний пакет з магазину додатків (Google Play Store, Galaxy Store тощо).
+        </p>
+
+        <p>
+          На iOS голосові інструкції доступні 26 мовами: Англійська,
+          арабська, китайська (традиційна та спрощена), чеська, данська, голландська, чеська, датська,
+          фінська, французька, німецька, грецька, хінді, угорська, індонезійська, італійська, німецька, хорватська, чеська, шведська, японська,
+          японська, корейська, польська, португальська, румунська, російська, словацька, словацька,
+          іспанська, шведська, тайська, українсьска, турецька.
+        </p>
+      </dd>
+    </dl>
 
 
     <dl id="bookmarks_export">
@@ -2976,6 +3275,7 @@
         <h3 lang="pt-BR">Como compartilhar (exportar) favoritos</h3>
         <h3 lang="pl">Jak udostępniać (eksportować) zakładki</h3>
         <h3 lang="tr">Yer imleri nasıl paylaşılır/dışa aktarılır</h3>
+        <h3 lang="uk">Як поділитися (експортувати) мітками</h3>
       </dt>
 
       <dd lang="en">
@@ -3060,6 +3360,14 @@
 	önündeki üç noktaya dokunun ve açılır pencereden Dosyayı Dışa Aktar'a dokunun.
       </dd>
 
+      <dd lang="uk">
+        Виберіть мітку на карті, торкніться її, а потім натисніть кнопку "Поділитися"
+        в нижній панели. Щоб поділитися відразу всіма мітками зі списку, торкніться
+        символу зірки на головному екрані, потім торкніться значка з трьома крапками після
+        назви списку з мітками і натисніть "Експортувати файл" у спливаючому вікні.
+      </dd>
+    </dl>
+
     <dl id="bookmarks_import">
       <dt>
         <h3 lang="en">How to import bookmarks</h3>
@@ -3071,6 +3379,7 @@
         <h3 lang="pt-BR">Como importar favoritos</h3>
         <h3 lang="pl">Jak importować zakładki</h3>
         <h3 lang="tr">Yer imleri nasıl içe aktarılır</h3>
+        <h3 lang="uk">Як імпортувати мітки</h3>
       </dt>
 
       <dd lang="en">
@@ -3464,6 +3773,43 @@
           </li>
         </ol>
       </dd>
+    
+      <dd lang="uk">
+        Ви можете імпортувати мітки, надіслані з Organic Maps або зі сторонніх додатків,
+        які підтримують експорт у формати KML, KMZ або GPX:
+
+        <ol>
+          <li>
+            <p>
+              На Android ви можете імпортувати мітки з папок і програм (включно з Maps.Me).
+              Натисніть кнопку із зірочкою, щоб відкрити мітки, натисніть
+              "Імпортувати мітки" і виберіть диск або папку з файлами KML, KMZ, GPX.
+            </p>
+          </li>
+
+          <li>
+            <p>
+              Відкрийте файл KML, KMZ, GPX із мітками, який ви отримали електронною поштою,
+              в месенджері або через хмарним сховище, наприклад, iCloud або Google Drive.
+            </p>
+          </li>
+          <li>
+            <p>
+              Натисніть один раз або натисніть і утримуйте файл KML, KMZ, GPX із мітками та
+              виберіть "Відкрити за допомогою Organic Maps" (Android) або "Імпортувати за допомогою Organic
+              Maps" (iOS) у спливаючому вікні.
+            </p>
+          </li>
+
+          <li>
+            <p>
+              Її буде відкрито у програмі Organic Maps, і ви побачите повідомлення "Закладки завантажено
+              успішно!". Ви можете побачити їх на мапі або в меню Мітки на головному екрані.
+            </p>
+          </li>
+        </ol>
+      </dd>
+    </dl>
 
     <a href="#" lang="en">Go to Top</a>
     <a href="#" lang="ru">Наверх</a>
@@ -3474,5 +3820,6 @@
     <a href="#" lang="pt-BR">Ir para o início</a>
     <a href="#" lang="pl">Idź na górę</a>
     <a href="#" lang="tr">Başa Git</a>
+    <a href="#" lang="uk">До початку</a>
   </body>
 </html>
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index f8a0e97769..4a9a042501 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -21966,170 +21966,220 @@
     zh-Hans = 绕行设置
     zh-Hant = 繞行設定
 
+  [driving_options_subheader]
+    tags = android,ios
+    en = Avoid on every route
+    af = Vermy op elke roete
+    ar = تجنبها على جميع الطرق
+    be = Пазбягаць на кожным маршруце
+    bg = Избягване при всеки маршрут
+    ca = Evita-ho en totes les rutes
+    cs = Vyhněte se na každé trase
+    da = Undgå på enhver rute
+    de = In jeder Reiseroute vermeiden
+    el = Αποφυγή σε κάθε διαδρομή
+    es = Evitar en todas las rutas
+    es-MX = Evitar en cada ruta
+    et = Väldi igal marsruudil
+    eu = Ibilbide guztietan saihestu
+    fa = اجتناب از تمامی مسیرها
+    fi = Vältettävä kaikissa reiteissä
+    fr = Éviter sur tous les itinéraires
+    hu = Elkerülés minden útvonalon
+    id = Hindari di setiap rute
+    it = Evitare in tutti i percorsi
+    ja = すべてのルートで回避
+    ko = 모든 길에서 피하기
+    lt = Vengti kiekviename maršrute
+    mr = प्रत्येक मार्गावर टाळा
+    nb = Unngå ved hver rute
+    nl = Vermijden op elke route
+    pl = Unikaj na każdej trasie
+    pt = Evitar em todos os percursos
+    pt-BR = Evitar em todas as rotas
+    ro = De evitat pe orice traseu
+    ru = Избегать в каждом маршруте
+    sk = Vyhnúť sa na každej trase
+    sv = Undvik på varje rutten
+    sw = Epuka kwenye kila njia
+    th = หลีกเลี่ยงในทุกเส้นทาง
+    tr = Her rotada kaçının
+    uk = Уникати в кожному маршруті
+    vi = Tránh trên mỗi tuyến
+    zh-Hans = 在每条线路上规避
+    zh-Hant = 在每條線路上規避
+
   [avoid_tolls]
     tags = android,ios
-    en = Avoid tolls
-    ar = تجنب الطرق ذات الرسوم
-    be = Пазбягаць платныя дарогі
-    bg = Избягвайте платените пътища
-    ca = Eviteu les autopistes de peatge
-    cs = Vyhněte se zpoplatněným silnicím
-    da = Undgå betalingsveje
-    de = Mautstraßen vermeiden
-    el = Αποφύγετε τους δρόμους με διόδια
-    es = Evitar peajes
-    et = Vältige tasulisi teid
-    eu = Saihestu ordainpeko errepideak
-    fa = از جاده های عوارضی خودداری کنید
-    fi = Vältä maksullisia teitä
-    fr = Éviter les routes à péage
-    he = הימנעו מכבישי אגרה
-    hu = Kerülje a fizetős utakat
-    id = Hindari jalan tol
-    it = Evita le strade a pedaggio
-    ja = 有料道路を避ける
-    ko = 유료 도로 피하기
-    mr = टोल रस्ते टाळा
-    nb = Unngå bompenger
-    nl = Vermijd tolwegen
-    pl = Unikaj płatnych dróg
-    pt = Evitar portagens
-    pt-BR = Evitar pedágios
-    ro = Evitați drumurile cu taxă
-    ru = Избегать платных дорог
-    sk = Vyhnite sa spoplatneným cestám
-    sv = Undvik avgiftsbelagda vägar
-    sw = Epuka barabara za ushuru
-    th = หลีกเลี่ยงถนนที่เก็บค่าผ่านทาง
-    tr = Ücretli yollardan kaçının
-    uk = Уникати платних доріг
-    vi = Tránh đường thu phí
-    zh-Hans = 避免使用收费公路
-    zh-Hant = 避開收費公路
+    en = Toll roads
+    af = Tolpaaie
+    ar = الطرق ذات الرسوم
+    be = Платныя дарогі
+    bg = Платени пътища
+    ca = Vies de peatge
+    cs = Silnice s mýtným
+    da = Betalingsveje
+    de = Mautstraßen
+    el = Δρόμοι με διόδια
+    es = Carreteras de pago
+    es-MX = Carreteras de peaje
+    et = Tasulised teed
+    eu = Ordainpeko errepideak
+    fa = جاده‌های دارای عوارض
+    fi = Maksulliset tiet
+    fr = Routes à péage
+    hu = Díjköteles utak
+    id = Jalan tol
+    it = Strade a pedaggio
+    ja = 有料道路
+    ko = 유로 도로
+    lt = Mokami keliai
+    mr = टोल मार्ग
+    nb = Bompengeveier
+    nl = Tolwegen
+    pl = Drogi płatne
+    pt = Estradas com portagem
+    pt-BR = Pedágios
+    ro = Drumuri cu plată
+    ru = Платные дороги
+    sk = Spoplatnené cesty
+    sv = Betalväg
+    sw = Barabara za kulipia
+    th = ถนนแบบเสียค่าผ่านทาง
+    tr = Paralı yollar
+    uk = Платні дороги
+    vi = Đường trả phí
+    zh-Hans = 收费公路
+    zh-Hant = 收費公路
 
   [avoid_unpaved]
     tags = android,ios
-    en = Avoid unpaved roads
-    ar = تجنب الطرق الترابية
-    be = Пазбягаць грунтавыя дарогі
-    bg = Избягвайте неасфалтирани пътища
-    ca = Eviteu els camins de terra
-    cs = Vyhněte se nezpevněným cestám
-    da = Undgå uasfalterede veje
-    de = Unbefestigte Straßen vermeiden
-    el = Αποφύγετε μη ασφαλτοστρωμένους δρόμους
-    es = Evitar caminos sin pavimentar
-    et = Vältige sillutamata teid
-    eu = Saihestu lurrezko bideak
-    fa = از جاده های خاکی خودداری کنید
-    fi = Vältä päällystämättömiä teitä
-    fr = Éviter les routes non pavées
-    he = הימנע מדרכי עפר
-    hu = Kerülje a burkolatlan utakat
-    id = Hindari jalan yang tidak beraspal
-    it = Evita le strade non asfaltate
-    ja = 舗装されていない道路を避ける
-    ko = 비포장 도로 피하기
-    mr = मातीचे रस्ते टाळा
-    nb = Unngå asfalterte veier
-    nl = Vermijd onverharde wegen
-    pl = Unikaj nieutwardzonych dróg
-    pt = Evitar estradas não-pavimentadas
-    pt-BR = Evitar estradas não-pavimentadas
-    ro = Evitați drumurile neasfaltate
-    ru = Избегать грунтовых дорог
-    sk = Vyhnite sa nespevneným cestám
-    sv = Undvik oasfalterade vägar
-    sw = Epuka barabara za uchafu
-    th = หลีกเลี่ยงถนนลูกรัง
-    tr = Asfaltsız yollardan kaçının
-    uk = Уникати ґрунтових доріг
-    vi = Tránh đường đất
-    zh-Hans = 避免使用未铺设路面的道路
-    zh-Hant = 避開土路
+    en = Unpaved roads
+    af = Grondpaaie
+    ar = الطرق غير المعبدة
+    be = Грунтовыя дарогі
+    bg = Неасфалтирани пътища
+    ca = Vies sense pavimentar
+    cs = Nezpevněná silnice
+    da = Grusveje
+    de = Unbefestigte Straßen
+    el = Χωματόδρομοι
+    es = Caminos sin pavimento
+    es-MX = Caminos de tierra
+    et = Katteta teed
+    eu = Asfaltatu gabeko errepideak
+    fa = جاده‌های آسفالت نشده
+    fi = Päällystämättömät tiet
+    fr = Routes non revêtues
+    hu = Burkolatlan utak
+    id = Jalan tanah
+    it = Strade non asfaltate
+    ja = 未舗装道路
+    ko = 비포장 도로
+    lt = Neasfaltuoti keliai
+    mr = कच्चे मार्ग
+    nb = Uasfaltert vei
+    nl = Onverharde wegen
+    pl = Drogi gruntowe
+    pt = Estradas não pavimentadas
+    pt-BR = Pistas sem pavimentação
+    ro = Drumuri neasfaltate
+    ru = Грунтовые дороги
+    sk = Nespevnené cesty
+    sv = Kärrväg
+    sw = Barabara za vumbi
+    th = ถนนดิน
+    tr = Asfaltsız yollar
+    uk = Ґрунтові дороги
+    vi = Đường đất
+    zh-Hans = 土路
+    zh-Hant = 土路
 
   [avoid_ferry]
     tags = android,ios
-    en = Avoid ferry crossings
-    ar = تجنب معابر العبارات
-    be = Пазбягаць паромныя пераправы
-    bg = Избягвайте преминаването с ферибот
-    ca = Eviteu les travessies en ferri
-    cs = Vyhněte se přejezdům trajektů
-    da = Undgå færgeoverfarter
-    de = Fähren vermeiden
-    el = Αποφύγετε τις διασταυρώσεις πλοίων
-    es = Evitar ferris
-    et = Vältige parvlaevade ületamist
-    eu = Saihestu ferry-pasatzeak
-    fa = از عبور کشتی ها خودداری کنید
-    fi = Vältä lauttaristeyksiä
-    fr = Éviter les traversées en ferry
-    he = הימנעו ממעברי מעבורת
-    hu = Kerülje a kompátkelést
-    id = Hindari penyeberangan feri
-    it = Evita le traversate in traghetto
-    ja = フェリー乗船を避ける
-    ko = 페리 횡단 피하기
-    mr = फेरी क्रॉसिंग टाळा
-    nb = Unngå fergeoverganger
-    nl = Vermijd overtochten met de veerboot
-    pl = Unikaj przepraw promowych
-    pt = Evitar balsas
-    pt-BR = Evitar balsas
-    ro = Evitați traversările cu feribotul
-    ru = Избегать паромных переправ
-    sk = Vyhnite sa prejazdom trajektom
-    sv = Undvik färjeöverfarter
-    sw = Epuka vivuko vya feri
-    th = หลีกเลี่ยงการข้ามเรือข้ามฟาก
-    tr = Feribot geçişlerinden kaçının
-    uk = Уникати поромних переправ
-    vi = Tránh qua phà
-    zh-Hans = 避免渡轮过境
-    zh-Hant = 避免渡口
+    en = Ferry crossings
+    af = Veerbootkruisings
+    ar = استخدام العبّارات
+    be = Паромныя пераправы
+    bg = Преходи с ферибот
+    ca = Transbordaments en ferri
+    cs = Přejezdy trajektů
+    da = Færgeoverfarter
+    de = Fährstellen
+    el = Πορθμεία
+    es = Cruces de ferri
+    es-MX = Cruces de ferri
+    et = Praamiületused
+    eu = Ferry pasabideak
+    fa = گذرگاه‌های جاده‌ای
+    fi = Lauttaliikenne
+    fr = Traversées en ferry
+    hu = Kompátkelők
+    id = Penyeberangan kapal feri
+    it = Traghetti
+    ja = フェリー航路
+    ko = 여객선 교차로
+    lt = Kelionė keltu
+    mr = जल मार्ग
+    nb = Fergeoverganger
+    nl = Veerdiensten
+    pl = Przeprawy promowe
+    pt = Ferry
+    pt-BR = Balsa
+    ro = Treceri cu bac
+    ru = Паромные переправы
+    sk = Prechody trajektom
+    sv = Färjetrafik
+    sw = Vivuko cha feri
+    th = เรือข้ามฟาก
+    tr = Feribot geçişleri
+    uk = Поромні переправи
+    vi = Bến phà
+    zh-Hans = 渡轮渡口
+    zh-Hant = 渡輪渡口
 
   [avoid_motorways]
     tags = android,ios
-    en = Avoid freeways
-    en-GB = Avoid motorways
-    ar = تجنب الطريق السريع
-    be = Пазбягаць аўтамагістралі
-    bg = Избягвайте магистралата
-    ca = Eviteu l'autopista
-    cs = Vyhněte se dálnici
-    da = Undgå motorvejen
-    de = Autobahnen vermeiden
-    el = Αποφύγετε τον αυτοκινητόδρομο
-    es = Evitar autopistas
-    et = Vältige kiirteed
-    eu = Saihestu autobidea
-    fa = از بزرگراه دوری کنید
-    fi = Vältä moottoritietä
-    fr = Éviter les autoroutes
-    he = הימנע מהכביש המהיר
-    hu = Kerülje az autópályát
-    id = Hindari jalan raya
-    it = Evita l'autostrada
-    ja = 高速道路を避ける
-    ko = 고속도로를 피하세요
-    mr = मोटरवे टाळा
-    nb = Unngå motorveien
-    nl = Vermijd de snelweg
-    pl = Unikaj autostrad
-    pt = Evitar autoestradas
-    pt-BR = Evitar rodovias
-    ro = Evitați autostrada
-    ru = Избегать автомагистралей
-    sk = Vyhnite sa diaľnici
-    sv = Undvik motorvägen
-    sw = Epuka barabara
-    th = หลีกเลี่ยงมอเตอร์เวย์
-    tr = Otoyoldan kaçının
-    uk = Уникати автострад
-    vi = Tránh xa lộ
-    zh-Hans = 避开高速公路
-    zh-Hant = 避開高速公路
+    en = Motorways
+    af = Snelweg
+    ar = الطرق السريعة
+    be = Аўтамагістралі
+    bg = Магистрали
+    ca = Autopistes
+    cs = Dálnice
+    da = Motorveje
+    de = Autobahnen
+    el = Αυτοκινητόδρομοι
+    es = Autopistas
+    es-MX = Autopistas
+    et = Kiirteed
+    eu = Autobideak
+    fa = بزرگراه‌ها
+    fi = Valtatiet
+    fr = Autoroutes
+    hu = Autópályák
+    id = Jalur motor
+    it = Autostrade
+    ja = 高速道路
+    ko = 고속도로
+    lt = Automagistralės
+    mr = महामार्ग
+    nb = Motorvei
+    nl = Autosnelwegen
+    pl = Autostrady
+    pt = Autoestradas
+    pt-BR = Autoestradas
+    ro = Autostrăzi
+    ru = Магистрали
+    sk = Diaľnice
+    sv = Motorväg
+    sw = Barabara za mwendo kasi
+    th = ทางด่วน
+    tr = Otoyollar
+    uk = Магістралі
+    vi = Đường cao tốc
+    zh-Hans = 高速公路
+    zh-Hant = 高速公路
 
   [unable_to_calc_alert_title]
     tags = android,ios
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index ce80b9216c..bdb375fa19 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -15524,7 +15524,6 @@
   [type.leisure.marina]
     en = Marina
     af = Jaghawe
-    ar = مرسى
     be = Прычал
     de = Jachthafen
     es = Marina
@@ -22574,7 +22573,6 @@
     en = RV Dealership
     en-GB = Caravan Dealership
     af = Karavaanhandelaar
-    ar = معرض سيارات التخييم
     be = Продаж аўтадамоў
     de = Wohnmobilhändler
     es = Concesionario de caravanas
@@ -23596,7 +23594,6 @@
     en = Grocery Store
     en-GB = Grocery Shop
     af = Kruidenier
-    ar = محل بقالة
     be = Бакалея
     bg = Хранителни стоки
     cs = Potraviny
diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss
index d3636ecde4..e61d92f814 100644
--- a/data/styles/clear/include/Roads_label.mapcss
+++ b/data/styles/clear/include/Roads_label.mapcss
@@ -110,15 +110,15 @@ line|z18[highway=secondary]::shield,
 line|z18[highway=residential]::shield,
 line|z18[highway=tertiary]::shield,
 {shield-font-size: 10;shield-min-distance: 300;}
-line|z19-[highway=motorway]::shield,
-line|z19-[highway=trunk]::shield,
-line|z19-[highway=motorway_link]::shield,
-line|z19-[highway=trunk_link]::shield,
-line|z19-[highway=primary]::shield,
-line|z19-[highway=primary_link]::shield,
-line|z19-[highway=secondary]::shield,
-line|z19-[highway=residential]::shield,
-line|z19-[highway=tertiary]::shield,
+line|z19[highway=motorway]::shield,
+line|z19[highway=trunk]::shield,
+line|z19[highway=motorway_link]::shield,
+line|z19[highway=trunk_link]::shield,
+line|z19[highway=primary]::shield,
+line|z19[highway=primary_link]::shield,
+line|z19[highway=secondary]::shield,
+line|z19[highway=residential]::shield,
+line|z19[highway=tertiary]::shield,
 {shield-font-size: 11;shield-min-distance: 350;}
 
 /* 3.TRUNK & MOTORWAY 10-22 ZOOM */
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 53f524e76e..2e35a7e710 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -486,6 +486,9 @@ tourism-camp_site                                   # icon z15- (also has captio
 tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 === 3800
 
+amenity-sanitary_dump_station                       # icon z15- (also has caption(optional) z15-)
+=== 3750
+
 amenity-drinking_water                              # icon z15- (also has caption(optional) z19-)
 amenity-water_point                                 # icon z15- (also has caption(optional) z19-)
 man_made-water_tap                                  # icon z15-
@@ -936,7 +939,6 @@ landuse-military                                    # icon z16- (also has captio
 landuse-military-danger_area                        # icon z16- (also has caption(optional) z17-, area z10-)
 === 2000
 
-amenity-sanitary_dump_station                       # icon z15- (also has caption(optional) z15-)
 leisure-beach_resort                                # icon z16- (also has caption(optional) z16-, area z10-)
 === 1950
 
@@ -1608,6 +1610,9 @@ amenity-parking-private                             # icon z18- (also has captio
 # tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # === -6200
 
+# amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
+# === -6250
+
 # amenity-drinking_water                            # caption(optional) z19- (also has icon z15-)
 # amenity-water_point                               # caption(optional) z19- (also has icon z15-)
 # === -6300
@@ -1888,7 +1893,6 @@ amenity-parking-private                             # icon z18- (also has captio
 # landuse-military-danger_area                      # caption(optional) z17- (also has icon z16-, area z10-)
 # === -8000
 
-# amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
 # leisure-beach_resort                              # caption(optional) z16- (also has icon z16-, area z10-)
 # === -8050
 
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index cba8f42af9..f776428aac 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -532,16 +532,16 @@ node|z18[building],
 area|z18[building]::int_name,
 node|z18[building]::int_name,
 {font-size: 12;}
-area|z19-[building],
-node|z19-[building],
+area|z19[building],
+node|z19[building],
 {font-size: 14;}
-area|z19-[building]::int_name,
-node|z19-[building]::int_name,
+area|z19[building]::int_name,
+node|z19[building]::int_name,
 {font-size: 13;}
 
 node|z18[addr:housenumber][addr:street],
 {font-size: 13;}
-node|z19-[addr:housenumber][addr:street],
+node|z19[addr:housenumber][addr:street],
 {font-size: 14;}
 node|z18-[addr:housenumber][addr:street]::int_name,
 {font-size: 12;}
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 8a2e6f42c4..d3f787fa6d 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -483,14 +483,14 @@ node|z18[amenity=fast_food],
 area|z18[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 14.5;}
 
-node|z19-[amenity=cafe],
-area|z19-[amenity=cafe]
+node|z19[amenity=cafe],
+area|z19[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 35;font-size: 14.5;}
-node|z19-[amenity=restaurant],
-area|z19-[amenity=restaurant]
+node|z19[amenity=restaurant],
+area|z19[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 40;font-size: 14.5;}
-node|z19-[amenity=fast_food],
-area|z19-[amenity=fast_food]
+node|z19[amenity=fast_food],
+area|z19[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 45;font-size: 14.5;}
 
 
@@ -552,8 +552,8 @@ area|z17[amenity=university][name]
 node|z18[amenity=university][name],
 area|z18[amenity=university][name]
 {icon-min-distance: 10;font-size: 14.5;}
-node|z19-[amenity=university][name],
-area|z19-[amenity=university][name]
+node|z19[amenity=university][name],
+area|z19[amenity=university][name]
 {icon-min-distance: 0; font-size: 14.5;}
 
 node|z15-[amenity=university][!name]
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index 559039e03b..8d8d117b03 100644
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -953,8 +953,8 @@ line|z17[railway=light_rail][!tunnel],
 line|z18[railway=subway][!tunnel],
 line|z18[railway=light_rail][!tunnel],
 {width: 4.2;}
-line|z19-[railway=subway][!tunnel],
-line|z19-[railway=light_rail][!tunnel],
+line|z19[railway=subway][!tunnel],
+line|z19[railway=light_rail][!tunnel],
 {width: 5.8;}
 
 line|z16[railway=subway][!tunnel]::dash,
@@ -966,8 +966,8 @@ line|z17[railway=light_rail][!tunnel]::dash,
 line|z18[railway=subway][!tunnel]::dash,
 line|z18[railway=light_rail][!tunnel]::dash,
 {width: 3.3;dashes: 8.1,8.1;}
-line|z19-[railway=subway][!tunnel]::dash,
-line|z19-[railway=light_rail][!tunnel]::dash,
+line|z19[railway=subway][!tunnel]::dash,
+line|z19[railway=light_rail][!tunnel]::dash,
 {width: 5;dashes: 10.1,10.1;}
 
 
diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss
index ff57bb87e7..2f1029884a 100644
--- a/data/styles/vehicle/include/Roads_label.mapcss
+++ b/data/styles/vehicle/include/Roads_label.mapcss
@@ -117,15 +117,15 @@ line|z18[highway=secondary]::shield,
 line|z18[highway=residential]::shield,
 line|z18[highway=tertiary]::shield,
 {shield-font-size: 10;shield-min-distance: 350;}
-line|z19-[highway=motorway]::shield,
-line|z19-[highway=trunk]::shield,
-line|z19-[highway=motorway_link]::shield,
-line|z19-[highway=trunk_link]::shield,
-line|z19-[highway=primary]::shield,
-line|z19-[highway=primary_link]::shield,
-line|z19-[highway=secondary]::shield,
-line|z19-[highway=residential]::shield,
-line|z19-[highway=tertiary]::shield,
+line|z19[highway=motorway]::shield,
+line|z19[highway=trunk]::shield,
+line|z19[highway=motorway_link]::shield,
+line|z19[highway=trunk_link]::shield,
+line|z19[highway=primary]::shield,
+line|z19[highway=primary_link]::shield,
+line|z19[highway=secondary]::shield,
+line|z19[highway=residential]::shield,
+line|z19[highway=tertiary]::shield,
 {shield-font-size: 11;shield-min-distance: 350;}
 
 /* 3.TRUNK & MOTORWAY 10-22 ZOOM */
diff --git a/drape/visual_scale.hpp b/drape/visual_scale.hpp
index 1b559ff523..68518196ab 100644
--- a/drape/visual_scale.hpp
+++ b/drape/visual_scale.hpp
@@ -1,17 +1,17 @@
 #pragma once
-#include "platform/platform.hpp"
 
 namespace dp
 {
-/// This fuction is called in iOS/Android native code.
 inline double VisualScale(double exactDensityDPI)
 {
+  double constexpr kMdpiDensityDPI = 160.;
+  double const tabletFactor = 1.2;
   // In case of tablets and iPads increased DPI is used to make visual scale bigger.
   if (GetPlatform().IsTablet())
-    exactDensityDPI *= 1.2;
+    exactDensityDPI *= tabletFactor;
 
-  // For some old devices (for example iPad 2) the density could be less than 160 DPI (mdpi).
+  // For some old devices (for example iPad 2) the density could be less than 160 DPI.
   // Returns one in that case to keep readable text on the map.
-  return std::max(1.35, exactDensityDPI / 160.0);
+  return std::max(1.35, exactDensityDPI / kMdpiDensityDPI);
 }
 } //  namespace dp
diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp
index 448f7441e7..54878dfb2f 100644
--- a/drape_frontend/drape_engine.cpp
+++ b/drape_frontend/drape_engine.cpp
@@ -31,7 +31,7 @@ DrapeEngine::DrapeEngine(Params && params)
 
   VisualParams::Init(params.m_vs, df::CalculateTileSize(m_viewport.GetWidth(), m_viewport.GetHeight()));
 
-  SetFontScaleFactor(params.m_fontsScaleFactor);
+  df::VisualParams::Instance().SetFontScale(params.m_fontsScaleFactor);
 
   gui::DrapeGui::Instance().SetSurfaceSize(m2::PointF(m_viewport.GetWidth(), m_viewport.GetHeight()));
 
@@ -839,6 +839,11 @@ void DrapeEngine::EnableIsolines(bool enable)
 
 void DrapeEngine::SetFontScaleFactor(double scaleFactor)
 {
+  double const kMinScaleFactor = 0.5;
+  double const kMaxScaleFactor = 2.0;
+
+  scaleFactor = base::Clamp(scaleFactor, kMinScaleFactor, kMaxScaleFactor);
+
   VisualParams::Instance().SetFontScale(scaleFactor);
 }
 
diff --git a/drape_frontend/kinetic_scroller.cpp b/drape_frontend/kinetic_scroller.cpp
index fc5de5bf83..cb46a97283 100644
--- a/drape_frontend/kinetic_scroller.cpp
+++ b/drape_frontend/kinetic_scroller.cpp
@@ -1,25 +1,27 @@
 #include "kinetic_scroller.hpp"
 #include "visual_params.hpp"
 
+#include "indexer/scales.hpp"
+
+#include "base/logging.hpp"
+
 #include <algorithm>
 
 namespace df
 {
-double constexpr kKineticDuration = 1.5;
-double constexpr kKineticFadeoff = 4.0;
-double constexpr kKineticAcceleration = 0.4;
-
-/// @name Generic pixels per second. Should multiply on visual scale.
-/// @{
-double constexpr kKineticMaxSpeedStart = 1000.0;
-double constexpr kKineticMaxSpeedEnd = 5000.0;
-double constexpr kInstantVelocityThreshold = 200.0;
-/// @}
+double const kKineticDuration = 1.5;
+double const kKineticFadeoff = 4.0;
+double const kKineticThreshold = 50.0;
+double const kKineticAcceleration = 0.4;
+double const kKineticMaxSpeedStart = 1000.0; // pixels per second
+double const kKineticMaxSpeedEnd = 10000.0; // pixels per second
+double const kInstantVelocityThresholdUnscaled = 200.0; // pixels per second
 
 double CalculateKineticMaxSpeed(ScreenBase const & modelView)
 {
   double const lerpCoef = 1.0 - GetNormalizedZoomLevel(modelView.GetScale());
-  return kKineticMaxSpeedStart * lerpCoef + kKineticMaxSpeedEnd * (1.0 - lerpCoef);
+  return (kKineticMaxSpeedStart * lerpCoef + kKineticMaxSpeedEnd * (1.0 - lerpCoef)) *
+         VisualParams::Instance().GetVisualScale();
 }
 
 class KineticScrollAnimation : public Animation
@@ -120,32 +122,25 @@ void KineticScroller::Init(ScreenBase const & modelView)
 {
   ASSERT(!m_isActive, ());
   m_isActive = true;
-
-  m_points.clear();
-  m_points.emplace_back(modelView.GlobalRect().Center(), ClockT::now());
+  m_lastRect = modelView.GlobalRect();
+  m_lastTimestamp = std::chrono::steady_clock::now();
+  m_updatePosition = modelView.GlobalRect().GlobalCenter();
+  m_updateTimestamp = m_lastTimestamp;
 }
 
 void KineticScroller::Update(ScreenBase const & modelView)
 {
   ASSERT(m_isActive, ());
+  using namespace std::chrono;
+  auto const nowTimestamp = std::chrono::steady_clock::now();
+  auto const curPos = modelView.GlobalRect().GlobalCenter();
 
-  auto const nowTime = ClockT::now();
-  if (m_points.size() > 1)
-  {
-    // Time window to store move points for better (smooth) _instant_ velocity calculation.
-    double constexpr kTimeWindowSec = 0.03;
-    auto it = std::find_if(m_points.begin(), m_points.end(), [&nowTime](auto const & e)
-    {
-      return GetDurationSeconds(nowTime, e.second) <= kTimeWindowSec;
-    });
+  double const instantPixelLen = (modelView.GtoP(curPos) - modelView.GtoP(m_updatePosition)).Length();
+  auto const updateElapsed = duration_cast<duration<double>>(nowTimestamp - m_updateTimestamp).count();
+  m_instantVelocity = (updateElapsed >= 1e-5) ? instantPixelLen / updateElapsed : 0.0;
 
-    // Keep last point always.
-    if (it == m_points.end())
-      --it;
-    m_points.erase(m_points.begin(), it);
-  }
-
-  m_points.emplace_back(modelView.GlobalRect().Center(), nowTime);
+  m_updateTimestamp = nowTimestamp;
+  m_updatePosition = curPos;
 }
 
 bool KineticScroller::IsActive() const
@@ -153,33 +148,31 @@ bool KineticScroller::IsActive() const
   return m_isActive;
 }
 
-// Calculate direction in mercator space, and velocity in pixel space.
-// We need the same reaction on different zoom levels, and should calculate velocity on pixel space.
-std::pair<m2::PointD, double> KineticScroller::GetDirectionAndVelocity(ScreenBase const & modelView) const
+m2::PointD KineticScroller::GetDirection(ScreenBase const & modelView) const
 {
+  // In KineticScroller we store m_direction in mixed state.
+  // Direction in mercator space, and length(m_direction) in pixel space.
+  // We need same reaction on different zoom levels, and should calculate velocity on pixel space.
   ASSERT(m_isActive, ());
-  ASSERT(!m_points.empty(), ());
-
-  // Or take m_points.back() ?
+  using namespace std::chrono;
+  auto const nowTimestamp = steady_clock::now();
+  auto const elapsed = duration_cast<duration<double>>(nowTimestamp - m_lastTimestamp).count();
   m2::PointD const currentCenter = modelView.GlobalRect().GlobalCenter();
 
-  double const lengthPixel = (modelView.GtoP(currentCenter) - modelView.GtoP(m_points.front().first)).Length();
-  double const elapsedSec = GetDurationSeconds(ClockT::now(), m_points.front().second);
-  if (elapsedSec < 1E-6)
-    return {{}, 0};
+  m2::PointD const lastCenter = m_lastRect.GlobalCenter();
+  double const pxDeltaLength = (modelView.GtoP(currentCenter) - modelView.GtoP(lastCenter)).Length();
+  m2::PointD delta = currentCenter - lastCenter;
+  if (!delta.IsAlmostZero())
+  {
+    delta = delta.Normalize();
 
-  double const vs = VisualParams::Instance().GetVisualScale();
+    // Velocity on pixels.
+    double const v = std::min(pxDeltaLength / elapsed, CalculateKineticMaxSpeed(modelView));
 
-  // Most touch filtrations happen here.
-  double const velocity = lengthPixel / elapsedSec;
-  if (velocity < kInstantVelocityThreshold * vs)
-    return {{}, 0};
-
-  m2::PointD const delta = currentCenter - m_points.front().first;
-  if (delta.IsAlmostZero())
-    return {{}, 0};
-
-  return {delta.Normalize(), std::min(velocity, CalculateKineticMaxSpeed(modelView) * vs)};
+    // At this point length(m_direction) already in pixel space, and delta normalized.
+    return delta * v;
+  }
+  return m2::PointD::Zero();
 }
 
 void KineticScroller::Cancel()
@@ -189,20 +182,30 @@ void KineticScroller::Cancel()
 
 drape_ptr<Animation> KineticScroller::CreateKineticAnimation(ScreenBase const & modelView)
 {
-  auto const [dir, velocity] = GetDirectionAndVelocity(modelView);
-  // Cancel current animation in any case.
-  Cancel();
-  if (velocity < 1E-6)
-    return {};
+  static double vs = VisualParams::Instance().GetVisualScale();
+  static double kVelocityThreshold = kKineticThreshold * vs;
+  static double kInstantVelocityThreshold = kInstantVelocityThresholdUnscaled * vs;
 
-  // Before we start animation we have to convert velocity vector from pixel space to mercator space.
+  if (m_instantVelocity < kInstantVelocityThreshold)
+  {
+    Cancel();
+    return drape_ptr<Animation>();
+  }
+
+  auto const direction = GetDirection(modelView);
+  Cancel();
+
+  if (direction.Length() < kVelocityThreshold)
+    return drape_ptr<Animation>();
+
+  // Before we start animation we have to convert length(m_direction) from pixel space to mercator space.
   m2::PointD const center = modelView.GlobalRect().GlobalCenter();
-  double const offset = (modelView.PtoG(modelView.GtoP(center) + dir * velocity) - center).Length();
+  double const offset = (modelView.PtoG(modelView.GtoP(center) + direction) - center).Length();
   double const glbLength = kKineticAcceleration * offset;
-  m2::PointD const glbDirection = dir * glbLength;
+  m2::PointD const glbDirection = direction.Normalize() * glbLength;
   m2::PointD const targetCenter = center + glbDirection;
   if (!df::GetWorldRect().IsPointInside(targetCenter))
-    return {};
+    return drape_ptr<Animation>();
 
   return make_unique_dp<KineticScrollAnimation>(center, glbDirection, kKineticDuration);
 }
diff --git a/drape_frontend/kinetic_scroller.hpp b/drape_frontend/kinetic_scroller.hpp
index 4ca944e420..d3950a7870 100644
--- a/drape_frontend/kinetic_scroller.hpp
+++ b/drape_frontend/kinetic_scroller.hpp
@@ -4,8 +4,9 @@
 
 #include "drape/pointers.hpp"
 
+#include "geometry/any_rect2d.hpp"
+
 #include <chrono>
-#include <deque>
 
 namespace df
 {
@@ -19,15 +20,13 @@ public:
   drape_ptr<Animation> CreateKineticAnimation(ScreenBase const & modelView);
 
 private:
-  std::pair<m2::PointD, double> GetDirectionAndVelocity(ScreenBase const & modelView) const;
+  m2::PointD GetDirection(ScreenBase const & modelView) const;
 
-  using ClockT = std::chrono::steady_clock;
-  static double GetDurationSeconds(ClockT::time_point const & t2, ClockT::time_point const & t1)
-  {
-    return std::chrono::duration_cast<std::chrono::duration<double>>(t2 - t1).count();
-  }
-
-  std::deque<std::pair<m2::PointD, ClockT::time_point>> m_points;
+  std::chrono::steady_clock::time_point m_lastTimestamp;
+  std::chrono::steady_clock::time_point m_updateTimestamp;
   bool m_isActive = false;
+  m2::AnyRectD m_lastRect;
+  m2::PointD m_updatePosition;
+  double m_instantVelocity = 0.0;
 };
 }  // namespace df
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 96416b895f..96f97a7600 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -66,6 +66,7 @@ char const * UserEventStream::DOUBLE_TAP_AND_HOLD = "DoubleTapAndHold";
 char const * UserEventStream::END_DOUBLE_TAP_AND_HOLD = "EndDoubleTapAndHold";
 #endif
 
+uint8_t constexpr TouchEvent::INVALID_MASKED_POINTER = 0xFF;
 
 void TouchEvent::SetFirstTouch(const Touch & touch)
 {
@@ -128,17 +129,6 @@ void TouchEvent::Swap()
   SetSecondMaskedPointer(swapIndex(GetSecondMaskedPointer()));
 }
 
-std::string DebugPrint(Touch const & t)
-{
-  return DebugPrint(t.m_location) + "; " + std::to_string(t.m_id) + "; " + std::to_string(t.m_force);
-}
-
-std::string DebugPrint(TouchEvent const & e)
-{
-  return std::to_string(e.m_type) + "; { " + DebugPrint(e.m_touches[0]) + " }";
-}
-
-
 UserEventStream::UserEventStream()
   : m_state(STATE_EMPTY)
   , m_animationSystem(AnimationSystem::Instance())
diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp
index fa26dda21d..1f4172088f 100644
--- a/drape_frontend/user_event_stream.hpp
+++ b/drape_frontend/user_event_stream.hpp
@@ -54,8 +54,6 @@ struct Touch
   m2::PointF m_location = m2::PointF::Zero();
   int64_t m_id = -1; // if id == -1 then touch is invalid
   float m_force = 0.0; // relative force of touch [0.0 - 1.0]
-
-  friend std::string DebugPrint(Touch const & t);
 };
 
 class TouchEvent : public UserEvent
@@ -75,7 +73,7 @@ public:
     TOUCH_CANCEL
   };
 
-  static uint8_t constexpr INVALID_MASKED_POINTER = 0xFF;
+  static uint8_t const INVALID_MASKED_POINTER;
 
   EventType GetType() const override { return UserEvent::EventType::Touch; }
 
@@ -108,8 +106,6 @@ public:
   uint8_t GetSecondMaskedPointer() const;
   size_t GetMaskedCount();
 
-  friend std::string DebugPrint(TouchEvent const & e);
-
 private:
   void Swap();
 
@@ -334,7 +330,7 @@ private:
 class RotateEvent : public UserEvent
 {
 public:
-  RotateEvent(double targetAzimuth, bool isAnim, TAnimationCreator const & parallelAnimCreator)
+  explicit RotateEvent(double targetAzimuth, bool isAnim, TAnimationCreator const & parallelAnimCreator)
     : m_targetAzimuth(targetAzimuth)
     , m_isAnim(isAnim)
     , m_parallelAnimCreator(parallelAnimCreator)
@@ -385,18 +381,19 @@ private:
 class ScrollEvent : public UserEvent
 {
 public:
-  ScrollEvent(double distanceX, double distanceY)
-    : m_distanceX(distanceX), m_distanceY(distanceY)
-  {}
+    ScrollEvent(double distanceX, double distanceY)
+              : m_distanceX(distanceX)
+              , m_distanceY(distanceY)
+    {}
 
-  EventType GetType() const override { return UserEvent::EventType::Scroll; }
+    EventType GetType() const override { return UserEvent::EventType::Scroll; }
 
-  double GetDistanceX() const { return m_distanceX; }
-  double GetDistanceY() const { return m_distanceY; }
+    double GetDistanceX() const { return m_distanceX; }
+    double GetDistanceY() const { return m_distanceY; }
 
 private:
-  double m_distanceX;
-  double m_distanceY;
+    double m_distanceX;
+    double m_distanceY;
 };
 
 class UserEventStream
diff --git a/drape_frontend/visual_params.cpp b/drape_frontend/visual_params.cpp
index 97933d4377..6fb6419a60 100644
--- a/drape_frontend/visual_params.cpp
+++ b/drape_frontend/visual_params.cpp
@@ -55,6 +55,8 @@ void VisualParams::Init(double vs, uint32_t tileSize)
   vizParams.m_tileSize = tileSize;
   vizParams.m_visualScale = vs;
 
+  LOG(LINFO, ("Visual scale =", vs, "; Tile size =", tileSize));
+
   // Here we set up glyphs rendering parameters separately for high-res and low-res screens.
   if (vs <= 1.0)
     vizParams.m_glyphVisualParams = { 0.48f, 0.08f, 0.2f, 0.01f, 0.49f, 0.04f };
@@ -62,8 +64,6 @@ void VisualParams::Init(double vs, uint32_t tileSize)
     vizParams.m_glyphVisualParams = { 0.5f, 0.06f, 0.2f, 0.01f, 0.49f, 0.04f };
 
   RISE_INITED;
-
-  LOG(LINFO, ("Visual scale =", vs, "; Tile size =", tileSize, "; Resources =", GetResourcePostfix(vs)));
 }
 
 uint32_t VisualParams::GetGlyphSdfScale() const
@@ -93,7 +93,7 @@ double VisualParams::GetFontScale() const
 void VisualParams::SetFontScale(double fontScale)
 {
   ASSERT_INITED;
-  m_fontScale = base::Clamp(fontScale, 0.5, 2.0);
+  m_fontScale = fontScale;
 }
 
 void VisualParams::SetVisualScale(double visualScale)
@@ -110,9 +110,7 @@ std::string const & VisualParams::GetResourcePostfix(double visualScale)
   ASSERT_INITED;
   static VisualScale postfixes[] =
   {
-    /// @todo Not used in mobile because of minimal visual scale (@see visual_scale.hpp)
     {"mdpi", kMdpiScale},
-
     {"hdpi", kHdpiScale},
     {"xhdpi", kXhdpiScale},
     {"6plus", k6plusScale},
@@ -188,9 +186,10 @@ VisualParams::GlyphVisualParams const & VisualParams::GetGlyphVisualParams() con
   return m_glyphVisualParams;
 }
 
-m2::RectD GetWorldRect()
+m2::RectD const & GetWorldRect()
 {
-  return mercator::Bounds::FullRect();
+  static m2::RectD const worldRect = mercator::Bounds::FullRect();
+  return worldRect;
 }
 
 int GetTileScaleBase(ScreenBase const & s, uint32_t tileSize)
@@ -217,7 +216,6 @@ int GetTileScaleBase(ScreenBase const & s)
 int GetTileScaleBase(m2::RectD const & r)
 {
   double const sz = std::max(r.SizeX(), r.SizeY());
-  ASSERT_GREATER(sz, 0., ("Rect should not be a point:", r));
   return std::max(1, base::SignedRound(std::log2(mercator::Bounds::kRangeX / sz)));
 }
 
diff --git a/drape_frontend/visual_params.hpp b/drape_frontend/visual_params.hpp
index 2f0089b418..5a4260c7f6 100644
--- a/drape_frontend/visual_params.hpp
+++ b/drape_frontend/visual_params.hpp
@@ -75,7 +75,7 @@ private:
   DISALLOW_COPY_AND_MOVE(VisualParams);
 };
 
-m2::RectD GetWorldRect();
+m2::RectD const & GetWorldRect();
 
 int GetTileScaleBase(ScreenBase const & s, uint32_t tileSize);
 int GetTileScaleBase(ScreenBase const & s);
diff --git a/indexer/scales.hpp b/indexer/scales.hpp
index ca0ca85813..52cdec87bb 100644
--- a/indexer/scales.hpp
+++ b/indexer/scales.hpp
@@ -29,7 +29,7 @@ namespace scales
   /// Default scale in adding-new-place mode.
   constexpr int GetAddNewPlaceScale() { return 18; }
   /// Lower scale when standalone point housenumbers (of building-address type) become visible.
-  constexpr int GetPointHousenumbersScale() { return 17; }
+  constexpr int GetPointHousenumbersScale() { return 18; }
 
   int GetMinAllowableIn3dScale();
 
diff --git a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
index 427c348d15..f8afa160a0 100644
--- a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
+++ b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
@@ -54,28 +54,9 @@
     return false
   }
 
-  // Hacky check if it's ge0 style link.
-  private func isGe0Link(url: URL) -> Bool {
-    if url.query != nil {
-      return false;
-    }
-    switch (url.path) {
-    case "map": fallthrough
-    case "search": fallthrough
-    case "route": fallthrough
-    case "crosshair": return false
-
-    default: return true
-    }
-  }
-  
   private func handleDeepLink(url: URL) -> Bool {
     LOG(.info, "handleDeepLink: \(url)")
 
-    // TODO(AB): Rewrite API so iOS and Android will call only one C++ method to clear/set API state.
-    // This call is also required for DeepLinkParser.showMap, and it also clears old API points...
-    let dlData = DeepLinkParser.parseAndSetApiURL(url)
-
     switch url.scheme {
       // Process old Maps.Me url schemes.
       case "geo", "ge0":
@@ -88,20 +69,16 @@
         DeepLinkParser.addBookmarksFile(url)
         return true  // We don't really know if async parsing was successful.
       case  "om":
-        // TODO(AB): DeepLinkParser.showMap uses points that are reset in DeepLinkParser.parseAndSetApiURL.
-        // Need a complete rewrite if API parsing and processing logic, now use a crude check for omaps.app style urls.
         // It could be either a renamed ge0 link...
-        if isGe0Link(url: url) {
-          if DeepLinkParser.showMap(for: url) {
-            MapsAppDelegate.theApp().showMap()
-            return true
-          }
-          return false
+        if DeepLinkParser.showMap(for: url) {
+          MapsAppDelegate.theApp().showMap()
+          return true
         }
         // ...or an API scheme.
         fallthrough
       // API scheme.
       case "mapswithme", "mapsme", "mwm":
+        let dlData = DeepLinkParser.parseAndSetApiURL(url)
         guard dlData.success else { return false }
 
         switch dlData.urlType {
diff --git a/iphone/Maps/Core/Theme/Renderers/UITableViewHeaderFooterViewRenderer.swift b/iphone/Maps/Core/Theme/Renderers/UITableViewHeaderFooterViewRenderer.swift
index 16e6bcea74..ed7a49cf6f 100644
--- a/iphone/Maps/Core/Theme/Renderers/UITableViewHeaderFooterViewRenderer.swift
+++ b/iphone/Maps/Core/Theme/Renderers/UITableViewHeaderFooterViewRenderer.swift
@@ -15,6 +15,9 @@ class UITableViewHeaderFooterViewRenderer {
     if let backgroundColor = style.backgroundColor {
       control.backgroundView = UIImageView(image: backgroundColor.getImage())
     }
+    if let font = style.font {
+      control.textLabel?.font = font
+    }
     if let fontColor = style.fontColor {
       control.textLabel?.textColor = fontColor
     }
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 72e57a3ed4..35a4b04acf 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "خيارات رسم المسار";
 
-"avoid_tolls" = "تجنب الطرق ذات الرسوم";
+"driving_options_subheader" = "تجنبها على جميع الطرق";
 
-"avoid_unpaved" = "تجنب الطرق الترابية";
+"avoid_tolls" = "الطرق ذات الرسوم";
 
-"avoid_ferry" = "تجنب معابر العبارات";
+"avoid_unpaved" = "الطرق غير المعبدة";
 
-"avoid_motorways" = "تجنب الطريق السريع";
+"avoid_ferry" = "استخدام العبّارات";
+
+"avoid_motorways" = "الطرق السريعة";
 
 "unable_to_calc_alert_title" = "لا يمكن حساب الطريق";
 
@@ -2484,7 +2486,7 @@
 
 "type.leisure.landscape_reserve" = "Landscape Reserve";
 
-"type.leisure.marina" = "مرسى";
+"type.leisure.marina" = "Marina";
 
 "type.leisure.nature_reserve" = "محمية طبيعية";
 
@@ -3411,7 +3413,7 @@
 
 "type.shop.car_repair.tyres" = "إصلاح إطارات";
 
-"type.shop.caravan" = "معرض سيارات التخييم";
+"type.shop.caravan" = "RV Dealership";
 
 "type.shop.carpet" = "متجر سجادات";
 
@@ -3467,7 +3469,7 @@
 
 "type.shop.greengrocer" = "محل خضار";
 
-"type.shop.grocery" = "محل بقالة";
+"type.shop.grocery" = "Grocery Store";
 
 "type.shop.hairdresser" = "حلاق";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 18a95ee0c9..8d55551215 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Налады пракладкі маршрута";
 
-"avoid_tolls" = "Пазбягаць платныя дарогі";
+"driving_options_subheader" = "Пазбягаць на кожным маршруце";
 
-"avoid_unpaved" = "Пазбягаць грунтавыя дарогі";
+"avoid_tolls" = "Платныя дарогі";
 
-"avoid_ferry" = "Пазбягаць паромныя пераправы";
+"avoid_unpaved" = "Грунтовыя дарогі";
 
-"avoid_motorways" = "Пазбягаць аўтамагістралі";
+"avoid_ferry" = "Паромныя пераправы";
+
+"avoid_motorways" = "Аўтамагістралі";
 
 "unable_to_calc_alert_title" = "Не атрымалася пракласці маршрут";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 5f3a0aecab..ba7a712fe3 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Опции за маршрутизация";
 
-"avoid_tolls" = "Избягвайте платените пътища";
+"driving_options_subheader" = "Избягване при всеки маршрут";
 
-"avoid_unpaved" = "Избягвайте неасфалтирани пътища";
+"avoid_tolls" = "Платени пътища";
 
-"avoid_ferry" = "Избягвайте преминаването с ферибот";
+"avoid_unpaved" = "Неасфалтирани пътища";
 
-"avoid_motorways" = "Избягвайте магистралата";
+"avoid_ferry" = "Преходи с ферибот";
+
+"avoid_motorways" = "Магистрали";
 
 "unable_to_calc_alert_title" = "Не е възможнос изчисляване на маршрут";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 4546e230e2..e5b688b164 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Opcions de la ruta";
 
-"avoid_tolls" = "Eviteu les autopistes de peatge";
+"driving_options_subheader" = "Evita-ho en totes les rutes";
 
-"avoid_unpaved" = "Eviteu els camins de terra";
+"avoid_tolls" = "Vies de peatge";
 
-"avoid_ferry" = "Eviteu les travessies en ferri";
+"avoid_unpaved" = "Vies sense pavimentar";
 
-"avoid_motorways" = "Eviteu l'autopista";
+"avoid_ferry" = "Transbordaments en ferri";
+
+"avoid_motorways" = "Autopistes";
 
 "unable_to_calc_alert_title" = "No s'ha pogut calcular la ruta";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 32e7705de1..48aa25ef1f 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Možnosti trasy";
 
-"avoid_tolls" = "Vyhněte se zpoplatněným silnicím";
+"driving_options_subheader" = "Vyhněte se na každé trase";
 
-"avoid_unpaved" = "Vyhněte se nezpevněným cestám";
+"avoid_tolls" = "Silnice s mýtným";
 
-"avoid_ferry" = "Vyhněte se přejezdům trajektů";
+"avoid_unpaved" = "Nezpevněná silnice";
 
-"avoid_motorways" = "Vyhněte se dálnici";
+"avoid_ferry" = "Přejezdy trajektů";
+
+"avoid_motorways" = "Dálnice";
 
 "unable_to_calc_alert_title" = "Nelze vypočítat trasu";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index cc1069f758..30176edd7f 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Køre muligheder";
 
-"avoid_tolls" = "Undgå betalingsveje";
+"driving_options_subheader" = "Undgå på enhver rute";
 
-"avoid_unpaved" = "Undgå uasfalterede veje";
+"avoid_tolls" = "Betalingsveje";
 
-"avoid_ferry" = "Undgå færgeoverfarter";
+"avoid_unpaved" = "Grusveje";
 
-"avoid_motorways" = "Undgå motorvejen";
+"avoid_ferry" = "Færgeoverfarter";
+
+"avoid_motorways" = "Motorveje";
 
 "unable_to_calc_alert_title" = "Det er ikke muligt at beregne rute";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 29d77dc2d6..464a805dfc 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Routenbeschränkungen";
 
-"avoid_tolls" = "Mautstraßen vermeiden";
+"driving_options_subheader" = "In jeder Reiseroute vermeiden";
 
-"avoid_unpaved" = "Unbefestigte Straßen vermeiden";
+"avoid_tolls" = "Mautstraßen";
 
-"avoid_ferry" = "Fähren vermeiden";
+"avoid_unpaved" = "Unbefestigte Straßen";
 
-"avoid_motorways" = "Autobahnen vermeiden";
+"avoid_ferry" = "Fährstellen";
+
+"avoid_motorways" = "Autobahnen";
 
 "unable_to_calc_alert_title" = "Route kann nicht berechnet werden";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index c490218365..5dcd2915d0 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Ρυθμίσεις παράκαμψης";
 
-"avoid_tolls" = "Αποφύγετε τους δρόμους με διόδια";
+"driving_options_subheader" = "Αποφυγή σε κάθε διαδρομή";
 
-"avoid_unpaved" = "Αποφύγετε μη ασφαλτοστρωμένους δρόμους";
+"avoid_tolls" = "Δρόμοι με διόδια";
 
-"avoid_ferry" = "Αποφύγετε τις διασταυρώσεις πλοίων";
+"avoid_unpaved" = "Χωματόδρομοι";
 
-"avoid_motorways" = "Αποφύγετε τον αυτοκινητόδρομο";
+"avoid_ferry" = "Πορθμεία";
+
+"avoid_motorways" = "Αυτοκινητόδρομοι";
 
 "unable_to_calc_alert_title" = "Δεν είναι δυνατή η δημιουργία διαδρομής";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 483d5e0d28..5d5d26bae5 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Routing options";
 
-"avoid_tolls" = "Avoid tolls";
+"driving_options_subheader" = "Avoid on every route";
 
-"avoid_unpaved" = "Avoid unpaved roads";
+"avoid_tolls" = "Toll roads";
 
-"avoid_ferry" = "Avoid ferry crossings";
+"avoid_unpaved" = "Unpaved roads";
 
-"avoid_motorways" = "Avoid motorways";
+"avoid_ferry" = "Ferry crossings";
+
+"avoid_motorways" = "Motorways";
 
 "unable_to_calc_alert_title" = "Unable to calculate route";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 017cbce24d..82b0565442 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Routing options";
 
-"avoid_tolls" = "Avoid tolls";
+"driving_options_subheader" = "Avoid on every route";
 
-"avoid_unpaved" = "Avoid unpaved roads";
+"avoid_tolls" = "Toll roads";
 
-"avoid_ferry" = "Avoid ferry crossings";
+"avoid_unpaved" = "Unpaved roads";
 
-"avoid_motorways" = "Avoid freeways";
+"avoid_ferry" = "Ferry crossings";
+
+"avoid_motorways" = "Motorways";
 
 "unable_to_calc_alert_title" = "Unable to calculate route";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 593fd3727b..73361012d1 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Ajustes de desvío";
 
-"avoid_tolls" = "Evitar peajes";
+"driving_options_subheader" = "Evitar en cada ruta";
 
-"avoid_unpaved" = "Evitar caminos sin pavimentar";
+"avoid_tolls" = "Carreteras de peaje";
 
-"avoid_ferry" = "Evitar ferris";
+"avoid_unpaved" = "Caminos de tierra";
 
-"avoid_motorways" = "Evitar autopistas";
+"avoid_ferry" = "Cruces de ferri";
+
+"avoid_motorways" = "Autopistas";
 
 "unable_to_calc_alert_title" = "No se puede construir una ruta";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index ce3bd81867..041076c633 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Opciones de enrutamiento";
 
-"avoid_tolls" = "Evitar peajes";
+"driving_options_subheader" = "Evitar en todas las rutas";
 
-"avoid_unpaved" = "Evitar caminos sin pavimentar";
+"avoid_tolls" = "Carreteras de pago";
 
-"avoid_ferry" = "Evitar ferris";
+"avoid_unpaved" = "Caminos sin pavimento";
 
-"avoid_motorways" = "Evitar autopistas";
+"avoid_ferry" = "Cruces de ferri";
+
+"avoid_motorways" = "Autopistas";
 
 "unable_to_calc_alert_title" = "No se puede calcular la ruta";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 7931c87442..3b3d4fba93 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Marsruutimise valikud";
 
-"avoid_tolls" = "Vältige tasulisi teid";
+"driving_options_subheader" = "Väldi igal marsruudil";
 
-"avoid_unpaved" = "Vältige sillutamata teid";
+"avoid_tolls" = "Tasulised teed";
 
-"avoid_ferry" = "Vältige parvlaevade ületamist";
+"avoid_unpaved" = "Katteta teed";
 
-"avoid_motorways" = "Vältige kiirteed";
+"avoid_ferry" = "Praamiületused";
+
+"avoid_motorways" = "Kiirteed";
 
 "unable_to_calc_alert_title" = "Marsruudi arvutamine ei õnnestu";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 6466f3c8ac..dadacebb91 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Bideratzeko aukerak";
 
-"avoid_tolls" = "Saihestu ordainpeko errepideak";
+"driving_options_subheader" = "Ibilbide guztietan saihestu";
 
-"avoid_unpaved" = "Saihestu lurrezko bideak";
+"avoid_tolls" = "Ordainpeko errepideak";
 
-"avoid_ferry" = "Saihestu ferry-pasatzeak";
+"avoid_unpaved" = "Asfaltatu gabeko errepideak";
 
-"avoid_motorways" = "Saihestu autobidea";
+"avoid_ferry" = "Ferry pasabideak";
+
+"avoid_motorways" = "Autobideak";
 
 "unable_to_calc_alert_title" = "Ezin da ibilbidea proposatu";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 93102bd564..b144395842 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "گزینه‌های رانندگی";
 
-"avoid_tolls" = "از جاده های عوارضی خودداری کنید";
+"driving_options_subheader" = "اجتناب از تمامی مسیرها";
 
-"avoid_unpaved" = "از جاده های خاکی خودداری کنید";
+"avoid_tolls" = "جاده‌های دارای عوارض";
 
-"avoid_ferry" = "از عبور کشتی ها خودداری کنید";
+"avoid_unpaved" = "جاده‌های آسفالت نشده";
 
-"avoid_motorways" = "از بزرگراه دوری کنید";
+"avoid_ferry" = "گذرگاه‌های جاده‌ای";
+
+"avoid_motorways" = "بزرگراه‌ها";
 
 "unable_to_calc_alert_title" = "امکان محاسبه مسیر نیست";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 13231fb1a9..bae0dca133 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Reititysvalinnat";
 
-"avoid_tolls" = "Vältä maksullisia teitä";
+"driving_options_subheader" = "Vältettävä kaikissa reiteissä";
 
-"avoid_unpaved" = "Vältä päällystämättömiä teitä";
+"avoid_tolls" = "Maksulliset tiet";
 
-"avoid_ferry" = "Vältä lauttaristeyksiä";
+"avoid_unpaved" = "Päällystämättömät tiet";
 
-"avoid_motorways" = "Vältä moottoritietä";
+"avoid_ferry" = "Lauttaliikenne";
+
+"avoid_motorways" = "Valtatiet";
 
 "unable_to_calc_alert_title" = "Reittiä ei voi luoda";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 4e96d0427a..5f52c0dfd4 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Paramètres des itinéraires";
 
-"avoid_tolls" = "Éviter les routes à péage";
+"driving_options_subheader" = "Éviter sur tous les itinéraires";
 
-"avoid_unpaved" = "Éviter les routes non pavées";
+"avoid_tolls" = "Routes à péage";
 
-"avoid_ferry" = "Éviter les traversées en ferry";
+"avoid_unpaved" = "Routes non revêtues";
 
-"avoid_motorways" = "Éviter les autoroutes";
+"avoid_ferry" = "Traversées en ferry";
+
+"avoid_motorways" = "Autoroutes";
 
 "unable_to_calc_alert_title" = "Impossible de calculer l'itinéraire";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 1634c69b18..a2a6e15d44 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Routing options";
 
-"avoid_tolls" = "הימנעו מכבישי אגרה";
+"driving_options_subheader" = "Avoid on every route";
 
-"avoid_unpaved" = "הימנע מדרכי עפר";
+"avoid_tolls" = "Toll roads";
 
-"avoid_ferry" = "הימנעו ממעברי מעבורת";
+"avoid_unpaved" = "Unpaved roads";
 
-"avoid_motorways" = "הימנע מהכביש המהיר";
+"avoid_ferry" = "Ferry crossings";
+
+"avoid_motorways" = "Motorways";
 
 "unable_to_calc_alert_title" = "Unable to calculate route";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 0ed15efdc9..43e8e5be3b 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Útvonaltervezési lehetőségek";
 
-"avoid_tolls" = "Kerülje a fizetős utakat";
+"driving_options_subheader" = "Elkerülés minden útvonalon";
 
-"avoid_unpaved" = "Kerülje a burkolatlan utakat";
+"avoid_tolls" = "Díjköteles utak";
 
-"avoid_ferry" = "Kerülje a kompátkelést";
+"avoid_unpaved" = "Burkolatlan utak";
 
-"avoid_motorways" = "Kerülje az autópályát";
+"avoid_ferry" = "Kompátkelők";
+
+"avoid_motorways" = "Autópályák";
 
 "unable_to_calc_alert_title" = "Nem lehet útvonalat számítani";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 5aa03f8eec..b86c028831 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Pilihan berkendara";
 
-"avoid_tolls" = "Hindari jalan tol";
+"driving_options_subheader" = "Hindari di setiap rute";
 
-"avoid_unpaved" = "Hindari jalan yang tidak beraspal";
+"avoid_tolls" = "Jalan tol";
 
-"avoid_ferry" = "Hindari penyeberangan feri";
+"avoid_unpaved" = "Jalan tanah";
 
-"avoid_motorways" = "Hindari jalan raya";
+"avoid_ferry" = "Penyeberangan kapal feri";
+
+"avoid_motorways" = "Jalur motor";
 
 "unable_to_calc_alert_title" = "Tidak dapat menghitung rute";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index b403a76b31..a195ac72eb 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Impostazioni di deviazione";
 
-"avoid_tolls" = "Evita le strade a pedaggio";
+"driving_options_subheader" = "Evitare in tutti i percorsi";
 
-"avoid_unpaved" = "Evita le strade non asfaltate";
+"avoid_tolls" = "Strade a pedaggio";
 
-"avoid_ferry" = "Evita le traversate in traghetto";
+"avoid_unpaved" = "Strade non asfaltate";
 
-"avoid_motorways" = "Evita l'autostrada";
+"avoid_ferry" = "Traghetti";
+
+"avoid_motorways" = "Autostrade";
 
 "unable_to_calc_alert_title" = "Impossibile elaborare il percorso";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 757338f552..3d20ed3270 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "運転オプション";
 
-"avoid_tolls" = "有料道路を避ける";
+"driving_options_subheader" = "すべてのルートで回避";
 
-"avoid_unpaved" = "舗装されていない道路を避ける";
+"avoid_tolls" = "有料道路";
 
-"avoid_ferry" = "フェリー乗船を避ける";
+"avoid_unpaved" = "未舗装道路";
 
-"avoid_motorways" = "高速道路を避ける";
+"avoid_ferry" = "フェリー航路";
+
+"avoid_motorways" = "高速道路";
 
 "unable_to_calc_alert_title" = "ルートを計算できません";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index e3b08f60e4..0f0b2c5378 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "운전 옵션";
 
-"avoid_tolls" = "유료 도로 피하기";
+"driving_options_subheader" = "모든 길에서 피하기";
 
-"avoid_unpaved" = "비포장 도로 피하기";
+"avoid_tolls" = "유로 도로";
 
-"avoid_ferry" = "페리 횡단 피하기";
+"avoid_unpaved" = "비포장 도로";
 
-"avoid_motorways" = "고속도로를 피하세요";
+"avoid_ferry" = "여객선 교차로";
+
+"avoid_motorways" = "고속도로";
 
 "unable_to_calc_alert_title" = "루트를 계산할 수 없습니다";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 6954a6e5f0..a367474328 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "मार्गशोधी पर्याय";
 
-"avoid_tolls" = "टोल रस्ते टाळा";
+"driving_options_subheader" = "प्रत्येक मार्गावर टाळा";
 
-"avoid_unpaved" = "मातीचे रस्ते टाळा";
+"avoid_tolls" = "टोल मार्ग";
 
-"avoid_ferry" = "फेरी क्रॉसिंग टाळा";
+"avoid_unpaved" = "कच्चे मार्ग";
 
-"avoid_motorways" = "मोटरवे टाळा";
+"avoid_ferry" = "जल मार्ग";
+
+"avoid_motorways" = "महामार्ग";
 
 "unable_to_calc_alert_title" = "मार्गाची गणना करण्यात अक्षम";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 48e6172e37..a19f80e150 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Kjørealternativer";
 
-"avoid_tolls" = "Unngå bompenger";
+"driving_options_subheader" = "Unngå ved hver rute";
 
-"avoid_unpaved" = "Unngå asfalterte veier";
+"avoid_tolls" = "Bompengeveier";
 
-"avoid_ferry" = "Unngå fergeoverganger";
+"avoid_unpaved" = "Uasfaltert vei";
 
-"avoid_motorways" = "Unngå motorveien";
+"avoid_ferry" = "Fergeoverganger";
+
+"avoid_motorways" = "Motorvei";
 
 "unable_to_calc_alert_title" = "Kan ikke beregne rute";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index b53906531b..bc00d0e0c9 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Route instellingen";
 
-"avoid_tolls" = "Vermijd tolwegen";
+"driving_options_subheader" = "Vermijden op elke route";
 
-"avoid_unpaved" = "Vermijd onverharde wegen";
+"avoid_tolls" = "Tolwegen";
 
-"avoid_ferry" = "Vermijd overtochten met de veerboot";
+"avoid_unpaved" = "Onverharde wegen";
 
-"avoid_motorways" = "Vermijd de snelweg";
+"avoid_ferry" = "Veerdiensten";
+
+"avoid_motorways" = "Autosnelwegen";
 
 "unable_to_calc_alert_title" = "Kan route niet opbouwen";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 6d549dc617..dee5f735eb 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Ustawienia nawigacji";
 
-"avoid_tolls" = "Unikaj płatnych dróg";
+"driving_options_subheader" = "Unikaj na każdej trasie";
 
-"avoid_unpaved" = "Unikaj nieutwardzonych dróg";
+"avoid_tolls" = "Drogi płatne";
 
-"avoid_ferry" = "Unikaj przepraw promowych";
+"avoid_unpaved" = "Drogi gruntowe";
 
-"avoid_motorways" = "Unikaj autostrad";
+"avoid_ferry" = "Przeprawy promowe";
+
+"avoid_motorways" = "Autostrady";
 
 "unable_to_calc_alert_title" = "Brak możliwości zbudowania trasy";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 14b5f356b7..bc8d428eb7 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Opções de direção";
 
-"avoid_tolls" = "Evitar pedágios";
+"driving_options_subheader" = "Evitar em todas as rotas";
 
-"avoid_unpaved" = "Evitar estradas não-pavimentadas";
+"avoid_tolls" = "Pedágios";
 
-"avoid_ferry" = "Evitar balsas";
+"avoid_unpaved" = "Pistas sem pavimentação";
 
-"avoid_motorways" = "Evitar rodovias";
+"avoid_ferry" = "Balsa";
+
+"avoid_motorways" = "Autoestradas";
 
 "unable_to_calc_alert_title" = "Incapaz de calcular rota";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 36963f6f67..361f19a923 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Configurações de direção";
 
-"avoid_tolls" = "Evitar portagens";
+"driving_options_subheader" = "Evitar em todos os percursos";
 
-"avoid_unpaved" = "Evitar estradas não-pavimentadas";
+"avoid_tolls" = "Estradas com portagem";
 
-"avoid_ferry" = "Evitar balsas";
+"avoid_unpaved" = "Estradas não pavimentadas";
 
-"avoid_motorways" = "Evitar autoestradas";
+"avoid_ferry" = "Ferry";
+
+"avoid_motorways" = "Autoestradas";
 
 "unable_to_calc_alert_title" = "Não foi possível calcular a rota";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 70b9c77ebf..b12dc0f871 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Opțiuni de ocolire";
 
-"avoid_tolls" = "Evitați drumurile cu taxă";
+"driving_options_subheader" = "De evitat pe orice traseu";
 
-"avoid_unpaved" = "Evitați drumurile neasfaltate";
+"avoid_tolls" = "Drumuri cu plată";
 
-"avoid_ferry" = "Evitați traversările cu feribotul";
+"avoid_unpaved" = "Drumuri neasfaltate";
 
-"avoid_motorways" = "Evitați autostrada";
+"avoid_ferry" = "Treceri cu bac";
+
+"avoid_motorways" = "Autostrăzi";
 
 "unable_to_calc_alert_title" = "Nu poate fi creat un traseu";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index a88b418b1a..dd63253f55 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Настройки объезда";
 
-"avoid_tolls" = "Избегать платных дорог";
+"driving_options_subheader" = "Избегать в каждом маршруте";
 
-"avoid_unpaved" = "Избегать грунтовых дорог";
+"avoid_tolls" = "Платные дороги";
 
-"avoid_ferry" = "Избегать паромных переправ";
+"avoid_unpaved" = "Грунтовые дороги";
 
-"avoid_motorways" = "Избегать автомагистралей";
+"avoid_ferry" = "Паромные переправы";
+
+"avoid_motorways" = "Магистрали";
 
 "unable_to_calc_alert_title" = "Невозможно построить маршрут";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 2d96539542..cb397b67d5 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Možnosti jazdy";
 
-"avoid_tolls" = "Vyhnite sa spoplatneným cestám";
+"driving_options_subheader" = "Vyhnúť sa na každej trase";
 
-"avoid_unpaved" = "Vyhnite sa nespevneným cestám";
+"avoid_tolls" = "Spoplatnené cesty";
 
-"avoid_ferry" = "Vyhnite sa prejazdom trajektom";
+"avoid_unpaved" = "Nespevnené cesty";
 
-"avoid_motorways" = "Vyhnite sa diaľnici";
+"avoid_ferry" = "Prechody trajektom";
+
+"avoid_motorways" = "Diaľnice";
 
 "unable_to_calc_alert_title" = "Nepodarilo sa vypočítať trasu";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index e35e069b4b..b4697c5db7 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Omvägsinställningar";
 
-"avoid_tolls" = "Undvik avgiftsbelagda vägar";
+"driving_options_subheader" = "Undvik på varje rutten";
 
-"avoid_unpaved" = "Undvik oasfalterade vägar";
+"avoid_tolls" = "Betalväg";
 
-"avoid_ferry" = "Undvik färjeöverfarter";
+"avoid_unpaved" = "Kärrväg";
 
-"avoid_motorways" = "Undvik motorvägen";
+"avoid_ferry" = "Färjetrafik";
+
+"avoid_motorways" = "Motorväg";
 
 "unable_to_calc_alert_title" = "Det går inte att bygga ruttenen";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 6abfeb3b15..739b66c272 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Machaguo ya njia";
 
-"avoid_tolls" = "Epuka barabara za ushuru";
+"driving_options_subheader" = "Epuka kwenye kila njia";
 
-"avoid_unpaved" = "Epuka barabara za uchafu";
+"avoid_tolls" = "Barabara za kulipia";
 
-"avoid_ferry" = "Epuka vivuko vya feri";
+"avoid_unpaved" = "Barabara za vumbi";
 
-"avoid_motorways" = "Epuka barabara";
+"avoid_ferry" = "Vivuko cha feri";
+
+"avoid_motorways" = "Barabara za mwendo kasi";
 
 "unable_to_calc_alert_title" = "Haiwezi kukokotoa njia";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index b0085343c6..6a5aaae0d7 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "ทางเลือกเส้นทางขับขี่";
 
-"avoid_tolls" = "หลีกเลี่ยงถนนที่เก็บค่าผ่านทาง";
+"driving_options_subheader" = "หลีกเลี่ยงในทุกเส้นทาง";
 
-"avoid_unpaved" = "หลีกเลี่ยงถนนลูกรัง";
+"avoid_tolls" = "ถนนแบบเสียค่าผ่านทาง";
 
-"avoid_ferry" = "หลีกเลี่ยงการข้ามเรือข้ามฟาก";
+"avoid_unpaved" = "ถนนดิน";
 
-"avoid_motorways" = "หลีกเลี่ยงมอเตอร์เวย์";
+"avoid_ferry" = "เรือข้ามฟาก";
+
+"avoid_motorways" = "ทางด่วน";
 
 "unable_to_calc_alert_title" = "ไม่สามารถคำนวณเส้นทาง";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 8a93d73b22..1d134e29c8 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Yönlendirme seçenekleri";
 
-"avoid_tolls" = "Ücretli yollardan kaçının";
+"driving_options_subheader" = "Her rotada kaçının";
 
-"avoid_unpaved" = "Asfaltsız yollardan kaçının";
+"avoid_tolls" = "Paralı yollar";
 
-"avoid_ferry" = "Feribot geçişlerinden kaçının";
+"avoid_unpaved" = "Asfaltsız yollar";
 
-"avoid_motorways" = "Otoyoldan kaçının";
+"avoid_ferry" = "Feribot geçişleri";
+
+"avoid_motorways" = "Otoyollar";
 
 "unable_to_calc_alert_title" = "Rota hesaplanamıyor";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index eeb6dd96b4..627e696f13 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Налаштування об’їзду";
 
-"avoid_tolls" = "Уникати платних доріг";
+"driving_options_subheader" = "Уникати в кожному маршруті";
 
-"avoid_unpaved" = "Уникати ґрунтових доріг";
+"avoid_tolls" = "Платні дороги";
 
-"avoid_ferry" = "Уникати поромних переправ";
+"avoid_unpaved" = "Ґрунтові дороги";
 
-"avoid_motorways" = "Уникати автострад";
+"avoid_ferry" = "Поромні переправи";
+
+"avoid_motorways" = "Магістралі";
 
 "unable_to_calc_alert_title" = "Неможливо побудувати маршрут";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 7376394067..28b0151dd5 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "Thiết lập đi vòng";
 
-"avoid_tolls" = "Tránh đường thu phí";
+"driving_options_subheader" = "Tránh trên mỗi tuyến";
 
-"avoid_unpaved" = "Tránh đường đất";
+"avoid_tolls" = "Đường trả phí";
 
-"avoid_ferry" = "Tránh qua phà";
+"avoid_unpaved" = "Đường đất";
 
-"avoid_motorways" = "Tránh xa lộ";
+"avoid_ferry" = "Bến phà";
+
+"avoid_motorways" = "Đường cao tốc";
 
 "unable_to_calc_alert_title" = "Không thể tạo tuyến đường";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 49628562a5..4081b1ac66 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "绕行设置";
 
-"avoid_tolls" = "避免使用收费公路";
+"driving_options_subheader" = "在每条线路上规避";
 
-"avoid_unpaved" = "避免使用未铺设路面的道路";
+"avoid_tolls" = "收费公路";
 
-"avoid_ferry" = "避免渡轮过境";
+"avoid_unpaved" = "土路";
 
-"avoid_motorways" = "避开高速公路";
+"avoid_ferry" = "渡轮渡口";
+
+"avoid_motorways" = "高速公路";
 
 "unable_to_calc_alert_title" = "无法规划路线";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 43bd333c26..30f8895394 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1013,13 +1013,15 @@
 
 "driving_options_title" = "繞行設定";
 
-"avoid_tolls" = "避開收費公路";
+"driving_options_subheader" = "在每條線路上規避";
 
-"avoid_unpaved" = "避開土路";
+"avoid_tolls" = "收費公路";
 
-"avoid_ferry" = "避免渡口";
+"avoid_unpaved" = "土路";
 
-"avoid_motorways" = "避開高速公路";
+"avoid_ferry" = "渡輪渡口";
+
+"avoid_motorways" = "高速公路";
 
 "unable_to_calc_alert_title" = "無法規劃路線";
 
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
index 0727963722..36f3153d16 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -9,6 +9,7 @@ class InfoItemViewController: UIViewController {
   @IBOutlet var imageView: UIImageView!
   @IBOutlet var infoLabel: UILabel!
   @IBOutlet var accessoryImage: UIImageView!
+  @IBOutlet var separatorView: UIView!
   @IBOutlet var tapGestureRecognizer: UITapGestureRecognizer!
 
   var tapHandler: TapHandler?
@@ -25,6 +26,7 @@ class InfoItemViewController: UIViewController {
     }
   }
   var canShowMenu = false
+
   @IBAction func onTap(_ sender: UITapGestureRecognizer) {
     tapHandler?()
   }
@@ -221,6 +223,7 @@ class PlacePageInfoViewController: UIViewController {
   }
 
   // MARK: private
+
   private func createInfoItem(_ info: String,
                               icon: UIImage?,
                               style: Style = .regular,
@@ -236,36 +239,7 @@ class PlacePageInfoViewController: UIViewController {
 
   private func addToStack(_ viewController: UIViewController) {
     addChild(viewController)
-    stackView.addArrangedSubviewWithSeparator(viewController.view)
+    stackView.addArrangedSubview(viewController.view)
     viewController.didMove(toParent: self)
   }
 }
-
-private extension UIStackView {
-  func addArrangedSubviewWithSeparator(_ view: UIView) {
-    if !arrangedSubviews.isEmpty {
-      view.addSeparator(thickness: CGFloat(1.0),
-                        color: StyleManager.shared.theme?.colors.blackDividers,
-                        insets: UIEdgeInsets(top: 0, left: 56, bottom: 0, right: 0))
-    }
-    addArrangedSubview(view)
-  }
-}
-
-private extension UIView {
-  func addSeparator(thickness: CGFloat,
-                    color: UIColor?,
-                    insets: UIEdgeInsets) {
-    let lineView = UIView()
-    lineView.backgroundColor = color ?? .black
-    lineView.isUserInteractionEnabled = false
-    lineView.translatesAutoresizingMaskIntoConstraints = false
-    addSubview(lineView)
-    NSLayoutConstraint.activate([
-      lineView.heightAnchor.constraint(equalToConstant: thickness),
-      lineView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: insets.left),
-      lineView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -insets.right),
-      lineView.topAnchor.constraint(equalTo: topAnchor, constant: insets.top),
-    ])
-  }
-}
diff --git a/iphone/Maps/UI/PlacePage/PlacePage.storyboard b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
index b0aab3fc3e..da9c2ef498 100644
--- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard
+++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -20,17 +20,17 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TtY-w3-kOi" userLabel="Background View">
-                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPBackgroundView"/>
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dJ0-97-CDh" customClass="PlacePageScrollView" customModule="Organic_Maps" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="375" height="597"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="617"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="bsv-S8-EiF">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="597"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="617"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <gestureRecognizers/>
                                     </stackView>
@@ -53,7 +53,7 @@
                                 </connections>
                             </scrollView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RZh-69-00e" userLabel="Divider View">
-                                <rect key="frame" x="0.0" y="616" width="375" height="1"/>
+                                <rect key="frame" x="0.0" y="617" width="375" height="1"/>
                                 <color key="backgroundColor" systemColor="separatorColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="1" id="G2u-nx-IJt"/>
@@ -63,7 +63,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="inM-UW-vpv">
-                                <rect key="frame" x="0.0" y="617" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="618" width="375" height="49"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
@@ -86,7 +86,7 @@
                             <constraint firstItem="inM-UW-vpv" firstAttribute="leading" secondItem="WOB-EV-vjA" secondAttribute="leading" id="apX-d6-VvF"/>
                             <constraint firstItem="TtY-w3-kOi" firstAttribute="leading" secondItem="bsv-S8-EiF" secondAttribute="leading" id="hQh-bC-doW"/>
                             <constraint firstItem="gXh-A8-hCx" firstAttribute="bottom" secondItem="TtY-w3-kOi" secondAttribute="bottom" id="iT0-Pn-Zue"/>
-                            <constraint firstItem="inM-UW-vpv" firstAttribute="top" secondItem="dJ0-97-CDh" secondAttribute="bottom" id="mk3-a2-JVy"/>
+                            <constraint firstItem="RZh-69-00e" firstAttribute="top" secondItem="dJ0-97-CDh" secondAttribute="bottom" id="mk3-a2-JVy"/>
                             <constraint firstAttribute="trailing" secondItem="inM-UW-vpv" secondAttribute="trailing" id="oNS-yS-5VJ"/>
                             <constraint firstItem="TtY-w3-kOi" firstAttribute="top" secondItem="bsv-S8-EiF" secondAttribute="top" priority="250" id="r8L-A7-Fbc"/>
                             <constraint firstItem="gXh-A8-hCx" firstAttribute="bottom" secondItem="dJ0-97-CDh" secondAttribute="bottom" constant="50" id="xwz-cT-wns"/>
@@ -124,7 +124,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="212"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YyN-l5-4le">
-                                        <rect key="frame" x="4" y="20" width="367" height="50"/>
+                                        <rect key="frame" x="4" y="0.0" width="367" height="50"/>
                                         <subviews>
                                             <view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Jgo-Sd-tyF">
                                                 <rect key="frame" x="0.0" y="0.0" width="171.5" height="50"/>
@@ -217,10 +217,10 @@
                                         <edgeInsets key="layoutMargins" top="0.0" left="12" bottom="0.0" right="12"/>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKt-f3-qqN">
-                                        <rect key="frame" x="4" y="78" width="367" height="76"/>
+                                        <rect key="frame" x="4" y="58" width="367" height="96"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="Open" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="caI-ec-meo">
-                                                <rect key="frame" x="12" y="0.0" width="343" height="76"/>
+                                                <rect key="frame" x="12" y="0.0" width="343" height="96"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
@@ -346,7 +346,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="180"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" verticalHuggingPriority="750" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="4pU-ex-66e">
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="4pU-ex-66e">
                                 <rect key="frame" x="16" y="16" width="343" height="131"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -356,6 +356,12 @@
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                 <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding">
+                                        <integer key="value" value="0"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                             </textView>
                             <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="soI-1J-JL6">
                                 <rect key="frame" x="16" y="147" width="343" height="33"/>
@@ -373,41 +379,15 @@
                                     <action selector="onMore:" destination="WSQ-QR-4WY" eventType="touchUpInside" id="z5J-UQ-f0u"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QEp-rn-Kgr" userLabel="Spacing Top">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="l15-DI-Ikm"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
-                                </userDefinedRuntimeAttributes>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sb1-VR-dnu" userLabel="Spacing Bottom">
-                                <rect key="frame" x="0.0" y="179" width="375" height="1"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="2ol-iq-Dnr"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
-                                </userDefinedRuntimeAttributes>
-                            </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="pcV-Cv-rW6"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="sb1-VR-dnu" secondAttribute="trailing" id="0DE-s1-N8e"/>
-                            <constraint firstAttribute="bottom" secondItem="sb1-VR-dnu" secondAttribute="bottom" id="AUQ-7h-CnS"/>
-                            <constraint firstItem="QEp-rn-Kgr" firstAttribute="top" secondItem="99j-36-7TK" secondAttribute="top" id="Hg5-NP-hKL"/>
                             <constraint firstItem="4pU-ex-66e" firstAttribute="leading" secondItem="99j-36-7TK" secondAttribute="leading" constant="16" id="T4C-Nw-I3N"/>
                             <constraint firstItem="soI-1J-JL6" firstAttribute="leading" secondItem="99j-36-7TK" secondAttribute="leading" constant="16" id="Vac-L0-pTZ"/>
                             <constraint firstAttribute="bottom" secondItem="soI-1J-JL6" secondAttribute="bottom" id="XvI-Sc-kIL"/>
                             <constraint firstAttribute="trailing" secondItem="4pU-ex-66e" secondAttribute="trailing" constant="16" id="bVa-3L-AtD"/>
-                            <constraint firstAttribute="trailing" secondItem="QEp-rn-Kgr" secondAttribute="trailing" id="bzy-12-Exm"/>
-                            <constraint firstItem="sb1-VR-dnu" firstAttribute="leading" secondItem="99j-36-7TK" secondAttribute="leading" id="cjK-6L-rtp"/>
                             <constraint firstItem="4pU-ex-66e" firstAttribute="top" secondItem="99j-36-7TK" secondAttribute="top" constant="16" id="f7d-q9-70I"/>
-                            <constraint firstItem="QEp-rn-Kgr" firstAttribute="leading" secondItem="99j-36-7TK" secondAttribute="leading" id="gU2-VG-YLQ"/>
                             <constraint firstItem="soI-1J-JL6" firstAttribute="top" secondItem="4pU-ex-66e" secondAttribute="bottom" id="i4f-1B-jfo"/>
                             <constraint firstAttribute="trailing" secondItem="soI-1J-JL6" secondAttribute="trailing" constant="16" id="tu6-L8-fUt"/>
                         </constraints>
@@ -433,10 +413,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="pmL-HT-I1N">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
-                            </stackView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ojl-qe-MWU" userLabel="Top separator">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ojl-qe-MWU">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
@@ -446,7 +423,10 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u8Q-Ia-dJM" userLabel="Bottom separator">
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="pmL-HT-I1N">
+                                <rect key="frame" x="0.0" y="1" width="375" height="98"/>
+                            </stackView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u8Q-Ia-dJM">
                                 <rect key="frame" x="0.0" y="99" width="375" height="1"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
@@ -460,12 +440,12 @@
                         <viewLayoutGuide key="safeArea" id="g60-e9-U8G"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstAttribute="bottom" secondItem="pmL-HT-I1N" secondAttribute="bottom" id="0Xe-Gp-10C"/>
+                            <constraint firstItem="pmL-HT-I1N" firstAttribute="top" secondItem="Ojl-qe-MWU" secondAttribute="bottom" id="AtT-RR-dJE"/>
                             <constraint firstItem="Ojl-qe-MWU" firstAttribute="top" secondItem="uyH-Qn-86F" secondAttribute="top" id="Huk-kl-GY1"/>
-                            <constraint firstAttribute="top" secondItem="pmL-HT-I1N" secondAttribute="top" id="THV-MF-4pC"/>
                             <constraint firstItem="pmL-HT-I1N" firstAttribute="leading" secondItem="uyH-Qn-86F" secondAttribute="leading" id="VNA-7u-TMS"/>
-                            <constraint firstItem="u8Q-Ia-dJM" firstAttribute="bottom" secondItem="uyH-Qn-86F" secondAttribute="bottom" id="erE-W5-8I9"/>
+                            <constraint firstItem="u8Q-Ia-dJM" firstAttribute="top" secondItem="pmL-HT-I1N" secondAttribute="bottom" id="erE-W5-8I9"/>
                             <constraint firstItem="Ojl-qe-MWU" firstAttribute="leading" secondItem="uyH-Qn-86F" secondAttribute="leading" id="hbC-z3-Jvb"/>
+                            <constraint firstAttribute="bottom" secondItem="u8Q-Ia-dJM" secondAttribute="bottom" id="laF-hA-orx"/>
                             <constraint firstAttribute="trailing" secondItem="Ojl-qe-MWU" secondAttribute="trailing" id="m7e-JQ-8Yz"/>
                             <constraint firstAttribute="trailing" secondItem="u8Q-Ia-dJM" secondAttribute="trailing" id="ozT-6W-mau"/>
                             <constraint firstAttribute="trailing" secondItem="pmL-HT-I1N" secondAttribute="trailing" id="sUb-Fg-UED"/>
@@ -483,7 +463,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="UlS-Pw-E6a" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="928.79999999999995" y="-289.65517241379314"/>
+            <point key="canvasLocation" x="929" y="-289"/>
         </scene>
         <!--Action Bar View Controller-->
         <scene sceneID="MOc-50-GOI">
@@ -530,7 +510,7 @@
                                 <rect key="frame" x="16" y="16" width="343" height="224"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RUc-Qr-8Sb">
-                                        <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="343" height="164"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="44" id="OYY-L8-CtC"/>
                                         </constraints>
@@ -545,7 +525,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bAP-Be-X7d">
-                                        <rect key="frame" x="0.0" y="60" width="343" height="164"/>
+                                        <rect key="frame" x="0.0" y="180" width="343" height="44"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="44" id="fBI-zz-Fkk"/>
                                         </constraints>
@@ -561,40 +541,14 @@
                                     </button>
                                 </subviews>
                             </stackView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hRi-Xr-pFy" userLabel="Spacing Top">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="1"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="S6g-eX-SKD"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
-                                </userDefinedRuntimeAttributes>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kvs-3m-aX5" userLabel="Spacing Bottom">
-                                <rect key="frame" x="0.0" y="255" width="375" height="1"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="sLf-h1-gaG"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
-                                </userDefinedRuntimeAttributes>
-                            </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="wND-VP-FnI"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="kvs-3m-aX5" firstAttribute="leading" secondItem="uEh-Ml-VWK" secondAttribute="leading" id="2ml-Sl-4Ab"/>
                             <constraint firstAttribute="bottom" secondItem="021-FW-tZO" secondAttribute="bottom" constant="16" id="9ot-3E-Be3"/>
-                            <constraint firstAttribute="trailing" secondItem="kvs-3m-aX5" secondAttribute="trailing" id="EJa-hE-gkc"/>
                             <constraint firstItem="021-FW-tZO" firstAttribute="leading" secondItem="uEh-Ml-VWK" secondAttribute="leading" constant="16" id="Hq9-h5-Znu"/>
                             <constraint firstItem="021-FW-tZO" firstAttribute="top" secondItem="uEh-Ml-VWK" secondAttribute="top" constant="16" id="NQ6-jj-fu0"/>
                             <constraint firstAttribute="trailing" secondItem="021-FW-tZO" secondAttribute="trailing" constant="16" id="Ox1-Cd-PWE"/>
-                            <constraint firstItem="hRi-Xr-pFy" firstAttribute="leading" secondItem="uEh-Ml-VWK" secondAttribute="leading" id="Zhy-TR-brz"/>
-                            <constraint firstAttribute="bottom" secondItem="kvs-3m-aX5" secondAttribute="bottom" id="iEU-H1-Cmq"/>
-                            <constraint firstAttribute="trailing" secondItem="hRi-Xr-pFy" secondAttribute="trailing" id="pQ8-7S-WYf"/>
-                            <constraint firstItem="hRi-Xr-pFy" firstAttribute="top" secondItem="uEh-Ml-VWK" secondAttribute="top" id="sMX-ou-xsp"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
@@ -650,6 +604,16 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Ac-Ag-dut">
+                                <rect key="frame" x="56" y="43" width="319" height="1"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="1" id="EEb-FZ-zQK"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
+                                </userDefinedRuntimeAttributes>
+                            </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="xdh-hy-Bxo"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -657,9 +621,12 @@
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="l7d-ck-nSv" secondAttribute="bottom" id="AV5-Tu-LK4"/>
                             <constraint firstAttribute="bottom" secondItem="8eU-Fj-XRv" secondAttribute="bottom" id="Cu6-uK-4Ox"/>
+                            <constraint firstAttribute="trailing" secondItem="1Ac-Ag-dut" secondAttribute="trailing" id="KWp-x3-Fcy"/>
+                            <constraint firstItem="1Ac-Ag-dut" firstAttribute="bottom" secondItem="oz0-2o-icQ" secondAttribute="bottom" id="MFU-bG-Yjy"/>
                             <constraint firstItem="onF-JL-5dZ" firstAttribute="leading" secondItem="8eU-Fj-XRv" secondAttribute="trailing" id="Y7d-Lw-sIv"/>
                             <constraint firstItem="l7d-ck-nSv" firstAttribute="leading" secondItem="oz0-2o-icQ" secondAttribute="leading" id="ZKa-Nx-mMv"/>
                             <constraint firstItem="8eU-Fj-XRv" firstAttribute="leading" secondItem="l7d-ck-nSv" secondAttribute="trailing" id="fPc-6Q-inb"/>
+                            <constraint firstItem="1Ac-Ag-dut" firstAttribute="leading" secondItem="l7d-ck-nSv" secondAttribute="trailing" id="khr-Ce-xHs"/>
                             <constraint firstItem="l7d-ck-nSv" firstAttribute="top" secondItem="oz0-2o-icQ" secondAttribute="top" id="mvH-dY-Evu"/>
                             <constraint firstItem="xdh-hy-Bxo" firstAttribute="trailing" secondItem="onF-JL-5dZ" secondAttribute="trailing" constant="8" id="oIb-Tv-InY"/>
                             <constraint firstItem="onF-JL-5dZ" firstAttribute="centerY" secondItem="oz0-2o-icQ" secondAttribute="centerY" id="sxb-OB-j2b"/>
@@ -678,6 +645,7 @@
                         <outlet property="accessoryImage" destination="onF-JL-5dZ" id="EfX-rZ-lGT"/>
                         <outlet property="imageView" destination="l7d-ck-nSv" id="Llp-U6-qLx"/>
                         <outlet property="infoLabel" destination="8eU-Fj-XRv" id="72o-pM-iKo"/>
+                        <outlet property="separatorView" destination="1Ac-Ag-dut" id="9s3-iT-pUP"/>
                         <outlet property="tapGestureRecognizer" destination="pe0-Qk-VTv" id="ysd-CD-jhE"/>
                     </connections>
                 </viewController>
@@ -693,7 +661,7 @@
                     </connections>
                 </pongPressGestureRecognizer>
             </objects>
-            <point key="canvasLocation" x="1565.5999999999999" y="-315.74212893553226"/>
+            <point key="canvasLocation" x="1567" y="-315"/>
         </scene>
         <!--Opening Hours View Controller-->
         <scene sceneID="txO-kw-ZRm">
@@ -761,7 +729,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="251" text="12:00 - 18:15" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yw5-Jp-V9B">
-                                                <rect key="frame" x="47.5" y="0.0" width="231.5" height="44"/>
+                                                <rect key="frame" x="47.5" y="0.0" width="231.5" height="43.5"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                 <nil key="textColor"/>
@@ -777,7 +745,7 @@
                                             <constraint firstItem="Yw5-Jp-V9B" firstAttribute="leading" secondItem="sw2-Oa-u57" secondAttribute="trailing" constant="4" id="9Jg-oZ-8n0"/>
                                             <constraint firstItem="Yw5-Jp-V9B" firstAttribute="top" secondItem="Uvb-Ju-e8X" secondAttribute="top" id="9ee-Eo-f2m"/>
                                             <constraint firstAttribute="bottom" secondItem="sw2-Oa-u57" secondAttribute="bottom" id="RKu-mb-B0V"/>
-                                            <constraint firstAttribute="bottom" secondItem="Yw5-Jp-V9B" secondAttribute="bottom" id="aKL-HR-TXq"/>
+                                            <constraint firstAttribute="bottom" secondItem="Yw5-Jp-V9B" secondAttribute="bottom" constant="0.33333333333333215" id="aKL-HR-TXq"/>
                                             <constraint firstItem="sw2-Oa-u57" firstAttribute="top" secondItem="Uvb-Ju-e8X" secondAttribute="top" id="eGg-GV-YEx"/>
                                             <constraint firstAttribute="trailing" secondItem="Yw5-Jp-V9B" secondAttribute="trailing" id="uAI-9S-bWD"/>
                                         </constraints>
@@ -814,6 +782,16 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="43E-TR-OSz">
+                                <rect key="frame" x="56" y="99" width="319" height="1"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="1" id="YSz-cB-2pD"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
+                                </userDefinedRuntimeAttributes>
+                            </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="PcM-qb-4Kv"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -821,7 +799,10 @@
                         <constraints>
                             <constraint firstItem="A9s-da-nap" firstAttribute="leading" secondItem="2IW-oU-HLV" secondAttribute="leading" id="2E9-CD-9Tw"/>
                             <constraint firstItem="EVy-Wt-5En" firstAttribute="centerY" secondItem="A9s-da-nap" secondAttribute="centerY" id="2O4-Ge-lKN"/>
+                            <constraint firstAttribute="trailing" secondItem="43E-TR-OSz" secondAttribute="trailing" id="ORJ-zz-5Od"/>
                             <constraint firstAttribute="trailing" secondItem="EVy-Wt-5En" secondAttribute="trailing" constant="8" id="VCX-dn-JVo"/>
+                            <constraint firstAttribute="bottom" secondItem="43E-TR-OSz" secondAttribute="bottom" id="YIW-PC-dgZ"/>
+                            <constraint firstItem="43E-TR-OSz" firstAttribute="leading" secondItem="A9s-da-nap" secondAttribute="trailing" id="bpy-jU-MhU"/>
                             <constraint firstItem="EVy-Wt-5En" firstAttribute="leading" secondItem="6l3-ag-Ii0" secondAttribute="trailing" constant="8" id="en9-qQ-E3G"/>
                             <constraint firstAttribute="bottom" secondItem="6l3-ag-Ii0" secondAttribute="bottom" constant="12" id="hYu-lK-2lS"/>
                             <constraint firstItem="6l3-ag-Ii0" firstAttribute="top" secondItem="2IW-oU-HLV" secondAttribute="top" constant="12" id="kyp-NX-Ol1"/>
@@ -1405,21 +1386,21 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fcE-Xu-odc" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="928.79999999999995" y="-703.44827586206907"/>
+            <point key="canvasLocation" x="929" y="-703"/>
         </scene>
         <!--Elevation Profile View Controller-->
         <scene sceneID="0yF-nr-ALU">
             <objects>
                 <viewController storyboardIdentifier="ElevationProfileViewController" id="d1y-Na-lDm" customClass="ElevationProfileViewController" customModule="Organic_Maps" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" ambiguous="YES" id="7Mx-au-yIa">
+                    <view key="view" contentMode="scaleToFill" id="7Mx-au-yIa">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="319"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
-                                <rect key="frame" x="0.0" y="20" width="375" height="156"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="176"/>
                                 <subviews>
-                                    <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jIS-0e-Ztd" customClass="ChartView" customModule="Chart">
-                                        <rect key="frame" x="16" y="0.0" width="343" height="156"/>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIS-0e-Ztd" customClass="ChartView" customModule="Chart">
+                                        <rect key="frame" x="16" y="0.0" width="343" height="176"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     </view>
                                 </subviews>
@@ -1432,7 +1413,7 @@
                                     <constraint firstAttribute="height" constant="176" id="utH-YA-2pe"/>
                                 </constraints>
                             </view>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
                                 <rect key="frame" x="16" y="192" width="343" height="68"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -1507,7 +1488,7 @@
                                     </collectionViewCell>
                                 </cells>
                             </collectionView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" ambiguous="YES" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
                                 <rect key="frame" x="16" y="281" width="68" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -1517,7 +1498,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
                                 <rect key="frame" x="91" y="287" width="40" height="10"/>
                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -1525,7 +1506,7 @@
                                     <constraint firstAttribute="width" constant="40" id="Sor-5l-zjy"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="1h 10m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQJ-fW-QVh">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1h 10m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQJ-fW-QVh">
                                 <rect key="frame" x="301" y="281" width="58" height="20.5"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -1534,7 +1515,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:blackPrimaryText"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoy-lg-Wl9">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoy-lg-Wl9">
                                 <rect key="frame" x="249" y="280.5" width="43" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -1544,13 +1525,13 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
                                 <rect key="frame" x="133" y="276.5" width="30" height="30"/>
                                 <connections>
                                     <action selector="onExtendedDifficultyButtonPressed:" destination="d1y-Na-lDm" eventType="touchUpInside" id="4zH-m2-OSE"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
                                 <rect key="frame" x="138.5" y="281" width="19" height="20.5"/>
                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
@@ -1664,13 +1645,26 @@
                                     </label>
                                 </subviews>
                             </stackView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eZE-Gl-rKQ">
+                                <rect key="frame" x="56" y="99" width="319" height="1"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="1" id="mkQ-1n-CMT"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
+                                </userDefinedRuntimeAttributes>
+                            </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="hQb-fZ-zig"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="eZE-Gl-rKQ" firstAttribute="leading" secondItem="lIJ-bh-coX" secondAttribute="leading" id="EAb-Nf-J9m"/>
+                            <constraint firstAttribute="trailing" secondItem="eZE-Gl-rKQ" secondAttribute="trailing" id="IPN-zL-JOb"/>
                             <constraint firstItem="lIJ-bh-coX" firstAttribute="leading" secondItem="Bn7-Ag-wuu" secondAttribute="leading" constant="56" id="WXv-gZ-ygJ"/>
                             <constraint firstAttribute="bottom" secondItem="lIJ-bh-coX" secondAttribute="bottom" constant="12" id="Wcq-WA-Qd8"/>
                             <constraint firstAttribute="trailing" secondItem="lIJ-bh-coX" secondAttribute="trailing" constant="16" id="hw3-UC-uCp"/>
+                            <constraint firstAttribute="bottom" secondItem="eZE-Gl-rKQ" secondAttribute="bottom" id="snF-4v-t08"/>
                             <constraint firstItem="lIJ-bh-coX" firstAttribute="top" secondItem="Bn7-Ag-wuu" secondAttribute="top" constant="12" id="tpq-hf-4gG"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
@@ -1693,11 +1687,11 @@
             <objects>
                 <viewController storyboardIdentifier="PlacePageHeaderViewController" id="aB1-Yk-7p4" customClass="PlacePageHeaderViewController" customModule="Organic_Maps" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="xTs-NP-HcT" customClass="PlacePageHeaderView" customModule="Organic_Maps" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="72"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="spW-XI-KSY" customClass="PlacePageHeaderView" customModule="Organic_Maps" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="62" width="375" height="10"/>
+                                <rect key="frame" x="0.0" y="49" width="375" height="10"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="10" id="aON-3f-qnX"/>
@@ -1707,10 +1701,10 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fqh-H3-eji" customClass="PlacePageHeaderView" customModule="Organic_Maps" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="20" width="375" height="52"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gdy-g5-gbM">
-                                        <rect key="frame" x="0.0" y="0.0" width="329" height="52"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="329" height="59"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3HJ-WD-nF5">
@@ -1728,12 +1722,12 @@
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="750" text="Хинкальная" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lR4-to-4wX">
-                                        <rect key="frame" x="16" y="28" width="313" height="17"/>
+                                        <rect key="frame" x="16" y="28" width="313" height="24"/>
                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZT-ea-Kac">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZT-ea-Kac">
                                         <rect key="frame" x="333" y="12" width="30" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="30" id="IYz-Cb-KoJ"/>
@@ -1748,7 +1742,7 @@
                                         </connections>
                                     </button>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DHT-jj-Idk">
-                                        <rect key="frame" x="0.0" y="51" width="375" height="1"/>
+                                        <rect key="frame" x="0.0" y="58" width="375" height="1"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="9IC-go-aaZ"/>
@@ -1793,7 +1787,7 @@
                             <constraint firstItem="fqh-H3-eji" firstAttribute="bottom" secondItem="My8-Gu-lky" secondAttribute="bottom" id="zkf-gE-4vs"/>
                         </constraints>
                     </view>
-                    <size key="freeformSize" width="375" height="72"/>
+                    <size key="freeformSize" width="375" height="59"/>
                     <connections>
                         <outlet property="expandView" destination="Gdy-g5-gbM" id="rzi-mb-hUi"/>
                         <outlet property="headerView" destination="fqh-H3-eji" id="Z2K-Wd-hRO"/>
@@ -1804,7 +1798,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="0Ew-Om-aj3" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="928.79999999999995" y="-1141.529235382309"/>
+            <point key="canvasLocation" x="928.79999999999995" y="-1147.3763118440781"/>
         </scene>
     </scenes>
     <resources>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift
index 8189c97a76..f30905ee45 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift
@@ -23,8 +23,8 @@ enum PlacePageState {
 
 protocol IPlacePageLayout: AnyObject {
   var presenter: PlacePagePresenterProtocol? { get set }
-  var headerViewControllers: [UIViewController] { get }
-  var bodyViewControllers: [UIViewController] { get }
+  var header: PlacePageHeaderViewController? { get }
+  var viewControllers: [UIViewController] { get }
   var actionBar: ActionBarViewController? { get }
   var navigationBar: UIViewController? { get }
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
index b9da7712c6..5a9ece5b2b 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
@@ -1,5 +1,4 @@
 class PlacePageCommonLayout: NSObject, IPlacePageLayout {
-  
   private lazy var distanceFormatter: MKDistanceFormatter = {
     let formatter =  MKDistanceFormatter()
     formatter.unitStyle = .abbreviated
@@ -20,11 +19,7 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
 
   fileprivate var lastLocation: CLLocation?
 
-  lazy var headerViewControllers: [UIViewController] = {
-    [headerViewController, previewViewController]
-  }()
-
-  lazy var bodyViewControllers: [UIViewController] = {
+  lazy var viewControllers: [UIViewController] = {
     return configureViewControllers()
   }()
 
@@ -35,10 +30,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
   var navigationBar: UIViewController? {
     return placePageNavigationViewController
   }
-  
-  lazy var headerViewController: PlacePageHeaderViewController = {
-    PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .flexible)
-  }()
 
   lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
@@ -84,6 +75,10 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
     return vc
   } ()
 
+  lazy var header: PlacePageHeaderViewController? = {
+    return PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .flexible)
+  } ()
+
   lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
     return PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .fixed)
   } ()
@@ -96,6 +91,7 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
 
   private func configureViewControllers() -> [UIViewController] {
     var viewControllers = [UIViewController]()
+    viewControllers.append(previewViewController)
     viewControllers.append(wikiDescriptionViewController)
     if let wikiDescriptionHtml = placePageData.wikiDescriptionHtml {
       wikiDescriptionViewController.descriptionHtml = wikiDescriptionHtml
@@ -187,9 +183,9 @@ extension PlacePageCommonLayout {
       bookmarkViewController.bookmarkData = bookmarkData
       isBookmark = true
     }
-    if let title = placePageData.previewData.title, let headerViewController = headerViewControllers.compactMap({ $0 as? PlacePageHeaderViewController }).first {
+    if let title = placePageData.previewData.title {
       let secondaryTitle = placePageData.previewData.secondaryTitle
-      headerViewController.setTitle(title, secondaryTitle: secondaryTitle)
+      header?.setTitle(title, secondaryTitle: secondaryTitle)
       placePageNavigationViewController.setTitle(title, secondaryTitle: secondaryTitle)
     }
     self.presenter?.layoutIfNeeded()
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift
index 3b49316114..333ad2c65d 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift
@@ -4,7 +4,7 @@ class PlacePageElevationLayout: IPlacePageLayout {
   private let storyboard: UIStoryboard
   weak var presenter: PlacePagePresenterProtocol?
 
-  lazy var bodyViewControllers: [UIViewController] = {
+  lazy var viewControllers: [UIViewController] = {
     return configureViewControllers()
   }()
 
@@ -14,8 +14,8 @@ class PlacePageElevationLayout: IPlacePageLayout {
     return placePageNavigationViewController
   }
 
-  lazy var headerViewControllers: [UIViewController] = {
-    return [PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .flexible)]
+  lazy var header: PlacePageHeaderViewController? = {
+    return PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .flexible)
   } ()
 
   lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
index 0b3ccdc677..9733edffde 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@@ -14,25 +14,14 @@ final class PlacePageScrollView: UIScrollView {
 }
 
 @objc final class PlacePageViewController: UIViewController {
-  
-  private enum Constants {
-    static let actionBarHeight: CGFloat = 50
-    static let additionalPreviewOffset: CGFloat = 80
-  }
-  
   @IBOutlet var scrollView: UIScrollView!
   @IBOutlet var stackView: UIStackView!
   @IBOutlet var actionBarContainerView: UIView!
   @IBOutlet var actionBarHeightConstraint: NSLayoutConstraint!
   @IBOutlet var panGesture: UIPanGestureRecognizer!
 
-  var headerStackView: UIStackView = {
-    let stackView = UIStackView()
-    stackView.axis = .vertical
-    stackView.distribution = .fill
-    return stackView
-  }()
   var presenter: PlacePagePresenterProtocol!
+
   var beginDragging = false
   var rootViewController: MapViewController {
     MapViewController.shared()!
@@ -44,13 +33,19 @@ final class PlacePageScrollView: UIScrollView {
   var isPreviewPlus: Bool = false
   private var isNavigationBarVisible = false
 
+  let kActionBarHeight: CGFloat = 50
+
   // MARK: - VC Lifecycle
 
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    layout.headerViewControllers.forEach({ addToHeader($0) })
-    layout.bodyViewControllers.forEach({ addToBody($0) })
+    if let header = layout.header {
+      addHeader(header)
+    }
+    for viewController in layout.viewControllers {
+      addToStack(viewController)
+    }
 
     if let actionBar = layout.actionBar {
       hideActionBar(false)
@@ -113,8 +108,8 @@ final class PlacePageScrollView: UIScrollView {
   func updatePreviewOffset() {
     updateSteps()
     if !beginDragging {
-      let stateOffset = isPreviewPlus ? scrollSteps[2].offset : scrollSteps[1].offset + Constants.additionalPreviewOffset
-      scrollTo(CGPoint(x: 0, y: stateOffset))
+      let state = isPreviewPlus ? scrollSteps[2] : scrollSteps[1]
+      scrollTo(CGPoint(x: 0, y: state.offset))
     }
   }
 
@@ -195,17 +190,19 @@ extension PlacePageViewController: PlacePageViewProtocol {
   }
 
   func hideActionBar(_ value: Bool) {
-    actionBarHeightConstraint.constant = !value ? Constants.actionBarHeight : .zero
+    actionBarHeightConstraint.constant = !value ? kActionBarHeight : 0
   }
 
-  func addToHeader(_ headerViewController: UIViewController) {
-    if !stackView.arrangedSubviews.contains(headerStackView) {
-      stackView.addArrangedSubview(headerStackView)
+  func addHeader(_ headerViewController: UIViewController) {
+    addToStack(headerViewController)
+    // TODO: workaround. Custom spacing isn't working if visibility of any arranged subview
+    // changes after setting custom spacing
+    DispatchQueue.main.async {
+      self.stackView.setCustomSpacing(0, after: headerViewController.view)
     }
-    headerStackView.addArrangedSubview(headerViewController.view)
   }
 
-  func addToBody(_ viewController: UIViewController) {
+  func addToStack(_ viewController: UIViewController) {
     addChild(viewController)
     stackView.addArrangedSubview(viewController.view)
     viewController.didMove(toParent: self)
diff --git a/iphone/Maps/UI/Settings/DrivingOptions.storyboard b/iphone/Maps/UI/Settings/DrivingOptions.storyboard
index 16e06ed0cf..a3eb786170 100644
--- a/iphone/Maps/UI/Settings/DrivingOptions.storyboard
+++ b/iphone/Maps/UI/Settings/DrivingOptions.storyboard
@@ -16,7 +16,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <sections>
-                            <tableViewSection id="qNN-Uw-84i">
+                            <tableViewSection headerTitle="AVOID ON EVERY ROUTE" id="qNN-Uw-84i">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="YrA-ve-xPG" customClass="SettingsTableViewSwitchCell" customModule="OMaps" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
diff --git a/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift b/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift
index 227eabedcd..d64a7e7bb6 100644
--- a/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift
+++ b/iphone/Maps/UI/Settings/DrivingOptionsViewController.swift
@@ -14,6 +14,10 @@ class DrivingOptionsViewController: MWMTableViewController {
     ferryCrossingsCell.isOn = options.avoidFerry
     motorwaysCell.isOn = options.avoidMotorway
   }
+
+  override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+    return L("driving_options_subheader")
+  }
 }
 
 extension DrivingOptionsViewController: SettingsTableViewSwitchCellDelegate {
diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp
index eb6866cf49..2030a7a154 100644
--- a/map/mwm_url.cpp
+++ b/map/mwm_url.cpp
@@ -376,12 +376,9 @@ void ParsedMapApi::Reset()
 bool ParsedMapApi::GetViewportParams(m2::PointD & center, double & scale) const
 {
   auto const & markIds = m_bmManager->GetUserMarkIds(UserMark::Type::API);
-  if (markIds.size() == 1)
+  if (markIds.size() == 1 && m_zoomLevel >= 1)
   {
-    if (m_zoomLevel >= 1)  // 0 means uninitialized/not passed to the API.
-      scale = min(static_cast<double>(scales::GetUpperComfortScale()), m_zoomLevel);
-    else
-      scale = static_cast<double>(scales::GetUpperComfortScale());
+    scale = min(static_cast<double>(scales::GetUpperComfortScale()), m_zoomLevel);
     center = m_bmManager->GetUserMark(*markIds.begin())->GetPivot();
     return true;
   }