[android] Add Map Layers button to custom left button options

Signed-off-by: Harry Bond <me@hbond.xyz> Signed-off-by: Harry Bond <me@hbond.xyz>
2026-01-11 14:54:17 +00:00 · 2025-08-06 09:49:44 +01:00
624 changed files with 861068 additions and 8100 deletions
--- a/.forgejo/workflows/android-beta.yaml
+++ b/.forgejo/workflows/android-beta.yaml
@@ -36,6 +36,8 @@ jobs:
  android-google-beta:
    name: Android Google Beta
    runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
    environment: beta
    steps:
      - name: Install build tools and dependencies
--- a/.forgejo/workflows/android-check-metadata.yaml
+++ b/.forgejo/workflows/android-check-metadata.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
  android-check-metadata:
    name: Check app metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    steps:
      - name: Checkout
        uses: actions/checkout@v4
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -37,7 +37,9 @@ on:
 jobs:
  lint:
    name: Android Lint
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
+    container:
+      image: runmymind/docker-android-sdk:latest
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
@@ -56,6 +58,8 @@ jobs:
  android-check:
    name: Build Android Debug
    runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
    strategy:
      fail-fast: false
      matrix:
--- a/.forgejo/workflows/android-monkey.yaml
+++ b/.forgejo/workflows/android-monkey.yaml
@@ -6,7 +6,7 @@ on:

 jobs:
  precondition:
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    name: Check preconditions
    steps:
      - name: Checkout sources
@@ -31,6 +31,8 @@ jobs:
  android-google-beta:
    name: Android Google Beta
    runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
    needs: precondition
    if: ${{ needs.precondition.outputs.updated != '' }}
    environment: beta
--- a/.forgejo/workflows/android-release-metadata.yaml
+++ b/.forgejo/workflows/android-release-metadata.yaml
@@ -5,7 +5,9 @@ on:
 jobs:
  android-release-metadata:
    name: Upload Google Play metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
+    container:
+      image: runmymind/docker-android-sdk:latest
    environment: production
    steps:
      - name: Checkout sources
--- a/.forgejo/workflows/android-release.yaml
+++ b/.forgejo/workflows/android-release.yaml
@@ -10,6 +10,8 @@ jobs:
  tag:
    name: Tag
    runs-on: ubuntu-latest
+    container:
+      image: runmymind/docker-android-sdk:latest
    environment: production
    steps:
      - name: Checkout sources
--- a/.forgejo/workflows/appstream-check.yaml
+++ b/.forgejo/workflows/appstream-check.yaml
@@ -3,20 +3,20 @@ on:
  workflow_dispatch: # Manual trigger
  pull_request:
    paths:
-      - packaging/app.comaps.comaps.metainfo.xml
-      - .forgejo/workflows/appstream-check.yaml # Run check on self change
+      - packaging/app.comaps.desktop.metainfo.xml
+      - .forgejo/workflows/appstream-check.yaml  # Run check on self change

 jobs:
  validate-appstream:
    name: Validate appstream metadata xml
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 1
          sparse-checkout: |
-            packaging/app.comaps.comaps.metainfo.xml
+            packaging/app.comaps.desktop.metainfo.xml

      - name: Install appstream validator and flatpak Builder
        shell: bash
@@ -29,8 +29,8 @@ jobs:

      - name: Lint appstream data with flatpak Builder
        shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.desktop.metainfo.xml

      - name: Run appstreamcli in pedantic mode
        shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.desktop.metainfo.xml
--- a/.forgejo/workflows/coverage-check.yaml
+++ b/.forgejo/workflows/coverage-check.yaml
@@ -33,7 +33,7 @@ concurrency:
 jobs:
  should-run-check:
    name: Should run coverage
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    outputs:
      run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }}
      manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }}
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -5,4 +5,4 @@ jobs:
  check:
    runs-on: codeberg-tiny
    steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1
+      - uses: https://github.com/KineticCafe/actions-dco@v1
--- a/.forgejo/workflows/desktop-file-check.yaml
+++ b/.forgejo/workflows/desktop-file-check.yaml
@@ -3,20 +3,20 @@ on:
  workflow_dispatch: # Manual trigger
  pull_request:
    paths:
-      - qt/res/app.comaps.comaps.desktop
-      - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
+      - qt/res/app.comaps.desktop.desktop
+      - .forgejo/workflows/desktop-file-check.yaml  # Run check on self change

 jobs:
  validate-desktop-file:
    name: Validate .desktop file
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 1
          sparse-checkout: |
-            qt/res/app.comaps.comaps.desktop
+            qt/res/app.comaps.desktop.desktop

      - name: Install desktop-file-validate tool
        shell: bash
@@ -27,4 +27,4 @@ jobs:

      - name: Validate desktop file
        shell: bash
-        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.comaps.desktop.desktop && echo "Successfully validated .desktop file"
--- a/.forgejo/workflows/ios-check-metadata.yaml
+++ b/.forgejo/workflows/ios-check-metadata.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
  ios-check-metadata:
    name: Check app metadata
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    steps:
      - name: Checkout
        uses: actions/checkout@v4
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,12 @@ stxxl.errlog
 stxxl.log
 screenlog.0

