[android] Handle exceptions when starting foreground services

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2026-01-06 12:34:24 +00:00 · 2025-07-20 21:14:03 +07:00
233 changed files with 3092 additions and 18264 deletions
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ The project's financial information is completely open and transparent at [our O

 ## 🔒 Privacy

-The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/en/reports/app.comaps.google/latest/).
+The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/fr/reports/app.comaps.google/latest/).

 To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
 ```
--- a/android/app/src/beta/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-hdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-hdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-mdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-mdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/android/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- 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,10 +1,6 @@
-Hotfix: Behebung des Absturzes der App beim Start unter Android 5-7
-
-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
-• Wandern: bessere Darstellung der Höhenlinien
+• OpenStreetMap-Daten vom 22. Juni
+• Optionale automatische Backups von Lesezeichen & Tracks
+• Neue 100m-Höhenlinien für Regionen die vorher gröbere/keine Isolinien hatten
+• Vegetation & Spielplätze werden früher angezeigt, neue Farben für Campingplätze & andere Einrichtungen
+• Pfade & Tracks werden standardmäßig bei höherem Zoom angezeigt, Outdoor-Stil für Detailübersicht
+• Aktion des linken Button nichtm mehr im Hamburger-Menü, stattdessen werden "Über & Hilfe" dort angezeigt
--- 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,10 +1,7 @@
-Hotfix: solved app crashing at launch on Android 5-7
-
-Introducing CoMaps logo!
-• upgrade altitude contour lines for many regions to 20 or 50 meter steps
-• 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
-• outdoors: bolder altitude contour lines
+• OpenStreetMap data as of June 22
+• a setting for automatic bookmarks and tracks backup
+• added 100m-step altitude isolines to all regions that had worse or no isolines
+• display vegetation and playground color fills earlier, add fills to camp sites and some amenities
+• paths & tracks appear on the map later by default - still appear earlier in the outdoor style
+• hide active custom button action from the hamburger menu, move there About & Help from the settings
+• update map transport icons
--- 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,10 +1,6 @@
-Revisión: se solucionó el fallo de inicio en Android 5-7
-
-¡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
-• exteriores: líneas de contorno de altitud más gruesas
+• datos de OpenStreetMap a 22 de junio
+• añadido ajuste para la copia de seguridad automática de marcadores y trazas
+• añadidas isolíneas de 100 m a las regiones que tenían isolíneas peores o no tenían isolíneas
+• se muestra antes la vegetación y zonas de juego, añadidas áreas a campings y otros servicios
+• los senderos y pistas aparecen más tarde - siguen igual en estilo de outdoors
+• se oculta botón personalizado del menú y se mueve allí Acerca de y Ayuda desde los ajustes
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,8 +1,6 @@
-Correctif: correction du plantage de l'application au démarrage sur Android 5-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
-• Outdoors: Améliorations de la visibilité des courbes d'altitude
+• Données OpenStreetMap du 22 juin
+• Sauvegarde automatique des signets et traces GPS en local
+• Ajout des courbes d'altitude avec un précision de 100 mètres dans toutes les régions qui avaient peu de courbes ou aucune
+• Ajustements des styles notamment sur la végétation, les aires de jeu et les chemins
+• Masque l’action active du bouton personnalisé dans le menu hamburger
+• Correction de certains plantages et bugs
--- 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 cartographique facile - Découvrez davantage de votre voyage - Propulsé par la communauté
+Navigation cartographique facile - Propulsé par la communauté
--- a/android/app/src/fdroid/play/listings/pl-PL/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pl-PL/release-notes.txt
@@ -1,10 +0,0 @@
-Poprawka: naprawiono awarię aplikacji podczas uruchamiania na systemie Android 5-7
-
-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
-• 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,10 +0,0 @@
-Correção: corrigir o travamento do aplicativo ao iniciar no Android 5-7
-
-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
-• Ar livre: curvas de nível de altitude mais destacadas
--- 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,10 +1,6 @@
-Исправление: устранён сбой при запуске приложения на Android 5-7
-
-Представляем логотип CoMaps!
-• Линии высот для многих регионов с шагом 20м или 50м
-• Ссылки на изображения Panoramax к выбранным POI
-• Карты OpenStreetMap от 13 июля
-• Заливки цветом ко многим объектам и более ранняя заливка для существующих объектов
-• Показ часов работы при выборе POI
-• Разные водно-болотные угодья отличаются цветом
-• В стиле "Активный отдых" более четкие линии высот
+• карты OpenStreetMap от 22 июня
+• автоматическое резервное копирование меток и треков
+• линии высот с шагом 100м для всех регионов, где линии с этим шагом отсутствовали
+• цветная заливка растительности и игровых площадок отображается раньше, добавлена заливка для кемпингов и других объектов
+• тропы и грунтовки отображаются позже в стиле по умолчанию - используйте стиль «Активный отдых» для обзора троп
+• выбранная функция настраиваемой кнопки больше не дублируется в пунктах меню
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -1,10 +0,0 @@
-Хитна исправка: поправка рушења апликације при покретању на Андроиду 5–7
-
-Представљамо CoMaps лого!
-• ажуриране изохипсе за многе регионе на кораке од 20 или 50 метара
-• додате везе ка Panoramax сликама за изабране тачке интересовања (POI)
-• подаци са OpenStreetMap-а од 13. јула
-• додате боје за многе елементе и раније приказивање постојећих површина
-• приказ стања радног времена при избору POI-ја
-• мочваре подељене на неколико различитих типова
-• на отвореном: наглашеније изохипсе
--- a/android/app/src/fdroid/play/listings/sr/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/short-description.txt
@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Ради на бази заједнице
+Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.08.08-2-FDroid+25080802
+version: 2025.03.02-7-FDroid+25030207
--- a/android/app/src/google/play/listings/sr/full-description.txt
+++ b/android/app/src/google/play/listings/sr/full-description.txt
@@ -1,6 +1,6 @@
 Бесплатна апликација за мапе отвореног кода коју води заједница заснована на OpenStreetMap подацима и ојачана посвећеношћу транспарентности, приватности и непрофитности.

-Придружите се заједници и помозите да направите најбољу навигацију
+Придружите се заједници и помозите да направимо најбољу навигацију
 • Користите апликацију и ширите информације о њој
 • Оставите повратне информације и пријавите проблеме
 • Ажурирајте мапе из апликације или на сајту OpenStreetMap
@@ -11,26 +11,26 @@
 ‣ <b>Офлајн фокусирана</b>: Планирајте путовање у иностранство без употребе мобилне телефоније, потражите правац тачке током дугог путовања, итд . Све функције апликације су дизајниране за рад у режиму без интернета.
 ‣ <b>Поштовање приватности</b>: Апликација је развијена с обзиром на приватност - не идентификује људе, не прати и не прикупља личне информације. Без реклама.
 ‣ <b>Штеди батерију и простор</b>: Не празни батерију, као остале навигациje. Компактне mape штедe драгоценi prostor на вашем телефону..
-‣ <b>Бесплатно и изграђено од стране заједнице</b>: Људи попут вас помогли су у изради апликације додавањем места на OpenStreetMap, тестирањем и давањем повратних информација о функцијама и доприносом својим развојним вештинама и новцем.
-‣ <b>Отворено и транспарентно доношење одлука и финансије, непрофитне и потпуно отвореног кода.</b>
+‣ <b>Free and Built by the Community</b>: Такви људи, као што сте помогли да креирате апликацију, додајући места у OpenStreetMap, тестира и остављајући повратне информације о функцијама, као и стављајући своје вештине развоја и новац.
+‣ <b>Отворено и транспарентно доношење одлука и финансија, непрофитни и потпуно отворени кода.</b>

 <b>Главне карактеристике</b>:
-<li>Преузимање детаљних мапа са локацијама које нису доступне у Google Maps</li>
-<li>Режим на отвореном са истакнутим планинарским стазама, кампови, извори воде, врхови, контурне линије, итд</li>
-<li>Пешачке и бициклистичке стазе</li>
-<li>Тачке интереса попут ресторана, бензинских станица, хотели, продавнице, разгледање и још много тога</li>
-<li>Претрага по имену, адреси или по ТОИ категоријама</li>
-<li>Навигација са гласовним упутима за планинарење, бициклизам или вожњу аутомобилом</li>
-<li>Обележите своја омиљена места једним додиром</li>
-<li>Википедија чланци без интернета</li>
-<li>Нивои транзита у метроа и смер кретања</li>
-<li>Снимање траса</li>
-<li>Извоз и увоз маркера и траса у форматима KML, KMZ, GPX</li>
-<li>Тамни режим за употребу ноћу</li>
-<li>Побољшавање картографских података за све, користећи основни едитор за уређивање</li>
-<li>Подршка за Андроид Ауто</li>
+• Преузимање детаљне мапе са локацијама које нису доступне у Google Maps
+• Истакнуте планинарске стазе, кампови, изворима воде, врхове, контуре линије итд
+• Пешачке и бициклистичке стазе
+• Тачке од интереса као што су ресторани, бензинске станице, хотели, атракције, шопинг и још много тога
+• Претрага по имену или адреси или по категорији интересних места
+• Навигација са гласовним огласима за планинарење, бициклизам или вожње аутомобила
+• Означи своја омиљене места са једним додиром
+• Офлајн Википедиа чланци
+• Транзитни слој метроа и упутства
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
+• Подршка за Андроид Ауто

 Молимо Вас да пријавите проблеме са апликацијом, предложите идеје и придружите се нашој заједници на <b><i>comaps.app</i></b> страни.

-<b>Сад је слободно</b>
+<b>Сад је слободна</b>
 Откријте своје путовање, путујте светом с приватношћу и заједницом на челу!
--- a/android/app/src/google/play/listings/sr/short-description.txt
+++ b/android/app/src/google/play/listings/sr/short-description.txt
@@ -1 +1 @@
-Једноставна навигација - Сазнајте више о свом путовању - Ради на бази заједнице
+Једноставна навигација - Сазнајте више о свом путовању - Покреће је заједница
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
@@ -85,7 +85,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
      case FMD_WEBSITE_MENU ->
          mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
      case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER,
-           FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE, FMD_PANORAMAX ->
+           FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE ->
      {
        if (TextUtils.isEmpty(mMapObject.getMetadata(type)))
          yield "";
@@ -171,7 +171,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
    mPanoramax = mFrame.findViewById(R.id.ll__place_panoramax);
    mTvPanoramax = mFrame.findViewById(R.id.tv__place_panoramax);
    mPanoramax.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_PANORAMAX));
-    mPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX));
+    mTvPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX));
  }

  private void openUrl(Metadata.MetadataType type)
@@ -192,7 +192,6 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
    final String title = switch (type){
      case FMD_WEBSITE -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
      case FMD_WEBSITE_MENU -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
-      case FMD_PANORAMAX -> null; // Don't add raw ID to list, as it's useless for users.
      default -> mMapObject.getMetadata(type);
    };
    // Add user names for social media if available
@@ -238,8 +237,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
    refreshMetadataOrHide(line, mLinePage, mTvLinePage);

    final String panoramax = mMapObject.getMetadata(Metadata.MetadataType.FMD_PANORAMAX);
-    final String panoramaxTitle = TextUtils.isEmpty(panoramax) ? "" : getResources().getString(R.string.panoramax);
-    refreshMetadataOrHide(panoramaxTitle, mPanoramax, mTvPanoramax);
+    refreshMetadataOrHide(panoramax, mPanoramax, mTvPanoramax);
  }

  @Override
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,15 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-  <path
-      android:pathData="m43.279,20.906a0.803,0.803 0,0 1,1.236 -0.052,16.697 16.697,0 0,1 4.243,11.142 16.697,16.697 0,0 1,-3.745 10.556,0.803 0.803,0 0,1 -1.256,-0.024l-1.726,-2.272a0.803,0.803 0,0 1,-0.008 -0.963,12.322 12.322,0 0,0 2.38,-7.297c0,-2.978 -1.052,-5.712 -2.806,-7.851a0.803,0.803 0,0 1,-0.02 -0.995z"
-      android:fillColor="#ccdfca"/>
-  <path
-      android:pathData="m25.706,33.561a0.803,0.803 0,0 1,-0.309 -1.473l11.319,-7.12a0.803,0.803 0,0 1,1.2 0.911l-3.893,12.8a0.803,0.803 0,0 1,-1.505 0.088l-1.975,-4.475z"
-      android:fillColor="#ccdfca"/>
-  <path
-      android:pathData="m40.381,45.466a0.803,0.803 0,0 1,-0.249 1.188,16.697 16.697,0 0,1 -8.132,2.103 16.765,16.765 0,0 1,-16.757 -16.761,16.765 16.765,0 0,1 24.215,-15.007 0.803,0.803 0,0 1,0.281 1.204l-1.702,2.24a0.803,0.803 0,0 1,-0.971 0.245,12.322 12.322,0 0,0 -5.065,-1.084 12.402,12.402 0,0 0,-12.402 12.402c0,6.847 5.559,12.402 12.402,12.402a12.322,12.322 0,0 0,5.683 -1.377,0.803 0.803,0 0,1 1.007,0.225z"
-      android:fillColor="#fefdf6"/>
-</vector>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_logo"
+    android:inset="20dp" />
--- a/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
@@ -1,12 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-  <path
-      android:pathData="M43.938,20.588A0.803,0.803 0,0 0,43.279 20.906L41.577,23.15A0.803,0.803 0,0 0,41.597 24.145C43.351,26.284 44.402,29.018 44.402,31.997A12.322,12.322 0,0 1,42.022 39.293A0.803,0.803 0,0 0,42.031 40.257L43.756,42.527A0.803,0.803 0,0 0,45.013 42.552A16.697,16.697 0,0 0,48.757 31.997A16.697,16.697 0,0 0,44.515 20.854A0.803,0.803 0,0 0,43.938 20.588zM37.126,24.842A0.803,0.803 0,0 0,36.716 24.968L25.397,32.089A0.803,0.803 0,0 0,25.707 33.561L30.543,34.292L32.518,38.767A0.803,0.803 0,0 0,34.022 38.679L37.916,25.879A0.803,0.803 0,0 0,37.126 24.842z"
-      android:fillColor="#BFFFFFFF" />
-  <path
-      android:pathData="m40.381,45.466a0.803,0.803 0,0 1,-0.249 1.188,16.697 16.697,0 0,1 -8.132,2.103 16.765,16.765 0,0 1,-16.757 -16.761,16.765 16.765,0 0,1 24.215,-15.007 0.803,0.803 0,0 1,0.281 1.204l-1.702,2.24a0.803,0.803 0,0 1,-0.971 0.245,12.322 12.322,0 0,0 -5.065,-1.084 12.402,12.402 0,0 0,-12.402 12.402c0,6.847 5.559,12.402 12.402,12.402a12.322,12.322 0,0 0,5.683 -1.377,0.803 0.803,0 0,1 1.007,0.225z"
-      android:fillColor="#FFFFFF"/>
-</vector>
+<inset
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:drawable="@drawable/ic_logo_monochrome"
+android:inset="20dp" />
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -13,7 +13,6 @@
    android:layout_marginStart="@dimen/margin_base"
    android:text="@string/download_country_ask"
    android:textAppearance="?fontBody2"
-    app:buttonTint="?colorAccent"
    android:visibility="gone"
    tools:visibility="visible"/>
  <com.google.android.material.progressindicator.LinearProgressIndicator
--- a/android/app/src/main/res/layout/item_cuisine.xml
+++ b/android/app/src/main/res/layout/item_cuisine.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="@dimen/height_item_oneline"
  android:background="?clickableBackground"
@@ -13,8 +12,7 @@
    android:id="@+id/selected"
    android:layout_width="48dp"
    android:layout_height="48dp"
-    android:layout_marginEnd="@dimen/margin_double"
-    app:buttonTint="?colorAccent"/>
+    android:layout_marginEnd="@dimen/margin_double"/>

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/cuisine"
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -52,8 +52,7 @@
        <com.google.android.material.checkbox.MaterialCheckBox
          android:id="@id/chb__day"
          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          style="@style/MwmWidget.Editor.DayCheckBox"/>
+          android:layout_height="wrap_content"/>

      </LinearLayout>

@@ -70,8 +69,7 @@
        <com.google.android.material.checkbox.MaterialCheckBox
          android:id="@id/chb__day"
          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          style="@style/MwmWidget.Editor.DayCheckBox"/>
+          android:layout_height="wrap_content"/>

      </LinearLayout>

@@ -88,8 +86,7 @@
        <com.google.android.material.checkbox.MaterialCheckBox
          android:id="@id/chb__day"
          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          style="@style/MwmWidget.Editor.DayCheckBox"/>
+          android:layout_height="wrap_content"/>

      </LinearLayout>

@@ -106,8 +103,7 @@
        <com.google.android.material.checkbox.MaterialCheckBox
          android:id="@id/chb__day"
          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          style="@style/MwmWidget.Editor.DayCheckBox"/>
+          android:layout_height="wrap_content"/>

      </LinearLayout>

@@ -124,8 +120,7 @@
        <com.google.android.material.checkbox.MaterialCheckBox
          android:id="@id/chb__day"
          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          style="@style/MwmWidget.Editor.DayCheckBox"/>
+          android:layout_height="wrap_content"/>

      </LinearLayout>

@@ -146,8 +141,7 @@
        <com.google.android.material.checkbox.MaterialCheckBox
          android:id="@id/chb__day"
          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          style="@style/MwmWidget.Editor.DayCheckBox"/>
+          android:layout_height="wrap_content"/>

      </LinearLayout>

--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -775,238 +775,4 @@
    <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>
-    <string name="type.amenity.love_hotel">Любовен хотел</string>
-    <string name="type.highway.ladder">Стълба</string>
-    <string name="type.amenity.vending_machine.excrement_bags">Диспенсър за торбички</string>
-    <string name="type.natural.wetland.fen">Мочурище</string>
-    <string name="type.natural.wetland.reedbed">Тръстиково легло</string>
-    <string name="type.natural.wetland.swamp">Блато</string>
-    <string name="type.natural.wetland.mangrove">Мангрова гора</string>
-    <string name="type.cuisine.burger">Бургер</string>
-    <string name="type.aerialway.gondola">Гондола</string>
-    <string name="type.sport.diving">Високо гмуркане</string>
-    <string name="type.amenity.place_of_worship.hindu">Хиндуистки храм</string>
-    <string name="type.amenity.place_of_worship.taoist">Даоистки храм</string>
-    <string name="type.recycling.small_appliances">Електронни отпадъци</string>
-    <string name="type.amenity.sanitary_dump_station">Станция за изхвърляне на резервоара за задържане</string>
-    <string name="type.amenity.vending_machine">Вендинг машина</string>
-    <string name="type.amenity.vending_machine.cigarettes">Диспенсър за цигари</string>
-    <string name="type.amenity.vending_machine.coffee">Диспенсър за кафе</string>
-    <string name="type.amenity.vending_machine.condoms">Диспенсър за презервативи</string>
-    <string name="type.amenity.vending_machine.drinks">Диспенсър за напитки</string>
-    <string name="type.amenity.vending_machine.newspapers">Диспенсър за вестници</string>
-    <string name="type.amenity.vending_machine.parking_tickets">Паркинг метър</string>
-    <string name="type.barrier.retaining_wall">Подпорна стена</string>
-    <string name="type.barrier.stile">Стъпалата</string>
-    <string name="type.barrier.swing_gate">Бариера на жп линия</string>
-    <string name="type.cuisine.argentinian">Аржентински</string>
-    <string name="type.cuisine.asian">Азиатски</string>
-    <string name="type.cuisine.bagel">Геврек</string>
-    <string name="type.cuisine.barbecue">Барбекю</string>
-    <string name="type.cuisine.beef_bowl">Купа с говеждо месо</string>
-    <string name="type.cuisine.bubble_tea">Бабъл чай</string>
-    <string name="type.cuisine.buschenschank">Бушеншанк</string>
-    <string name="type.cuisine.cake">Торта</string>
-    <string name="type.cuisine.chicken">Пиле</string>
-    <string name="type.cuisine.coffee_shop">Кафе</string>
-    <string name="type.cuisine.crepe">Креп</string>
-    <string name="type.cuisine.croatian">Хърватски</string>
-    <string name="type.cuisine.diner">Вагон-ресторант</string>
-    <string name="type.cuisine.donut">Донът</string>
-    <string name="type.cuisine.fine_dining">Изящна кухня</string>
-    <string name="type.cuisine.fish">Риба</string>
-    <string name="type.railway.station.subway.qingdao">Метростанция</string>
-    <string name="type.natural.wetland.tidalflat">Приливната равнина</string>
-    <string name="type.cuisine.curry">Къри</string>
-    <string name="type.amenity.place_of_worship.shinto">Шинтоистко светилище</string>
-    <string name="type.amenity.vending_machine.food">Диспенсър за храна</string>
-    <string name="type.amenity.nightclub">Нощен клуб</string>
-    <string name="type.cuisine.breakfast">Закуска</string>
-    <string name="type.cuisine.fish_and_chips">Риба и чипс</string>
-    <string name="type.cuisine.friture">Фритюр</string>
-    <string name="type.cuisine.grill">Грил</string>
-    <string name="type.cuisine.hotdog">Хотдог</string>
-    <string name="type.cuisine.ice_cream">Сладолед</string>
-    <string name="type.cuisine.italian_pizza">Италиански, пица</string>
-    <string name="type.cuisine.kebab">Кебап</string>
-    <string name="type.cuisine.mediterranean">Средиземноморски</string>
-    <string name="type.cuisine.oriental">Източноазиатска</string>
-    <string name="type.cuisine.pancake">Палачинки</string>
-    <string name="type.cuisine.pizza">Пица</string>
-    <string name="type.cuisine.mexican">Мексиканска</string>
-    <string name="type.cuisine.moroccan">Мароканска</string>
-    <string name="type.cuisine.japanese">Японска</string>
-    <string name="type.cuisine.hungarian">Унгарска</string>
-    <string name="type.cuisine.french">Френска</string>
-    <string name="type.cuisine.chinese">Китайска</string>
-    <string name="type.cuisine.ethiopian">Етиопска</string>
-    <string name="type.cuisine.filipino">Филипинска</string>
-    <string name="type.cuisine.georgian">Грузинска</string>
-    <string name="type.cuisine.german">Немска</string>
-    <string name="type.cuisine.greek">Гръцка</string>
-    <string name="type.cuisine.indian">Индийска</string>
-    <string name="type.cuisine.indonesian">Индонезийска</string>
-    <string name="type.cuisine.international">Международна</string>
-    <string name="type.cuisine.irish">Ирландска</string>
-    <string name="type.cuisine.italian">Италианска</string>
-    <string name="type.cuisine.korean">Корейска</string>
-    <string name="type.cuisine.lao">Лао</string>
-    <string name="type.cuisine.lebanese">Ливанска</string>
-    <string name="type.cuisine.local">Местна</string>
-    <string name="type.cuisine.ramen">Рамен</string>
-    <string name="type.cuisine.regional">Регионална</string>
-    <string name="type.cuisine.sausage">Колбаси</string>
-    <string name="type.cuisine.savory_pancakes">Пикантни палачинки</string>
-    <string name="type.cuisine.seafood">Морски дарове</string>
-    <string name="type.cuisine.soba">Соба</string>
-    <string name="type.cuisine.steak_house">Стекхаус</string>
-    <string name="type.cuisine.sushi">Суши</string>
-    <string name="type.cuisine.tapas">Тапас</string>
-    <string name="type.cuisine.tea">Чай</string>
-    <string name="type.cuisine.vegan">Веганска</string>
-    <string name="type.cuisine.thai">Тайландска</string>
-    <string name="type.cuisine.turkish">Турска</string>
-    <string name="type.cuisine.russian">Руска</string>
-    <string name="type.leisure.dog_park">Парк за кучета</string>
-    <string name="type.leisure.fitness_centre">Фитнес център</string>
-    <string name="type.leisure.garden">Градина</string>
-    <string name="type.leisure.golf_course">Голф игрище</string>
-    <string name="type.leisure.hackerspace">Хакерспейс</string>
-    <string name="type.leisure.ice_rink">Ледена пързалка</string>
-    <string name="type.leisure.marina">Яхт-клуб</string>
-    <string name="type.leisure.pitch">Спортен терен</string>
-    <string name="type.leisure.playground">Детска площадка</string>
-    <string name="type.leisure.recreation_ground">Парк за отдих</string>
-    <string name="type.leisure.firepit">Огнище</string>
-    <string name="type.leisure.park">Парк</string>
-    <string name="type.leisure.park.no.access">Частен парк</string>
-    <string name="type.leisure.park.permissive">Парк</string>
-    <string name="type.leisure.park.private">Частен парк</string>
-    <string name="type.leisure.sauna">Сауна</string>
-    <string name="type.leisure.track.area">Пътека</string>
-    <string name="type.leisure.water_park">Аквапарк</string>
-    <string name="type.leisure.beach_resort">Плажен курорт</string>
-    <string name="type.man_made">Изкуствена структура</string>
-    <string name="type.man_made.cairn">Керн</string>
-    <string name="type.man_made.chimney">Комин</string>
-    <string name="type.leisure">Място за отдих</string>
-    <string name="type.cuisine.malaysian">Мадагаскарска</string>
-    <string name="type.cuisine.malagasy">Мадагаскар</string>
-    <string name="type.cuisine.polish">Полска</string>
-    <string name="type.cuisine.portuguese">Португалска</string>
-    <string name="type.leisure.slipway">Стапел</string>
-    <string name="type.leisure.sports_centre">Спортен център</string>
-    <string name="type.leisure.stadium">Стадион</string>
-    <string name="type.shop.cosmetics">Магазин за козметика</string>
-    <string name="type.leisure.nature_reserve">Природен резерват</string>
-    <string name="type.shop.florist">Цветарски магазин</string>
-    <string name="type.man_made.breakwater">Вълнолом</string>
-    <string name="type.leisure.fitness_station">Фитнес станция</string>
-    <string name="type.leisure.track">Пътека</string>
-    <string name="type.landuse.forest.coniferous">Иглолистни гори</string>
-    <string name="type.landuse.forest.deciduous">Широколистна гора</string>
-    <string name="type.landuse.garages">Гаражи</string>
-    <string name="type.landuse.greenfield">Земля за застройки</string>
-    <string name="type.landuse.greenhouse_horticulture">Оранжерия</string>
-    <string name="type.landuse.industrial">Индустриална зона</string>
-    <string name="type.landuse.landfill">Депо за отпадъци</string>
-    <string name="type.landuse.military">Военна зона</string>
-    <string name="type.landuse.orchard">Овощна градина</string>
-    <string name="type.landuse.railway">Железопътни съоръжения</string>
-    <string name="type.landuse.recreation_ground">Място за отдих</string>
-    <string name="type.landuse.reservoir">Резервоар</string>
-    <string name="type.landuse.residential">Жилищна зона</string>
-    <string name="type.landuse.retail">Търговска площ</string>
-    <string name="type.landuse.salt_pond">Солено езеро</string>
-    <string name="type.man_made.cutline">Просека</string>
-    <string name="type.man_made.survey_point">Геодезическа точка</string>
-    <string name="type.man_made.flagpole">Мачта за знаме</string>
-    <string name="type.man_made.crane">Кран</string>
-    <string name="type.man_made.water_tap">Кранче за вода</string>
-    <string name="type.man_made.water_tap.drinking_water_no">Кранче за вода</string>
-    <string name="type.man_made.water_tower">Водна кула</string>
-    <string name="type.man_made.water_well">Кладенец</string>
-    <string name="type.man_made.water_well.drinking_water_no">Кладенец</string>
-    <string name="type.man_made.windmill">Вятърна мелница</string>
-    <string name="type.man_made.works">Промишлени предприятия</string>
-    <string name="type.military">Военни</string>
-    <string name="type.military.bunker">Бункер</string>
-    <string name="type.power.generator">Генератор на електроенергия</string>
-    <string name="type.power.line">Електропровод</string>
-    <string name="type.power.line.underground">Подземен електропровод</string>
-    <string name="type.power.minor_line">Електропровод за ниско напрежение</string>
-    <string name="type.power.substation">Подстанция</string>
-    <string name="type.railway">Железопътна линия</string>
-    <string name="type.railway.funicular.tunnel">Фуникулярен тунел</string>
-    <string name="type.power">Електричество</string>
-    <string name="type.landuse.farmyard">Стопански двор</string>
-    <string name="type.man_made.lighthouse">Фар</string>
-    <string name="type.man_made.mast">Мачта</string>
-    <string name="type.man_made.pier">Пирс</string>
-    <string name="type.man_made.pipeline">Тръбопровод</string>
-    <string name="type.man_made.pipeline.overground">Надземен тръбопровод</string>
-    <string name="type.man_made.storage_tank">Резервоар за съхранение</string>
-    <string name="type.man_made.surveillance">Камера за наблюдение</string>
-    <string name="type.cuisine.vegetarian">Вегетарианска</string>
-    <string name="type.emergency">Спешна помощ</string>
-    <string name="type.emergency.defibrillator">Дефибрилатор</string>
-    <string name="type.emergency.phone">Телефон за спешни случаи</string>
-    <string name="type.cuisine.vietnamese">Виетнамска</string>
-    <string name="type.highway.bridleway">Пътека за юздечки</string>
-    <string name="type.highway.bridleway.permissive">Пътека за юздечки</string>
-    <string name="type.highway.construction">Път в процес на изграждане</string>
-    <string name="type.highway.living_street">Жилищна улица</string>
-    <string name="type.highway.track">Пътека</string>
-    <string name="type.highway.track.area">Пътека</string>
-    <string name="type.highway.track.grade1">Пътека</string>
-    <string name="type.highway.track.no.access">Пътека</string>
-    <string name="type.area_highway.living_street">Жилищна улица</string>
-    <string name="type.area_highway.track">Пътека</string>
-    <string name="type.landuse">Земеползване</string>
-    <string name="type.landuse.allotments">Овощни градини</string>
-    <string name="type.landuse.brownfield">Земля за застройки</string>
-    <string name="type.landuse.commercial">Търговска зона</string>
-    <string name="type.landuse.construction">Строителна зона</string>
-    <string name="type.landuse.education">Учебно заведение</string>
-    <string name="type.man_made.utility_pole">Стълб за комунални услуги</string>
-    <string name="type.landuse.religious">Религиозна земя</string>
-    <string name="type.power.tower">Електрическа кула</string>
-    <string name="type.power.pole">Електрически стълб</string>
-    <string name="type.railway.abandoned">Изоставена железопътна линия</string>
-    <string name="type.railway.abandoned.bridge">Изоставен железопътен мост</string>
-    <string name="type.railway.abandoned.tunnel">Изоставен железопътен тунел</string>
-    <string name="type.railway.construction">Строителство на железопътни линии</string>
-    <string name="type.railway.crossing">Железопътен прелез</string>
-    <string name="type.railway.disused">Неизползвана железопътна линия</string>
-    <string name="type.railway.funicular.bridge">Фуникулярен мост</string>
-    <string name="type.railway.halt">Железопътна спирка</string>
-    <string name="type.railway.level_crossing">Железопътен прелез</string>
-    <string name="type.railway.light_rail">Скоростен трамвай</string>
-    <string name="type.railway.light_rail.bridge">Мост на скоростен трамвай</string>
-    <string name="type.railway.light_rail.tunnel">Тунел на скоростен трамвай</string>
-    <string name="type.railway.monorail">Монорелс</string>
-    <string name="type.natural.wetland.saltmarsh">Солено блато</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Приливни солени блато</string>
-    <string name="type.noexit">Задънена улица</string>
-    <string name="type.office.estate_agent">Агент по недвижими имоти</string>
-    <string name="type.office.government">Правителствен офис</string>
-    <string name="type.office.lawyer">Адвокат</string>
-    <string name="type.office.ngo">Неправителствена организация</string>
-    <string name="type.organic.only">Органичен</string>
-    <string name="type.organic.yes">Органичен</string>
-    <string name="type.railway.monorail.bridge">Мост на монорелсите</string>
-    <string name="type.junction">Съединение</string>
-    <string name="type.landuse.forest.mixed">Смесена гора</string>
-    <string name="type.landuse.plant_nursery">Посадъчен материал</string>
-    <string name="type.landuse.farmland">Земеделска земя</string>
-    <string name="type.area_highway.steps">Стълбища</string>
-    <string name="type.office.company">Офис на компанията</string>
-    <string name="type.man_made.wastewater_plant">Пречиствателна станция за отпадъчни води</string>
-    <string name="type.landuse.quarry">Кариера</string>
-    <string name="type.office.insurance">Застрахователна служба</string>
-    <string name="type.railway.monorail.tunnel">Тунел на монорелсите</string>
-    <string name="type.boundary.national_park">National Park</string>
 </resources>
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -36,15 +36,15 @@
    <string name="country_status_download_failed">La baixada ha fallat</string>
    <!-- Button text for the button under the country_status_download_failed message -->
    <string name="try_again">Torna-ho a intentar</string>
-    <string name="about_menu_title">Quant al CoMaps</string>
+    <string name="about_menu_title">Quant a l’CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• Fàcil d\'usar i elegant</string>
+    <string name="about_proposition_1">• Sense publicitat, rastreig ni recopilació de dades</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_2">• Centrat en la privacitat i sense anuncis</string>
+    <string name="about_proposition_2">• Consum de bateria mínim, funciona fora de línia</string>
    <!-- Text in About screen -->
    <string name="about_proposition_3">• Fora de línia, ràpid i compacte</string>
    <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Codi totalment obert, sense ànim de lucre i transparència en la presa de decisions i finances.</string>
+    <string name="about_developed_by_enthusiasts">Aplicació de codi obert creada per entusiastes i voluntaris.</string>
    <!-- The button that opens system location settings -->
    <string name="location_settings">Paràmetres d’ubicació</string>
    <string name="close">Tanca</string>
@@ -297,9 +297,9 @@
    <!-- Item in context menu. -->
    <string name="downloader_update_map">Actualitza el mapa</string>
    <!-- Preference title -->
-    <string name="google_play_services">Servei d\'ubicació de Google Fused</string>
+    <string name="google_play_services">Serveis d\'ubicació de Google Play</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Un servei de propietat que combina GPS, Wi-Fi, xarxes mòbils, etc. per a determinar la teva ubicació amb més precisió. Pot ser que es connecti als serveis de Google.</string>
+    <string name="pref_use_google_play">Determineu ràpidament la vostra ubicació aproximada mitjançant Bluetooth, WiFi o xarxa mòbil</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -884,44 +884,4 @@
    <string name="panoramax">Imatge Panoramax</string>
    <string name="app_site_url">https://comaps.app/ca/</string>
    <string name="saved">S\'ha desat</string>
-    <string name="about_headline">Projecte obert, desenvolupat per la comunitat</string>
-    <string name="codeberg">Codeberg</string>
-    <string name="bluesky">Bluesky</string>
-    <string name="error_enter_correct_level">Introdueix un valor de pis vàlid</string>
-    <string name="error_enter_correct_fediverse_page">Introdueix un nom d\'usuari o una adreça web de Mastodon vàlids</string>
-    <string name="pref_backup_now_summary">Crear una còpia de seguretat immediatament</string>
-    <string name="pref_backup_now_title">Crear una còpia de seguretat ara</string>
-    <string name="pref_backup_now_summary_progress">Còpia de seguretat en progrés…</string>
-    <string name="editor_building_levels">Pisos (incl. baixos, excl. teulada)</string>
-    <string name="pref_left_button_disable">Desactivar</string>
-    <string name="editor_level">Pis (0 és la planta baixa)</string>
-    <string name="error_enter_correct_bluesky_page">Introdueix un nom d\'usuari o una adreça web de Bluesky vàlids</string>
-    <string name="pref_backup_title">Còpia de seguretat de marcadors i recorreguts</string>
-    <string name="pref_left_button_title">Configuració del botó esquerre</string>
-    <string name="pref_backup_summary">Còpia de seguretat automàtica a un directori del teu dispositiu</string>
-    <string name="pref_backup_now_summary_ok">Còpia de seguretat completada amb èxit</string>
-    <string name="pref_backup_now_summary_empty_lists">No hi ha marcadors o recorreguts per a fer una còpia de seguretat</string>
-    <string name="pref_backup_now_summary_failed">Còpia de seguretat fallida</string>
-    <string name="pref_backup_now_summary_folder_unavailable">El directori de la còpia de seguretat no està disponible</string>
-    <string name="pref_backup_status_summary_success">Última còpia de seguretat amb èxit</string>
-    <string name="pref_backup_location_title">Ubicació de la còpia de seguretat</string>
-    <string name="pref_backup_location_summary_initial">Si us plau, selecciona primer un directori i proporciona accés</string>
-    <string name="pref_backup_history_title">Nombre de còpies de seguretat a mantenir</string>
-    <string name="pref_backup_interval_title">Còpia de seguretat automàtica</string>
-    <string name="backup_interval_every_day">Diari</string>
-    <string name="backup_interval_every_week">Setmanal</string>
-    <string name="backup_interval_manual_only">Desactivat (només manual)</string>
-    <string name="clear">Netejar</string>
-    <string name="route_type">Tipus de ruta</string>
-    <string name="vehicle">Vehicle</string>
-    <string name="pedestrian">A peu</string>
-    <string name="bicycle">Bicicleta</string>
-    <string name="ruler">Regle</string>
-    <string name="bookmark_color">Color del marcador</string>
-    <string name="about_help">Quant a i Ajuda</string>
-    <string name="open_now">Obert ara</string>
-    <string name="closed_now">Tancat ara</string>
-    <string name="at">a les %s</string>
-    <string name="dialog_report_error_missing_folder">La ubicació seleccionada per a la còpia de seguretat no està disponible o no s\'hi pot escriure. Si us plau, selecciona una ubicació diferent.</string>
-    <string name="dialog_report_error_with_logs">Si us plau, envia\'ns un informe d\'error:\n - \"Activa el registre\" a la configuració\n - reprodueix el problema\n - a la pantalla \"Quant a i Ajuda\" prem el botó \"Informa d’un error\" i envia-ho via email o xat\n - desactiva el registre</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -66,7 +66,7 @@
    <!-- REMOVE THIS STRING AFTER REFACTORING -->
    <string name="continue_button">Fortfahren</string>
    <!-- Show popup notification on top of the map when country download has failed. -->
-    <string name="download_country_failed">Herunterladen von %s ist fehlgeschlagen</string>
+    <string name="download_country_failed">%s Herunterladen fehlgeschlagen</string>
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Neue Liste hinzufügen</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
@@ -106,11 +106,11 @@
    <!-- Error moving map files from one storage to another -->
    <string name="move_maps_error">Fehler beim Verschieben der Karten</string>
    <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten …</string>
+    <string name="wait_several_minutes">Dies kann einige Minuten in Anspruch nehmen. \nBitte warten…</string>
    <!-- Measurement units title in settings activity -->
    <string name="measurement_units">Maßeinheiten</string>
    <!-- Detailed description of Measurement Units settings button -->
-    <string name="measurement_units_summary">Zwischen Kilometern und Meilen wählen</string>
+    <string name="measurement_units_summary">Wählen Sie zwischen Kilometern und Meilen</string>
    <!-- SECTION: Search categories -->
    <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
    <string name="category_eat">Essmöglichkeiten</string>
@@ -121,7 +121,7 @@
    <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
    <string name="category_fuel">Tankstelle</string>
    <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
-    <string name="category_parking">Parkplätze</string>
+    <string name="category_parking">Parkplatz</string>
    <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
    <string name="category_shopping">Shopping</string>
    <!-- Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @category_secondhand! -->
@@ -129,7 +129,7 @@
    <!-- Search category for places to stay; any changes should be duplicated in categories.txt @category_hotel! -->
    <string name="category_hotel">Hotel</string>
    <!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @category_tourism! -->
-    <string name="category_tourism">Sehenswürdigkeiten</string>
+    <string name="category_tourism">Sehenswürdigkeit</string>
    <!-- Search category for entertainment; any changes should be duplicated in categories.txt @category_entertainment! -->
    <string name="category_entertainment">Unterhaltung</string>
    <!-- Search category for ATMs; any changes should be duplicated in categories.txt @category_atm! -->
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -212,7 +212,7 @@
    <!-- Settings «Route» category: «Tts enabled» title -->
    <string name="pref_tts_enable_title">음성 지침</string>
    <!-- Settings «Route» category: «Tts announce street names» title -->
-    <string name="pref_tts_street_names_title">거리 이름 발표</string>
+    <string name="pref_tts_street_names_title">\"거리 이름 발표\"</string>
    <!-- Settings «Route» category: «Tts announce street names» description -->
    <string name="pref_tts_street_names_description">사용하도록 설정하면 회전할 거리 또는 출구의 이름을 소리내어 말합니다.</string>
    <!-- Settings «Route» category: «Tts language» title -->
--- a/android/app/src/main/res/values-ko/types_strings.xml
+++ b/android/app/src/main/res/values-ko/types_strings.xml
@@ -160,7 +160,7 @@
    <string name="type.barrier.border_control">국경통제소</string>
    <string name="type.barrier.city_wall">도시의 벽</string>
    <string name="type.waterway.ditch">배수구</string>
-    <string name="type.natural.water.moat">해자 외호</string>
+    <string name="type.natural.water.moat">\"해자 외호\"</string>
    <string name="type.natural.water.wastewater">폐수</string>
    <string name="type.barrier.entrance">입구</string>
    <string name="type.barrier.gate">게이트</string>
@@ -479,7 +479,7 @@
    <string name="type.area_highway.unclassified">거리</string>
    <!-- SECTION: Types: Historic -->
    <string name="type.historic">역사적 물건</string>
-    <string name="type.historic.aircraft">역사적인 항공기</string>
+    <string name="type.historic.aircraft">\"역사적인 항공기\"</string>
    <string name="type.historic.anchor">역사적인 앵커</string>
    <string name="type.historic.archaeological_site">발굴</string>
    <string name="type.historic.battlefield">전장터</string>
@@ -530,7 +530,7 @@
    <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
    <string name="type.landuse.cemetery.christian">묘소</string>
    <string name="type.landuse.farmland">농지</string>
-    <string name="type.landuse.flowerbed">화단</string>
+    <string name="type.landuse.flowerbed">\"화단\"</string>
    <string name="type.landuse.forest">숲</string>
    <string name="type.landuse.forest.coniferous">숲</string>
    <string name="type.landuse.forest.deciduous">숲</string>
@@ -542,7 +542,7 @@
    <string name="type.leisure.dog_park">애완견 지역</string>
    <string name="type.leisure.fitness_centre">피트니스센터</string>
    <string name="type.leisure.fitness_station">피트니스 스테이션</string>
-    <string name="type.leisure.dance">댄스홀</string>
+    <string name="type.leisure.dance">\"댄스홀\"</string>
    <string name="type.leisure.garden">정원</string>
    <string name="type.leisure.garden.residential">정원</string>
    <string name="type.leisure.golf_course">골프장</string>
@@ -554,7 +554,7 @@
    <string name="type.leisure.park.no.access">공원</string>
    <string name="type.leisure.park.permissive">공원</string>
    <string name="type.leisure.park.private">공원</string>
-    <string name="type.leisure.picnic_table">피크닉 테이블</string>
+    <string name="type.leisure.picnic_table">\"피크닉 테이블\"</string>
    <string name="type.leisure.pitch">운동장</string>
    <string name="type.leisure.playground">놀이터</string>
    <string name="type.leisure.sauna">사우나</string>
@@ -986,7 +986,7 @@
    <string name="type.shop.electronics">전자제품</string>
    <string name="type.shop.erotic">성인용품 가게</string>
    <string name="type.shop.fabric">원단 가게</string>
-    <string name="type.shop.farm">농장 식품 가게</string>
+    <string name="type.shop.farm">\"농장 식품 가게\"</string>
    <string name="type.shop.fashion_accessories">패션 악세사리</string>
    <string name="type.shop.florist">꽃가게</string>
    <string name="type.shop.funeral_directors">장의사</string>
@@ -995,16 +995,16 @@
    <string name="type.shop.gas">주유소</string>
    <string name="type.shop.gift">선물 가게</string>
    <string name="type.shop.greengrocer">청과상</string>
-    <string name="type.shop.grocery">식료품점</string>
+    <string name="type.shop.grocery">\"식료품점\"</string>
    <string name="type.shop.hairdresser">이발사</string>
-    <string name="type.shop.health_food">건강식품 가게</string>
+    <string name="type.shop.health_food">\"건강식품 가게\"</string>
    <string name="type.shop.hearing_aids">보청기 스토어</string>
    <string name="type.shop.herbalist">허브 가게</string>
    <string name="type.shop.hifi">하이파이 오디오</string>
-    <string name="type.shop.houseware">가정용품 가게</string>
+    <string name="type.shop.houseware">\"가정용품 가게\"</string>
    <string name="type.shop.jewelry">보석류</string>
    <string name="type.shop.kiosk">정자</string>
-    <string name="type.shop.kitchen">주방용품점</string>
+    <string name="type.shop.kitchen">\"주방용품점\"</string>
    <string name="type.shop.laundry">세탁소</string>
    <string name="type.shop.mall">몰</string>
    <string name="type.shop.massage">마사지샵</string>
@@ -1054,19 +1054,19 @@
    <string name="type.shop.charity">자선 상점</string>
    <string name="type.shop.cheese">치즈 가게</string>
    <string name="type.shop.craft">예술과 공예</string>
-    <string name="type.shop.dairy">유제품</string>
-    <string name="type.shop.electrical">전기용품점</string>
+    <string name="type.shop.dairy">\"유제품\"</string>
+    <string name="type.shop.electrical">\"전기용품점\"</string>
    <string name="type.shop.fishing">낚시점</string>
    <string name="type.shop.interior_decoration">실내 장식</string>
    <string name="type.shop.lottery">복권</string>
-    <string name="type.shop.medical_supply">의료용품</string>
+    <string name="type.shop.medical_supply">\"의료용품\"</string>
    <string name="type.shop.nutrition_supplements">영양 보조제</string>
    <string name="type.shop.paint">그림 물감</string>
-    <string name="type.shop.perfumery">향료 제조업</string>
-    <string name="type.shop.sewing">재봉용품</string>
+    <string name="type.shop.perfumery">\"향료 제조업\"</string>
+    <string name="type.shop.sewing">\"재봉용품\"</string>
    <string name="type.shop.storage_rental">스토리지 렌탈</string>
    <string name="type.shop.tobacco">담배</string>
-    <string name="type.shop.trade">거래 용품</string>
+    <string name="type.shop.trade">\"거래 용품\"</string>
    <string name="type.shop.watches">시계</string>
    <string name="type.shop.wholesale">도매점</string>
    <string name="type.sport">스포츠</string>
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">Endereço/bloco</string>
+    <string name="type.addr_interpolation">Endereço/Bloco</string>
    <string name="type.addr_interpolation.even">Endereço/Bloco</string>
    <string name="type.addr_interpolation.odd">Endereço/Bloco</string>
    <string name="type.aerialway">Transporte aéreo</string>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -880,7 +880,7 @@
    <string name="error_enter_correct_fediverse_page">Унесите важеће корисничко име Мастодона или веб адресу</string>
    <string name="error_enter_correct_bluesky_page">Unesite važeće Bluesky korisničko ime ili veb adresu</string>
    <string name="pref_left_button_title">Подешавање левог дугмета</string>
-    <string name="pref_left_button_disable">Искључи</string>
+    <string name="pref_left_button_disable">Onemogući</string>
    <string name="saved">Сачувано</string>
    <string name="editor_building_levels">Spratovi (укљ. приземље, искључујући кров)</string>
    <string name="error_enter_correct_level">Унесите важећи спрат</string>
@@ -896,14 +896,14 @@
    <string name="panoramax">Panoramax Picture</string>
    <string name="pref_backup_now_title">Направите резервну копију сада</string>
    <string name="pref_backup_now_summary">Направите резервну копију</string>
-    <string name="pref_backup_now_summary_progress">Правим резервну копију…</string>
+    <string name="pref_backup_now_summary_progress">Снимање у току…</string>
    <string name="pref_backup_now_summary_ok">Резервна копија је успешно завршена</string>
    <string name="pref_backup_now_summary_failed">Резервна копија није успела</string>
    <string name="pref_backup_now_summary_folder_unavailable">Фолдер за резервну копију није доступан</string>
-    <string name="pref_backup_location_title">Локација резервних копија</string>
+    <string name="pref_backup_location_title">Локација резервне копије</string>
    <string name="pref_backup_location_summary_initial">Молим вас, прво изаберите фолдер и дајте дозволу</string>
    <string name="pref_backup_history_title">Број сачуваних резервних копија</string>
-    <string name="backup_interval_every_day">Сваки дан</string>
+    <string name="backup_interval_every_day">Дневно</string>
    <string name="backup_interval_every_week">Седмично</string>
    <string name="backup_interval_manual_only">Искључено (само ручно)</string>
    <string name="pref_backup_summary">Аутоматски направити резервну копију у фолдеру на уређају</string>
@@ -913,8 +913,7 @@
    <string name="pref_backup_interval_title">Аутоматска резервна копија</string>
    <string name="pref_backup_now_summary_empty_lists">Нема маркера и путања за израду резервне копије</string>
    <string name="pref_backup_title">Чување маркера и путања</string>
-    <string name="closed_now">Затворено сада</string>
+    <string name="closed_now">Сада је затворено</string>
    <string name="open_now">Сада је отворено</string>
    <string name="at">на %s</string>
-    <string name="about_headline">Отворени пројекат који покреће заједница</string>
 </resources>
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -850,7 +850,7 @@
    <string name="type.railway.station">Железничка станица</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.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>
@@ -909,7 +909,7 @@
    <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.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>
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1349,11 +1349,4 @@
    <string name="type.natural.wetland.fen">Kärr</string>
    <string name="type.natural.wetland.reedbed">Vass</string>
    <string name="type.natural.wetland.swamp">Träsk</string>
-    <string name="type.natural.wetland.mangrove">Mangroveträsk</string>
-    <string name="type.railway.monorail.tunnel">Monorail Tunnel</string>
-    <string name="type.railway.station.subway.qingdao">Tunnelbana</string>
-    <string name="type.natural.wetland.tidalflat">Tidvatten</string>
-    <string name="type.sport.diving">Höghöjdsdykning</string>
-    <string name="type.amenity.love_hotel">Kärlekshotell</string>
-    <string name="type.tourism.zoo.petting">Djurpark för barn</string>
 </resources>
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -907,20 +907,4 @@
    <string name="bicycle">Bisiklet</string>
    <string name="pref_backup_now_title">Şimdi yedekle</string>
    <string name="pref_backup_status_summary_success">Son başarılı yedekleme</string>
-    <string name="pref_backup_now_summary">Hemen bir yedek oluşturun</string>
-    <string name="pref_backup_summary">Cihazınızdaki bir klasöre otomatik olarak yedekleme yapın</string>
-    <string name="pref_backup_now_summary_progress">Yedekleme sürüyor…</string>
-    <string name="pref_backup_now_summary_ok">Yedekleme başarıyla tamamlandı</string>
-    <string name="pref_backup_location_summary_initial">Lütfen önce bir klasör seçin ve izin verin</string>
-    <string name="pref_backup_history_title">Saklanacak yedekleme sayısı</string>
-    <string name="ruler">Cetvel</string>
-    <string name="bookmark_color">Yer imi rengi</string>
-    <string name="open_now">Şimdi aç</string>
-    <string name="closed_now">Şimdi kapandı</string>
-    <string name="at">%s\'da</string>
-    <string name="pref_backup_title">Yer imleri ve izlerin yedeği</string>
-    <string name="dialog_report_error_with_logs">Lütfen bize hata raporu yollayın:\n - Ayarlardan \"Günlüğe kaydetmeyi etkinleştir\" \n - hatayı tekrarlayın\n - \"Hakkında ve Yardım\" ekranında \"Hata Bildir\" düğmesine basın ve e-posta veya sohbet yoluyla gönderin\n - günlüğe kaydetmeyi devre dışı bırak</string>
-    <string name="pref_backup_now_summary_folder_unavailable">Yedekleme klasörü kullanılamıyor</string>
-    <string name="pref_backup_now_summary_empty_lists">Yedeklenecek yer imi ve parça yok</string>
-    <string name="dialog_report_error_missing_folder">Seçilen yedekleme konumu kullanılamıyor veya yazılabilir değil. Lütfen farklı bir konum seçin.</string>
 </resources>
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -1373,9 +1373,4 @@
    <string name="type.landuse.plant_nursery">Fidanlık</string>
    <string name="type.barrier.guard_rail">Korkuluk</string>
    <string name="type.mapswithme">MapsWithMe</string>
-    <string name="type.amenity.love_hotel">Aşk Oteli</string>
-    <string name="type.landuse.religious">Dini Toprak</string>
-    <string name="type.natural.wetland.saltmarsh">Tuz Bataklığı</string>
-    <string name="type.natural.wetland.saltmarsh.tidal">Gelgit Tuz Bataklığı</string>
-    <string name="type.natural.wetland.fen">Bataklık</string>
 </resources>
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -38,7 +38,6 @@
    <item name="android:layout_width">wrap_content</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:checked">true</item>
-    <item name="buttonTint">?colorAccent</item>
  </style>

  <style name="MwmWidget.Editor.DayText">
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -662,7 +662,7 @@ nl:geld
 fi:2Raha
 fr:DAB|GAB|argent
 de:5Bankomat|Geld
-hu:Bankautomata|pénz|ATM
+hu:pénz|ATM
 id:uang
 it:soldi
 ja:atm|お金|マネー|金|引き出し|預金|振り込み
@@ -684,10 +684,10 @@ tr:3para
 uk:гроші
 vi:2Máy atm|tiền
 zh-Hans:钱|atm
-zh-Hant:自動櫃員機|1atm|理財|錢|金錢
+zh-Hant:1atm|理財|錢|金錢
 el:χρήματα
 sk:sporiteľna|peniaze
-fa:دستگاه خودپرداز|خودپرداز
+fa:دستگاه خودپرداز


 # First keyword should match [category_bank] definition in strings.txt!
@@ -803,7 +803,7 @@ pt-BR:dinheiro|U+1F3E6|U+1F4B0|U+1F4B2|U+1F4B3|U+1F4B4|U+1F4B5|U+1F4B6|U+1F4B7
 ro:bani
 es:dinero
 et:raha
-eu:Banketxea|3dirua
+eu:3dirua
 sr:новац|novac
 sv:pengar
 th:เงิน
@@ -7201,7 +7201,7 @@ cs:3Škola
 da:2Skole
 nl:3School|basisschool|middelbare school
 fi:Koulu
-fr:3École|Maternelle|Élémentaire|Primaire|Collège|Lycée|Secondaire
+fr:3École|Maternelle|Élémentaire|Primaire|Collège|Lycée|Secondaire 
 de:3Schule|Schulgebäude
 hi:4विदयालय
 hu:3Iskola
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -725,7 +725,6 @@
 3007930697
 3008054851
 3008113177
-3008787798
 3009559935
 3012069512
 3015998207
--- a/data/countries-strings/ast.json/localize.json
+++ b/data/countries-strings/ast.json/localize.json
@@ -126,6 +126,5 @@
 "Belarus_Minsk Region":"Provincia de Minsk",
 "Belarus_Vitebsk Region":"Provincia de Vítebsk",
 "Belarus_Homiel Region":"Provincia de Gómel",
-"Belarus_Brest Region":"Provincia de Brest",
-"North Korea":"Corea del Norte"
+"Belarus_Brest Region":"Provincia de Brest"
 }
--- a/data/countries-strings/ca.json/localize.json
+++ b/data/countries-strings/ca.json/localize.json
@@ -1863,7 +1863,7 @@
 "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena",
 "Italy_Sicily Description":"Palermo, Catania, Messina",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto",
-"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena",
+"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto",
 "Italy_Tuscany_Massa e Carrara Description":"Lucca, Florence, Prato",
 "Italy_Umbria Description":"Perugia, Terni, Foligno",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
--- a/data/countries-strings/id.json/localize.json
+++ b/data/countries-strings/id.json/localize.json
@@ -918,7 +918,7 @@
 "Somalia":"Somalia",
 "South Africa":"Afrika Selatan",
 "South Africa_Eastern Cape":"Eastern Cape",
-"South Africa_Free State":"Negara Bebas",
+"South Africa_Free State":"Free State",
 "South Africa_Gauteng":"Gauteng",
 "South Africa_KwaZulu-Natal":"KwaZulu-Natal",
 "South Africa_Limpopo":"Limpopo",
--- a/data/countries-strings/it.json/localize.json
+++ b/data/countries-strings/it.json/localize.json
@@ -918,7 +918,7 @@
 "Somalia":"Somalia",
 "South Africa":"Sudafrica",
 "South Africa_Eastern Cape":"provincia del Capo Orientale",
-"South Africa_Free State":"Stato libero",
+"South Africa_Free State":"Free State",
 "South Africa_Gauteng":"Gauteng",
 "South Africa_KwaZulu-Natal":"KwaZulu-Natal",
 "South Africa_Limpopo":"provincia del Limpopo",
--- a/data/countries-strings/lt.json/localize.json
+++ b/data/countries-strings/lt.json/localize.json
@@ -52,13 +52,13 @@
 "US_Pennsylvania_Reading":"Skaitomas",
 "United Kingdom":"Jungtinė Karalystė",
 "Armenia":"armėnų",
-"Azerbaijan":"Azerbaidžanas",
+"Azerbaijan":"azerbaidžaniečių",
 "Italy_Lombardy":"Lombardų",
 "Jamaica":"Jamaikiečių",
 "Spain_Extremadura":"ispanų kalbos Ekstremadūros tarmė",
 "US_Georgia":"Georgian",
 "Spain_Galicia_North Short":"galisų",
-"Azerbaijan Region":"Irano Azerbaidžanas",
+"Azerbaijan Region":"azerbaidžaniečių",
 "Bolivia":"Boliviečių",
 "Canada_Ontario_Bame":"Barrier",
 "France_Corsica":"korsikiečių",
@@ -244,6 +244,5 @@
 "Belarus_Brest Region":"Bresto sritis",
 "Belarus_Homiel Region":"Gomelio sritis",
 "Belarus_Minsk Region":"Minsko sritis",
-"Belarus_Vitebsk Region":"Vitebsko sritis",
-"North Korea":"Šiaurės Korėja"
+"Belarus_Vitebsk Region":"Vitebsko sritis"
 }
--- a/data/countries-strings/nl.json/localize.json
+++ b/data/countries-strings/nl.json/localize.json
@@ -1376,7 +1376,7 @@
 "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg",
 "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg",
 "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel",
-"Austria_Lower Austria_Wien Description":"Wenen, Industrieviertel, Weinviertel",
+"Austria_Lower Austria_Wien Description":"Wenen",
 "Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau",
 "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg",
 "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld",
@@ -1863,7 +1863,7 @@
 "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena",
 "Italy_Sicily Description":"Palermo, Catania, Messina",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Bozen",
-"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena",
+"Italy_Tuscany_Grosseto Description":"Arezzo,  Grosseto, Siena",
 "Italy_Tuscany_Massa e Carrara Description":"Florence, Livorno, Lucca, Pisa, Prato, Pistoia, Carrara, Massa",
 "Italy_Umbria Description":"Perugia, Terni, Foligno",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
--- a/data/countries-strings/pt.json/localize.json
+++ b/data/countries-strings/pt.json/localize.json
@@ -1863,7 +1863,7 @@
 "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena",
 "Italy_Sicily Description":"Palermo, Catânia",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Bolzano",
-"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena",
+"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto",
 "Italy_Tuscany_Massa e Carrara Description":"Florença",
 "Italy_Umbria Description":"Perúgia",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
--- a/data/countries-strings/sr.json/localize.json
+++ b/data/countries-strings/sr.json/localize.json
@@ -47,13 +47,5 @@
 "Belarus_Homiel Region":"Гомељска област",
 "Belarus_Vitebsk Region":"Витепска област",
 "Belgium":"Белгија",
-"Belarus_Minsk Region":"Минска област",
-"Russia_Perm Krai":"Пермскиј крај",
-"Russia_Republic of Karelia":"Република Карелије",
-"Russia_Sverdlovsk Oblast":"Свердловска област",
-"Spain_Galicia":"Галиција",
-"Switzerland_Espace Mittelland":"Еспаце Мителанд",
-"US_Pennsylvania_Reading":"Читање",
-"Russia_Perm Krai_North Short":"Пермскиј крај",
-"Spain_Castile and Leon":"Кастиља и Леон"
+"Belarus_Minsk Region":"Минска област"
 }
--- a/data/countries.txt
+++ b/data/countries.txt
--- a/data/drules_proto_outdoors_dark.bin
+++ b/data/drules_proto_outdoors_dark.bin
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -47366,7 +47366,7 @@ cont {
    scale: 13
    lines {
      width: 1.1
-      color: 3007930697
+      color: 3226034505
      priority: 60
      cap: BUTTCAP
    }
@@ -47375,7 +47375,7 @@ cont {
    scale: 14
    lines {
      width: 1.1
-      color: 3007930697
+      color: 3226034505
      priority: 60
      cap: BUTTCAP
    }
@@ -47570,7 +47570,7 @@ cont {
    scale: 16
    lines {
      width: 1.6
-      color: 2152292681
+      color: 1716085065
      priority: 60
    }
    path_text {
--- a/data/drules_proto_outdoors_light.bin
+++ b/data/drules_proto_outdoors_light.bin
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -47260,7 +47260,7 @@ cont {
    scale: 13
    lines {
      width: 1.1
-      color: 3008787798
+      color: 3226891606
      priority: 60
      cap: BUTTCAP
    }
@@ -47269,7 +47269,7 @@ cont {
    scale: 14
    lines {
      width: 1.1
-      color: 3008787798
+      color: 3226891606
      priority: 60
      cap: BUTTCAP
    }
@@ -47464,7 +47464,7 @@ cont {
    scale: 16
    lines {
      width: 1.6
-      color: 2152292681
+      color: 1716085065
      priority: 60
    }
    path_text {
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1018,9 +1018,6 @@ cont {
  name: "amenity-car_wash"
  element {
    scale: 17
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1038,9 +1035,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1057,9 +1051,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1076,9 +1067,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1283,9 +1271,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1303,9 +1288,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1323,9 +1305,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1342,9 +1321,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1361,9 +1337,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1380,9 +1353,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1765,9 +1735,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1785,9 +1752,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1805,9 +1769,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1824,9 +1785,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1843,9 +1801,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1862,9 +1817,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -5624,9 +5576,6 @@ cont {
  name: "amenity-vehicle_inspection"
  element {
    scale: 17
-    area {
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -5635,9 +5584,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -5645,9 +5591,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -5655,9 +5598,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -16004,17 +15944,8 @@ cont {
 }
 cont {
  name: "highway-rest_area"
-  element {
-    scale: 13
-    area {
-      priority: -1850
-    }
-  }
  element {
    scale: 14
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -16032,9 +15963,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -16051,9 +15979,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -16070,9 +15995,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -16089,9 +16011,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -16108,9 +16027,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -16127,9 +16043,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -18732,9 +18645,6 @@ cont {
  }
  element {
    scale: 13
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18752,9 +18662,6 @@ cont {
  }
  element {
    scale: 14
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18772,9 +18679,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18792,9 +18696,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18812,9 +18713,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18831,9 +18729,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18850,9 +18745,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18869,9 +18761,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -28836,57 +28725,6 @@ cont {
    apply_if: "!name"
  }
 }
-cont {
-  name: "landuse-garages"
-  element {
-    scale: 13
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 14
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 15
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 16
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 17
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 18
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      priority: -1850
-    }
-  }
-  element {
-    scale: 20
-    area {
-      priority: -1850
-    }
-  }
-}
 cont {
  name: "landuse-grass"
  element {
--- a/data/drules_proto_vehicle_light.bin
+++ b/data/drules_proto_vehicle_light.bin
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -1018,10 +1018,6 @@ cont {
  name: "amenity-car_wash"
  element {
    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1039,10 +1035,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1059,10 +1051,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1079,10 +1067,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-wash-m"
      priority: 2650
@@ -1287,10 +1271,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1308,10 +1288,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1329,10 +1305,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1349,10 +1321,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1369,10 +1337,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1389,10 +1353,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "charging-station-m"
      priority: 3200
@@ -1775,10 +1735,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1796,10 +1752,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1817,10 +1769,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1837,10 +1785,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1857,10 +1801,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -1877,10 +1817,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "fuel-m"
      priority: 3200
@@ -5640,10 +5576,6 @@ cont {
  name: "amenity-vehicle_inspection"
  element {
    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -5652,10 +5584,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -5663,10 +5591,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -5674,10 +5598,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "vehicle_inspection-m"
      priority: 2650
@@ -15718,19 +15638,8 @@ cont {
 }
 cont {
  name: "highway-rest_area"
-  element {
-    scale: 13
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
  element {
    scale: 14
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -15748,10 +15657,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -15768,10 +15673,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -15788,10 +15689,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -15808,10 +15705,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -15828,10 +15721,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -15848,10 +15737,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "picnic-m"
      priority: 4150
@@ -18400,10 +18285,6 @@ cont {
  }
  element {
    scale: 13
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18421,10 +18302,6 @@ cont {
  }
  element {
    scale: 14
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18442,10 +18319,6 @@ cont {
  }
  element {
    scale: 15
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18463,10 +18336,6 @@ cont {
  }
  element {
    scale: 16
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18484,10 +18353,6 @@ cont {
  }
  element {
    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18504,10 +18369,6 @@ cont {
  }
  element {
    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18524,10 +18385,6 @@ cont {
  }
  element {
    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -18544,10 +18401,6 @@ cont {
  }
  element {
    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
    symbol {
      name: "car-repair-m"
      priority: 4200
@@ -28332,65 +28185,6 @@ cont {
    apply_if: "!name"
  }
 }
-cont {
-  name: "landuse-garages"
-  element {
-    scale: 13
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16445409
-      priority: -1850
-    }
-  }
-}
 cont {
  name: "landuse-grass"
  element {
--- a/data/styles/default/dark/symbols/postbox-m.svg
+++ b/data/styles/default/dark/symbols/postbox-m.svg
@@ -1 +1,8 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.4 4.5h-8.8c-.605 0-1.0945.495-1.0945 1.1l-.0055 6.6c0 .605.495 1.1 1.1 1.1h8.8c.605 0 1.1-.495 1.1-1.1v-6.6c0-.605-.495-1.1-1.1-1.1zm-.22 2.3375-3.8885 2.431c-.176.11-.407.11-.583 0l-3.8885-2.431c-.1375-.088-.22-.2365-.22-.396 0-.3685.4015-.5885.715-.396l3.685 2.3045 3.685-2.3045c.3135-.1925.715.0275.715.396 0 .1595-.0825.308-.22.396z" fill="#777777"/></svg>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <title>postbox-m</title>
+ <g id="Page-2:-Night" fill="none">
+  <g id="postbox-m">
+   <path id="Path" d="m17.321 10.489v7.5111h-12.321v-7.7296l2.2402 1.9947v1.7454h7.8408v-1.527l2.2402-1.9947zm0.67879-3.012-5.0965 4.539h-3.2382l-2.2861-1.9947h5.2679l1.3128-1.3774v-4.6437l4.0402 3.4768zm-5.8279 1.5469h-4.7918l2.798-2.5323 2.6625-2.4914v4.2408l-0.66871 0.78293z" fill="#777777"/>
+  </g>
+ </g>
+</svg>
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -414,6 +414,7 @@ piste:type-sled                                     # line z14- (also has pathte
 === 120

 building:part                                       # area z16-
+landuse-garages                                     # area z13-
 === 110

 barrier-retaining_wall                              # line z16-
--- a/data/styles/default/light/symbols/postbox-m.svg
+++ b/data/styles/default/light/symbols/postbox-m.svg
@@ -1 +1,8 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m13.4 4.5h-8.8c-.605 0-1.0945.495-1.0945 1.1l-.0055 6.6c0 .605.495 1.1 1.1 1.1h8.8c.605 0 1.1-.495 1.1-1.1v-6.6c0-.605-.495-1.1-1.1-1.1zm-.22 2.3375-3.8885 2.431c-.176.11-.407.11-.583 0l-3.8885-2.431c-.1375-.088-.22-.2365-.22-.396 0-.3685.4015-.5885.715-.396l3.685 2.3045 3.685-2.3045c.3135-.1925.715.0275.715.396 0 .1595-.0825.308-.22.396z" fill="#747e86"/></svg>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <title>postbox-m</title>
+ <g fill="none" fill-rule="evenodd">
+  <g id="postbox-m" fill-rule="nonzero">
+   <path id="Shape" d="m17.321 10.489v7.5111h-12.321v-7.7296l2.2402 1.9947v1.7454h7.8408v-1.527l2.2402-1.9947zm0.67879-3.012-5.0965 4.539h-3.2382l-2.2861-1.9947h5.2679l1.3128-1.3774v-4.6437l4.0402 3.4768zm-5.8279 1.5469h-4.7918l2.798-2.5323 2.6625-2.4914v4.2408l-0.66871 0.78293z" fill="#747E86"/>
+  </g>
+ </g>
+</svg>
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -189,12 +189,13 @@ line|z13-14[isoline=step_500],
 line|z13-14[isoline=step_100],
 {width: 1.6; opacity: 0.25;}
 line|z13-14[isoline=step_50],
-{width: 1.1; opacity: 0.3;}
+{width: 1.1; opacity: 0.25;}

 line|z15-16[isoline=step_1000],
 line|z15-16[isoline=step_500],
 {width: 1.6; opacity: 0.5;}
 line|z15-16[isoline=step_100],
+line|z15-16[isoline=step_50],
 {width: 1.6; opacity: 0.35;}
 line|z15-16[isoline=step_50],
 {width: 1.6; opacity: 0.25;}
@@ -203,7 +204,7 @@ line|z15-16[isoline=step_10],
 {width: 1.1; opacity: 0.35;}

 line|z17-[isoline=step_1000],
-line|z17-[isoline=step_500],
+line|z16-[isoline=step_500],
 {width: 1.6; opacity: 0.6;}
 line|z17-[isoline=step_100],
 line|z17-[isoline=step_50],
--- a/data/styles/vehicle/dark/colors.mapcss
+++ b/data/styles/vehicle/dark/colors.mapcss
@@ -63,7 +63,6 @@
@university: #261F13;
@hospital: #261916;
 */
-@general_area: #000000;
@industrial: #0D0A0D;
@construction_area: #0D0A0D;
@sport: #070F0A;
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -340,17 +340,7 @@ area|z16-[landuse=cemetery]

 /* 7.5 Pedestrian areas */

-/* Generic amenities */

-area|z13-[highway=services],
-area|z13-[highway=rest_area],
-area|z13-[landuse=garages],
-
-area|z15-[amenity=charging_station][motorcar?],
-area|z15-[amenity=fuel],
-area|z17-[amenity=vehicle_inspection],
-area|z17-[amenity=car_wash],
-{fill-opacity: 1; fill-color: @general_area;}

 /* 7.6 Airports */

--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -30,13 +30,6 @@ amenity-parking-street_side-fee                     # area z15- (also has icon z
 amenity-parking-street_side-private                 # area z15- (also has icon z17-, caption(optional) z17-)
 === 160

-amenity-car_wash                                    # area z17- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
-amenity-vehicle_inspection                          # area z17- (also has icon z17-)
-highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z14-)
-highway-services                                    # area z13- (also has icon z12-, caption(optional) z13-)
-landuse-garages                                     # area z13-
 leisure-stadium                                     # area z15-
 === 150

--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -62,11 +62,11 @@ highway-motorway_junction                           # caption z15-
 highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
 highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
-highway-services                                    # icon z12- (also has caption(optional) z13-, area z13-)
+highway-services                                    # icon z12- (also has caption(optional) z13-)
 === 4200

 highway-ford                                        # icon z14-
-highway-rest_area                                   # icon z14- (also has caption(optional) z14-, area z13-)
+highway-rest_area                                   # icon z14- (also has caption(optional) z14-)
 highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z14-)
 highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
 highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z14-)
@@ -170,8 +170,8 @@ aeroway-aerodrome-international                     # icon z7- (also has caption
 place-town                                          # caption z8-
 === 3250

-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
-amenity-fuel                                        # icon z12- (also has caption(optional) z12-, area z15-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-)
+amenity-fuel                                        # icon z12- (also has caption(optional) z12-)
 === 3200

 amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
@@ -216,8 +216,8 @@ barrier-lift_gate                                   # icon z16- (also has captio
 railway-level_crossing                              # icon z17-
 === 2700

-amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z17-)
-amenity-vehicle_inspection                          # icon z17- (also has area z17-)
+amenity-car_wash                                    # icon z17- (also has caption(optional) z17-)
+amenity-vehicle_inspection                          # icon z17-
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 shop-car_parts                                      # icon z17-
 shop-car_repair                                     # icon z17-
@@ -754,17 +754,17 @@ entrance-main                                       # icon z18- (also has captio
 # They follow the order of their correspoding icons.
 #

-# highway-services                                  # caption(optional) z13- (also has icon z12-, area z13-)
+# highway-services                                  # caption(optional) z13- (also has icon z12-)
 # === -5800

-# highway-rest_area                                 # caption(optional) z14- (also has icon z14-, area z13-)
+# highway-rest_area                                 # caption(optional) z14- (also has icon z14-)
 # === -5850

 # aeroway-aerodrome-international                   # caption(optional) z10- (also has icon z7-, area z10-)
 # === -6700

-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
-# amenity-fuel                                      # caption(optional) z12- (also has icon z12-, area z15-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-)
+# amenity-fuel                                      # caption(optional) z12- (also has icon z12-)
 # === -6800

 # amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
@@ -795,7 +795,7 @@ entrance-main                                       # icon z18- (also has captio
 # barrier-lift_gate                                 # caption(optional) z16- (also has icon z16-)
 # === -7250

-# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z17-)
+# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -7350
--- a/data/styles/vehicle/light/colors.mapcss
+++ b/data/styles/vehicle/light/colors.mapcss
@@ -100,7 +100,6 @@
@unversity: #F8E4BA;
@hospital: #F8D9D9;
 */
-@general_area: #FAEFE1;
@industrial: #E1DCE3;
@construction_area: #E4E3E6;
@sport: #C8DBAD;
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -482,7 +482,7 @@ world  000000000000000000000  +
            bridge  000000000000111111111  -
            tunnel  000000000000111111111  -
            {}
-        rest_area  000000000000011111111  -
+        rest_area  000000000000001111111  -
        road  000000000000111111111  +
            bridge  000000000000111111111  -
            tunnel  000000000000111111111  -
@@ -632,7 +632,7 @@ world  000000000000000000000  +
            deciduous  000000000011111111111  -
            mixed  000000000011111111111  -
            {}
-        garages  000000000000011111111  -
+        garages  000000000000000000000  -
        grass  000000000000111111111  -
        greenfield  000000000000000000000  -
        greenhouse_horticulture  000000000000000000000  -
--- a/docs/ANDROID_LOCATION_TEST.md
+++ b/docs/ANDROID_LOCATION_TEST.md
@@ -72,7 +72,7 @@ This test-case should work with the same behavior regardless of
 - Tap on location button - "To continue, turn on device..." dialog
  should re-appear again.

-5. CoMaps location dialog (negative case)
+5. OM location dialog (negative case)

 - Use non-Google flavor or disable Google Play Location in the app settings;
 - Disable Wi-Fi, disable Cellular Data, disable Location;
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -25,7 +25,8 @@ When reporting a bug please provide as much information as possible: OS and appl
 list of actions leading to a bug, a log file produced by the app.

 When using CoMaps app on a device, use the built-in "Report a bug" option:
-on Android it creates a new e-mail with a log file attached. Enabling logs in CoMaps settings on Android
+on Android it creates a new e-mail with a log file attached. Your issue will be processed much
+faster if you send it to <bugs@comaps.app>. Enabling logs in CoMaps settings on Android
 before sending the bug report also helps us a lot with debugging.

 ### Translations
@@ -69,7 +70,7 @@ While we strive to help onboard new developers we don't have enough time to guid
 Please help us:
 - processing users questions and feedback in chats, app stores, email and social media and creating follow-up issues or updating existing ones
 - reproducing and triaging reported bugs
- [testing upcoming features and bug fixes for Android, iOS and desktop versions](TESTING.md)
+- testing upcoming features and bug fixes for Android, iOS and desktop versions
 - keeping [issues](https://codeberg.org/comaps/comaps/issues) in order (check for duplicates, organize, assign labels, link related issues, etc.)
 - composing nice user-centric release notes and news items
 - etc.
--- a/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md
+++ b/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md
@@ -71,7 +71,7 @@ TRANSIT_URL: file:///home/result_json_dir

 Run generator tool [as usual](../tools/python/maps_generator) with this ini config. After it is done you'll have mwms with transit section in experimental GTFS format.

-:checkered_flag: Use the resulting mwms in your app. Enjoy the experimental public transport in CoMaps!
+:checkered_flag: Use the resulting mwms in your app. Enjoy the experimental public transport in Organic Maps!

 ## If you have questions

--- a/docs/STRUCTURE.md
+++ b/docs/STRUCTURE.md
@@ -30,7 +30,7 @@ There are some other files not mentioned here.

 ### Map features / classificator

- `mapcss-mapping.csv` - mapping between OSM tags and CoMaps types.
+- `mapcss-mapping.csv` - mapping between OSM tags and OM types.
 - `replaced_tags.txt` - merging similar OSM tags.
 - `mixed_tags.txt` - pedestrian streets of high popularity.

@@ -38,7 +38,7 @@ There are some other files not mentioned here.
 - `config.xsd` - XML schema for `editor.config`.

 Automatically generated:
- `classificator.txt` - hierarchical list of all CoMaps types.
+- `classificator.txt` - hierarchical list of all OM types.
 - `types.txt`

 ### Styles and icons
--- a/docs/STYLES.md
+++ b/docs/STYLES.md
@@ -56,7 +56,7 @@ Icons are stored in [`data/styles/default/light/symbols/`](../data/styles/defaul
 ## How to add a new icon

 1. Add an svg icon to `data/styles/default/light/symbols/` (and to `dark` too)
-preferably look for icons in [collections CoMaps uses already](../data/copyright.html#icons)
+preferably look for icons in [collections OM uses already](../data/copyright.html#icons)
 2. Add icon rendering/visibility rules into `data/styles/default/include/Icons.mapcss` and to "navigation style" `data/styles/vehicle/include/Icons.mapcss`
 3. Run `tools/unix/generate_symbols.sh` to add new icons into skin files
 4. Run `tools/unix/generate_drules.sh` to generate drawing rules for the new icons
@@ -64,7 +64,7 @@ preferably look for icons in [collections CoMaps uses already](../data/copyright

 ## How to add a new map feature / POI type

-1. Add it into `data/mapcss-mapping.csv` (or better replace existing `deprecated` line) to make CoMaps import it from OSM
+1. Add it into `data/mapcss-mapping.csv` (or better replace existing `deprecated` line) to make OM import it from OSM
 2. If necessary merge similar tags in via `data/replaced_tags.txt`
 3. Define a priority for the new feature type in e.g. [`priorities_4_overlays.prio.txt`](../data/styles/default/include/priorities_4_overlays.prio.txt) and/or other priorities files
 4. Add a new icon (see [above](#how-to-add-a-new-icon)) and/or other styling (area, line..)
@@ -105,7 +105,7 @@ A whole map needs to be [regenerated](MAPS.md) for the changes to take effect if
 ## Technical details

 Map style files syntax is based on [MapCSS/0.2](https://wiki.openstreetmap.org/wiki/MapCSS/0.2),
-though the specification is not supported in full and there are CoMaps-specific extensions to it.
+though the specification is not supported in full and there are OM-specific extensions to it.

 The `tools/unix/generate_drules.sh` script uses a customized version of [Kothic](https://codeberg.org/comaps/kothic)
 stylesheet processor to compile MapCSS files into binary drawing rules files `data/drules_proto*.bin`.
--- a/docs/TESTING.md
+++ b/docs/TESTING.md
@@ -1,25 +0,0 @@
-# Testing
-
-User testing is an important part of the pre-release process to make sure no bugs make it into the final release version.
-
-You can install test builds, which are pre-release versions of our app, and try to find new bugs before they make it to more people. You should be aware though that those test builds can be more unstable and prone to errors than the released versions. So don't use those test builds, if you really need to rely on our app working as stable and bug-free as possible.
-
-The main focus of testing those test builds should always be the newly introduced or changed parts.
-[Finding and reporting other already existing bugs](https://codeberg.org/comaps/comaps/issues) of course is important too, but it is not the principal purpose of the test builds.
-
-This is the process for the different platforms:
-
-## Android
- A new Issue is created for every Android test build.
- The Issue includes the APK, that needs to be tested, and notes of what changed with this test build.
- Comments and problems found with the specific test build should be noted in the Issue.
- The existing test build Issue will be closed with a link to the new test build Issue, if a new test build becomes available.
- New test builds also usually get announced in the chats.
-
-## iOS
- A new Issue is created for every iOS test build.
- The Issue includes the signup link for the TestFlight and notes of what changed with this test build.
- The available space for beta testers in TestFlight is limited and all spots might be filled already. We regularly remove inactive testers and sometimes add more spots though. So if the beta is full, maybe check again at some point later.
- Comments and problems found with the specific test build should be noted in the Issue.
- The existing test build Issue will be closed with a link to the new test build Issue, if a new test build becomes available.
- TestFlight normally notifies existing testers of a new test build and new test builds also usually get announced in the chats.
--- a/indexer/validate_and_format_contacts.cpp
+++ b/indexer/validate_and_format_contacts.cpp
@@ -26,7 +26,6 @@ constexpr string_view kVk{"contact:vk"};
 constexpr string_view kLine{"contact:line"};
 constexpr string_view kFediverse{"contact:mastodon"};
 constexpr string_view kBluesky{"contact:bluesky"};
-constexpr string_view kPanoramax{"panoramax"};

 constexpr string_view kProfilePhp{"profile.php"};

@@ -609,7 +608,7 @@ bool ValidateBlueskyPage(string const & page)

 bool isSocialContactTag(string_view tag)
 {
-  return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky || tag == kPanoramax;
+  return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky;
 }

 bool isSocialContactTag(MapObject::MetadataID const metaID)
@@ -620,8 +619,7 @@ bool isSocialContactTag(MapObject::MetadataID const metaID)
         metaID == MapObject::MetadataID::FMD_CONTACT_VK ||
         metaID == MapObject::MetadataID::FMD_CONTACT_LINE ||
         metaID == MapObject::MetadataID::FMD_CONTACT_FEDIVERSE ||
-         metaID == MapObject::MetadataID::FMD_CONTACT_BLUESKY ||
-         metaID == MapObject::MetadataID::FMD_PANORAMAX;
+         metaID == MapObject::MetadataID ::FMD_CONTACT_BLUESKY;
 }

 // Functions ValidateAndFormat_{facebook,instagram,twitter,vk}(...) by default strip domain name
@@ -649,8 +647,6 @@ string socialContactToURL(string_view tag, string_view value)
    else // 'value' is an URL.
      return string{kHttps}.append(value);
  }
-  if (tag == kPanoramax)
-    return string{kUrlPanoramax}.append(value);

  return string{value};
 }
--- a/iphone/CoreApi/CoreApi/Logger/Logger.mm
+++ b/iphone/CoreApi/CoreApi/Logger/Logger.mm
@@ -28,8 +28,7 @@ NSString * const kLoggerSubsystem = [[NSBundle mainBundle] bundleIdentifier];
 NSString * const kLoggerCategory = @"OM";
 NSString * const kLogFileName = @"log.txt";
 NSString * const kZipLogFileExtension = @"zip";
-NSString * const kLogFilePath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject]
-                                 stringByAppendingPathComponent:kLogFileName];
+NSString * const kLogFilePath = [[NSFileManager.defaultManager temporaryDirectory] URLByAppendingPathComponent:kLogFileName].path;
 // TODO: (KK) Review and change this limit after some testing.
 NSUInteger const kMaxLogFileSize = 1024 * 1024 * 100; // 100 MB;

@@ -226,13 +225,13 @@ bool AssertMessage(base::SrcPoint const & src, std::string const & message)
 }

 + (NSURL *)getZippedLogFile:(NSString *)logFilePath {
-  NSString * zipFileName = [[logFilePath.lastPathComponent stringByDeletingPathExtension] stringByAppendingPathExtension:kZipLogFileExtension];
-  NSString * zipFilePath = [[NSFileManager.defaultManager temporaryDirectory] URLByAppendingPathComponent:zipFileName].path;
+  NSString * zipFilePath = [[logFilePath stringByDeletingPathExtension] stringByAppendingPathExtension:kZipLogFileExtension];
  auto const success = CreateZipFromFiles({logFilePath.UTF8String}, zipFilePath.UTF8String);
  if (!success) {
    LOG(LERROR, ("Failed to zip log file:", kLogFilePath.UTF8String, ". The original file will be returned."));
    return [NSURL fileURLWithPath:logFilePath];
  }
+  [self removeFileAtPath:kLogFilePath];
  return [NSURL fileURLWithPath:zipFilePath];
 }

--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageButtonsData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageButtonsData.mm
@@ -9,7 +9,7 @@
 - (instancetype)initWithRawData:(place_page::Info const &)rawData {
  self = [super init];
  if (self) {
-    _showAddPlace = rawData.ShouldShowAddPlace() || rawData.ShouldShowAddBusiness();
+    _showAddPlace = rawData.ShouldShowAddPlace();
    _showEditPlace = rawData.ShouldShowEditPlace();
    _enableAddPlace = rawData.ShouldEnableAddPlace();
    _enableEditPlace = rawData.ShouldEnableEditPlace();
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData+Core.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData+Core.h
@@ -6,8 +6,8 @@ NS_ASSUME_NONNULL_BEGIN

@interface PlacePageTrackData (Core)

- (instancetype)initWithRawData:(place_page::Info const &)rawData
-           onActivePointChanged:(MWMVoidBlock)onActivePointChangedHandler;
+- (instancetype)initWithTrack:(Track const &)track
+         onActivePointChanged:(MWMVoidBlock)onActivePointChangedHandler;

@end

--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData.h
@@ -1,5 +1,4 @@
 #import <Foundation/Foundation.h>
-#import <UIKit/UIColor.h>
 #import "MWMTypes.h"

@class TrackInfo;
@@ -11,12 +10,6 @@ NS_ASSUME_NONNULL_BEGIN

@property(nonatomic, readonly) MWMTrackID trackId;
@property(nonatomic, readonly) MWMMarkGroupID groupId;
-@property(nonatomic, readonly, nullable) NSString * trackCategory;
-// TODO: The track description is not fully implemented in the core yet.
-@property(nonatomic, readonly, nullable) NSString * trackDescription;
-
-/// The color is nil for Track Recordings.
-@property(nonatomic, readonly, nullable) UIColor * color;
@property(nonatomic, readwrite, nonnull) TrackInfo * trackInfo;
@property(nonatomic, readwrite, nullable) ElevationProfileData * elevationProfileData;
@property(nonatomic, readonly) double activePointDistance;
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageTrackData.mm
@@ -32,27 +32,14 @@

@implementation PlacePageTrackData (Core)

- (instancetype)initWithRawData:(place_page::Info const &)rawData
-           onActivePointChanged:(MWMVoidBlock)onActivePointChangedHandler {
+- (instancetype)initWithTrack:(Track const &)track
+         onActivePointChanged:(MWMVoidBlock)onActivePointChangedHandler {
  self = [super init];
  if (self) {
-    auto const trackPtr = GetFramework().GetBookmarkManager().GetTrack(rawData.GetTrackId());
-    auto const & track = *trackPtr;
-    auto const & bm = GetFramework().GetBookmarkManager();
-
    _trackId = track.GetData().m_id;
-
-    auto const & groupId = track.GetGroupId();
-    if (groupId && bm.HasBmCategory(groupId)) {
-      _groupId = groupId;
-      _trackCategory = [NSString stringWithCString:bm.GetCategoryName(groupId).c_str() encoding:NSUTF8StringEncoding];
-    }
-
-    auto const color = track.GetColor(0);
-    _color = [UIColor colorWithRed:color.GetRedF() green:color.GetGreenF() blue:color.GetBlueF() alpha:1.f];
-
-    _trackDescription = [NSString stringWithCString:track.GetDescription().c_str() encoding:NSUTF8StringEncoding];
    _trackInfo = [[TrackInfo alloc] initWithTrackStatistics:track.GetStatistics()];
+
+    auto const & bm = GetFramework().GetBookmarkManager();
    _activePointDistance = bm.GetElevationActivePoint(_trackId);
    _myPositionDistance = bm.GetElevationMyPosition(_trackId);
    _onActivePointChangedHandler = onActivePointChangedHandler;
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
@@ -35,8 +35,6 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
@property(nonatomic, readwrite) PlacePagePreviewData *previewData;
@property(nonatomic, readwrite) CLLocationCoordinate2D locationCoordinate;

- (PlacePageObjectType)objectTypeFromRawData;
-
@end

@implementation PlacePageData
@@ -48,6 +46,7 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
    _infoData = [[PlacePageInfoData alloc] initWithRawData:rawData() ohLocalization:localization];

    if (rawData().IsBookmark()) {
+      _objectType = PlacePageObjectTypeBookmark;
      _bookmarkData = [[PlacePageBookmarkData alloc] initWithRawData:rawData()];
    }

@@ -69,10 +68,13 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
    }

    if (rawData().IsTrack()) {
+      _objectType = PlacePageObjectTypeTrack;
+      auto const & track = GetFramework().GetBookmarkManager().GetTrack(rawData().GetTrackId());
      __weak auto weakSelf = self;
-      _trackData = [[PlacePageTrackData alloc] initWithRawData:rawData() onActivePointChanged:^(void) {
+      _trackData = [[PlacePageTrackData alloc] initWithTrack:*track onActivePointChanged:^(void) {
        [weakSelf handleActiveTrackSelectionPointChanged];
      }];
+      _isPreviewPlus = track->HasAltitudes();
    }
    _previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()];

@@ -82,8 +84,6 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
      [[MWMStorage sharedStorage] addObserver:self];
    }

-    _objectType = [self objectTypeFromRawData];
-
    m_featureID = rawData().GetID();
    m_mercator = rawData().GetMercator();
    m_rawTypes = rawData().GetRawTypes();
@@ -142,33 +142,15 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
  }
  if (rawData().IsBookmark()) {
    _bookmarkData = [[PlacePageBookmarkData alloc] initWithRawData:rawData()];
-  } else if (rawData().IsTrack()) {
-    __weak auto weakSelf = self;
-    _trackData = [[PlacePageTrackData alloc] initWithRawData:rawData() onActivePointChanged:^(void) {
-      [weakSelf handleActiveTrackSelectionPointChanged];
-    }];
  } else {
    _bookmarkData = nil;
  }
  _previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()];
-  _objectType = [self objectTypeFromRawData];
  if (self.onBookmarkStatusUpdate != nil) {
    self.onBookmarkStatusUpdate();
  }
 }

- (PlacePageObjectType)objectTypeFromRawData {
-  if (rawData().IsBookmark()) {
-    return PlacePageObjectTypeBookmark;
-  } else if (rawData().IsTrack()) {
-    return PlacePageObjectTypeTrack;
-  } else if (self.trackData) {
-    return PlacePageObjectTypeTrackRecording;
-  } else {
-    return PlacePageObjectTypePOI;
-  }
-}
-
 #pragma mark - MWMStorageObserver

 - (void)processCountryEvent:(NSString *)countryId {
--- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib
@@ -31,7 +31,7 @@
                            <action selector="onVisibleChanged:" destination="KGk-i7-Jjw" eventType="valueChanged" id="fV8-pr-hNc"/>
                        </connections>
                    </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="My Places" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jut-eq-wia">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="My Places" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jut-eq-wia">
                        <rect key="frame" x="56" y="10" width="204" height="21"/>
                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                        <nil key="textColor"/>
--- a/iphone/Maps/Core/Search/SearchResult.mm
+++ b/iphone/Maps/Core/Search/SearchResult.mm
@@ -36,19 +36,18 @@
    if (result.IsSuggest())
      _suggestion = @(result.GetSuggestionString().c_str());

-    _distanceText = nil;
-    if (result.HasPoint()) {
-      auto const center = result.GetFeatureCenter();
-      _point = CGPointMake(center.x, center.y);
-      auto const [centerLat, centerLon] = mercator::ToLatLon(center);
-      _coordinate = CLLocationCoordinate2DMake(centerLat, centerLon);
+    auto const & pivot = result.GetFeatureCenter();
+    _point = CGPointMake(pivot.x, pivot.y);
+    auto const location = mercator::ToLatLon(pivot);
+    _coordinate = CLLocationCoordinate2DMake(location.m_lat, location.m_lon);

-      CLLocation * lastLocation = [MWMLocationManager lastLocation];
-      if (lastLocation) {
-        double const distanceM = mercator::DistanceOnEarth(lastLocation.mercator, center);
-        std::string const distanceStr = platform::Distance::CreateFormatted(distanceM).ToString();
-        _distanceText = @(distanceStr.c_str());
-      }
+    CLLocation * lastLocation = [MWMLocationManager lastLocation];
+    if (lastLocation && result.HasPoint()) {
+      double distanceInMeters = mercator::DistanceOnEarth(lastLocation.mercator, result.GetFeatureCenter());
+      std::string distanceStr = platform::Distance::CreateFormatted(distanceInMeters).ToString();
+      _distanceText = @(distanceStr.c_str());
+    } else {
+      _distanceText = nil;
    }

    switch (result.IsOpenNow()) {
--- a/iphone/Maps/Core/Theme/Core/ThemeManager.swift
+++ b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
@@ -53,21 +53,8 @@ final class ThemeManager: NSObject {
      }
    }(actualTheme)

-    if Settings.mapAppearance == .light {
-      if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
-          FrameworkHelper.setTheme(.vehicleDay)
-      } else {
-          FrameworkHelper.setTheme(.day)
-      }
-    } else if Settings.mapAppearance == .dark {
-      if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
-        FrameworkHelper.setTheme(.vehicleNight)
-      } else {
-        FrameworkHelper.setTheme(.night)
-      }
-    } else {
-      FrameworkHelper.setTheme(actualTheme)
-    }
+
+    FrameworkHelper.setTheme(actualTheme)
    if nightMode != newNightMode || StyleManager.shared.hasTheme() == false{
      UIColor.setNightMode(newNightMode)
      if newNightMode {
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -1091,6 +1091,3 @@
 "osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is 'n gemeenskapsprojek om 'n gratis en oop kaart te bou. Dit is die hoofbron van kaartdata in CoMaps en werk soortgelyk aan Wikipedia. Jy kan plekke byvoeg of wysig en hulle word beskikbaar vir miljoene gebruikers regoor die wêreld. \nSluit aan by die gemeenskap en help om 'n beter kaart vir almal te maak!";
 "osm_profile_view_notes" = "Bekyk notas";
 "osm_profile_view_edit_history" = "Bekyk wysigingsgeskiedenis";
-"about_headline" = "Open project powered by the community";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
--- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
@@ -1484,18 +1484,3 @@
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Sportsaal";
 "type.railway.station.subway.qingdao" = "Moltreinstasie";
-"type.leisure.firepit" = "Firepit";
-"type.natural.wetland.tidalflat" = "Tidal Flat";
-"type.sport.diving" = "High Diving";
-"type.highway.ladder" = "Ladder";
-"type.natural.wetland.swamp" = "Swamp";
-"type.man_made.crane" = "Crane";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
-"type.natural.wetland.mangrove" = "Mangrove";
-"type.barrier.guard_rail" = "Guard Rail";
-"type.amenity.studio" = "Studio";
-"type.natural.wetland.fen" = "Fen";
-"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
-"type.natural.wetland.reedbed" = "Reed Bed";
-"type.landuse.plant_nursery" = "Plant Nursery";
-"type.amenity.love_hotel" = "Love Hotel";
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1091,6 +1091,3 @@
 "osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) هو مشروع مجتمعي لبناء خريطة مجانية ومفتوحة. إنه المصدر الرئيسي لبيانات الخرائط في CoMaps ويعمل على غرار ويكيبيديا. يمكنك إضافة الأماكن أو تعديلها وتصبح متاحة لملايين المستخدمين في جميع أنحاء العالم.\nنضم إلى المجتمع وساعد في إنشاء خريطة أفضل للجميع!";
 "osm_profile_view_edit_history" = "عرض سجل مساهمات";
 "osm_profile_view_notes" = "عرض ملاحظات";
-"about_headline" = "Open project powered by the community";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
--- a/Show More
+++ b/Show More