-data/symbols/*/design/
+data/styles/*/*/out/*
+data/resources-*_design/*
 # symbols png/sdf are now generated at build
-data/symbols/**/symbols.png
-data/symbols/**/symbols.sdf
+data/resources-*_*/symbols.png
+data/resources-*_*/symbols.sdf
+data/drules_proto_default_design.bin
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
@@ -26,12 +28,6 @@ data/World.mwm
 data/WorldCoasts.mwm
 data/world_mwm/*
 data/*_hash
-data/drules_proto*
-data/classificator.txt
-data/types.txt
-data/visibility.txt
-data/colors.txt
-data/patterns.txt

 # Compiled Python
 *.pyc
@@ -52,7 +48,8 @@ omim.sdf
 *.rc
 !qt/res/windows.rc
 *.pdb
-out/
+out/*
+qt/mapswithme.log

 # XCode
 xcode/keys/*
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.22.1)
-
 project(omim C CXX)

 set(CMAKE_CXX_STANDARD 20)
@@ -106,7 +105,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
  add_definitions(-DRELEASE)
  if (NOT MSVC)
-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)
+    add_compile_options(-Ofast $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)  # Also enables -ffast-math
  endif()
 else()
  message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1 +1 @@
-See [docs/INSTALL.md](docs/INSTALL.md) 
+See [docs/INSTALL.md](docs/INSTALL.md)
--- a/README.md
+++ b/README.md
@@ -125,8 +125,10 @@ You can help by donating, contributing code, translating, or by telling others a

 - Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
 - Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
+> [!NOTE]  
+> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!

-There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/main/contribute.md#3-team-messaging) chat for active contributors.
+There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)

 ---

--- a/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
@@ -1,7 +0,0 @@
-• Data OpenStreetMap k 4. 8.
-• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
-• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
-• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
-• podpora více zkratek a aliasů pro vyhledávání
-• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
-• plynulejší pohyb šipky pro určení polohy
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,7 +1,9 @@
-• OpenStreetMap-Daten vom 4. August
-• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Der Positionspfeil bewegt sich gleichmässiger
+Wir stellen vor: Das neue CoMaps-Logo!
+• Verbesserte Höhenlinien in vielen Regionen (Stufen von 20/50 m)
+• Links zu Panoramax-Bildern für ausgewählte POIs
+• OpenStreetMap-Daten vom 13. Juli
+• Neue Farben für viele Objekte und Farben werden früher angezeigt
+• Öffnungszeiten werden beim Antippen eines POI angezeigt
+• Verschiedene Arten von Feuchtgebieten
+• Neue Farben für Vegetation und andere Features; einige neue Icons
+• Wandern: bessere Darstellung der Höhenlinien
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,7 +1,10 @@
-• OpenStreetMap data as of August 4
-• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• upgrade altitude contour lines to 20m step for some popular hiking regions
-• support more search abbreviations and aliases
-• add search and bookmark icons for fast food, bicycle and charging stations
-• more smooth position arrow movements
+Introducing CoMaps logo!
+
+• upgrade altitude contour lines for many regions to 20 or 50 meters step
+• add Panoramax Picture links to selected POIs
+• OpenStreetMap data as of July 13
+• add color fills to many features and display fills earlier for existing features
+• display opening hours state when selecting a POI
+• split all wetlands into several distinct types
+• update vegetation and other map colors, update some map icons
+• outdoors: bolder altitude contour lines
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,7 +1,9 @@
-• Datos de OpenStreetMap a fecha 2025.08.04
-• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• Más abreviaturas y alias de búsqueda
-• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• Más fluidez de la flecha de posición
+¡Presentamos el logo de CoMaps!
+• mejora de isolíneas con más detalle para muchas regiones
+• añade enlaces de imágenes de Panoramax a POIs seleccionados
+• datos de OpenStreetMap a 13 de julio
+• añadidos rellenos de color a muchas características
+• se muestra el estado de horarios de apertura al seleccionar un POI
+• se dividen los humedales en tipos distintos
+• se actualiza la vegetación y otros colores del mapa, así como otros iconos
+• exteriores: líneas de contorno de altitud más gruesas
--- a/android/app/src/fdroid/play/listings/fa-IR/short-description.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/short-description.txt
@@ -1 +0,0 @@
-ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه
--- a/android/app/src/fdroid/play/listings/fa-IR/title.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/title.txt
@@ -1 +0,0 @@
-CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -0,0 +1,7 @@
+Présentation du logo CoMaps !
+• Amélioration des courbes d’altitude à une précision de 20 ou 50 mètres pour de nombreuses régions
+• Ajout d'un lien vers les images Panoramax des POI
+• Données OpenStreetMap du 13 juillet
+• Affichage de l’état des heures d’ouverture lors de la sélection d’un POI
+• Mise à jour du style(végétation et zones humides), mise à jour de certaines icônes de la carte
+• Outdoors: Améliorations de la visibilité des courbes d'altitude
--- a/android/app/src/fdroid/play/listings/fr-FR/short-description.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/short-description.txt
@@ -1 +1 @@
-Navigation de cartes facile - Découvrez le monde - Propulsé par la communauté
+Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
--- a/android/app/src/fdroid/play/listings/hu-HU/short-description.txt
+++ b/android/app/src/fdroid/play/listings/hu-HU/short-description.txt
@@ -1 +0,0 @@
-Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -1,7 +0,0 @@
-• Dati di OpenStreetMap aggiornati al 4 Agosto
-• Migliorati i colori per acqua, foreste, servizi etc
-• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
-• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
-• Aggiunto il supporto per un maggior numero di alias
-• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
-• Resi più fluidi i movimenti della freccia di posizione
--- a/android/app/src/fdroid/play/listings/pl-PL/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pl-PL/release-notes.txt
@@ -0,0 +1,9 @@
+Wprowadzamy logo CoMaps!
+• zwiększenie dokładności izolinii w wielu regionach w krokach 20 do 50 metrów
+• dodanie linków do zdjęć z Panoramax do wybranych POI
+• aktualizacja danych OpenStreetMap z 13 lipca
+• dodanie wypełnienia kolorem dla wielu typów obiektów
+• wyświetlanie stanu godzin otwarcia przy wyborze POI
+• podział mokradeł na kilka typów
+• aktualizacja koloru roślinności i innych kolorów, aktualizacja części ikon na mapie
+• tryb outdoorowy: pogrubione warstwice wysokości
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,7 +1,9 @@
-• Dados OSM de 4/08
-• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Suporte a mais abreviações para busca
-• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Movimentos mais suaves para seta de posição
+Apresentamos o logo do CoMaps!
+• Curvas de nível mais detalhadas em muitas regiões
+• Adicionados links de imagens do Panoramax para pontos de interesse selecionados
+• Dados OSM de 13/07
+• Adicionados preenchimentos de cor a muitos elementos
+• Exibição de horário de funcionamento ao selecionar um ponto de interesse
+• Divididas áreas úmidas em vários tipos distintos
+• Atualizada cores/ícones para vegetação e outros elementos
+• Ar livre: curvas de nível de altitude mais destacadas
--- a/android/app/src/fdroid/play/listings/pt-PT/short-description.txt
+++ b/android/app/src/fdroid/play/listings/pt-PT/short-description.txt
@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos
--- a/android/app/src/fdroid/play/listings/pt-PT/title.txt
+++ b/android/app/src/fdroid/play/listings/pt-PT/title.txt
@@ -1 +0,0 @@
-CoMaps - Mapas e Navegação - Offline e Privada
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,7 +1,9 @@
-• Карты OpenStreetMap от 4 августа
-• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
-• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
-• Для некоторых популярных туристических регионов добавлены линии высот 20м
-• Поддержка дополнительных поисковых сокращений и синонимов
-• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
-• Более плавное движение стрелки местоположения
+Представляем логотип CoMaps!
+• Линии высот для многих регионов с шагом 20м или 50м
+• Ссылки на изображения Panoramax к выбранным POI
+• Карты OpenStreetMap от 13 июля
+• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
+• Показ часов работы при выборе POI
+• Разные водно-болотные угодья отличаются цветом
+• Обновлены цвета растительности и другие цвета на карте, изменены некоторые иконки
+• В стиле "Активный отдых" более четкие линии высот
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -1,7 +1,9 @@
-• подаци из OpenStreetMap-а од 4. августа
-• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
-• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
-• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
-• подршка за више скраћеница и алтернативних назива у претрази
-• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• равномерније кретање стрелице која приказује позицију
+Представљамо CoMaps лого!
+• ажуриране изохипсе за многе регионе на кораке од 20 или 50 метара
+• додате везе ка Panoramax сликама за изабране тачке интересовања (POI)
+• подаци са OpenStreetMap-а од 13. јула
+• додате боје за многе елементе и раније приказивање постојећих површина
+• приказ стања радног времена при избору POI-ја
+• мочваре подељене на неколико различитих типова
+• ажуриране боје вегетације и других елемената на мапи, ажуриране поједине иконе
+• на отвореном: наглашеније изохипсе
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.08.13-8-FDroid+25081308
+version: 2025.03.02-7-FDroid+25030207
--- a/android/app/src/google/play/listings/fr-FR/short-description.txt
+++ b/android/app/src/google/play/listings/fr-FR/short-description.txt
@@ -1 +1 @@
-Navigation cartographique facile - Vivez de grands voyages - Propulsé par la communauté
+Navigation cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
--- a/android/app/src/google/play/listings/hu-HU/short-description.txt
+++ b/android/app/src/google/play/listings/hu-HU/short-description.txt
@@ -1 +0,0 @@
-Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével
--- a/android/app/src/google/play/listings/hu-HU/title.txt
+++ b/android/app/src/google/play/listings/hu-HU/title.txt
@@ -1 +0,0 @@
-CoMaps - Az adatvédő navigáció
--- a/android/app/src/google/play/listings/ml-IN/title.txt
+++ b/android/app/src/google/play/listings/ml-IN/title.txt
@@ -1 +0,0 @@
-കോമാപ്പ്സ് - സ്വകാര്യതയോടെ സഞ്ചരിക്കൂ
--- a/android/app/src/google/play/listings/pl-PL/title.txt
+++ b/android/app/src/google/play/listings/pl-PL/title.txt
@@ -1 +0,0 @@
-CoMaps - Nawigacja szanująca prywatność
--- a/android/app/src/google/play/listings/tr-TR/full-description.txt
+++ b/android/app/src/google/play/listings/tr-TR/full-description.txt
@@ -7,12 +7,12 @@ Topluluğa katılın ve en iyi harita uygulamasını oluşturmamıza yardım edi

 <i>Geri bildirimleriniz ve 5 yıldızlı yorumlarınız bizim için en iyi destektir!</i>

-‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit ve işe yarayan özellikler.
-‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası. Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
+‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit, işe yarayan özellikler.
+‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası . Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
 ‣ <b>Gizliliğe Saygılı</b>: Uygulama gizliliğe saygılı olarak tasarlanmıştır. Kullanıcı profilinizi çıkarmaz, sizi takip etmez ve kişisel bilgi toplamaz. Üstelik tamamen reklamsızdır.
-‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Kompakt harita dosyaları, değerli depolama alanınızdan tasarruf eder.
-‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak bu uygulamanın oluşturulmasına yardımcı oldular.
-‣ <b>Açık ve Şeffaf Bir Şekilde Yürütülen Karar Alma ve Fonlama Süreçlerine Sahip, Kâr Amacı Gütmeyen ve Tamamen Açık Kaynaklı Bir Uygulama.</b>
+‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Compact maps değerli depolama alanınızdan tasarruf eder.
+‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
+‣ <b>Açık ve Şeffaf Şekilde Yürütülen Karar Alma ve Fonlama Süreçleri, Kâr Amacı Gütmez ve Tamamen Açık Kaynaklı.</b>

 <b>Ana Özellikler</b>:
 • Google Haritalar'da bulunmayan yerleri içeren, çevrimdışı detaylı haritalar
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -6,6 +6,7 @@ import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
+import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_MAP_LAYER_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW;
@@ -944,6 +945,42 @@ public class MwmActivity extends BaseMwmFragmentActivity
        drawIcon(left);
      }
    });
+
+    buttonsHolder.registerButton(new LeftToggleButton() {
+      //TODO: hide layers button
+      private boolean isLayerActive = false; //TODO: hook up
+
+      @Override
+      public void setChecked(boolean checked)
+      {
+        isLayerActive = checked;
+      }
+
+      @Override
+      public String getCode()
+      {
+        return BUTTON_MAP_LAYER_CODE;
+      }
+
+      @Override
+      public String getPrefsName()
+      {
+        return getString(R.string.layers_title);
+      }
+
+      @Override
+      public void drawIcon(FloatingActionButton imageView)
+      {
+        imageView.setImageResource(isLayerActive ? R.drawable.ic_layers : R.drawable.ic_layers_clear);
+      }
+
+      @Override
+      public void onClick(FloatingActionButton left)
+      {
+        toggleMapLayerBottomSheet();
+        drawIcon(left);
+      }
+    });
  }

  private void initNavigationButtons(MapButtonsController.LayoutMode layoutMode)
--- a/android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java
+++ b/android/app/src/main/java/app/organicmaps/leftbutton/LeftButtonsHolder.java
@@ -19,6 +19,7 @@ public class LeftButtonsHolder
  public static final String BUTTON_SETTINGS_CODE = "settings";
  public static final String BUTTON_ADD_PLACE_CODE = "add-place";
  public static final String BUTTON_RECORD_TRACK_CODE = "record-track";
+  public static final String BUTTON_MAP_LAYER_CODE = "map-layer";
  private static final String DEFAULT_BUTTON_CODE = BUTTON_HELP_CODE;

  private final String leftButtonPreferenceKey;
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -9,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import app.organicmaps.R;
@@ -18,7 +19,6 @@ import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -93,9 +93,9 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
  {
    @SuppressLint("InflateParams")
    final View countryView = View.inflate(requireActivity(), R.layout.dialog_missed_map, null);
-    ((MaterialTextView) countryView.findViewById(R.id.tv__title)).setText(map.name);
+    ((TextView) countryView.findViewById(R.id.tv__title)).setText(map.name);

-    final MaterialTextView szView = countryView.findViewById(R.id.tv__size);
+    final TextView szView = countryView.findViewById(R.id.tv__size);
    szView.setText(StringUtils.getFileSizeString(requireContext(), map.totalSize));
    ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) szView.getLayoutParams();
    lp.rightMargin = 0;
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
@@ -8,11 +8,11 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
@@ -232,16 +232,16 @@ public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.
    public final View mItemView;

    @NonNull
-    public final ShapeableImageView mImageViewIcon;
+    public final ImageView mImageViewIcon;

    @NonNull
-    public final MaterialTextView mTextViewTitle;
+    public final TextView mTextViewTitle;

    @NonNull
-    public final MaterialTextView mTextViewSubtitle;
+    public final TextView mTextViewSubtitle;

    @NonNull
-    public final ShapeableImageView mImageViewDelete;
+    public final ImageView mImageViewDelete;

    ManageRouteViewHolder(@NonNull View itemView)
    {
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -4,6 +4,7 @@ import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -27,22 +28,20 @@ import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
 import app.organicmaps.widget.menu.NavMenu;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;

 public class NavigationController implements TrafficManager.TrafficCallback, NavMenu.NavMenuListener
 {
  private final View mFrame;

  private final ImageView mNextTurnImage;
-  private final MaterialTextView mNextTurnDistance;
-  private final MaterialTextView mCircleExit;
+  private final TextView mNextTurnDistance;
+  private final TextView mCircleExit;

  private final View mNextNextTurnFrame;
  private final ImageView mNextNextTurnImage;

  private final View mStreetFrame;
-  private final MaterialTextView mNextStreet;
+  private final TextView mNextStreet;

  @NonNull
  private final LanesView mLanesView;
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -60,7 +60,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
  @NonNull
  private final View mTransitFrame;
  @NonNull
-  private final MaterialTextView mError;
+  private final TextView mError;
  @NonNull
  private final Button mStart;
  @NonNull
@@ -94,7 +94,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
    View altitudeChartFrame = getViewById(activity, frame, R.id.altitude_chart_panel);
    View timeElevationLine = getViewById(activity, frame, R.id.time_elevation_line);
    View transitFrame = getViewById(activity, frame, R.id.transit_panel);
-    MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
+    TextView error = (TextView) getViewById(activity, frame, R.id.error);
    Button start = (Button) getViewById(activity, frame, R.id.start);
    ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
    MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
@@ -117,7 +117,7 @@ final class RoutingBottomMenuController implements View.OnClickListener

  private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                      @NonNull View timeElevationLine, @NonNull View transitFrame,
-                                      @NonNull MaterialTextView error, @NonNull Button start, @NonNull ImageView altitudeChart,
+                                      @NonNull TextView error, @NonNull Button start, @NonNull ImageView altitudeChart,
                                      @NonNull MaterialTextView time, @NonNull MaterialTextView altitudeDifference,
                                      @NonNull TextView timeVehicle, @Nullable MaterialTextView arrival,
                                      @NonNull View actionFrame, @Nullable RoutingBottomMenuListener listener)
@@ -223,7 +223,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
    else
      UiUtils.hide(rv); // Show only distance between start and finish

-    MaterialTextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
+    TextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
    totalTimeView.setText(mContext.getString(R.string.placepage_distance) + ": " + totalLength.mDistanceStr + " "
                          + totalLength.getUnitsStr(mContext));

--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -8,12 +8,12 @@ import android.text.TextUtils;
 import android.util.Pair;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
-import com.google.android.material.textview.MaterialTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
@@ -38,7 +38,7 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment

    if (!TextUtils.isEmpty(titleMessage.first))
    {
-      MaterialTextView titleView = new MaterialTextView(requireContext());
+      TextView titleView = new TextView(requireContext());
      titleView.setText(titleMessage.first);
      titleView.setPadding(65, 32, 32, 16);
      titleView.setTextSize(18);
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -5,6 +5,7 @@ import android.util.Pair;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
@@ -18,7 +19,6 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.concurrent.TimeUnit;
@@ -31,15 +31,15 @@ public class NavMenu

  private final ImageView mTts;
  private final View mSpeedViewContainer;
-  private final MaterialTextView mSpeedValue;
-  private final MaterialTextView mSpeedUnits;
-  private final MaterialTextView mTimeHourValue;
-  private final MaterialTextView mTimeHourUnits;
-  private final MaterialTextView mTimeMinuteValue;
-  private final MaterialTextView mTimeMinuteUnits;
-  private final MaterialTextView mTimeEstimate;
-  private final MaterialTextView mDistanceValue;
-  private final MaterialTextView mDistanceUnits;
+  private final TextView mSpeedValue;
+  private final TextView mSpeedUnits;
+  private final TextView mTimeHourValue;
+  private final TextView mTimeHourUnits;
+  private final TextView mTimeMinuteValue;
+  private final TextView mTimeMinuteUnits;
+  private final TextView mTimeEstimate;
+  private final TextView mDistanceValue;
+  private final TextView mDistanceUnits;
  private final LinearProgressIndicator mRouteProgress;

  private final AppCompatActivity mActivity;
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.MwmActivity;
@@ -20,17 +21,16 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.ArrowView;
-import com.google.android.material.textview.MaterialTextView;

 public class DirectionFragment extends BaseMwmDialogFragment implements LocationListener, SensorListener
 {
  private static final String EXTRA_MAP_OBJECT = "MapObject";

  private ArrowView mAvDirection;
-  private MaterialTextView mTvTitle;
-  private MaterialTextView mTvSubtitle;
-  private MaterialTextView mTvDistance;
-  private MaterialTextView mTvAzimuth;
+  private TextView mTvTitle;
+  private TextView mTvSubtitle;
+  private TextView mTvDistance;
+  private TextView mTvAzimuth;

  private MapObject mMapObject;

--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -619,7 +619,7 @@ public class PlacePageView extends Fragment

  private void addOrganisation()
  {
-    ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, true);
+    ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, false);
  }

  private void addPlace()
--- a/android/app/src/main/res/drawable/ic_category_parking.xml
+++ b/android/app/src/main/res/drawable/ic_category_parking.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#427BB8" />
+            <solid android:color="#2E89B0" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_water.xml
+++ b/android/app/src/main/res/drawable/ic_category_water.xml
@@ -5,7 +5,7 @@
      <size
        android:width="40dp"
        android:height="40dp" />
-      <solid android:color="#54A3B6" />
+      <solid android:color="#14A0C2" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable/route_point_01.xml
+++ b/android/app/src/main/res/drawable/route_point_01.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m15.251,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182z"
--- a/android/app/src/main/res/drawable/route_point_02.xml
+++ b/android/app/src/main/res/drawable/route_point_02.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m16.985,17h-5.848v-1.16l2.76,-2.941q0.568,-0.621 0.838,-1.084 0.275,-0.463 0.275,-0.879 0,-0.568 -0.287,-0.891 -0.287,-0.328 -0.82,-0.328 -0.574,0 -0.908,0.398 -0.328,0.393 -0.328,1.037h-1.699q0,-0.779 0.369,-1.424 0.375,-0.645 1.055,-1.008 0.68,-0.369 1.541,-0.369 1.318,0 2.045,0.633 0.732,0.633 0.732,1.787 0,0.633 -0.328,1.289t-1.125,1.529l-1.939,2.045h3.668z"
--- a/android/app/src/main/res/drawable/route_point_03.xml
+++ b/android/app/src/main/res/drawable/route_point_03.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m12.86,11.984h0.902q0.645,0 0.955,-0.322 0.311,-0.322 0.311,-0.855 0,-0.516 -0.311,-0.803 -0.305,-0.287 -0.844,-0.287 -0.486,0 -0.814,0.27 -0.328,0.264 -0.328,0.691h-1.693q0,-0.668 0.357,-1.195 0.363,-0.533 1.008,-0.832 0.65,-0.299 1.43,-0.299 1.354,0 2.121,0.65 0.768,0.645 0.768,1.781 0,0.586 -0.357,1.078 -0.357,0.492 -0.938,0.756 0.721,0.258 1.072,0.773 0.357,0.516 0.357,1.219 0,1.137 -0.832,1.822 -0.826,0.686 -2.191,0.686 -1.277,0 -2.092,-0.674 -0.809,-0.674 -0.809,-1.781h1.693q0,0.48 0.357,0.785 0.363,0.305 0.891,0.305 0.604,0 0.943,-0.316 0.346,-0.322 0.346,-0.85 0,-1.277 -1.406,-1.277h-0.896z"
--- a/android/app/src/main/res/drawable/route_point_04.xml
+++ b/android/app/src/main/res/drawable/route_point_04.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m16.147,13.789h0.967v1.365h-0.967v1.846h-1.693v-1.846h-3.498l-0.076,-1.066 3.557,-5.619h1.711zM12.567,13.789h1.887v-3.012l-0.111,0.193z"
--- a/android/app/src/main/res/drawable/route_point_05.xml
+++ b/android/app/src/main/res/drawable/route_point_05.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.39,12.805 l0.492,-4.336h4.781v1.412h-3.393l-0.211,1.834q0.604,-0.322 1.283,-0.322 1.219,0 1.91,0.756 0.691,0.756 0.691,2.115 0,0.826 -0.352,1.482 -0.346,0.65 -0.996,1.014 -0.65,0.357 -1.535,0.357 -0.773,0 -1.436,-0.311 -0.662,-0.316 -1.049,-0.885 -0.381,-0.568 -0.404,-1.295h1.676q0.053,0.533 0.369,0.832 0.322,0.293 0.838,0.293 0.574,0 0.885,-0.41 0.311,-0.416 0.311,-1.172 0,-0.727 -0.357,-1.113 -0.357,-0.387 -1.014,-0.387 -0.604,0 -0.979,0.316l-0.164,0.152z"
--- a/android/app/src/main/res/drawable/route_point_06.xml
+++ b/android/app/src/main/res/drawable/route_point_06.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m15.731,8.381v1.395h-0.164q-1.148,0.018 -1.852,0.598 -0.697,0.58 -0.838,1.611 0.68,-0.691 1.717,-0.691 1.113,0 1.77,0.797t0.656,2.098q0,0.832 -0.363,1.506 -0.357,0.674 -1.02,1.049 -0.656,0.375 -1.488,0.375 -1.348,0 -2.18,-0.938 -0.826,-0.938 -0.826,-2.502v-0.609q0,-1.389 0.521,-2.449 0.527,-1.066 1.506,-1.646 0.984,-0.586 2.279,-0.592zM14.079,12.652q-0.41,0 -0.744,0.217 -0.334,0.211 -0.492,0.563v0.516q0,0.85 0.334,1.33 0.334,0.475 0.938,0.475 0.545,0 0.879,-0.428 0.34,-0.434 0.34,-1.119 0,-0.697 -0.34,-1.125 -0.34,-0.428 -0.914,-0.428z"
--- a/android/app/src/main/res/drawable/route_point_07.xml
+++ b/android/app/src/main/res/drawable/route_point_07.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m16.938,9.418 l-3.299,7.582h-1.787l3.305,-7.16h-4.242v-1.371h6.023z"
--- a/android/app/src/main/res/drawable/route_point_08.xml
+++ b/android/app/src/main/res/drawable/route_point_08.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m16.698,10.736q0,0.621 -0.311,1.102 -0.311,0.48 -0.855,0.768 0.621,0.299 0.984,0.826 0.363,0.521 0.363,1.23 0,1.137 -0.773,1.799 -0.773,0.656 -2.103,0.656t-2.109,-0.662 -0.779,-1.793q0,-0.709 0.363,-1.236 0.363,-0.527 0.979,-0.82 -0.545,-0.287 -0.855,-0.768 -0.305,-0.48 -0.305,-1.102 0,-1.09 0.727,-1.734 0.727,-0.65 1.975,-0.65 1.242,0 1.969,0.645 0.732,0.639 0.732,1.74zM15.18,14.539q0,-0.557 -0.322,-0.891 -0.322,-0.334 -0.867,-0.334 -0.539,0 -0.861,0.334 -0.322,0.328 -0.322,0.891 0,0.545 0.316,0.879 0.316,0.334 0.879,0.334 0.551,0 0.861,-0.322 0.316,-0.322 0.316,-0.891zM15.005,10.818q0,-0.498 -0.264,-0.797 -0.264,-0.305 -0.744,-0.305 -0.475,0 -0.738,0.293 -0.264,0.293 -0.264,0.809 0,0.51 0.264,0.82t0.744,0.311q0.48,0 0.738,-0.311 0.264,-0.311 0.264,-0.82z"
--- a/android/app/src/main/res/drawable/route_point_09.xml
+++ b/android/app/src/main/res/drawable/route_point_09.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m15.099,13.59q-0.662,0.65 -1.547,0.65 -1.131,0 -1.811,-0.773 -0.68,-0.779 -0.68,-2.098 0,-0.838 0.363,-1.535 0.369,-0.703 1.025,-1.09 0.656,-0.393 1.477,-0.393 0.844,0 1.5,0.422t1.02,1.213q0.363,0.791 0.369,1.811v0.627q0,2.133 -1.061,3.352t-3.006,1.301l-0.416,0.006v-1.412l0.375,-0.006q2.209,-0.1 2.391,-2.074zM13.968,12.945q0.41,0 0.703,-0.211 0.299,-0.211 0.451,-0.51v-0.697q0,-0.861 -0.328,-1.336 -0.328,-0.475 -0.879,-0.475 -0.51,0 -0.838,0.469 -0.328,0.463 -0.328,1.166 0,0.697 0.316,1.148 0.322,0.445 0.902,0.445z"
--- a/android/app/src/main/res/drawable/route_point_10.xml
+++ b/android/app/src/main/res/drawable/route_point_10.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.323,13.473q0,1.77 -0.732,2.707 -0.732,0.938 -2.145,0.938 -1.395,0 -2.133,-0.92 -0.738,-0.92 -0.756,-2.637v-1.57q0,-1.787 0.738,-2.713 0.744,-0.926 2.139,-0.926 1.395,0 2.133,0.92 0.738,0.914 0.756,2.631zM18.629,11.75q0,-1.061 -0.293,-1.541 -0.287,-0.486 -0.902,-0.486 -0.598,0 -0.885,0.463 -0.281,0.457 -0.299,1.436v2.074q0,1.043 0.281,1.553 0.287,0.504 0.914,0.504 0.621,0 0.896,-0.486 0.275,-0.486 0.287,-1.488z"
--- a/android/app/src/main/res/drawable/route_point_11.xml
+++ b/android/app/src/main/res/drawable/route_point_11.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM18.694,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182z"
--- a/android/app/src/main/res/drawable/route_point_12.xml
+++ b/android/app/src/main/res/drawable/route_point_12.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.428,17h-5.848v-1.16l2.76,-2.941q0.568,-0.621 0.838,-1.084 0.275,-0.463 0.275,-0.879 0,-0.568 -0.287,-0.891 -0.287,-0.328 -0.82,-0.328 -0.574,0 -0.908,0.398 -0.328,0.393 -0.328,1.037h-1.699q0,-0.779 0.369,-1.424 0.375,-0.645 1.055,-1.008 0.68,-0.369 1.541,-0.369 1.318,0 2.045,0.633 0.732,0.633 0.732,1.787 0,0.633 -0.328,1.289t-1.125,1.529l-1.939,2.045h3.668z"
--- a/android/app/src/main/res/drawable/route_point_13.xml
+++ b/android/app/src/main/res/drawable/route_point_13.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM16.303,11.984h0.902q0.645,0 0.955,-0.322 0.311,-0.322 0.311,-0.855 0,-0.516 -0.311,-0.803 -0.305,-0.287 -0.844,-0.287 -0.486,0 -0.814,0.27 -0.328,0.264 -0.328,0.691h-1.693q0,-0.668 0.357,-1.195 0.363,-0.533 1.008,-0.832 0.65,-0.299 1.43,-0.299 1.354,0 2.121,0.65 0.768,0.645 0.768,1.781 0,0.586 -0.357,1.078 -0.357,0.492 -0.938,0.756 0.721,0.258 1.072,0.773 0.357,0.516 0.357,1.219 0,1.137 -0.832,1.822 -0.826,0.686 -2.191,0.686 -1.277,0 -2.092,-0.674 -0.809,-0.674 -0.809,-1.781h1.693q0,0.48 0.357,0.785 0.363,0.305 0.891,0.305 0.604,0 0.943,-0.316 0.346,-0.322 0.346,-0.85 0,-1.277 -1.406,-1.277h-0.896z"
--- a/android/app/src/main/res/drawable/route_point_14.xml
+++ b/android/app/src/main/res/drawable/route_point_14.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM19.59,13.789h0.967v1.365h-0.967v1.846h-1.693v-1.846h-3.498l-0.076,-1.066 3.557,-5.619h1.711zM16.01,13.789h1.887v-3.012l-0.111,0.193z"
--- a/android/app/src/main/res/drawable/route_point_15.xml
+++ b/android/app/src/main/res/drawable/route_point_15.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM14.832,12.805 L15.325,8.469h4.781v1.412h-3.393l-0.211,1.834q0.604,-0.322 1.283,-0.322 1.219,0 1.91,0.756 0.691,0.756 0.691,2.115 0,0.826 -0.352,1.482 -0.346,0.65 -0.996,1.014 -0.65,0.357 -1.535,0.357 -0.773,0 -1.436,-0.311 -0.662,-0.316 -1.049,-0.885 -0.381,-0.568 -0.404,-1.295h1.676q0.053,0.533 0.369,0.832 0.322,0.293 0.838,0.293 0.574,0 0.885,-0.41 0.311,-0.416 0.311,-1.172 0,-0.727 -0.357,-1.113 -0.357,-0.387 -1.014,-0.387 -0.604,0 -0.979,0.316l-0.164,0.152z"
--- a/android/app/src/main/res/drawable/route_point_16.xml
+++ b/android/app/src/main/res/drawable/route_point_16.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM19.174,8.381v1.395h-0.164q-1.148,0.018 -1.852,0.598 -0.697,0.58 -0.838,1.611 0.68,-0.691 1.717,-0.691 1.113,0 1.77,0.797t0.656,2.098q0,0.832 -0.363,1.506 -0.357,0.674 -1.02,1.049 -0.656,0.375 -1.488,0.375 -1.348,0 -2.18,-0.938 -0.826,-0.938 -0.826,-2.502v-0.609q0,-1.389 0.521,-2.449 0.527,-1.066 1.506,-1.646 0.984,-0.586 2.279,-0.592zM17.522,12.652q-0.41,0 -0.744,0.217 -0.334,0.211 -0.492,0.563v0.516q0,0.85 0.334,1.33 0.334,0.475 0.938,0.475 0.545,0 0.879,-0.428 0.34,-0.434 0.34,-1.119 0,-0.697 -0.34,-1.125 -0.34,-0.428 -0.914,-0.428z"
--- a/android/app/src/main/res/drawable/route_point_17.xml
+++ b/android/app/src/main/res/drawable/route_point_17.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.381,9.418 L17.083,17h-1.787l3.305,-7.16h-4.242v-1.371h6.023z"
--- a/android/app/src/main/res/drawable/route_point_18.xml
+++ b/android/app/src/main/res/drawable/route_point_18.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.141,10.736q0,0.621 -0.311,1.102 -0.311,0.48 -0.855,0.768 0.621,0.299 0.984,0.826 0.363,0.521 0.363,1.23 0,1.137 -0.773,1.799 -0.773,0.656 -2.103,0.656 -1.33,0 -2.109,-0.662 -0.779,-0.662 -0.779,-1.793 0,-0.709 0.363,-1.236 0.363,-0.527 0.979,-0.82 -0.545,-0.287 -0.855,-0.768 -0.305,-0.48 -0.305,-1.102 0,-1.09 0.727,-1.734 0.727,-0.65 1.975,-0.65 1.242,0 1.969,0.645 0.732,0.639 0.732,1.74zM18.623,14.539q0,-0.557 -0.322,-0.891 -0.322,-0.334 -0.867,-0.334 -0.539,0 -0.861,0.334 -0.322,0.328 -0.322,0.891 0,0.545 0.316,0.879 0.316,0.334 0.879,0.334 0.551,0 0.861,-0.322 0.316,-0.322 0.316,-0.891zM18.448,10.818q0,-0.498 -0.264,-0.797 -0.264,-0.305 -0.744,-0.305 -0.475,0 -0.738,0.293 -0.264,0.293 -0.264,0.809 0,0.51 0.264,0.82t0.744,0.311q0.48,0 0.738,-0.311 0.264,-0.311 0.264,-0.82z"
--- a/android/app/src/main/res/drawable/route_point_19.xml
+++ b/android/app/src/main/res/drawable/route_point_19.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM18.541,13.59q-0.662,0.65 -1.547,0.65 -1.131,0 -1.811,-0.773 -0.68,-0.779 -0.68,-2.098 0,-0.838 0.363,-1.535 0.369,-0.703 1.025,-1.09 0.656,-0.393 1.477,-0.393 0.844,0 1.5,0.422t1.02,1.213q0.363,0.791 0.369,1.811v0.627q0,2.133 -1.061,3.352 -1.061,1.219 -3.006,1.301l-0.416,0.006v-1.412l0.375,-0.006q2.209,-0.1 2.391,-2.074zM17.411,12.945q0.41,0 0.703,-0.211 0.299,-0.211 0.451,-0.51v-0.697q0,-0.861 -0.328,-1.336 -0.328,-0.475 -0.879,-0.475 -0.51,0 -0.838,0.469 -0.328,0.463 -0.328,1.166 0,0.697 0.316,1.148 0.322,0.445 0.902,0.445z"
--- a/android/app/src/main/res/drawable/route_point_20.xml
+++ b/android/app/src/main/res/drawable/route_point_20.xml
@@ -11,7 +11,7 @@
  <path
      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
      android:strokeWidth="2"
-      android:fillColor="#FF37653F"
+      android:fillColor="#006c35"
      android:strokeColor="#fff"/>
  <path
      android:pathData="m8.598,16.168q0,-0.404 0.27,-0.656 0.275,-0.252 0.686,-0.252 0.416,0 0.686,0.252 0.275,0.252 0.275,0.656 0,0.398 -0.27,0.65 -0.27,0.246 -0.691,0.246 -0.416,0 -0.686,-0.246 -0.27,-0.252 -0.27,-0.65zM8.598,11.369q0,-0.404 0.27,-0.656 0.275,-0.252 0.686,-0.252 0.416,0 0.686,0.252 0.275,0.252 0.275,0.656 0,0.398 -0.27,0.65 -0.27,0.246 -0.691,0.246 -0.416,0 -0.686,-0.246 -0.27,-0.252 -0.27,-0.65zM15.195,14.029h-3.299v-1.365h3.299zM19.473,13.666q0,1.324 -0.381,2.549 -0.381,1.225 -1.096,2.162 -0.715,0.938 -1.529,1.289l-0.328,-0.896q0.832,-0.627 1.313,-1.934 0.48,-1.307 0.498,-3.006v-0.311q0,-1.752 -0.48,-3.088 -0.475,-1.336 -1.33,-2.004l0.328,-0.896q0.797,0.346 1.5,1.254 0.709,0.908 1.096,2.115 0.393,1.207 0.41,2.502z"
--- a/android/app/src/main/res/layout-land/fragment_direction.xml
+++ b/android/app/src/main/res/layout-land/fragment_direction.xml
@@ -26,7 +26,7 @@
      android:layout_toEndOf="@id/av__direction"
      android:orientation="vertical">

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/tv__title"
        style="@style/MwmWidget.TextView.Direction"
        android:layout_width="wrap_content"
@@ -35,7 +35,7 @@
        android:textSize="@dimen/text_direction_title"
        tools:text="Some place"/>

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/tv__subtitle"
        style="@style/MwmWidget.TextView.Direction"
        android:layout_width="wrap_content"
@@ -44,7 +44,7 @@
        android:textSize="@dimen/text_direction_subtitle"
        tools:text="Some place type"/>

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/tv__straight_distance"
        style="@style/MwmWidget.TextView.Direction"
        android:layout_width="wrap_content"
@@ -53,7 +53,7 @@
        android:textSize="@dimen/text_direction_dist"
        tools:text="9000 km"/>

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
          android:id="@+id/tv__azimuth"
          style="@style/MwmWidget.TextView.Direction"
          android:layout_width="wrap_content"
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -20,7 +20,7 @@
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      tools:ignore="UselessParent">
-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/street"
        style="@style/MwmWidget.TextView.NavStreet"
        android:layout_width="match_parent"
@@ -64,7 +64,7 @@
          app:tint="?iconTint"
          tools:background="#400000FF"/>

-        <com.google.android.material.textview.MaterialTextView
+        <TextView
          android:id="@+id/circle_exit"
          style="@style/MwmWidget.TextView.NavNextTurn.Exit"
          android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
          tools:text="9"/>
      </FrameLayout>

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/distance"
        style="@style/MwmWidget.TextView.NavNextTurn"
        android:layout_width="wrap_content"
@@ -96,7 +96,7 @@
      android:elevation="@dimen/nav_elevation"
      android:visibility="gone"
      tools:visibility="visible">
-      <com.google.android.material.imageview.ShapeableImageView
+      <ImageView
        android:id="@id/turn"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/dialog_missed_map.xml
+++ b/android/app/src/main/res/layout/dialog_missed_map.xml
@@ -5,7 +5,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:orientation="vertical">
-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__message"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -51,7 +51,6 @@
      android:layout_height="wrap_content"
      android:layout_marginTop="@dimen/margin_base"
      android:layout_marginEnd="@dimen/margin_quadruple"
-      android:layout_marginStart="@dimen/margin_half_plus"
      android:text="@string/list"
      android:textAppearance="@style/MwmTextAppearance.Body3" />
    <com.google.android.material.textview.MaterialTextView
--- a/android/app/src/main/res/layout/fragment_direction.xml
+++ b/android/app/src/main/res/layout/fragment_direction.xml
@@ -16,7 +16,7 @@
    android:layout_marginTop="@dimen/margin_direction_small"
    app:srcCompat="@drawable/ic_direction_fullscreen"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__subtitle"
    style="@style/MwmWidget.TextView.Direction"
    android:layout_width="wrap_content"
@@ -28,7 +28,7 @@
    android:textSize="@dimen/text_direction_subtitle"
    tools:text="Some place type"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__title"
    style="@style/MwmWidget.TextView.Direction"
    android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
    android:textSize="@dimen/text_direction_title"
    tools:text="Place, \n long, \n long"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__straight_distance"
    style="@style/MwmWidget.TextView.Direction"
    android:layout_width="wrap_content"
@@ -51,7 +51,7 @@
    android:layout_marginTop="@dimen/margin_direction_big"
    android:textSize="@dimen/text_direction_dist"
    tools:text="9000 km"/>
-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__azimuth"
    style="@style/MwmWidget.TextView.Direction"
    android:layout_width="wrap_content"
--- a/android/app/src/main/res/layout/fragment_routing.xml
+++ b/android/app/src/main/res/layout/fragment_routing.xml
@@ -23,7 +23,7 @@
    layout="@layout/routing_action_panel"
    android:visibility="gone"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/error"
    android:paddingStart="@dimen/margin_base"
    android:paddingEnd="@dimen/margin_base"
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -23,7 +23,7 @@
    app:centerDrawable="@android:color/transparent"
    tools:visibility="visible"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__size"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
    android:textAppearance="@style/MwmTextAppearance.Body1"
    tools:text="256 MB"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__title"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -23,7 +23,7 @@
    app:centerDrawable="@android:color/transparent"
    tools:visibility="visible"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__size"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
    android:textColor="?colorAccent"
    tools:text="256 MB"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/tv__title"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
@@ -23,7 +23,7 @@
    android:gravity="center"
    android:minWidth="@dimen/nav_numbers_side_min_width">

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
      android:id="@+id/speed_value"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
      tools:text="999" />

    <!-- Speed -->
-    <com.google.android.material.textview.MaterialTextView
+    <TextView
      android:id="@+id/speed_dimen"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
      android:layout_height="wrap_content"
      tools:background="#20FF0000">

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/time_hour_value"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
        android:textAppearance="@style/MwmTextAppearance.NavMenu.Time"
        tools:text="999" />

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/time_hour_dimen"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
        android:textAppearance="@style/MwmTextAppearance.NavMenu.Time.Dimension"
        tools:text="h" />

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/time_minute_value"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
        android:textAppearance="@style/MwmTextAppearance.NavMenu.Time"
        tools:text="99" />

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/time_minute_dimen"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
        tools:text="m" />
    </LinearLayout>

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
      android:id="@+id/time_estimate"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
@@ -126,7 +126,7 @@
    android:gravity="center"
    android:minWidth="@dimen/nav_numbers_side_min_width">

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
      android:id="@+id/distance_value"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
      android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
      tools:text="99999" />

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
      android:id="@+id/distance_dimen"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -20,7 +20,7 @@
      android:layout_width="match_parent"
      android:layout_height="@dimen/nav_street_height"
      tools:ignore="UselessParent">
-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/street"
        style="@style/MwmWidget.TextView.NavStreet"
        android:layout_width="match_parent"
@@ -64,7 +64,7 @@
          app:tint="?iconTint"
          tools:background="#400000FF"/>

-        <com.google.android.material.textview.MaterialTextView
+        <TextView
          android:id="@+id/circle_exit"
          style="@style/MwmWidget.TextView.NavNextTurn.Exit"
          android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
          tools:text="9"/>
      </FrameLayout>

-      <com.google.android.material.textview.MaterialTextView
+      <TextView
        android:id="@+id/distance"
        style="@style/MwmWidget.TextView.NavNextTurn"
        android:layout_width="wrap_content"
@@ -96,7 +96,7 @@
      android:elevation="@dimen/nav_elevation"
      android:visibility="invisible"
      tools:visibility="visible">
-      <com.google.android.material.imageview.ShapeableImageView
+      <ImageView
        android:id="@id/turn"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
+++ b/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
@@ -20,7 +20,7 @@
    android:paddingStart="0dp"
    android:paddingEnd="@dimen/altitude_chart_container_padding_left">

-    <com.google.android.material.textview.MaterialTextView
+    <TextView
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_alignParentStart="true"
@@ -28,7 +28,7 @@
      android:textSize="20sp"
      android:textStyle="bold"/>

-    <com.google.android.material.imageview.ShapeableImageView
+    <ImageView
      android:id="@+id/image_my_location"
      android:layout_width="24dp"
      android:layout_height="24dp"
@@ -80,7 +80,7 @@

  </androidx.constraintlayout.widget.ConstraintLayout>

-  <androidx.constraintlayout.widget.ConstraintLayout
+  <RelativeLayout
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
@@ -94,24 +94,20 @@
      style="@style/MwmWidget.Button"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:text="@string/cancel"
-      android:textColor="?android:attr/textColorPrimary"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
+      android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
+      android:text="@string/cancel"/>

    <Button
      android:id="@+id/btn__plan"
      style="@style/MwmWidget.Button.Primary"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:text="@string/button_plan"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
+      android:layout_gravity="end|center_vertical"
+      android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true"
+      android:text="@string/button_plan"/>

-  </androidx.constraintlayout.widget.ConstraintLayout>
+  </RelativeLayout>

 </LinearLayout>
--- a/android/app/src/main/res/layout/manage_route_list_item.xml
+++ b/android/app/src/main/res/layout/manage_route_list_item.xml
@@ -6,7 +6,7 @@
  android:layout_height="60dp"
  android:gravity="center_vertical">

-  <com.google.android.material.imageview.ShapeableImageView
+  <ImageView
    android:id="@+id/type_icon"
    android:layout_width="24dp"
    android:layout_height="24dp"
@@ -15,7 +15,7 @@
    app:layout_constraintBottom_toBottomOf="parent"
    app:srcCompat="@drawable/route_point_finish"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/title"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
    app:layout_constrainedWidth="true"
    tools:text="Title"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/subtitle"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
    app:layout_constrainedWidth="true"
    tools:text="Subtitle"/>

-  <com.google.android.material.imageview.ShapeableImageView
+  <ImageView
    android:id="@+id/delete_icon"
    android:layout_width="24dp"
    android:layout_height="24dp"
--- a/android/app/src/main/res/layout/menu_route_plan_line.xml
+++ b/android/app/src/main/res/layout/menu_route_plan_line.xml
@@ -10,7 +10,7 @@

  <include layout="@layout/routing_bottom_panel_transit"/>

-  <com.google.android.material.textview.MaterialTextView
+  <TextView
    android:id="@+id/error"
    android:paddingStart="@dimen/margin_base"
    android:paddingEnd="@dimen/margin_base"
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -23,7 +23,7 @@
          android:layout_width="match_parent"
          android:layout_height="?attr/actionBarSize">

-        <com.google.android.material.imageview.ShapeableImageView
+        <ImageView
            android:id="@+id/back"
            android:layout_width="?attr/actionBarSize"
            android:layout_height="?attr/actionBarSize"
@@ -157,14 +157,14 @@
      <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">
-        <com.google.android.material.imageview.ShapeableImageView
+        <ImageView
          android:id="@+id/driving_options_btn_img"
          android:layout_width="@dimen/margin_base_plus"
          android:layout_height="@dimen/margin_base_plus"
          android:layout_gravity="center"
          android:layout_marginEnd="@dimen/margin_half_plus_eight"
          app:srcCompat="@drawable/ic_error_white" />
-        <com.google.android.material.textview.MaterialTextView
+        <TextView
          android:id="@+id/driving_options_btn_title"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -763,6 +763,11 @@
    <string name="type.power.substation">Substasie</string>
    <!-- A tower or pylon carrying high voltage electricity cables. -->
    <string name="type.power.tower">Kragmas</string>
+    <string name="type.psurface">Padoppervlak</string>
+    <string name="type.psurface.paved_bad">Geteer</string>
+    <string name="type.psurface.paved_good">Geteer</string>
+    <string name="type.psurface.unpaved_bad">Ongeteer</string>
+    <string name="type.psurface.unpaved_good">Ongeteer</string>
    <string name="type.public_transport">Openbare vervoer</string>
    <string name="type.public_transport.platform">Platform</string>
    <string name="type.railway">Spoorweg</string>
@@ -1310,4 +1315,5 @@
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Sportsaal</string>
    <string name="type.railway.station.subway.qingdao">Moltreinstasie</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -1280,4 +1280,5 @@
    <string name="type.amenity.love_hotel">فندق جب</string>
    <string name="type.amenity.studio">معرض</string>
    <string name="type.railway.station.subway.qingdao">محطة مترو</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-ast/types_strings.xml
+++ b/android/app/src/main/res/values-ast/types_strings.xml
@@ -158,4 +158,5 @@
    <string name="type.amenity.language_school">Escuela de llingües</string>
    <string name="type.amenity.hospital">Hospital</string>
    <string name="type.craft.confectionery">Confitería</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -1328,4 +1328,5 @@
    <string name="type.amenity.dojo">Dojo</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">İdman zalı</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-be/types_strings.xml
+++ b/android/app/src/main/res/values-be/types_strings.xml
@@ -623,4 +623,6 @@
    <string name="type.amenity.dojo">Додзе</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Спартыўная зала</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -79,7 +79,7 @@
    <string name="type.craft.brewery">Пивоварна</string>
    <string name="type.craft.caterer">Кетъринг</string>
    <string name="type.craft.carpenter">Марангоз</string>
-    <string name="type.craft.confectionery">Сладкарница</string>
+    <string name="type.craft.confectionery">Сладкарски изделия</string>
    <string name="type.craft.electrician">Електротехник</string>
    <string name="type.craft.electronics_repair">Ремонт на електроника</string>
    <string name="type.craft.gardener">Градинар</string>
@@ -354,7 +354,7 @@
    <string name="type.place.country">Страна</string>
    <string name="type.place.county">Графство</string>
    <string name="type.place.farm">Ферма</string>
-    <string name="type.place.hamlet">Село</string>
+    <string name="type.place.hamlet">Cело</string>
    <string name="type.place.island">Остров</string>
    <string name="type.place.islet">Острови</string>
    <string name="type.place.isolated_dwelling">Изолирано жилище</string>
@@ -595,7 +595,7 @@
    <string name="type.recycling.plastic_bottles">Пластмасови бутилки</string>
    <string name="type.recycling.cardboard">Картон</string>
    <string name="type.recycling.shoes">Обувки</string>
-    <string name="type.amenity.restaurant">Ресторант</string>
+    <string name="type.amenity.restaurant">Заведение</string>
    <string name="type.amenity.school">Училище</string>
    <string name="type.amenity.shower">Душ</string>
    <string name="type.amenity.telephone">Телефон</string>
@@ -659,7 +659,7 @@
    <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.chemist">Битова химия</string>
+    <string name="type.shop.chemist">Химик</string>
    <string name="type.shop.pet">Магазин за животни</string>
    <string name="type.shop.seafood">Риба</string>
    <string name="type.shop.shoes">Магазин за обувки</string>
@@ -774,6 +774,7 @@
    <string name="type.highway.road">Път</string>
    <string name="type.highway.tertiary">Третостепенен път</string>
    <string name="type.landuse.cemetery">Гробище</string>
+    <string name="type.mapswithme">MapsWithMe</string>
    <string name="type.amenity.studio">Студио</string>
    <string name="type.amenity.college">Колеж</string>
    <string name="type.barrier.guard_rail">Мантинела</string>
@@ -1369,6 +1370,4 @@
    <string name="type.piste_type.downhill.advanced.area">Спускане със ски за напреднали</string>
    <string name="type.piste_type.downhill.freeride">Свободно каране спускане със ски</string>
    <string name="type.piste_type.downhill.novice.area">Спускане със ски за начинаещи</string>
-    <string name="type.highway.services">Обслужвана зона</string>
-    <string name="type.landuse.forest">Гора</string>
 </resources>
--- a/android/app/src/main/res/values-bn/types_strings.xml
+++ b/android/app/src/main/res/values-bn/types_strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="type.mapswithme">MapsWithMe</string>
    <string name="type.addr_interpolation">ঠিকানা/ব্লক</string>
 </resources>
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -963,4 +963,5 @@
    <string name="type.amenity.studio">Estudi</string>
    <string name="type.barrier.guard_rail">Barrera de seguretat</string>
    <string name="type.leisure.hackerspace">Hacklab</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1171,8 +1171,11 @@
    <string name="type.amenity.dojo">Dódžó</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Sportovní hala</string>
+    <string name="type.psurface">psurface</string>
    <string name="type.landuse.salt_pond">Solné jezírko</string>
    <string name="type.route">Trasa</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
    <string name="type.power.minor_line">Vedlejší elektrické vedení</string>
    <string name="type.recycling.cans">Plechovky</string>
    <string name="type.aerialway.drag_lift">Vlek</string>
@@ -1201,6 +1204,10 @@
    <string name="type.highway.bridleway.permissive">Hipostezka</string>
    <string name="type.highway.cycleway.permissive">Cyklostezka</string>
    <string name="type.highway.elevator">Výtah</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
    <string name="type.internet_access">Internet</string>
    <string name="type.junction.roundabout">Kruhový objezd</string>
    <string name="type.landuse.brownfield">Brownfield</string>
@@ -1218,6 +1225,7 @@
    <string name="type.man_made.pipeline.overground">Povrchové potrubí</string>
    <string name="type.man_made.wastewater_plant">Čistírna odpadních vod</string>
    <string name="type.man_made.works">Průmysl</string>
+    <string name="type.mapswithme">MapsWithMe</string>
    <string name="type.military">Armáda</string>
    <string name="type.mountain_pass">Horské sedlo</string>
    <string name="type.power">Energie</string>
@@ -1254,10 +1262,12 @@
    <string name="type.aerialway.cable_car">Visutá lanovka</string>
    <string name="type.landuse.vineyard">Vinice</string>
    <string name="type.leisure.beach_resort">Plážový areál</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
    <string name="type.amenity.food_court">Jídelní zóna</string>
    <string name="type.recycling.cardboard">Lepenka</string>
    <string name="type.recycling.shoes">Boty</string>
    <string name="type.building.warehouse">Sklad</string>
+    <string name="type.hwtag">hwtag</string>
    <string name="type.amenity.shelter.lean_to">Otevřený přístřešek</string>
    <string name="type.amenity.vending_machine.coffee">Automat na kávu</string>
    <string name="type.amenity.taxi">Stanoviště taxislužby</string>
@@ -1265,6 +1275,7 @@
    <string name="type.barrier.hedge">Živý plot</string>
    <string name="type.boundary">Hranice</string>
    <string name="type.amenity.vending_machine.newspapers">Automat na noviny</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
    <string name="type.leisure.ice_rink">Ledové kluziště</string>
    <string name="type.railway.construction">Železniční stavba</string>
    <string name="type.landuse">Využití území</string>
@@ -1277,12 +1288,18 @@
    <string name="type.boundary.administrative.3">Hranice oblasti</string>
    <string name="type.landuse.garages">Garáže</string>
    <string name="type.leisure.track.area">Trať</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
    <string name="type.junction.circular">Kruhový objezd</string>
    <string name="type.area_highway.cycleway">Cyklostezka</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
    <string name="type.landuse.commercial">Komerční zóna</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
    <string name="type.organic.only">Přírodní</string>
    <string name="type.railway.abandoned">Zaniklá železnice</string>
    <string name="type.landuse.education">Vzdělávací zařízení</string>
+    <string name="type.hwtag.private">hwtag-private</string>
    <string name="type.sport.bowls">Bowls</string>
    <string name="type.landuse.farmyard">Statek</string>
    <string name="type.man_made.pier">Molo</string>
@@ -1295,8 +1312,10 @@
    <string name="type.railway.crossing">Železniční přejezd</string>
    <string name="type.man_made.silo">Silo</string>
    <string name="type.man_made.survey_point">Topografický bod</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
    <string name="type.shop.supermarket">Supermarket</string>
    <string name="type.organic.yes">Přírodní</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
    <string name="type.railway.tram">Tramvajová trať</string>
    <string name="type.railway.light_rail.tunnel">Tunel lehké železnice</string>
    <string name="type.railway.abandoned.bridge">Most zaniklé železnice</string>
@@ -1310,14 +1329,18 @@
    <string name="type.railway.tram.tunnel">Tunel tramvajové trati</string>
    <string name="type.barrier.fence">Plot</string>
    <string name="type.leisure.marina">Přístav</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
    <string name="type.amenity.vending_machine.condoms">Automat na kondomy</string>
    <string name="type.public_transport">Veřejná doprava</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
    <string name="type.leisure.common">Veřejný prostor</string>
    <string name="type.leisure.recreation_ground">Rekreační areál</string>
    <string name="type.boundary.administrative.4">Hranice oblasti</string>
    <string name="type.aerialway">Lanová dráha</string>
    <string name="type.highway.services">Odpočívadlo se službami</string>
    <string name="type.man_made.cutline">Průsek</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
    <string name="type.railway.preserved.bridge">Most zachovalé železnice</string>
    <string name="type.railway.narrow_gauge.tunnel">Tunel úzkorozchodné železnice</string>
    <string name="type.amenity.bar">Bar</string>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -220,7 +220,7 @@
    <!-- Settings «Route» category: «Tts language» title -->
    <string name="pref_tts_language_title">Stemmesprog</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Test stemmevejledninger</string>
+    <string name="pref_tts_test_voice_title">Test stemmeanvisninger (TTS, Text-To-Speech)</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
    <string name="pref_tts_playing_test_voice">Tjek lydstyrken eller systemets tekst-til-tale-indstillinger, hvis du ikke kan høre stemmen nu</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1356,6 +1356,7 @@
    <string name="type.piste_type.sled.area">Kælkebane</string>
    <string name="type.piste_type.downhill.novice.area">Meget let pist</string>
    <string name="type.railway.tram.bridge">Sporvejsbro</string>
+    <string name="type.mapswithme">MapsWithMe</string>
    <string name="type.landuse.plant_nursery">Planteskole</string>
    <string name="type.leisure.firepit">Bålplads</string>
    <string name="type.man_made.crane">Kran</string>
@@ -1374,11 +1375,4 @@
    <string name="type.amenity.luggage_locker">Bagageboks</string>
    <string name="type.natural.wetland.saltmarsh">Strandeng</string>
    <string name="type.natural.wetland.saltmarsh.tidal">Tidevandspåvirket strandeng</string>
-    <string name="type.natural.wetland.mangrove">Mangrove</string>
-    <string name="type.natural.wetland.tidalflat">Tidevandsflade</string>
-    <string name="type.man_made.utility_pole">Lygtepæl</string>
-    <string name="type.leisure.escape_game">Escape Room</string>
-    <string name="type.landuse.religious">Religiøs jord</string>
-    <string name="type.power.pole">Elmast</string>
-    <string name="type.railway.station.subway.qingdao">Undergrundsstation</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -584,7 +584,7 @@
    <string name="prefs_languages_information">Wir verwenden Text-to-Speech-Systeme für Sprachanweisungen. Viele Android-Geräte nutzen Google-TTS, das Sie bei Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) herunterladen oder aktualisieren können</string>
    <string name="prefs_languages_information_off">Für einige Sprachen müssen Sie einen anderen Sprachgenerator oder ein zusätzliches Sprachpaket aus dem App Store installieren (Google Play, Galaxy Store, App Gallery, FDroid).\nÖffnen Sie die Einstellungen Ihres Gerätes → Sprache und Eingabe → Sprache → Text-to-Speech-Ausgabe.\nHier können Sie die Einstellungen für Sprachsynthese verwalten (beispielsweise ein Sprachpaket für die Offline-Verwendung herunterladen) und ein anderes Sprachausgabeprogramm auswählen.</string>
    <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
-    <string name="transliteration_title">Transliteration ins Lateinische alphabet</string>
+    <string name="transliteration_title">Transliteration ins lateinische Alphabet</string>
    <string name="learn_more">Weitere Informationen</string>
    <!-- Subway exits for public transport marks on the map -->
    <string name="core_exit">Ausgang</string>
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -1344,17 +1344,40 @@
    <string name="type.man_made.pipeline">Pipeline</string>
    <string name="type.amenity.bar">Bar</string>
    <string name="type.amenity.restaurant">Restaurant</string>
+    <string name="type.hwtag">hwtag</string>
+    <string name="type.hwtag.bidir_bicycle">hwtag-bidir_bicycle</string>
+    <string name="type.hwtag.onedir_bicycle">hwtag-onedir_bicycle</string>
+    <string name="type.hwtag.lit">hwtag-lit</string>
    <string name="type.internet_access">Internet</string>
    <string name="type.internet_access.wlan">Internet</string>
+    <string name="type.hwtag.nofoot">hwtag-nofoot</string>
+    <string name="type.hwtag.oneway">hwtag-oneway</string>
+    <string name="type.hwtag.private">hwtag-private</string>
+    <string name="type.hwtag.toll">hwtag-toll</string>
+    <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
+    <string name="type.hwtag.yescar">hwtag-yescar</string>
+    <string name="type.hwtag.yesfoot">hwtag-yesfoot</string>
    <string name="type.leisure.hackerspace">Hackerraum</string>
    <string name="type.sport.yoga">Yoga Studio</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
    <string name="type.noexit">Sackgasse</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
    <string name="type.shop.kiosk">Kiosk</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
    <string name="type.boundary.administrative.2">Landesgrenze</string>
    <string name="type.building.garage">Garage</string>
    <string name="type.cuisine.fish_and_chips">Fisch und Chips</string>
+    <string name="type.highway.world_level">highway-world_level</string>
+    <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
+    <string name="type.hwtag.nocar">hwtag-nocar</string>
+    <string name="type.mapswithme">MapsWithMe</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
    <string name="type.leisure.beach_resort">Badestrand</string>
    <string name="type.amenity.food_court">Food Court</string>
+    <string name="type.highway.world_towns_level">highway-world_towns_level</string>
    <string name="type.fee.yes">$</string>
    <string name="type.man_made.utility_pole">Versorgungsmast</string>
    <string name="type.cuisine.bubble_tea">Bubble Tea</string>
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -9,7 +9,7 @@
    <string name="delete">Διαγραφή</string>
    <string name="download_maps">Λήψη χαρτών</string>
    <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Η λήψη απέτυχε, πατήστε για να προσπαθήσετε ξανά</string>
+    <string name="download_has_failed">Η λήψη απέτυχε. Πατήστε για να προσπαθήσετε ξανά.</string>
    <!-- Settings/Downloader - info for country which started downloading -->
    <string name="downloading">Λήψη…</string>
    <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -30,7 +30,7 @@
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Περιορισμένη ακρίβεια</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Για να εξασφαλίσετε ακριβή πλοήγηση, ενεργοποιήστε την Ακριβής τοποθεσία στις ρυθμίσεις</string>
+    <string name="precise_location_is_disabled_long_text">Για να εξασφαλίσετε ακριβή πλοήγηση, ενεργοποιήστε την Ακριβής τοποθεσία στις ρυθμίσεις.</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">Εμφάνιση στο χάρτη</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
@@ -236,7 +236,7 @@
    <!-- Settings «Route» category: «Tts language» title -->
    <string name="pref_tts_language_title">Γλώσσα φωνής</string>
    <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Δοκιμή φωνητικών οδηγιών</string>
+    <string name="pref_tts_test_voice_title">Δοκιμή φωνητικών οδηγιών (TTS, Text-To-Speech)</string>
    <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
    <string name="pref_tts_playing_test_voice">Ελέγξτε την ένταση ήχου ή τις ρυθμίσεις του συστήματος text-to-speech αν δεν ακούτε τη φωνή τώρα.</string>
    <!-- Settings «Route» category: «Tts unavailable» subtitle -->
--- a/android/app/src/main/res/values-el/types_strings.xml
+++ b/android/app/src/main/res/values-el/types_strings.xml
@@ -142,7 +142,7 @@
    <string name="type.amenity.shelter.basic_hut">καταφύγιο bivouac</string>
    <string name="type.amenity.public_bath">Δημόσιο Λουτρό</string>
    <string name="type.amenity.shower">Ντους</string>
-    <string name="type.amenity.stripclub">Στριπτιζάδικο</string>
+    <string name="type.amenity.stripclub">Stripclub</string>
    <string name="type.amenity.taxi">Ταξί</string>
    <string name="type.amenity.telephone">Τηλέφωνο</string>
    <string name="type.amenity.theatre">Θέατρο</string>
@@ -691,9 +691,9 @@
    <string name="type.power.substation">Υποσταθμός</string>
    <!-- A tower or pylon carrying high voltage electricity cables. -->
    <string name="type.power.tower">Πυλώνες μεταφοράς ρεύματος</string>
-    <string name="type.railway.funicular">Τελεφερίκ</string>
-    <string name="type.railway.halt">Σιδηροδρομική στάση</string>
-    <string name="type.railway.level_crossing">Σιδηροδρομική διάβαση</string>
+    <string name="type.railway.funicular">Μονωτικό τρενάκι</string>
+    <string name="type.railway.halt">Σιδηροδρομικός σταθμός</string>
+    <string name="type.railway.level_crossing">Σιδηροδρομική διέλευση</string>
    <string name="type.railway.monorail">Μονοαξονικός σιδηρόδρομος</string>
    <string name="type.railway.rail">Σιδηρόδρομος</string>
    <string name="type.railway.rail.highspeed">Σιδηρόδρομος υψηλής ταχύτητας</string>
@@ -723,126 +723,126 @@
    <string name="type.railway.rail.spur.tunnel">Σιδηροδρομική σήραγγα</string>
    <string name="type.railway.rail.service.tunnel">Σιδηροδρομική σήραγγα</string>
    <string name="type.railway.station">Σιδηροδρομικός σταθμός</string>
-    <string name="type.railway.station.funicular">Τελεφερίκ</string>
+    <string name="type.railway.station.funicular">Μονωτικό τρενάκι</string>
    <string name="type.railway.station.light_rail">Σιδηροδρομικός σταθμός</string>
    <string name="type.railway.station.light_rail.berlin">Σιδηροδρομικός σταθμός</string>
    <string name="type.railway.station.light_rail.london">Σιδηροδρομικός σταθμός</string>
    <string name="type.railway.station.light_rail.porto">Σιδηροδρομικός σταθμός</string>
    <string name="type.railway.station.monorail">Σιδηροδρομικός σταθμός</string>
-    <string name="type.railway.station.subway">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.adana">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.algiers">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.almaty">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.amsterdam">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.ankara">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.athens">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.baku">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.bangkok">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.barcelona">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.beijing">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.bengalore">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.berlin">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.bilbao">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.brasilia">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.brescia">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.brussels">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.bucharest">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.budapest">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.buenos_aires">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.bursa">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.cairo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.caracas">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.catania">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.changchun">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.chengdu">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.chicago">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.chongqing">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.dalian">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.delhi">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.dnepro">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.dubai">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.ekb">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.fukuoka">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.glasgow">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.guangzhou">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.hamburg">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.helsinki">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.hiroshima">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.hongkong">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.isfahan">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.istanbul">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.izmir">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kazan">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kharkiv">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kiev">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kobe">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kolkata">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kunming">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.kyoto">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.la">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.lausanne">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.lille">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.lima">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.lisboa">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.london">Υπόγειος σταθμός</string>
-    <string name="type.railway.station.subway.lyon">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.madrid">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.malaga">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.manila">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.maracaibo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.mashhad">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.mecca">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.medellin">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.mexico">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.milan">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.minsk">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.montreal">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.moscow">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.munchen">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.nagoya">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.newyork">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.nnov">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.novosibirsk">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.osaka">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.oslo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.palma">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.panama">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.paris">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.philadelphia">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.pyongyang">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.rennes">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.rio">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.roma">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.rotterdam">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.samara">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.santiago">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.santo_domingo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.saopaulo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.sapporo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.sendai">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.sf">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.shanghai">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.shenzhen">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.shiraz">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.singapore">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.sofia">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.spb">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.stockholm">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.tabriz">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.taipei">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.taoyuan">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.tashkent">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.tbilisi">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.tehran">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.tianjin">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.tokyo">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.valencia">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.vienna">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.warszawa">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.washington">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.wuhan">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.yerevan">Σταθμός μετρό</string>
-    <string name="type.railway.station.subway.yokohama">Σταθμός μετρό</string>
+    <string name="type.railway.station.subway">Μετρό</string>
+    <string name="type.railway.station.subway.adana">Μετρό</string>
+    <string name="type.railway.station.subway.algiers">Μετρό</string>
+    <string name="type.railway.station.subway.almaty">Μετρό</string>
+    <string name="type.railway.station.subway.amsterdam">Μετρό</string>
+    <string name="type.railway.station.subway.ankara">Μετρό</string>
+    <string name="type.railway.station.subway.athens">Μετρό</string>
+    <string name="type.railway.station.subway.baku">Μετρό</string>
+    <string name="type.railway.station.subway.bangkok">Μετρό</string>
+    <string name="type.railway.station.subway.barcelona">Μετρό</string>
+    <string name="type.railway.station.subway.beijing">Μετρό</string>
+    <string name="type.railway.station.subway.bengalore">Μετρό</string>
+    <string name="type.railway.station.subway.berlin">Μετρό</string>
+    <string name="type.railway.station.subway.bilbao">Μετρό</string>
+    <string name="type.railway.station.subway.brasilia">Μετρό</string>
+    <string name="type.railway.station.subway.brescia">Μετρό</string>
+    <string name="type.railway.station.subway.brussels">Μετρό</string>
+    <string name="type.railway.station.subway.bucharest">Μετρό</string>
+    <string name="type.railway.station.subway.budapest">Μετρό</string>
+    <string name="type.railway.station.subway.buenos_aires">Μετρό</string>
+    <string name="type.railway.station.subway.bursa">Μετρό</string>
+    <string name="type.railway.station.subway.cairo">Μετρό</string>
+    <string name="type.railway.station.subway.caracas">Μετρό</string>
+    <string name="type.railway.station.subway.catania">Μετρό</string>
+    <string name="type.railway.station.subway.changchun">Μετρό</string>
+    <string name="type.railway.station.subway.chengdu">Μετρό</string>
+    <string name="type.railway.station.subway.chicago">Μετρό</string>
+    <string name="type.railway.station.subway.chongqing">Μετρό</string>
+    <string name="type.railway.station.subway.dalian">Μετρό</string>
+    <string name="type.railway.station.subway.delhi">Μετρό</string>
+    <string name="type.railway.station.subway.dnepro">Μετρό</string>
+    <string name="type.railway.station.subway.dubai">Μετρό</string>
+    <string name="type.railway.station.subway.ekb">Μετρό</string>
+    <string name="type.railway.station.subway.fukuoka">Μετρό</string>
+    <string name="type.railway.station.subway.glasgow">Μετρό</string>
+    <string name="type.railway.station.subway.guangzhou">Μετρό</string>
+    <string name="type.railway.station.subway.hamburg">Μετρό</string>
+    <string name="type.railway.station.subway.helsinki">Μετρό</string>
+    <string name="type.railway.station.subway.hiroshima">Μετρό</string>
+    <string name="type.railway.station.subway.hongkong">Μετρό</string>
+    <string name="type.railway.station.subway.isfahan">Μετρό</string>
+    <string name="type.railway.station.subway.istanbul">Μετρό</string>
+    <string name="type.railway.station.subway.izmir">Μετρό</string>
+    <string name="type.railway.station.subway.kazan">Μετρό</string>
+    <string name="type.railway.station.subway.kharkiv">Μετρό</string>
+    <string name="type.railway.station.subway.kiev">Μετρό</string>
+    <string name="type.railway.station.subway.kobe">Μετρό</string>
+    <string name="type.railway.station.subway.kolkata">Μετρό</string>
+    <string name="type.railway.station.subway.kunming">Μετρό</string>
+    <string name="type.railway.station.subway.kyoto">Μετρό</string>
+    <string name="type.railway.station.subway.la">Μετρό</string>
+    <string name="type.railway.station.subway.lausanne">Μετρό</string>
+    <string name="type.railway.station.subway.lille">Μετρό</string>
+    <string name="type.railway.station.subway.lima">Μετρό</string>
+    <string name="type.railway.station.subway.lisboa">Μετρό</string>
+    <string name="type.railway.station.subway.london">Μετρό</string>
+    <string name="type.railway.station.subway.lyon">Μετρό</string>
+    <string name="type.railway.station.subway.madrid">Μετρό</string>
+    <string name="type.railway.station.subway.malaga">Μετρό</string>
+    <string name="type.railway.station.subway.manila">Μετρό</string>
+    <string name="type.railway.station.subway.maracaibo">Μετρό</string>
+    <string name="type.railway.station.subway.mashhad">Μετρό</string>
+    <string name="type.railway.station.subway.mecca">Μετρό</string>
+    <string name="type.railway.station.subway.medellin">Μετρό</string>
+    <string name="type.railway.station.subway.mexico">Μετρό</string>
+    <string name="type.railway.station.subway.milan">Μετρό</string>
+    <string name="type.railway.station.subway.minsk">Μετρό</string>
+    <string name="type.railway.station.subway.montreal">Μετρό</string>
+    <string name="type.railway.station.subway.moscow">Μετρό</string>
+    <string name="type.railway.station.subway.munchen">Μετρό</string>
+    <string name="type.railway.station.subway.nagoya">Μετρό</string>
+    <string name="type.railway.station.subway.newyork">Μετρό</string>
+    <string name="type.railway.station.subway.nnov">Μετρό</string>
+    <string name="type.railway.station.subway.novosibirsk">Μετρό</string>
+    <string name="type.railway.station.subway.osaka">Μετρό</string>
+    <string name="type.railway.station.subway.oslo">Μετρό</string>
+    <string name="type.railway.station.subway.palma">Μετρό</string>
+    <string name="type.railway.station.subway.panama">Μετρό</string>
+    <string name="type.railway.station.subway.paris">Μετρό</string>
+    <string name="type.railway.station.subway.philadelphia">Μετρό</string>
+    <string name="type.railway.station.subway.pyongyang">Μετρό</string>
+    <string name="type.railway.station.subway.rennes">Μετρό</string>
+    <string name="type.railway.station.subway.rio">Μετρό</string>
+    <string name="type.railway.station.subway.roma">Μετρό</string>
+    <string name="type.railway.station.subway.rotterdam">Μετρό</string>
+    <string name="type.railway.station.subway.samara">Μετρό</string>
+    <string name="type.railway.station.subway.santiago">Μετρό</string>
+    <string name="type.railway.station.subway.santo_domingo">Μετρό</string>
+    <string name="type.railway.station.subway.saopaulo">Μετρό</string>
+    <string name="type.railway.station.subway.sapporo">Μετρό</string>
+    <string name="type.railway.station.subway.sendai">Μετρό</string>
+    <string name="type.railway.station.subway.sf">Μετρό</string>
+    <string name="type.railway.station.subway.shanghai">Μετρό</string>
+    <string name="type.railway.station.subway.shenzhen">Μετρό</string>
+    <string name="type.railway.station.subway.shiraz">Μετρό</string>
+    <string name="type.railway.station.subway.singapore">Μετρό</string>
+    <string name="type.railway.station.subway.sofia">Μετρό</string>
+    <string name="type.railway.station.subway.spb">Μετρό</string>
+    <string name="type.railway.station.subway.stockholm">Μετρό</string>
+    <string name="type.railway.station.subway.tabriz">Μετρό</string>
+    <string name="type.railway.station.subway.taipei">Μετρό</string>
+    <string name="type.railway.station.subway.taoyuan">Μετρό</string>
+    <string name="type.railway.station.subway.tashkent">Μετρό</string>
+    <string name="type.railway.station.subway.tbilisi">Μετρό</string>
+    <string name="type.railway.station.subway.tehran">Μετρό</string>
+    <string name="type.railway.station.subway.tianjin">Μετρό</string>
+    <string name="type.railway.station.subway.tokyo">Μετρό</string>
+    <string name="type.railway.station.subway.valencia">Μετρό</string>
+    <string name="type.railway.station.subway.vienna">Μετρό</string>
+    <string name="type.railway.station.subway.warszawa">Μετρό</string>
+    <string name="type.railway.station.subway.washington">Μετρό</string>
+    <string name="type.railway.station.subway.wuhan">Μετρό</string>
+    <string name="type.railway.station.subway.yerevan">Μετρό</string>
+    <string name="type.railway.station.subway.yokohama">Μετρό</string>
    <string name="type.railway.subway_entrance">Είσοδος μετρό</string>
    <string name="type.railway.subway_entrance.adana">Είσοδος μετρό</string>
    <string name="type.railway.subway_entrance.algiers">Είσοδος μετρό</string>
@@ -1014,7 +1014,7 @@
    <string name="type.shop.laundry">Άπλυτα</string>
    <string name="type.shop.mall">Εμπορικό κέντρο</string>
    <string name="type.shop.massage">Αίθουσα μασάζ</string>
-    <string name="type.shop.mobile_phone">Κατάστημα κινητής τηλεφωνίας</string>
+    <string name="type.shop.mobile_phone">Κινητή Τηλεφωνία</string>
    <string name="type.shop.money_lender">Δανειστής χρημάτων</string>
    <string name="type.shop.motorcycle">Κατάστημα μοτοσυκλετών</string>
    <string name="type.shop.motorcycle_repair">Επισκευή μοτοσυκλετών</string>
@@ -1183,7 +1183,7 @@
    <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
    <string name="type.emergency.emergency_ward_entrance">Είσοδος θαλάμου έκτακτης ανάγκης</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Ντότζο</string>
+    <string name="type.amenity.dojo">Dojo</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
    <string name="type.leisure.sports_hall">Αθλητική αίθουσα</string>
    <string name="type.piste_type.downhill.advanced">Προχωρημένη πίστα κατάβασης σκι</string>
@@ -1197,7 +1197,7 @@
    <string name="type.man_made.silo">Σιλό</string>
    <string name="type.power.pole">Ηλεκτρικός πόλος</string>
    <string name="type.man_made.utility_pole">Πόλος κοινής ωφέλειας</string>
-    <string name="type.railway.narrow_gauge.bridge">Σιδηροδρομική γέφυρα στενού εύρους</string>
+    <string name="type.railway.narrow_gauge.bridge">Σιδηροδρομική γέφυρα στενής γραμμής</string>
    <string name="type.aeroway">Υποδομή εναέριου χώρου</string>
    <string name="type.aeroway.apron">Ποδιά</string>
    <string name="type.aeroway.runway">Αεροδιάδρομος</string>
@@ -1227,6 +1227,7 @@
    <string name="type.highway.cycleway">Ποδηλατόδρομος</string>
    <string name="type.highway.cycleway.permissive">Ποδηλατόδρομος</string>
    <string name="type.highway.elevator">Ανελκυστήρας</string>
+    <string name="type.highway.world_level">αυτοκινητόδρομος-κόσμος_επίπεδο</string>
    <string name="type.barrier.wall">Τοίχος</string>
    <string name="type.recycling.cans">Κονσερβοκούτια</string>
    <string name="type.barrier">Εμπόδιο</string>
@@ -1246,18 +1247,5 @@
    <string name="type.area_highway.cycleway">Ποδηλατόδρομος</string>
    <string name="type.aeroway.gate">Πύλη</string>
    <string name="type.amenity.atm">ATM</string>
-    <string name="type.railway.platform">Σιδηροδρομική πλατφόρμα</string>
-    <string name="type.railway.narrow_gauge.tunnel">Σιδηροδρομική σήραγγα στενού εύρους</string>
-    <string name="type.railway.subway.bridge">Γέφυρα γραμμής μετρό</string>
-    <string name="type.railway.subway">Γραμμή μετρό</string>
-    <string name="type.highway.ladder">Σκάλα</string>
-    <string name="type.railway.subway.tunnel">Σήραγγα γραμμής μετρό</string>
-    <string name="type.man_made.crane">Γερανός</string>
-    <string name="type.railway.station.subway.qingdao">Σταθμός μετρό</string>
-    <string name="type.junction.circular">Κυκλικός κόμβος</string>
-    <string name="type.tourism">Τουρισμός</string>
-    <string name="type.attraction.big_wheel">Τροχός</string>
-    <string name="type.attraction.bumper_car">Συγκρουόμενα</string>
-    <string name="type.landuse">Χρήσης γης</string>
-    <string name="type.junction.roundabout">Κυκλικός κόμβος</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/android/app/src/main/res/values-en-rGB/types_strings.xml
+++ b/android/app/src/main/res/values-en-rGB/types_strings.xml
@@ -287,4 +287,5 @@
    <string name="type.power.pole">Power Pole</string>
    <string name="type.man_made.utility_pole">Utility Pole</string>
    <string name="type.railway.station.subway.qingdao">Metro Station</string>
+    <string name="type.mapswithme">MapsWithMe</string>
 </resources>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`ناوبری آسان نقشه - کشف بیشتر از سفر شما - توسط جامعه`
				`@@ -1 +0,0 @@`
				`CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی`
				`@@ -1 +0,0 @@`
				`Könnyű térképes navigáció - Fedezz fel többet az útjaidról - A közösség erejével`
				`@@ -1 +0,0 @@`
				`Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos`
				`@@ -1 +0,0 @@`
				`CoMaps - Mapas e Navegação - Offline e Privada`
				`@@ -1 +0,0 @@`
				`കോമാപ്പ്സ് - സ്വകാര്യതയോടെ സഞ്ചരിക്കൂ`