[fdroid] Release version 2025.11.19-2

Signed-off-by: map-per <map-per@gmx.de>
Release notes for 2nd November release
2025-12-19 13:03:36 +00:00 · 2025-11-19 09:40:04 +01:00 · 2025-11-19 08:17:11 +01:00 · 2025-11-18 21:29:15 +01:00 · 2025-11-18 19:19:10 +01:00 · 2025-11-18 17:17:14 +01:00
124 changed files with 3840 additions and 2520 deletions
--- a/android/app/src/fdroid/play/listings/da-DK/full-description.txt
+++ b/android/app/src/fdroid/play/listings/da-DK/full-description.txt
@@ -0,0 +1,33 @@
+En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME.
+
+Læs mere om grundlaget for projektet og dets udviklingsretnign på <b><i>codeberg.org/comaps</i></b>.
+Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden.
+• Brug appen og fortæl andre om den
+• Giv feedback anmeld fejl
+• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden.
+
+‣ <b>Offlinefokuseret</b>: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse.
+‣ <b>Respekt for privatlivets fred</b>: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri.
+‣ <b>Enkel og elegant</b>: de essentielle funktioner er nemme at bruge, og de virker bare.
+‣ <b>Sparer på batteriet og på lagerpladsen</b>: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug.
+‣ <b>Gratis og bygget i fællesskab</b>: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge.
+‣ <b>Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source.</b>
+
+<b>Hovedfunktioner</b>
+• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort.
+• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm.
+• Gangstier og cykelstier
+• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre.
+• Søg efter stednavn, adresse, eller type af sted.
+• Gem dine yndlingssteder som bogmærker med et enkelt tryk. 
+• iCloud synkronisering af bogmærker og optagede spor.
+• Offline artikler fra Wikipedia.
+• Metro-lag med navigation.
+• Optagelse af spor.
+• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX.
+• Mørk tilstand til brug om natten.
+• Mulighed for at forbedre kortet vha. en indbygget editor.
+• CarPlay understøttes.
+
+<b>Friheden er ankommet</b>
+Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet!
--- 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,8 +1,11 @@
-• OpenStreetMap-Daten vom 4. November
-• Aktualisierte Karten-Icons, inkl. Farben für Unterhaltungs-, Sport- & andere Unternehmen
-• Informationen zu Steckdosen an EV-Ladestationen
-• Symbole für Sportzentren, Veranstaltungsorte, Massagesalons, Gästehäuser und einige stillgelegte Unternehmen
-• Verbesserungen bei der Suche
-• Behebung eines Absturzes bei der Suche
-• Verbesserte Sprachführung während der Navigation
-Weitere Änderungen finden in unseren Codeberg-Versionshinweisen!
+• OpenStreetMap-Daten vom 16. November
+• Bäume hinzugefügt
+• Kleine Bushaltestellen-Icons die früher angezeigt werden
+• Sichtbarkeit von Eingängen reduziert
+• Neue POI-Typen hinzugefügt
+• Sandflächen werden auf Karte angezeigt
+• Option „Geschäft ist leerstehend” zum OSM-Editor hinzugefügt
+• Straßenbeschilderung in Europa verbessert
+• Option „Asphaltierte Straßen vermeiden” hinzugefügt
+• Icons in den Einstellungen hinzugefügt
+Weitere Änderungen in unseren Codeberg-Versionshinweisen!
--- 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,8 +1,11 @@
-• OpenStreetMap data as of November 4
-• Recategorized map icons including some new colors for entertainment, sports and other businesses
-• Display info about available sockets on charging stations
-• Added bandstands, backless benches and loungers
-• New icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
-• Multiple search improvements and crash fix
-• Improved voice guidance during navigation
+• OpenStreetMap data as of November 16
+• Added trees
+• Made bus stop icons smaller and show up earlier
+• Reduce visibility of entrances
+• Added several other POI types
+• Show sand areas on the map
+• Add business is vacant option to the OSM editor
+• Improved road shields in Europe
+• Avoid paved roads routing option
+• Added icons to the settings page
 Check our Codeberg release notes for more changes!
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,7 +1,11 @@
-• Datos OSM del 04/11
-• Iconos del mapa recategorizados, incluyendo nuevos colores
-• Visualización de información sobre enchufes disponibles en estaciones de recarga
-• Adición de iconos para diferentes centros deportivos, lugares de eventos, salones de masajes, posadas y algunos establecimientos comerciales desactivados
-• Varias mejoras y correcciones de errores en la búsqueda
-• Mejora en la orientación por voz durante la navegación
+• Nuevos datos OSM a 16.11.25
+• Se añaden árboles
+• Se reducen los iconos de paradas de autobús y aparecen antes
+• Se reduce visibilidad de entradas
+• Se añaden muchos tipos de puntos de interés
+• Se muestran las zonas de arena en el mapa
+• Se añade la opción «negocio vacío» al editor
+• Se mejoran las señales de tráfico en Europa
+• Nueva opción «evitar caminos asfaltadas»
+• Nuevos iconos en la página de configuración
 Más detalles en Codeberg
--- 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,11 @@
-• Données OpenStreetMap au 4 novembre
-• Recatégorisation des icônes sur la carte avec ajout de nouvelles couleurs pour certains types de lieux
-• Affichage des prises sur les bornes électriques
-• Ajout d'icônes pour les centres sportifs, salles d'événements, salon de massage et autres lieux
-• Multiple améliorations dans la recherche
-• Correction d'un plantage dans la recherche
-• Amélioration de la synthèse vocale durant la navigation
+• Données OpenStreetMap du 16 novembre
+• Ajout des arbres
+• Les icônes des arrêts de bus sont plus petites et apparaissent plus tôt
+• Réduction de la visibilité des entrées
+• Ajout de nouveaux types de POI
+• Affichage des zones de sable
+• Nouveau bouton pour signaler un commerce vacant
+• Amélioration des badges routiers en Europe
+• Ajout d'une option pour éviter les routes pavées
+• Ajout d'icônes dans les paramètres
 Plus d'informations sur notre Codeberg
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -0,0 +1,11 @@
+• Mappe OSM al 16 Novembre
+• Aggiunti alberi
+• Fermate bus più piccole e visibili prima
+• Entrate rese meno ingombranti
+• Aggiunti diversi POI
+• Le zone sabbiose sono ora visibili
+• Aggiunta l'opzione di POI vacante nell'editor OSM
+• Migliorate le insegne stradali in Europa
+• Aggiunta opzione per evitare strade pavimentate
+• Aggiunte icone nelle impostazioni
+Visita Codeberg per ulteriori dettagli
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,7 +1,11 @@
-• Dados OSM de 04/11
-• Ícones do mapa recategorizados, incluindo novas cores
-• Exibição de informações sobre tomadas disponíveis em eletropostos
-• Adição de ícones para diferentes centros esportivos, locais de eventos, salões de massagem, pousadas e alguns estabelecimentos comerciais desativados
-• Diversas melhorias e correção de erro na busca
-• Melhoria na orientação por voz durante a navegação
-Confira nossas notas de lançamento no Codeberg para mais detalhes!
+• Dados OSM de 16/11
+• Adição de árvores ao mapa
+• Ícones de pontos de ônibus menores e exibidos mais cedo
+• Visibilidade reduzida das entradas
+• Adição de diversos outros tipos de Pontos de Interesse
+• Exibição de áreas de areia no mapa
+• Adição de opção de "Estabelecimento vazio" ao editor do OSM
+• Melhorias nas placas de rodovias na Europa
+• Opção para evitar rotas por estradas pavimentadas
+• Adição de ícones nas configurações
+Confira as notas de lançamento do Codeberg para mais detalhes!
--- 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,8 +1,10 @@
-• Карты OpenStreetMap от 4 ноября
-• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов
-• На зарядных станциях показываются имеющиеся типы разъёмов
-• Добавлены эстрады, скамейки без спинок и лежаки
-• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов
-• Несколько улучшений и исправлений в поиске
-• Улучшены голосовые подсказки при навигации
+• Карты OpenStreetMap от 16 ноября
+• Добавлены деревья и песчаные области
+• Автобусные остановки показываются раньше, но маленькими иконами
+• Входы разделены по типам
+• В OSM редакторе можно отметить место как неиспользуемое
+• Улучшения в иконках номеров дорог в Европе
+• Возможность избегать дорог с покрытием при построении маршрута
+• Иконки в экране настроек
+• На карту добавлены несколько новых типов объектов 
 Подробнее смотрите на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -0,0 +1,11 @@
+• Подaци са OpenStreetMap-а закључно са 16. новембром
+• Додате ознаке за дрвеће
+• Смањене иконе аутобуских стајалишта и ранији приказ
+• Смањена видљивост улаза
+• Додато неколико нових типова ознака на мапу
+• Приказ пешчаних површина на мапи
+• Додата опција „пословни простор је празан“ у OSM едитору
+• Побољшани путокази у Европи
+• Опција рутирања „избегавај асфалтиране путеве“
+• Додате иконе на страници подешавања
+Погледајте детаље на Codeberg-у за списак свих промена!
--- a/android/app/src/fdroid/play/listings/ta-IN/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ta-IN/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.03.02-7-FDroid+25030207
+version: 2025.11.19-2-FDroid+25111902
--- a/android/app/src/google/play/listings/ta-IN/short-description.txt
+++ b/android/app/src/google/play/listings/ta-IN/short-description.txt
@@ -1 +1 @@
-எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -31,6 +31,8 @@ import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
+
+import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -108,7 +110,6 @@ public class PlacePageView extends Fragment
  private static final String TRACK_SHARE_MENU_ID = "TRACK_SHARE_MENU_ID";

  private static final int SHORT_HORIZON_CLOSE_MIN = 60;
-
  private static final int SHORT_HORIZON_OPEN_MIN = 15;

  private static final List<CoordinatesFormat> visibleCoordsFormat =
@@ -831,12 +832,44 @@ public class PlacePageView extends Fragment
    final SpannableStringBuilder openStateString = new SpannableStringBuilder();
    final boolean isOpen = (poiState.state == OhState.State.Open); // False == Closed due to early exit for Unknown
    final long nextStateTime = isOpen ? poiState.nextTimeClosed : poiState.nextTimeOpen; // Unix time (seconds)
+
+    ZonedDateTime nextChangeLocal = null;
+    boolean hasFiniteNextChange = false;
+
    final long nowSec = System.currentTimeMillis() / 1000;
    final int minsToNextState = (int) ((nextStateTime - nowSec) / 60);

+    // Try to resolve a finite next-change time; handle 24/7 case
+    final boolean looksLike247 = "24/7".equals(ohStr.trim());
+    final int ONE_WEEK_MIN = 7 * 24 * 60;
+    final boolean noRealNextChange = looksLike247 || minsToNextState >= ONE_WEEK_MIN;
+
+    if (!noRealNextChange)
+    {
+      try
+      {
+        if (nextStateTime > 0 && nextStateTime < Long.MAX_VALUE / 2)
+        {
          // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
-    final ZonedDateTime nextChangeLocal =
-      ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault());
+          nextChangeLocal = ZonedDateTime.ofInstant(
+              Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault()
+          );
+          hasFiniteNextChange = true;
+        }
+      }
+      catch (Throwable ignored) {}
+    }
+
+    if (!hasFiniteNextChange) // No valid next change
+    {
+      if (isOpen)
+        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      else
+        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+      UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString);
+      return;
+    }

    String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes(
      nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));
--- a/android/app/src/main/res/drawable-night/ic_category_atm.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_atm.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_bank.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_bank.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_children.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#7F5933" />
+      <solid android:color="#802D19" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable-night/ic_category_eat.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_eat.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BB9342" />
+            <solid android:color="#8C491C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#802D19" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_food.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_food.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#574469" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_hospital.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hospital.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#C15746" />
+            <solid android:color="#983E44" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_hotel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hotel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#664E42" />
+            <solid android:color="#614A43" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#BB9342" />
+            <solid android:color="#8C491C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_parking.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_parking.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#2E89B0" />
+            <solid android:color="#20607C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#C15746" />
+            <solid android:color="#983E44" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_police.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_police.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_post.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_post.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_recycling.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_recycling.xml
@@ -5,7 +5,7 @@
      <size
        android:width="40dp"
        android:height="40dp" />
-      <solid android:color="#717065" />
+      <solid android:color="#51585E" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable-night/ic_category_rv.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_rv.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_shopping.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_shopping.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C5F93" />
+            <solid android:color="#6B425C" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_tourism.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_tourism.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#7F5933" />
+            <solid android:color="#6E4426" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_wifi.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_wifi.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#717065" />
+            <solid android:color="#51585E" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_children.xml
+++ b/android/app/src/main/res/drawable/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#9C6136" />
+      <solid android:color="#EB785D" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="#EB785D" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="#AA96BC" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#9C6136" />
+            <solid android:color="#747E86" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -109,11 +109,11 @@
    <!-- 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|Parkplatz|Stellplatz</string>
+    <string name="category_parking">Parkplätze</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! -->
-    <string name="category_secondhand">Second-hand|Gebrauchte Artikel|Gebrauchte Ware</string>
+    <string name="category_secondhand">Second-hand</string>
    <!-- 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! -->
@@ -904,4 +904,5 @@
    </plurals>
    <string name="editor_business_vacant_button">Geschäft ist leerstehend</string>
    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_submit">Absenden</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -909,4 +909,8 @@
        <item quantity="other">%d min</item>
    </plurals>
    <string name="list_description_empty">Modificar la lista para añadir una descripción</string>
+    <string name="editor_business_vacant_button">Negocio vacante</string>
+    <string name="editor_mark_business_vacant_title">Marcar negocio como vacante</string>
+    <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
+    <string name="editor_submit">Enviar</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -518,8 +518,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
    <string name="navigation_stop_button">Apturēt</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Maršruta reģistrēšana</string>
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -306,7 +306,7 @@
    <string name="type.entrance">Vchod</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Hlavní vchod</string>
-    <string name="type.entrance.exit">Východ</string>
+    <string name="type.entrance.exit">Východ (Pouze)</string>
    <string name="type.fee.no">Zdarma</string>
    <string name="type.healthcare.laboratory">Lékařská laboratoř</string>
    <string name="type.healthcare.physiotherapist">Fyzioterapeut</string>
@@ -1001,7 +1001,7 @@
    <string name="type.shop.jewelry">Klenotnictví</string>
    <string name="type.shop.kitchen">Prodejna kuchyní</string>
    <string name="type.shop.laundry">Prádelna</string>
-    <string name="type.shop.mall">Obchoďák</string>
+    <string name="type.shop.mall">Obchodní centrum</string>
    <string name="type.shop.massage">Masážní salon</string>
    <string name="type.shop.mobile_phone">Obchod s mobilními telefony</string>
    <string name="type.shop.money_lender">Půjčovatel peněz</string>
@@ -1454,4 +1454,46 @@
    <string name="type.social_facility.soup_kitchen">Vývařovna</string>
    <string name="type.amenity.food_sharing">Food sharing</string>
    <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.beacon.cardinal.east">Kardinální baken</string>
+    <string name="type.beacon.cardinal.north">Kardinální baken</string>
+    <string name="type.beacon.cardinal.south">Kardinální baken</string>
+    <string name="type.beacon.cardinal.west">Kardinální baken</string>
+    <string name="type.beacon.isolated_danger">Izolovaný výstražný baken</string>
+    <string name="type.beacon.lateral.port">Laterální baken</string>
+    <string name="type.beacon.lateral.starboard">Laterální baken</string>
+    <string name="type.beacon.safe_water">Baken pro bezpečnou vodu</string>
+    <string name="type.beacon.special_purpose">Baken pro speciální účely</string>
+    <string name="type.buoy.cardinal.east">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.north">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.south">Kardinální bóje</string>
+    <string name="type.buoy.cardinal.west">Kardinální bóje</string>
+    <string name="type.buoy.isolated_danger">Izolovaná výstražná bóje</string>
+    <string name="type.buoy.lateral.port">Laterální bóje</string>
+    <string name="type.buoy.lateral.starboard">Laterální bóje</string>
+    <string name="type.buoy.safe_water">Bóje pro bezpečnou vodu</string>
+    <string name="type.buoy.special_purpose">Bóje pro speciální účely</string>
+    <string name="type.spherical_buoy.cardinal.east">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.north">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.south">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.cardinal.west">Sférická kardinální bóje</string>
+    <string name="type.spherical_buoy.isolated_danger">Sférická izolovaná výstražná bóje</string>
+    <string name="type.spherical_buoy.lateral.port">Sférická laterální bóje</string>
+    <string name="type.spherical_buoy.lateral.starboard">Sférická laterální bóje</string>
+    <string name="type.spherical_buoy.safe_water">Sférická bóje pro bezpečnou vodu</string>
+    <string name="type.spherical_buoy.special_purpose">Sférická bóje pro speciální účely</string>
+    <string name="type.lateral.port">Levobok</string>
+    <string name="type.lateral.starboard">Pravobok</string>
+    <string name="type.cardinal.east">Východ</string>
+    <string name="type.cardinal.north">Sever</string>
+    <string name="type.cardinal.south">Jih</string>
+    <string name="type.cardinal.west">Západ</string>
+    <string name="type.entrance.house">Vchod do domu</string>
+    <string name="type.entrance.garage">Vchod do garáže</string>
+    <string name="type.entrance.service">Služební vchod</string>
+    <string name="type.entrance.entry">Vstup (Pouze)</string>
+    <string name="type.entrance.emergency">Nouzový východ</string>
+    <string name="type.natural.sand">Písek</string>
+    <string name="type.natural.tree">Strom</string>
+    <string name="type.shop.beauty.nails">Nehtový salón</string>
+    <string name="type.xmas.tree">Vánoční strom</string>
 </resources>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -1416,5 +1416,8 @@
    <string name="type.social_facility.food_bank">Fødevarebank</string>
    <string name="type.social_facility.soup_kitchen">Suppekøkken</string>
    <string name="type.amenity.food_sharing">Fødevarerdeling</string>
-    <string name="type.amenity.give_box">Donationsbøsse</string>
+    <string name="type.amenity.give_box">Bytteboks</string>
+    <string name="type.amenity.sailing_school">Sejlerskole</string>
+    <string name="type.amenity.flight_school">Flyveskole</string>
+    <string name="type.power.portal">Kraftværksportal</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -1161,6 +1161,7 @@
    <string name="type.shop.bakery">Bäckerei</string>
    <string name="type.shop.bathroom_furnishing">Badezimmerausstattung</string>
    <string name="type.shop.beauty">Schönheitssalon</string>
+    <string name="type.shop.beauty.nails">Nagelstudio</string>
    <string name="type.shop.beverages">Getränkemarkt</string>
    <string name="type.shop.bicycle">Fahrradladen</string>
    <string name="type.shop.bookmaker">Wettbüro</string>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -1454,4 +1454,49 @@
    <string name="type.social_facility.soup_kitchen">Comedor social</string>
    <string name="type.amenity.food_sharing">Alimentos compartidos</string>
    <string name="type.amenity.give_box">Give Box</string>
+    <string name="type.amenity.sailing_school">Escuela de vela</string>
+    <string name="type.amenity.flight_school">Escuela de aviación</string>
+    <string name="type.amenity.prep_school">Escuela de tutoría</string>
+    <string name="type.beacon.cardinal.east">Marca cardinal</string>
+    <string name="type.beacon.cardinal.north">Marca cardinal</string>
+    <string name="type.beacon.cardinal.south">Marca cardinal</string>
+    <string name="type.beacon.cardinal.west">Marca cardinal</string>
+    <string name="type.beacon.isolated_danger">Marca de peligro aislado</string>
+    <string name="type.beacon.lateral.port">Marca lateral</string>
+    <string name="type.beacon.lateral.starboard">Marca lateral</string>
+    <string name="type.beacon.safe_water">Marca de aguas navegables</string>
+    <string name="type.beacon.special_purpose">Marca especial</string>
+    <string name="type.buoy.cardinal.east">Boya cardinal</string>
+    <string name="type.buoy.cardinal.north">Boya cardinal</string>
+    <string name="type.buoy.cardinal.south">Boya cardinal</string>
+    <string name="type.buoy.cardinal.west">Boya cardinal</string>
+    <string name="type.buoy.isolated_danger">Boya de peligro aislado</string>
+    <string name="type.buoy.lateral.port">Boya lateral</string>
+    <string name="type.buoy.lateral.starboard">Boya lateral</string>
+    <string name="type.buoy.safe_water">Boya de aguas navegables</string>
+    <string name="type.buoy.special_purpose">Boya de uso especial</string>
+    <string name="type.spherical_buoy.cardinal.east">Boya cardinal especial</string>
+    <string name="type.spherical_buoy.cardinal.north">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.south">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.cardinal.west">Boya esférica cardinal</string>
+    <string name="type.spherical_buoy.isolated_danger">Boya esférica de peligro aislado</string>
+    <string name="type.spherical_buoy.lateral.port">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.lateral.starboard">Boya esférica lateral</string>
+    <string name="type.spherical_buoy.safe_water">Boya esférica de aguas navegables</string>
+    <string name="type.spherical_buoy.special_purpose">Boya esférica de uso especial</string>
+    <string name="type.lateral.port">Babor</string>
+    <string name="type.lateral.starboard">Estribor</string>
+    <string name="type.cardinal.east">Este</string>
+    <string name="type.cardinal.north">Norte</string>
+    <string name="type.cardinal.south">Sur</string>
+    <string name="type.cardinal.west">Oeste</string>
+    <string name="type.entrance.house">Entrada de casa</string>
+    <string name="type.entrance.garage">Entrada de garaje</string>
+    <string name="type.entrance.service">Entrada de servicio</string>
+    <string name="type.entrance.entry">Entrada (únicamente)</string>
+    <string name="type.entrance.emergency">Salida de emergencia</string>
+    <string name="type.natural.sand">Arena</string>
+    <string name="type.natural.tree">Árbol</string>
+    <string name="type.shop.beauty.day_spa">Spa</string>
+    <string name="type.xmas.tree">Árbol de Navidad</string>
 </resources>
--- a/android/sdk/src/main/res/values-hu/types_strings.xml
+++ b/android/sdk/src/main/res/values-hu/types_strings.xml
@@ -1431,4 +1431,10 @@
    <string name="type.leisure.sports_centre.sport.yoga">Sportközpont</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Jógastúdió</string>
    <string name="type.amenity.charging_station.motorcar.small">Elektromos töltőpont</string>
+    <string name="type.amenity.boat_rental">Hajóbérlés</string>
+    <string name="type.man_made.telescope">Távcső</string>
+    <string name="type.man_made.telescope.optical">Távcső (Optikai)</string>
+    <string name="type.man_made.telescope.radio">Távcső (Rádió)</string>
+    <string name="type.man_made.telescope.gamma">Távcső (Gamma)</string>
+    <string name="type.man_made.observatory">Csillagvizsgáló</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -163,4 +163,23 @@
    <string name="type.emergency.assembly_point">Ārkārtas tikšanās punkts</string>
    <string name="type.shop.beauty.day_spa">Dienas spa</string>
    <string name="type.shop.massage">Masāžas salons</string>
+    <string name="type.natural.sand">Smiltis</string>
+    <string name="type.natural.geyser">Geizers</string>
+    <string name="type.natural.glacier">Ledājs</string>
+    <string name="type.natural.grassland">Pļava</string>
+    <string name="type.natural.heath">Tīrelis</string>
+    <string name="type.natural.hot_spring">Karstais avots</string>
+    <string name="type.natural.water.lake">Ezers</string>
+    <string name="type.natural.tree">Koks</string>
+    <string name="type.natural.tree_row">Koku rinda</string>
+    <string name="type.natural.vineyard">Vīnogu dārzs</string>
+    <string name="type.natural.volcano">Vulkāns</string>
+    <string name="type.natural.water">Ūdens</string>
+    <string name="type.natural.wetland">Mitrājs</string>
+    <string name="type.natural.wetland.bog">Muklājs</string>
+    <string name="type.natural.wetland.marsh">Dumbrājs</string>
+    <string name="type.natural.wetland.saltmarsh">Sāļūdens dumbrājs</string>
+    <string name="type.xmas.tree">Ziemassvētku egle</string>
+    <string name="type.entrance.emergency">Ārkārtas izeja</string>
+    <string name="type.lateral.port">Osta</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -1498,4 +1498,5 @@
    <string name="type.natural.sand">Песак</string>
    <string name="type.natural.tree">Дрво</string>
    <string name="type.xmas.tree">Божићна јелка</string>
+    <string name="type.shop.beauty.nails">Салон за нокте</string>
 </resources>
--- a/android/sdk/src/main/res/values-ta/types_strings.xml
+++ b/android/sdk/src/main/res/values-ta/types_strings.xml
@@ -9,4 +9,8 @@
    <string name="type.addr_interpolation">முகவரி/சாலைத் தொகுதி</string>
    <string name="type.addr_interpolation.even">முகவரி/சாலைத் தொகுதி</string>
    <string name="type.amenity.music_school">இசை பள்ளிக்கூடம்</string>
+    <string name="type.aerialway.cable_car">கேபிள் கார்</string>
+    <string name="type.aeroway.aerodrome.international">சர்வதேச விமான நிலையம்</string>
+    <string name="type.aeroway.helipad">ஹெலிபேட்</string>
+    <string name="type.aeroway.runway">ஓடுதளம்</string>
 </resources>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -1228,6 +1228,7 @@
    <string name="type.shop.bakery">Bakery</string>
    <string name="type.shop.bathroom_furnishing">Bathroom Furnishings</string>
    <string name="type.shop.beauty">Beauty Shop</string>
+    <string name="type.shop.beauty.nails">Nail Salon</string>
    <string name="type.shop.beverages">Beverages</string>
    <string name="type.shop.bicycle">Bicycle Shop</string>
    <string name="type.shop.bookmaker">Bookmaker</string>
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -47,7 +47,8 @@
 "shop-jewelry|@category_shopping|@shop": "4Juwelier|Juweliergeschäft|Schmuck",
 "shop-optician|@shop": "4Optiker|5Brillengeschäft|5Augenoptiker",
 "shop-gift|@category_shopping|@shop": "5Geschenkeladen|Geschenke|Geschenkartikelladen|5Andenkenladen|Andenken|Präsente|4Mitbringsel|4Souvenirladen",
-"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Friseur|Frisör|Haarschnitt|Kosmetikstudio|Friseursalon|Kosmetiksalon|Nagelstudio|Färbung",
+"shop-beauty": "5Schönheitssalon|Schönheitsshop|Kosmetiker|Kosmetikstudio|Kosmetiksalon",
+"shop-beauty-nails": "5Nagelstudio|Nagelsalon|Fingernägel|Fußnägel|Nägel",
 "shop-greengrocer|@category_food|@shop": "5Gemüseladen|Gemüsehändler",
 "shop-sports|@category_shopping|@shop": "4Sportgeschäft|Sportartikel|Fitnessgeschäft",
 "shop-supermarket|@category_food|@shop": "3Supermarkt",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -50,7 +50,8 @@
 "shop-jewelry|@category_shopping|@shop": "4Jewelry|U+1F48D",
 "shop-optician|@shop": "4Optician|glasses|sunglasses|U+1F453",
 "shop-gift|@category_shopping|@shop": "Gift|U+1F381|souvenir|souvenirs|3gifts|presents|4Souvenir shop|gift shop|giftshop",
-"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|nail salon|coloring",
+"shop-beauty": "4Beauty Shop|beautician|U+1F484|beauty salon|beauty parlor|coloring",
+"shop-beauty-nails": "4Nail salon|nail technician|nail tech|finger nails|toe nails|nails",
 "shop-greengrocer|@category_food|@shop": "4Greengrocer|U+1F345|U+1F346|U+1F33D|U+1F360|U+1F348|U+1F347|U+1F349|U+1F34A|U+1F34C|U+1F34D|U+1F34E|U+1F34F|U+1F350|U+1F351|U+1F353",
 "shop-sports|@category_shopping|@shop": "4Sports Goods|U+1F3BF|U+1F3A3|U+1F3C2|U+1F6B4|U+26BD|U+1F3C0|U+1F3C8|U+26BE|U+1F3BE|U+1F3C9|U+26F3",
 "shop-supermarket|@category_food|@shop": "3Supermarket",
--- a/data/countries-strings/sr.json/localize.json
+++ b/data/countries-strings/sr.json/localize.json
@@ -130,5 +130,67 @@
 "Brazil_Southeast Region_Sao Paulo_City":"Сао Пауло - Сантос",
 "Brazil_Southeast Region_Sao Paulo_West":"Сао Пауло - Рибеирао Прето",
 "British Indian Ocean Territory":"Британска територија у Индијском океану",
-"British Virgin Islands":"Британска Девичанска Острва"
+"British Virgin Islands":"Британска Девичанска Острва",
+"Campo de Hielo Sur":"Јужно патагонско ледено поље",
+"Canada_British Columbia_Central":"Британска Колумбија — центар",
+"Canada_British Columbia_Far_North":"Британска Колумбија — исток",
+"Canada_British Columbia_Islands":"Острво Ванкувер",
+"Canada_British Columbia_North":"Британска Колумбија — запад",
+"Canada_British Columbia_Northeast":"Британска Колумбија — север",
+"Canada_British Columbia_Southeast":"Келоуна",
+"Canada_British Columbia_Vancouver":"Ванкувер",
+"Canada_Labrador":"Лабрадор",
+"Canada_Labrador_North":"Лабрадор — север",
+"Canada_Labrador_South":"Лабрадор — југ",
+"Canada_Labrador_West":"Лабрадор — запад",
+"Canada_Manitoba":"Манитоба",
+"Canada_Manitoba_Northeast":"Манитоба — север",
+"Canada_Manitoba_Northwest":"Манитоба — запад",
+"Canada_Manitoba_South":"Брендон",
+"Canada_Manitoba_Winnipeg":"Винипег",
+"Canada_New Brunswick":"Њу Бранзвик",
+"Canada_Newfoundland":"Њуфаундленд",
+"Canada_Newfoundland_East":"Њуфаундленд — исток",
+"Canada_Newfoundland_North":"Њуфаундленд — север",
+"Canada_Newfoundland_South":"Њуфаундленд — југ",
+"Canada_Newfoundland_West":"Њуфаундленд — запад",
+"Canada_Northwest Territories":"Северозападне Територије",
+"Canada_Northwest Territories_East":"Северозападне Територије — исток",
+"Canada_Northwest Territories_North":"Северозападне Територије — север",
+"Canada_Northwest Territories_Yellowknife":"Јелоунајф",
+"Canada_Nova Scotia":"Нова Шкотска",
+"Canada_Nova Scotia_Halifax":"Халифакс",
+"Canada_Nova Scotia_Sydney":"Сидни",
+"Canada_Nunavut":"Нунавут",
+"Canada_Nunavut_North":"Нунавут — север",
+"Canada_Nunavut_South":"Нунавут — југ",
+"Canada_Ontario":"Онтарио",
+"Canada_Ontario_Bame":"Бери",
+"Canada_Ontario_Kingston":"Кингстон",
+"Canada_Ontario_London":"Лондон",
+"Canada_Ontario_Northeastern_Central":"Тиминс",
+"Canada_Ontario_Northeastern_North":"Мус Фектори",
+"Canada_Ontario_Northeastern_S":"Велики Садбери",
+"Canada_Ontario_Northeastern_SE":"Норт Беј",
+"Canada_Ontario_Northeastern_SW":"Су Сент Мари",
+"Canada_Ontario_Northeastern_Wawa":"Вава",
+"Canada_Ontario_Northern":"Тандербеј",
+"Canada_Ontario_Northwestern":"Онтарио — север",
+"Canada_Ontario_Toronto":"Торонто",
+"Canada_Prince Edward Island":"Острво Принца Едварда",
+"Canada_Quebec":"Квебек",
+"Canada_Quebec_Quebec":"Град Квебек",
+"Canada_Quebek_Far North":"Квебек — север",
+"Canada_Quebek_Montreal":"Монтреал",
+"Canada_Quebek_North":"Септ-Ил",
+"Canada_Quebek_Southeast_Rimouski":"Римуски",
+"Canada_Quebek_Southeast_Saguenay":"Сагне",
+"Canada_Quebek_West_Chibougamau":"Шибугамо",
+"Canada_Quebek_West_Rouyn-Noranda":"Руен-Норанда",
+"Canada_Saskatchewan":"Саскачеван",
+"Canada_Saskatchewan_North":"Саскачеван — север",
+"Canada_Saskatchewan_South":"Саскачеван — југ",
+"Canada_Yukon":"Јукон",
+"Canada_Yukon_North":"Јукон — север",
+"Canada_Yukon_Whitehorse":"Вајтхорс"
 }
--- a/data/countries.txt
+++ b/data/countries.txt
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -578,7 +578,7 @@ boundary|administrative|4;[boundary=administrative][admin_level=4];;;;459;
 # ~100k usages.
 railway|station;460;
 sport|handball;461;
-deprecated:boundary|administrative|city:04.2024;[boundary=administrative][border_type=city];x;name;int_name;462;
+shop|beauty|nails;[shop=beauty][beauty=nails];;name;int_name;462;
 piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride],[piste:type=downhill][piste:grooming=backcountry][!piste:difficulty];;name;int_name;463;
 # _path_grade is a surrogate tag which combines sac_scale and trail_visibility, see osm2type.cpp
 highway|path|difficult;[highway=path][_path_grade=difficult];;name;int_name;464;
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -51,6 +51,7 @@
@wetland_swamp: #3D5045;
@wetland_mangrove: #3E5143;
@beach: #322C20;
+@sand: #312d24;
@barerock: #2B2A26;
@scree: #292825;
@desert: #312E28;
--- a/data/styles/default/dark/symbols/bicycle-rental-xm.svg
+++ b/data/styles/default/dark/symbols/bicycle-rental-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/bicycle-rental.svg
+++ b/data/styles/default/dark/symbols/bicycle-rental.svg
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<title>bike-parking-m</title>
-	<g>
-		<rect id="Rectangle" width="20" height="20" rx="2.5" fill="#000" opacity=".6"/>
-		<rect x="1" y="1" width="18" height="18" rx="2" fill="#2F6499"/>
-		<path d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#000"/>
-		<path d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786 0 1.8052 1.468 3.2786 3.2667 3.2786 1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786c0-1.8052-1.468-3.2786-3.2667-3.2786-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419-1.2941 0-2.3333-1.043-2.3333-2.3419 0-1.2989 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#000"/>
-	</g>
-</svg>
--- a/data/styles/default/dark/symbols/nails-m.svg
+++ b/data/styles/default/dark/symbols/nails-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6b425c" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#000" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/taxi-m.svg
+++ b/data/styles/default/dark/symbols/taxi-m.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#000" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#000" />
- </g>
-</svg>
--- a/data/styles/default/dark/symbols/taxi-xm.svg
+++ b/data/styles/default/dark/symbols/taxi-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m4.5004375 5.7355v1.765625h1.99825v-1.765625zm1.99825 1.765625v1.763375h2.0004375v-1.763375zm2.0004375 0h2.0004375v-1.765625h-2.0004375zm2.0004375 0v1.763375h2.0004375v-1.763375zm-5.999125 0h-2.0004375v1.763375h2.0004375z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/tree-m.svg
+++ b/data/styles/default/dark/symbols/tree-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.76536686 3.31703659 2.71190694 1.12330864c.4900562.20298791.8794043.59233602 1.0823922 1.0823922l1.1233087 2.71190696c.2029879.49005617.2029879 1.04067755 0 1.53073372l-1.1233087 2.71190699c-.2029879.4900561-.592336.8794043-1.0823922 1.0823922l-2.71190694 1.1233086c-.49005617.2029879-1.04067755.2029879-1.53073372 0l-2.71190696-1.1233086c-.49005618-.2029879-.87940429-.5923361-1.0823922-1.0823922l-1.12330864-2.71190699c-.20298792-.49005617-.20298792-1.04067755 0-1.53073372l1.12330864-2.71190696c.20298791-.49005618.59233602-.87940429 1.0823922-1.0823922l2.71190696-1.12330864c.43560548-.18043371.91906496-.20048189 1.36530467-.06014457z" fill="#202510" fill-rule="evenodd"/></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#202510" fill-rule="evenodd"/></svg>
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -254,7 +254,7 @@ area|z11-[natural=bare_rock],
 /* 5.BEACH, GLACIER, DESERT, etc. */

 area|z0-[natural=glacier],
-area|z10-[natural=sand],
+area|z0-[natural=sand],
 area|z10-[natural=beach],
 area|z0-[natural=desert],
 area|z10-[leisure=beach_resort],
@@ -263,11 +263,13 @@ area|z10-[leisure=beach_resort],
 area|z0-[natural=glacier]
 {fill-color: @glacier;}

-area|z10-[natural=sand],
 area|z10-[natural=beach],
 area|z10-[leisure=beach_resort],
 {fill-color: @beach;}

+area|z10-[natural=sand],
+{fill-color: @sand;}
+
 area|z0-[natural=desert],
 area|z0-9[natural=sand],
 {fill-color: @desert;}
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -957,7 +957,6 @@ node|z16-[amenity=biergarten],
 /* 5.AMENITY (infrastructure) */

 node|z13-[leisure=stadium],
-node|z14-[barrier=toll_booth],
 node|z14-[amenity=university],
 node|z14-[amenity=place_of_worship],
 node|z14-[man_made=lighthouse],
@@ -981,6 +980,7 @@ node|z16-[barrier=kissing_gate],
 node|z16-[barrier=lift_gate],
 node|z16-[barrier=swing_gate],
 node|z16-[barrier=stile],
+node|z16-[barrier=toll_booth],
 node|z16-[barrier=turnstile],
 node|z17-[barrier=wicket_gate],
 node|z16-[barrier=cycle_barrier],
@@ -1521,9 +1521,7 @@ node|z13-14[man_made=lighthouse],
 node|z15-[man_made=lighthouse],
 {icon-image: lighthouse-m.svg;}

-node|z12-14[barrier=toll_booth],
-{icon-image: toll_booth-s.svg;}
-node|z15-[barrier=toll_booth],
+node|z16-[barrier=toll_booth],
 {icon-image: toll_booth-m.svg;}

 node|z14[barrier=border_control],
@@ -1581,7 +1579,7 @@ node|z17-[man_made=petroleum_well],
 {icon-image: pole-m.svg;}

 node|z16-[amenity=taxi],
-{icon-image: taxi-m.svg;icon-min-distance: 30;}
+{icon-image: taxi-xm.svg;icon-min-distance: 30;}
 node|z17-[amenity=taxi],
 {icon-min-distance: 20;}

@@ -1682,7 +1680,7 @@ node|z18-[amenity=boat_rental],
 {font-size: 11;}

 node|z17-[amenity=bicycle_rental],
-{icon-image: bicycle-rental.svg;}
+{icon-image: bicycle-rental-xm.svg;}
 node|z18-[amenity=bicycle_rental],
 {font-size: 11;}

@@ -1730,14 +1728,13 @@ node|z17-[amenity=telephone]
 node|z17-[emergency=phone]
 {icon-image: emergency-phone-m.svg; text-offset: 1;}

-
-node|z16-[amenity=recycling][recycling_type=centre],
-{icon-image: recycling-centre-m.svg;}
-
 node|z17-[amenity=recycling],
 node|z17-[amenity=waste_transfer_station],
 {icon-image: recycling-m.svg;}

+node|z16-[amenity=recycling][recycling_type=centre],
+{icon-image: recycling-centre-m.svg;}
+
 node|z17-[power=plant],
 /* Skip individual solar generators, because there are a lot of mapped panels */
 node|z17-[power=generator][generator:source!=solar],
@@ -2162,6 +2159,8 @@ node|z17-[shop=pastry],
 {icon-image: bakery-m.svg;icon-min-distance: 24;}
 node|z17-[shop=beauty],
 {icon-image: beauty-m.svg;icon-min-distance: 24;}
+node|z17-[shop=beauty][beauty=nails],
+{icon-image: nails-m.svg;icon-min-distance: 24;}
 node|z17-[shop=cosmetics],
 {icon-image: beauty-m.svg;icon-min-distance: 24;}
 node|z17-[shop=beverages],
--- a/data/styles/default/include/Icons_Label_Colors.mapcss
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -133,6 +133,7 @@ node[amenity=police],
 node[amenity=post_office],
 node[amenity=prep_school],
 node[amenity=prison],
+node[amenity=recycling][recycling_type=centre],
 node[amenity=sailing_school],
 node[amenity=school],
 node[amenity=townhall],
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -739,7 +739,8 @@ line|z15-[highway=track][bridge?]::bridgewhite,
 line|z15-[highway=bridleway][bridge?]::bridgewhite,
 line|z15-[highway=steps][bridge?]::bridgewhite,
 line|z16-[highway=road][bridge?]::bridgewhite,
-line|z16-[highway=service][bridge?]::bridgewhite
+line|z15-[highway=service][bridge?]::bridgewhite,
+line|z15-[highway=busway][bridge?]::bridgewhite
 {casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
 line|z13-[highway=pedestrian][bridge?]::bridgeblack,
 line|z17-[highway=footway][bridge?]::bridgeblack,
@@ -749,7 +750,8 @@ line|z17-[highway=track][bridge?]::bridgeblack,
 line|z17-[highway=bridleway][bridge?]::bridgeblack,
 line|z17-[highway=steps][bridge?]::bridgeblack,
 line|z16-[highway=road][bridge?]::bridgeblack,
-line|z16-[highway=service][bridge?]::bridgeblack
+line|z15-[highway=service][bridge?]::bridgeblack,
+line|z15-[highway=busway][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
 line|z15-[highway=track],
 {color: @track;opacity: 0.6;}
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -111,7 +111,7 @@ natural-water-lake                                  # caption z10- (also has are
 natural-water-reservoir                             # caption z10- (also has area z1-)
 === 6650

-barrier-toll_booth                                  # icon z12- (also has caption(optional) z14-)
+barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600

 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
@@ -846,6 +846,7 @@ shop-appliance                                      # icon z18- (also has captio
 shop-baby_goods                                     # icon z18- (also has caption(optional) z18-)
 shop-beauty                                         # icon z16- (also has caption(optional) z16-)
 shop-beauty-day_spa                                 # icon z16- (also has caption(optional) z16-)
+shop-beauty-nails                                   # icon z16- (also has caption(optional) z16-)
 shop-beverages                                      # icon z16- (also has caption(optional) z16-)
 shop-boutique                                       # icon z18- (also has caption(optional) z18-)
 shop-car_repair                                     # icon z16- (also has caption(optional) z16-)
@@ -1420,7 +1421,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-nature_reserve                            # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17)
 # === -3300

-# barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
+# barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400

 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
@@ -1931,6 +1932,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-baby_goods                                   # caption(optional) z18- (also has icon z18-)
 # shop-beauty                                       # caption(optional) z16- (also has icon z16-)
 # shop-beauty-day_spa                               # caption(optional) z16- (also has icon z16-)
+# shop-beauty-nails                                 # caption(optional) z16- (also has icon z16-)
 # shop-beverages                                    # caption(optional) z16- (also has icon z16-)
 # shop-boutique                                     # caption(optional) z18- (also has icon z18-)
 # shop-car_repair                                   # caption(optional) z16- (also has icon z16-)
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -51,6 +51,7 @@
@wetland_swamp: #A1D4B7;
@wetland_mangrove: #A2D4B0;
@beach: #FADDA0;
+@sand: #F7E4C3;
@barerock: #D9D2BF;
@scree: #CCC7BA;
@desert: #F4E5C8;
--- a/data/styles/default/light/symbols/bicycle-rental-xm.svg
+++ b/data/styles/default/light/symbols/bicycle-rental-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#fff"/></g></svg>
--- a/data/styles/default/light/symbols/bicycle-rental.svg
+++ b/data/styles/default/light/symbols/bicycle-rental.svg
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<title>bike-parking-m</title>
-	<g>
-		<rect id="Rectangle" width="20" height="20" rx="2.5" fill="#fff" opacity=".6"/>
-		<rect x="1" y="1" width="18" height="18" rx="2" fill="#2f6499"/>
-		<path d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#fff"/>
-		<path d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786 0 1.8052 1.468 3.2786 3.2667 3.2786 1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786c0-1.8052-1.468-3.2786-3.2667-3.2786-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419-1.2941 0-2.3333-1.043-2.3333-2.3419 0-1.2989 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#fff"/>
-	</g>
-</svg>
--- a/data/styles/default/light/symbols/nails-m.svg
+++ b/data/styles/default/light/symbols/nails-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#be75a3" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#fff" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/taxi-m.svg
+++ b/data/styles/default/light/symbols/taxi-m.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <g opacity="1">
-  <rect id="Rectangle" width="24" height="24" rx="2.5" fill="#fff" opacity=".6"/>
-  <rect x="1" y="1" width="22" height="22" rx="2" fill="#2F6499"/>
-  <path d="m7.2007 9.1768v2.825h3.1972v-2.825zm3.1972 2.825v2.8214h3.2007v-2.8214zm3.2007 0h3.2007v-2.825h-3.2007zm3.2007 0v2.8214h3.2007v-2.8214zm-9.5986 0h-3.2007v2.8214h3.2007z" fill="#fff" />
- </g>
-</svg>
--- a/data/styles/default/light/symbols/taxi-xm.svg
+++ b/data/styles/default/light/symbols/taxi-xm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m4.5004375 5.7355v1.765625h1.99825v-1.765625zm1.99825 1.765625v1.763375h2.0004375v-1.763375zm2.0004375 0h2.0004375v-1.765625h-2.0004375zm2.0004375 0v1.763375h2.0004375v-1.763375zm-5.999125 0h-2.0004375v1.763375h2.0004375z" fill="#fff"/></g></svg>
--- a/data/styles/default/light/symbols/tree-m.svg
+++ b/data/styles/default/light/symbols/tree-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.76536686 3.31703659 2.71190694 1.12330864c.4900562.20298791.8794043.59233602 1.0823922 1.0823922l1.1233087 2.71190696c.2029879.49005617.2029879 1.04067755 0 1.53073372l-1.1233087 2.71190699c-.2029879.4900561-.592336.8794043-1.0823922 1.0823922l-2.71190694 1.1233086c-.49005617.2029879-1.04067755.2029879-1.53073372 0l-2.71190696-1.1233086c-.49005618-.2029879-.87940429-.5923361-1.0823922-1.0823922l-1.12330864-2.71190699c-.20298792-.49005617-.20298792-1.04067755 0-1.53073372l1.12330864-2.71190696c.20298791-.49005618.59233602-.87940429 1.0823922-1.0823922l2.71190696-1.12330864c.43560548-.18043371.91906496-.20048189 1.36530467-.06014457z" fill="#a2ba4e" fill-rule="evenodd"/></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6.57402515.487769 2.91781369 1.20859801c.36754213.15224093.65955326.44425202.81179416.81179415l1.208598 2.91781369c.1522409.36754213.1522409.78050817 0 1.1480503l-1.208598 2.91781369c-.1522409.36754213-.44425203.65955326-.81179416.81179416l-2.91781369 1.208598c-.36754213.1522409-.78050817.1522409-1.1480503 0l-2.91781369-1.208598c-.36754213-.1522409-.65955322-.44425203-.81179415-.81179416l-1.20859801-2.91781369c-.15224093-.36754213-.15224093-.78050817 0-1.1480503l1.20859801-2.91781369c.15224093-.36754213.44425202-.65955322.81179415-.81179415l2.91781369-1.20859801c.36754213-.15224093.78050817-.15224093 1.1480503 0z" fill="#a2ba4e" fill-rule="evenodd"/></svg>
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -111,7 +111,7 @@ natural-water-lake                                  # caption z10- (also has are
 natural-water-reservoir                             # caption z10- (also has area z1-)
 === 6650

-barrier-toll_booth                                  # icon z12- (also has caption(optional) z14-)
+barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600

 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
@@ -846,6 +846,7 @@ shop-appliance                                      # icon z18- (also has captio
 shop-baby_goods                                     # icon z18- (also has caption(optional) z18-)
 shop-beauty                                         # icon z16- (also has caption(optional) z16-)
 shop-beauty-day_spa                                 # icon z16- (also has caption(optional) z16-)
+shop-beauty-nails                                   # icon z16- (also has caption(optional) z16-)
 shop-beverages                                      # icon z16- (also has caption(optional) z16-)
 shop-boutique                                       # icon z18- (also has caption(optional) z18-)
 shop-car_repair                                     # icon z16- (also has caption(optional) z16-)
@@ -1423,7 +1424,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-nature_reserve                            # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17)
 # === -3300

-# barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
+# barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400

 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
@@ -1934,6 +1935,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-baby_goods                                   # caption(optional) z18- (also has icon z18-)
 # shop-beauty                                       # caption(optional) z16- (also has icon z16-)
 # shop-beauty-day_spa                               # caption(optional) z16- (also has icon z16-)
+# shop-beauty-nails                                 # caption(optional) z16- (also has icon z16-)
 # shop-beverages                                    # caption(optional) z16- (also has icon z16-)
 # shop-boutique                                     # caption(optional) z18- (also has icon z18-)
 # shop-car_repair                                   # caption(optional) z16- (also has icon z16-)
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -187,13 +187,12 @@ area|z10-[leisure=beach_resort],
 area|z0-[natural=glacier]
 {fill-color: @glacier;}

-area|z10-[natural=sand],
 area|z10-[natural=beach],
 area|z10-[leisure=beach_resort],
 {fill-color: @beach;fill-opacity: 0.35;}

 area|z0-[natural=desert],
-area|z0-9[natural=sand],
+area|z0-[natural=sand],
 {fill-color: @desert;}

 /* 6.WATER */
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -531,13 +531,13 @@ node|z18-[addr:housenumber][addr:street]::int_name,

 node|z19-[entrance],
 node|z19-[amenity=loading_dock],
-{icon-image: entrance-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-m.svg; font-size: 13; text-offset: 1;}
 node|z19-[entrance=exit],
-{icon-image: entrance-exit-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-exit-m.svg; font-size: 13; text-offset: 1;}
 node|z18-[entrance=main],
-{icon-image: entrance-main-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-main-m.svg; font-size: 13; text-offset: 1;}
 node|z18-[emergency=emergency_ward_entrance],
-{icon-image: entrance-emergency-s.svg; font-size: 13; text-offset: 1;}
+{icon-image: entrance-emergency-m.svg; font-size: 13; text-offset: 1;}

 /* 8.3 Airports */
 area|z14-[aeroway=terminal]
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1,7 +1,7 @@
 {
    "data_format": 1,
    "data_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/taginfo.json",
-    "data_updated": "20251110T190102Z",
+    "data_updated": "20251117T175008Z",
    "project": {
        "name": "CoMaps",
        "description": "CoMaps is a community-focused privacy navigation iOS & Android app for travelers - drivers, hikers, and cyclists.",
@@ -146,7 +146,7 @@
            "description": "amenity=boat_rental",
            "key": "amenity",
            "value": "boat_rental",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boat-rental.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boat_rental-m.svg"
        },
        {
            "description": "amenity=brothel",
@@ -377,6 +377,12 @@
            "value": "fire_station",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fire_station-m.svg"
        },
+        {
+            "description": "amenity=flight_school",
+            "key": "amenity",
+            "value": "flight_school",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/flying_school-m.svg"
+        },
        {
            "description": "amenity=food_court",
            "key": "amenity",
@@ -901,6 +907,12 @@
            "value": "post_office",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/mail-m.svg"
        },
+        {
+            "description": "amenity=prep_school",
+            "key": "amenity",
+            "value": "prep_school",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/prep_school-m.svg"
+        },
        {
            "description": "amenity=prison",
            "key": "amenity",
@@ -955,6 +967,12 @@
            "value": "restaurant",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/restaurant-m.svg"
        },
+        {
+            "description": "amenity=sailing_school",
+            "key": "amenity",
+            "value": "sailing_school",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boating_school-m.svg"
+        },
        {
            "description": "amenity=sanitary_dump_station",
            "key": "amenity",
@@ -1268,7 +1286,7 @@
            "description": "barrier=entrance",
            "key": "barrier",
            "value": "entrance",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/entrance-barrier-s.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/entrance-barrier-xs.svg"
        },
        {
            "description": "barrier=gate",
@@ -1499,6 +1517,12 @@
            "key": "disused:shop",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/disusedbusiness-m.svg"
        },
+        {
+            "description": "emergency=access_point",
+            "key": "emergency",
+            "value": "access_point",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/access_point-m.svg"
+        },
        {
            "description": "emergency=assembly_point",
            "key": "emergency",
@@ -1517,6 +1541,12 @@
            "value": "fire_hydrant",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/firehydrant-m.svg"
        },
+        {
+            "description": "emergency=life_ring",
+            "key": "emergency",
+            "value": "life_ring",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/lifebuoy-m.svg"
+        },
        {
            "description": "emergency=lifeguard",
            "key": "emergency",
@@ -1599,7 +1629,7 @@
            "description": "highway=bus_stop",
            "key": "highway",
            "value": "bus_stop",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bus-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bus-xm.svg"
        },
        {
            "description": "highway=elevator",
@@ -2914,6 +2944,12 @@
            "value": "spring",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/drinking-water-no-m.svg"
        },
+        {
+            "description": "natural=tree",
+            "key": "natural",
+            "value": "tree",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tree-m.svg"
+        },
        {
            "description": "natural=volcano",
            "key": "natural",
@@ -3057,6 +3093,825 @@
            "value": "tram_stop",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tram-m.svg"
        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=east + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=north + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=south + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:beacon_cardinal:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_cardinal + seamark:beacon_cardinal:category=west + seamark:beacon_cardinal:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=buoyant",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=lattice",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=pile",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=tower",
+            "key": "seamark:beacon_isolated_danger:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_isolated_danger + seamark:beacon_isolated_danger:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=port + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:beacon_lateral:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_lateral + seamark:beacon_lateral:category=starboard + seamark:beacon_lateral:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=buoyant",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=lattice",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=pile",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=tower",
+            "key": "seamark:beacon_safe_water:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_safe_water + seamark:beacon_safe_water:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=buoyant",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "buoyant",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=buoyant",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=lattice",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "lattice",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=lattice",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=pile",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "pile",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=pile",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=tower",
+            "key": "seamark:beacon_special_purpose:shape",
+            "value": "tower",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=beacon_special_purpose + seamark:beacon_special_purpose:shape=tower",
+            "key": "seamark:type",
+            "value": "beacon_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beacon-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "east",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=east + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-east-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "north",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=north + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-north-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "south",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "south"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "south[seamark:buoy_cardinal:shape=spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=south[seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-south-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:category",
+            "value": "west",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:buoy_cardinal:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_cardinal + seamark:buoy_cardinal:category=west + seamark:buoy_cardinal:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_cardinal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-cardinal-west-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_isolated_danger",
+            "key": "seamark:type",
+            "value": "buoy_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_isolated_danger + seamark:buoy_isolated_danger:shape=spherical",
+            "key": "seamark:buoy_isolated_danger:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_isolated_danger + seamark:buoy_isolated_danger:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_isolated_danger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-isolated_danger-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port",
+            "key": "seamark:buoy_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:category",
+            "value": "port",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=port + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-port-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard",
+            "key": "seamark:buoy_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:category",
+            "value": "starboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:buoy_lateral:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_lateral + seamark:buoy_lateral:category=starboard + seamark:buoy_lateral:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_lateral",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-lateral-starboard-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_safe_water",
+            "key": "seamark:type",
+            "value": "buoy_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_safe_water + seamark:buoy_safe_water:shape=spherical",
+            "key": "seamark:buoy_safe_water:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_safe_water + seamark:buoy_safe_water:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_safe_water",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-safe_water-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_special_purpose",
+            "key": "seamark:type",
+            "value": "buoy_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_special_purpose + seamark:buoy_special_purpose:shape=spherical",
+            "key": "seamark:buoy_special_purpose:shape",
+            "value": "spherical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg"
+        },
+        {
+            "description": "seamark:type=buoy_special_purpose + seamark:buoy_special_purpose:shape=spherical",
+            "key": "seamark:type",
+            "value": "buoy_special_purpose",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/buoy-spherical-special_purpose-m.svg"
+        },
        {
            "description": "shop=*",
            "key": "shop",
@@ -3104,6 +3959,18 @@
            "value": "beauty",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/beauty-m.svg"
        },
+        {
+            "description": "shop=beauty + beauty=spa",
+            "key": "beauty",
+            "value": "spa",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/day-spa-m.svg"
+        },
+        {
+            "description": "shop=beauty + beauty=spa",
+            "key": "shop",
+            "value": "beauty",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/day-spa-m.svg"
+        },
        {
            "description": "shop=beverages",
            "key": "shop",
@@ -4078,6 +4945,12 @@
            "key": "waterway",
            "value": "waterfall",
            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/waterfall-m.svg"
+        },
+        {
+            "description": "xmas:feature=tree",
+            "key": "xmas:feature",
+            "value": "tree",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/christmas-tree-m.svg"
        }
    ]
 }
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/atm.imageset/atm_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>atm_dark</title>
    <g id="atm_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M20,8 L8,8 C7.17275,8 6.5,8.67275 6.5,9.5 L6.5,18.5 C6.5,19.32725 7.17275,20 8,20 L20,20 C20.82725,20 21.5,19.32725 21.5,18.5 L21.5,9.5 C21.5,8.67275 20.82725,8 20,8 Z M20.00075,14 L20.0015,18.5 L8,18.5 L8,14 L20.00075,14 Z M14,15.5 L9.5,15.5 L9.5,17 L14,17 L14,15.5 Z M20,9.5 L20,11 L8,11 L8,9.5 L20,9.5 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M20,8 L8,8 C7.17275,8 6.5,8.67275 6.5,9.5 L6.5,18.5 C6.5,19.32725 7.17275,20 8,20 L20,20 C20.82725,20 21.5,19.32725 21.5,18.5 L21.5,9.5 C21.5,8.67275 20.82725,8 20,8 Z M20.00075,14 L20.0015,18.5 L8,18.5 L8,14 L20.00075,14 Z M14,15.5 L9.5,15.5 L9.5,17 L14,17 L14,15.5 Z M20,9.5 L20,11 L8,11 L8,9.5 L20,9.5 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/bank.imageset/bank_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>bank_dark</title>
    <g id="bank_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.3 L7,9.53073333 L7,10.60766 L8.07692667,10.60766 L8.07692667,18.68461 L7,18.68461 L7,20.2999767 L21,20.2999767 L21,18.68461 L19.9230733,18.68461 L19.9230733,10.60766 L21,10.60766 L21,9.53073333 L14,6.3 Z M14.8974933,9.53068667 L14.8974933,10.3803583 C15.94096,10.6789083 16.69241,11.4673883 16.69241,12.4012583 L14.8974933,12.4012583 C14.8974933,12.0070417 14.4954483,11.6817167 13.9976667,11.6817167 C13.4998967,11.6817167 13.09784,12.003215 13.09784,12.4012583 C13.09784,12.7993017 13.50468,13.1208 13.9976667,13.1208 C15.4814333,13.1208 16.6923167,14.0852833 16.6923167,15.2756333 C16.6923167,16.2095617 15.94082,16.997995 14.8974,17.2965333 L14.8974,18.146205 L13.1024833,18.146205 L13.1024833,17.2965333 C12.0590167,16.9979833 11.3075667,16.2095033 11.3075667,15.2756333 L13.1024833,15.2756333 C13.1024833,15.66985 13.5045283,15.995175 14.00231,15.995175 C14.50008,15.995175 14.9021367,15.6736767 14.9021367,15.2756333 C14.9021367,14.87759 14.5000917,14.5560917 14.00231,14.5560917 C12.5185433,14.5560917 11.30766,13.5916083 11.30766,12.4012583 C11.30766,11.46733 12.0591567,10.6788967 13.1025767,10.3803583 L13.1025767,9.53068667 L14.8974933,9.53068667 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,6.3 L7,9.53073333 L7,10.60766 L8.07692667,10.60766 L8.07692667,18.68461 L7,18.68461 L7,20.2999767 L21,20.2999767 L21,18.68461 L19.9230733,18.68461 L19.9230733,10.60766 L21,10.60766 L21,9.53073333 L14,6.3 Z M14.8974933,9.53068667 L14.8974933,10.3803583 C15.94096,10.6789083 16.69241,11.4673883 16.69241,12.4012583 L14.8974933,12.4012583 C14.8974933,12.0070417 14.4954483,11.6817167 13.9976667,11.6817167 C13.4998967,11.6817167 13.09784,12.003215 13.09784,12.4012583 C13.09784,12.7993017 13.50468,13.1208 13.9976667,13.1208 C15.4814333,13.1208 16.6923167,14.0852833 16.6923167,15.2756333 C16.6923167,16.2095617 15.94082,16.997995 14.8974,17.2965333 L14.8974,18.146205 L13.1024833,18.146205 L13.1024833,17.2965333 C12.0590167,16.9979833 11.3075667,16.2095033 11.3075667,15.2756333 L13.1024833,15.2756333 C13.1024833,15.66985 13.5045283,15.995175 14.00231,15.995175 C14.50008,15.995175 14.9021367,15.6736767 14.9021367,15.2756333 C14.9021367,14.87759 14.5000917,14.5560917 14.00231,14.5560917 C12.5185433,14.5560917 11.30766,13.5916083 11.30766,12.4012583 C11.30766,11.46733 12.0591567,10.6788967 13.1025767,10.3803583 L13.1025767,9.53068667 L14.8974933,9.53068667 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>children_dark</title>
    <g id="children_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#7F5933"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#802D19"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/children.imageset/children_light.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>children_light</title>
    <g id="children_light" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#9C6136"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.4916069,12.4068343 L17.215814,12.4068343 C15.9971232,12.4068343 15.0006762,13.2537372 14.7609634,14.3838791 C15.757471,14.7010059 16.4764418,15.6254025 16.4764418,16.7240712 C16.4764418,17.2070581 16.336328,17.665886 16.0806774,18.0575117 L16.0416499,18.1124694 L16.0784713,18.1328785 C16.7526866,18.5346787 17.2273964,19.2299207 17.3385166,20.043376 L17.3567032,20.2194334 L17.3623501,20.3887564 L17.362,21.073 L22.004,21.073 L22.0041478,14.9163636 C22.0041478,13.5296391 20.8792516,12.4068343 19.4916069,12.4068343 Z M10.7398398,14.5988166 L8.46443574,14.5988166 C7.06098553,14.5988166 5.95232411,15.7221656 5.95232411,17.1079171 L5.952,21.073 L10.637,21.073 L10.6376499,20.3887564 C10.6376499,19.4380664 11.1417478,18.5947243 11.9142567,18.13405 L11.9546499,18.1104694 L11.9167798,18.0556079 C11.7280184,17.7632492 11.6012609,17.429281 11.5491056,17.0705775 L11.529303,16.8892426 L11.5235582,16.7240712 C11.5235582,16.0775925 11.7724801,15.4914625 12.1823664,15.0532612 C11.7741396,14.7668787 11.2766539,14.5988166 10.7398398,14.5988166 Z M14.7363802,18.7647355 L13.2636198,18.7647355 C12.3552335,18.7647355 11.6376499,19.4918257 11.6376499,20.3887564 L11.637,21.073 L16.362,21.073 L16.3623501,20.3887564 C16.3623501,19.4913492 15.6343829,18.7647355 14.7363802,18.7647355 Z M14,15.2664694 C13.1805943,15.2664694 12.5235582,15.9150816 12.5235582,16.7240712 C12.5235582,17.5330175 13.1805943,18.1816731 14,18.1816731 C14.819449,18.1816731 15.4764418,17.5330608 15.4764418,16.7240712 C15.4764418,15.9151249 14.8194057,15.2664694 14,15.2664694 Z M9.60213775,9.19402109 C8.33616197,9.19402109 7.32104605,10.1961223 7.32104605,11.4460053 C7.32104605,12.6958214 8.33616197,13.6979895 9.60213775,13.6979895 C10.8681805,13.6979895 11.8832295,12.6958883 11.8832295,11.4460053 C11.8832295,10.1961892 10.8681135,9.19402109 9.60213775,9.19402109 Z M18.3537105,7.00111521 C17.0875184,7.00111521 16.072229,8.00338763 16.072229,9.25348422 C16.072229,10.5035139 17.0875184,11.5058532 18.3537105,11.5058532 C19.6199695,11.5058532 20.635192,10.5035808 20.635192,9.25348422 C20.635192,8.00345456 19.6199026,7.00111521 18.3537105,7.00111521 Z" id="Shape" fill="#EB785D"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/eat.imageset/eat_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>eat_dark</title>
    <g id="eat_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 Z M8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 Z" id="Shape" fill="#BB9342"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8333333,7.000455 C17.3903333,7.000455 16.275,8.69912167 16.3333333,10.0337883 L16.3333333,14.9337883 L18.0833333,14.933345 L18.0833333,20.130845 C18.0833333,20.6108933 18.4717167,21.0000467 18.9583333,21.0000467 C19.4415783,21.0000467 19.8333333,20.6109983 19.8333333,20.1242883 L19.8333333,7.000455 Z M8.93001083,7 L8.86167333,7 C8.47784,7 8.16667833,7.32498667 8.16667833,7.70257833 L8.16667833,11.1416783 C8.16667833,12.749345 9.62501167,14.0000117 11.0104283,14.0000117 L10.8211833,20.055945 C10.8048897,20.5773283 11.2048417,21 11.7169383,21 L11.9080967,21 C12.4190967,21 12.815985,20.58308 12.7940167,20.055945 L12.54169,14.0000117 C14.0000233,14.0000117 15.7500233,12.749345 15.4583567,11.1416783 L15.4583567,7.70257833 C15.4583567,7.31455667 15.149085,7 14.7633617,7 L14.6950242,7 C14.3111908,7 14.0000292,7.32498667 14.0000292,7.70257833 L14.0000292,11.1416783 L12.5416958,11.1416783 L12.5416667,7.70257833 C12.5416667,7.31455667 12.232395,7 11.8466717,7 L11.7783342,7 C11.3945008,7 11.0833392,7.32498667 11.0833392,7.70257833 L11.0833392,11.1416783 L9.62500583,11.1416783 L9.62500583,7.70257833 C9.62500583,7.31455667 9.31573417,7 8.93001083,7 Z" id="Shape" fill="#8C491C"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>entertainment_dark</title>
    <g id="entertainment_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#7F5933"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#802D19"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/entertainment.imageset/entertainment_light.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>entertainment_light</title>
    <g id="entertainment_light" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#9C6136"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.8166667,12.2166667 L5.83333333,12.2166667 L5.83333333,17.525 C5.83333333,20.0076667 7.84233333,22.0166667 10.325,22.0166667 C12.8076667,22.0166667 14.8166667,20.0076667 14.8166667,17.525 L14.8166667,12.2166667 Z M12.3666667,17.9333333 C12.3666667,18.6111667 11.452,19.1583333 10.325,19.1583333 C9.198,19.1583333 8.28333333,18.6111667 8.28333333,17.9333333 Z M22.1666667,6.5 L13.1833333,6.5 L13.1833333,11.4 L15.6333333,11.4 L15.6333333,15.8018333 C16.2458333,16.1121667 16.94,16.3 17.675,16.3 C20.1576667,16.3 22.1666667,14.291 22.1666667,11.8083333 L22.1666667,6.5 Z M12.3666667,14.6666667 C12.8158333,14.6666667 13.1833333,15.0341667 13.1833333,15.4833333 C13.1833333,15.9325 12.8158333,16.3 12.3666667,16.3 C11.9175,16.3 11.55,15.9325 11.55,15.4833333 C11.55,15.0341667 11.9175,14.6666667 12.3666667,14.6666667 Z M8.28333333,14.6666667 C8.7325,14.6666667 9.1,15.0341667 9.1,15.4833333 C9.1,15.9325 8.7325,16.3 8.28333333,16.3 C7.83416667,16.3 7.46666667,15.9325 7.46666667,15.4833333 C7.46666667,15.0341667 7.83416667,14.6666667 8.28333333,14.6666667 Z M17.675,12.2166667 C18.802,12.2166667 19.7166667,12.7638333 19.7166667,13.4416667 L15.6333333,13.4416667 C15.6333333,12.7638333 16.548,12.2166667 17.675,12.2166667 Z M15.6333333,9.01533333 C16.0825,9.01533333 16.45,9.38283333 16.45,9.832 C16.45,10.2893333 16.0825,10.6486667 15.6333333,10.6486667 C15.1841667,10.6486667 14.8166667,10.2811667 14.8166667,9.832 C14.8166667,9.38283333 15.1841667,9.01533333 15.6333333,9.01533333 Z M19.7166667,9.01533333 C20.1658333,9.01533333 20.5333333,9.38283333 20.5333333,9.832 C20.5333333,10.2893333 20.1658333,10.6486667 19.7166667,10.6486667 C19.2675,10.6486667 18.9,10.2811667 18.9,9.832 C18.9,9.38283333 19.2675,9.01533333 19.7166667,9.01533333 Z" id="Shape" fill="#EB785D"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/food.imageset/food_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>food_dark</title>
    <g id="food_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z M8.90007,7 L7.37395333,7 C7.08872083,7 6.85200463,7.20231505 6.80751372,7.48998439 L6.804,7.537 L6.80787378,7.58356913 C6.8544439,7.86337323 7.1015005,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.59784491,14.5385077 9.0212948,15.2360993 8.95940083,16.1271425 L8.958,16.146 L8.95971279,16.1648718 C9.03286093,17.0630882 9.78722142,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.102542,17.769311 19.3464707,17.566996 19.392316,17.2793266 L19.396,17.231 L19.3921743,17.1857465 C19.3455447,16.9059424 19.0981857,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.3256492,16.6923913 10.083977,16.4900763 10.0385558,16.2024069 L10.034,16.154 L10.0386773,16.1088269 C10.0847592,15.8290228 10.3291352,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 Z" id="Shape" fill="#8C5F93"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M11.3735667,18.307716 C10.6313217,18.307716 10.0307333,18.9134843 10.0307333,19.653816 C10.0307333,20.394206 10.631275,20.999916 11.3735667,20.999916 C12.1158117,20.999916 12.72305,20.3941477 12.72305,19.653816 C12.72305,18.913426 12.115765,18.307716 11.3735667,18.307716 Z M17.8350333,18.307716 C17.0927883,18.307716 16.4922,18.9134843 16.4922,19.653816 C16.4922,20.394206 17.0927417,20.999916 17.8350333,20.999916 C18.577325,20.999916 19.1845167,20.3941477 19.1845167,19.653816 C19.1845167,18.913426 18.5772317,18.307716 17.8350333,18.307716 Z M8.90007,7 L7.37395333,7 C7.08872083,7 6.85200463,7.20231505 6.80751372,7.48998439 L6.804,7.537 L6.80787378,7.58356913 C6.8544439,7.86337323 7.1015005,8.07692433 7.38562,8.07692433 L8.2,8.07692433 L10.3,14.5385077 C9.59784491,14.5385077 9.0212948,15.2360993 8.95940083,16.1271425 L8.958,16.146 L8.95971279,16.1648718 C9.03286093,17.0630882 9.78722142,17.769311 10.7023833,17.769311 L18.8085,17.769311 C19.102542,17.769311 19.3464707,17.566996 19.392316,17.2793266 L19.396,17.231 L19.3921743,17.1857465 C19.3455447,16.9059424 19.0981857,16.6923913 18.8139717,16.6923913 L10.6169717,16.6923913 C10.3256492,16.6923913 10.083977,16.4900763 10.0385558,16.2024069 L10.034,16.154 L10.0386773,16.1088269 C10.0847592,15.8290228 10.3291352,15.6154717 10.6084667,15.6154717 L18.0620667,15.6154717 C19.2169033,15.6154717 19.113315,15.3197567 19.2870667,14.969325 L20.7161167,10.1360583 C20.7721167,10.0380583 20.8001167,9.91905833 20.8001167,9.80005833 C20.8001167,9.41505833 20.4851167,9.10005833 20.2616533,9.1539 L9.74707,9.1539 L8.90007,7 Z" id="Shape" fill="#6B425C"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>fuel_dark</title>
    <g id="fuel_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.8453474,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z M13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L13.2988474,7.77816667 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.8453474,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z M13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L13.2988474,7.77816667 Z" id="Shape" fill="#574469"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/fuel.imageset/fuel_light.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>fuel_light</title>
    <g id="fuel_light" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.8453474,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z M13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L13.2988474,7.77816667 Z" id="Shape" fill="#747E86"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.8453474,4.676 C17.5575662,4.7216586 17.3186367,4.92551065 17.2280519,5.20366514 C17.1374671,5.48181964 17.2105329,5.78727723 17.4171807,5.99433333 L19.428514,8.00566667 C19.799514,8.37666667 20.062014,8.83516667 20.1973474,9.33333333 L19.523014,9.33333333 C18.2431807,9.33333333 17.1896807,10.3868333 17.1896807,11.6666667 C17.1896807,12.9465 18.2431807,14 19.523014,14 L20.300007,14 L20.300007,19.4448333 C20.300007,19.8835 19.9616807,20.2218333 19.523014,20.2218333 C19.315878,20.2250062 19.1162779,20.1442015 18.9696836,19.997827 C18.8230893,19.8514525 18.7419852,19.6519738 18.7448474,19.4448333 L18.7448474,17.8885 C18.7448474,16.6098333 17.6913474,15.5551667 16.411514,15.5551667 L15.6333474,15.5551667 L15.6333474,7.77816667 C15.6345903,7.36522389 15.4711795,6.96881891 15.1792931,6.67671349 C14.8874066,6.38460807 14.4911243,6.22090001 14.0781807,6.22183333 L7.85634735,6.22183333 C7.44320185,6.22058891 7.04661893,6.38415963 6.75447962,6.67629894 C6.46234031,6.96843825 6.2987696,7.36502117 6.30000697,7.77816667 L6.30000697,20.2218333 C6.2987696,20.6349788 6.46234031,21.0315618 6.75447962,21.3237011 C7.04661893,21.6158404 7.44320185,21.7794111 7.85634735,21.7781737 L14.0781807,21.7781737 C14.4911243,21.7791 14.8874066,21.6153919 15.1792931,21.3232865 C15.4711795,21.0311811 15.6345903,20.6347761 15.6333474,20.2218333 L15.6333474,17.1115 L16.411514,17.1115 C16.8501807,17.1115 17.1896807,17.4498333 17.1896807,17.8885 L17.1896807,19.4448333 C17.1896807,20.7235 18.2431807,21.7781737 19.523014,21.7781737 C20.8016807,21.7781737 21.8563474,20.7235 21.8563474,19.4448333 L21.8563474,10.1115 C21.8563474,8.90940677 21.3788136,7.75655029 20.5286807,6.90666667 L18.5173474,4.89416667 C18.3411731,4.71808596 18.0913541,4.63698153 17.8453474,4.676 Z M19.523014,10.5 C20.1673462,10.5 20.6896807,11.0223345 20.6896807,11.6666667 C20.6896807,12.3109989 20.1673462,12.8333333 19.523014,12.8333333 C18.8786818,12.8333333 18.3563474,12.3109989 18.3563474,11.6666667 C18.3563474,11.0223345 18.8786818,10.5 19.523014,10.5 Z M13.2988474,7.77816667 C13.730514,7.77816667 14.077014,8.12466667 14.077014,8.55516667 L14.077014,12.4448333 L7.85634735,12.4448333 L7.85634735,8.55516667 C7.85634735,8.12466667 8.20284735,7.77816667 8.63334735,7.77816667 L13.2988474,7.77816667 Z" id="Shape" fill="#AA96BC"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hospital.imageset/hospital_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>hospital_dark</title>
    <g id="hospital_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M15.6847133,5.44442889 L12.3142911,5.44442889 C11.5300267,5.44442889 10.88836,6.08609556 10.88836,6.87036 L10.88836,10.8888267 L6.86973778,10.8888267 C6.08550444,10.8888267 5.44383778,11.5304933 5.44383778,12.3147578 L5.44383778,15.68518 C5.44383778,16.4694444 6.08547333,17.1111111 6.86973778,17.1111111 L10.88836,17.1111111 L10.88836,21.1295778 C10.88836,21.9138422 11.5300267,22.5555089 12.3142911,22.5555089 L15.6847133,22.5555089 C16.4689778,22.5555089 17.1106444,21.9138422 17.1106444,21.1295778 L17.1106444,17.1111111 L21.1291111,17.1111111 C21.9133756,17.1111111 22.5550422,16.4694444 22.5550422,15.68518 L22.5550422,12.3147578 C22.5550422,11.5304933 21.9133756,10.8888267 21.1291111,10.8888267 L17.1106444,10.8888267 L17.1106444,6.87036 C17.1106444,6.08609556 16.4689778,5.44442889 15.6847133,5.44442889 Z" id="Shape" fill="#C15746"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M15.6847133,5.44442889 L12.3142911,5.44442889 C11.5300267,5.44442889 10.88836,6.08609556 10.88836,6.87036 L10.88836,10.8888267 L6.86973778,10.8888267 C6.08550444,10.8888267 5.44383778,11.5304933 5.44383778,12.3147578 L5.44383778,15.68518 C5.44383778,16.4694444 6.08547333,17.1111111 6.86973778,17.1111111 L10.88836,17.1111111 L10.88836,21.1295778 C10.88836,21.9138422 11.5300267,22.5555089 12.3142911,22.5555089 L15.6847133,22.5555089 C16.4689778,22.5555089 17.1106444,21.9138422 17.1106444,21.1295778 L17.1106444,17.1111111 L21.1291111,17.1111111 C21.9133756,17.1111111 22.5550422,16.4694444 22.5550422,15.68518 L22.5550422,12.3147578 C22.5550422,11.5304933 21.9133756,10.8888267 21.1291111,10.8888267 L17.1106444,10.8888267 L17.1106444,6.87036 C17.1106444,6.08609556 16.4689778,5.44442889 15.6847133,5.44442889 Z" id="Shape" fill="#983E44"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/hotel.imageset/hotel_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>hotel_dark</title>
    <g id="hotel_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 Z M10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 Z" id="Shape" fill="#664E42"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M6.57584667,8.16671333 C6.16751333,8.16671333 5.83342667,8.5008 5.83342667,8.90913333 L5.83342667,18.5606167 C5.83342667,18.96895 6.16751333,19.3030367 6.57584667,19.3030367 C6.98418,19.3030367 7.31826667,18.96895 7.31826667,18.5606167 L7.31826667,17.0758 L20.6824333,17.0758 L20.6824333,18.5606167 C20.6824333,18.96895 21.01652,19.3030367 21.4248533,19.3030367 C21.8331867,19.3030367 22.1672733,18.96895 22.1672733,18.5606167 L22.1672733,12.6212333 C22.1672733,10.9804333 20.8383233,9.65148333 19.1975233,9.65148333 L14.7424667,9.6516 C13.9258,9.6516 13.25765,10.319785 13.25765,11.1364167 L13.25765,14.8485167 L7.31826667,14.8485167 L7.31826667,8.90913333 C7.31826667,8.5008 6.98418,8.16671333 6.57584667,8.16671333 Z M10.2879,9.6516 C9.05543333,9.6516 8.06061667,10.6464517 8.06061667,11.8788833 C8.06061667,13.11135 9.05546833,14.1061667 10.2879,14.1061667 C11.5203667,14.1061667 12.5151833,13.111315 12.5151833,11.8788833 C12.5151833,10.6464167 11.5203317,9.6516 10.2879,9.6516 Z" id="Shape" fill="#614A43"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/nightlife.imageset/nightlife_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>nightlife_dark</title>
    <g id="nightlife_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 Z M18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 Z" id="Shape" fill="#BB9342"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M19.8722183,7.3 L8.127385,7.3 C7.50516667,7.3 6.99960333,7.80555167 6.99960333,8.42778167 C6.99960333,8.7 7.10071483,8.97223 7.287385,9.17444833 L13.2218683,15.8555983 L13.2218683,19.7444483 L10.1107183,19.7444483 C9.68293667,19.7444483 9.33293667,20.0944483 9.33293667,20.52223 C9.33293667,20.9500117 9.68293667,21.3000117 10.1107183,21.3000117 L17.888535,21.3000117 C18.3163167,21.3000117 18.6663167,20.9500117 18.6663167,20.52223 C18.6663167,20.0944483 18.3163167,19.7444483 17.888535,19.7444483 L14.777385,19.7444483 L14.777385,15.8555983 L20.7118683,9.17444833 C20.898535,8.97223 20.99965,8.7 20.99965,8.42778167 C21,7.80556333 20.4944483,7.3 19.8722183,7.3 Z M18.93885,8.85559833 L17.5543667,10.411115 L10.4455167,10.411115 L9.06885,8.85559833 L18.93885,8.85559833 Z" id="Shape" fill="#8C491C"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/parking.imageset/parking_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>parking_dark</title>
    <g id="parking_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 Z M14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 L14.5565292,8.60425301 Z" id="Shape" fill="#2E89B0"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.6982667,5.7 L9.3502875,5.7002873 L9.35,22.3 L13.1840042,22.3 L13.1840042,16.379733 L14.4487167,16.379733 C16.4953333,16.379733 18.0936417,15.9233039 19.1939042,14.9897598 C20.3178375,14.0448193 20.85,12.6687324 20.85,10.8925278 C20.85,9.17330503 20.3522033,7.86253173 19.3111083,6.99727004 C18.2581875,6.12060241 16.709425,5.7 14.6982667,5.7 Z M14.5565292,8.60425301 C15.5029792,8.60425301 16.17755,8.78662355 16.6154125,9.17371683 C17.0649667,9.57220647 17.2884404,10.1637639 17.2884404,10.9949323 C17.2884404,11.8032888 17.0518663,12.4290544 16.5076479,12.8616374 C15.9752746,13.282891 15.1586979,13.5329885 14.0820104,13.5329885 L13.1840042,13.5329885 L13.1840042,8.60425301 L14.5565292,8.60425301 Z" id="Shape" fill="#20607C"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/pharmacy.imageset/pharmacy_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>pharmacy_dark</title>
    <g id="pharmacy_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M16.9608565,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 L7.3014167,18.4048176 C7.3907637,18.6062479 7.77130229,19.4349094 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 L9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 Z M16.96,8.398 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5119045,8.71989894 16.0723674,8.44977511 16.753187,8.40486353 L16.96,8.398 Z" id="Shape" fill="#C15746"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M16.9608565,6.99999417 C15.9026933,6.99999417 14.84875,7.41071333 14.0726833,8.17973333 L8.2299,13.9907833 C7.02531667,15.1842833 6.69806667,16.9171333 7.28183167,18.3600667 L7.3014167,18.4048176 C7.3907637,18.6062479 7.77130229,19.4349094 8.14171167,19.80195 C8.54021,20.1968083 9.021355,20.4748717 9.508695,20.675795 C9.64324667,20.7452082 9.744875,20.770512 9.86146,20.80687 L9.9055565,20.8287158 C11.3082398,21.2432442 12.8732065,20.907362 13.9403565,19.8019442 L17.4680065,16.3064942 L19.7830232,13.9907775 C21.4057398,12.3828775 21.4057398,9.80501083 19.7830232,8.26711083 C19.0774815,7.42821917 18.0191398,6.99999417 16.9608565,6.99999417 Z M16.96,8.398 C17.6665417,8.39813333 18.3852667,8.67339667 18.8792333,9.162755 C19.3732,9.65211333 19.6509133,10.364305 19.6509133,11.0633717 C19.6509133,11.76245 19.3731067,12.452755 18.8792333,12.9421717 L16.4760167,15.323455 L12.6658,11.523155 L14.9987833,9.22832167 C15.5119045,8.71989894 16.0723674,8.44977511 16.753187,8.40486353 L16.96,8.398 Z" id="Shape" fill="#983E44"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/police.imageset/police_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>police_dark</title>
    <g id="police_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 Z M14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5.833275 L7.31815,8.803025 L7.31815,13.2575917 C7.31815,17.378025 10.1690167,21.231175 14,22.166725 C17.8308667,21.2312683 20.68185,17.3781417 20.68185,13.2575917 L20.68185,8.803025 L14,5.833275 Z M14.00007,9.560355 L15.1434033,12.2628217 L18.0834033,12.5152417 L15.85612,14.4381417 L16.524235,17.3186417 L14.000035,15.796725 L11.475835,17.3186417 L12.14402,14.4454917 L9.91673667,12.5225917 L12.8567367,12.2701717 L14.00007,9.560355 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/post.imageset/post_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>post_dark</title>
    <g id="post_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,28 C21.7319865,28 28,21.7319865 28,14 C28,6.2680135 21.7319865,0 14,0 C6.2680135,0 0,6.2680135 0,14 C0,21.7319865 6.2680135,28 14,28 Z M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,28 C21.7319865,28 28,21.7319865 28,14 C28,6.2680135 21.7319865,0 14,0 C6.2680135,0 0,6.2680135 0,14 C0,21.7319865 6.2680135,28 14,28 Z M20.5333333,7 C21.4316667,7 22.1666667,7.735 22.1666667,8.63333333 L22.1666667,18.4333333 C22.1666667,19.3316667 21.4316667,20.0666667 20.5333333,20.0666667 L7.46666667,20.0666667 C6.56833333,20.0666667 5.83333333,19.3316667 5.83333333,18.4333333 L5.8415,8.63333333 C5.8415,7.735 6.56833333,7 7.46666667,7 L20.5333333,7 Z M20.5333333,9.88283333 C20.5333333,9.33566667 19.9371667,9.009 19.4716667,9.29483333 L14,12.7166667 L8.52833333,9.29483333 C8.06283333,9.009 7.46666667,9.33566667 7.46666667,9.88283333 C7.46666667,10.1196667 7.58916667,10.3401667 7.79333333,10.4708333 L13.5671667,14.0805 C13.8285,14.2438333 14.1715,14.2438333 14.4328333,14.0805 L20.2066667,10.4708333 C20.4108333,10.3401667 20.5333333,10.1196667 20.5333333,9.88283333 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/recycling.imageset/recycling_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>recycling_dark</title>
    <g id="recycling_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 Z M12.6855408,17.8427583 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 Z M9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L10.9451262,16.5394327 L9.83609613,12.0952009 Z M20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L20.8778628,12.4272676 Z M15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 Z M12.6455913,6.56634591 C12.3298444,6.04016587 11.5688972,6.04016587 11.2531868,6.56634591 L10.4193833,7.95061481 L9.26178239,9.86916295 L12.0384558,11.5367213 L12.8479738,10.2253086 L13.843676,8.5577503 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.5427097,16.2238072 L14.3046133,19.4619036 L17.5427097,22.7 L17.5427461,21.0808911 L18.7570171,21.0808911 C19.3722518,21.0808911 19.9308164,20.732796 20.2060066,20.1823306 L21.379806,17.8427947 L17.5427097,17.8427947 L17.5427097,16.2238072 Z M12.6855408,17.8427583 L9.20471166,17.8427947 L8.52471991,18.9842094 C8.28186572,19.3889623 8.26567949,19.8908691 8.47614908,20.3199075 C8.70281704,20.7813304 9.18042624,21.0808547 9.70656985,21.0808547 L12.6855408,21.0808547 L12.6855408,17.8427583 Z M9.83609613,12.0952009 L5.4,13.204231 L6.77613329,14.0299353 L6.44423661,14.5884999 C6.16091076,15.0661091 6.13662534,15.6489592 6.38757022,16.1427668 L7.70711848,18.7817419 L9.54467474,15.6974936 L10.9451262,16.5394327 L9.83609613,12.0952009 Z M20.8778628,12.4272676 L18.0769039,14.0462551 L19.8658893,17.0333617 L20.7806361,17.0333617 C21.3958708,17.0333617 21.9544354,16.6852666 22.2296256,16.1348011 C22.3429572,15.9081332 22.3996236,15.665279 22.3996236,15.4143378 C22.3996236,15.1229127 22.3186718,14.8395869 22.1729556,14.5805343 L20.8778628,12.4272676 Z M15.9236736,5.7 L13.0661298,5.7 L15.5918134,9.90951317 L14.1994089,10.7433166 L18.6436406,11.8523467 L19.7526707,7.40811497 L18.3684018,8.24191842 L17.3160782,6.48523261 C17.0165539,5.99952422 16.4903739,5.7 15.9236736,5.7 Z M12.6455913,6.56634591 C12.3298444,6.04016587 11.5688972,6.04016587 11.2531868,6.56634591 L10.4193833,7.95061481 L9.26178239,9.86916295 L12.0384558,11.5367213 L12.8479738,10.2253086 L13.843676,8.5577503 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/rv.imageset/rv_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>rv_dark</title>
    <g id="rv_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z M16.04414,7.43983333 L8.33772333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 Z M16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.8097067,10.684625 Z M10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 L10.9944917,9.60225 Z" id="Shape" fill="#717065"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M10.4111583,17.0581247 C9.94104172,17.0578394 9.49008616,17.2490609 9.15757567,17.5896894 C8.82506518,17.9303179 8.63829167,18.3924263 8.63829167,18.874275 C8.63829167,19.3561237 8.82506518,19.8182321 9.15757567,20.1588606 C9.49008616,20.4994891 9.94104172,20.6907106 10.4111583,20.6904253 C11.3892489,20.6896989 12.1817548,19.8767746 12.1816917,18.874275 C12.1817548,17.8717754 11.3892489,17.0588511 10.4111583,17.0581247 Z M16.04414,7.43983333 L8.33772333,7.43983333 C6.95648333,7.43983333 5.83333333,8.590085 5.83333333,10.0056833 L5.83333333,16.9397667 C5.83333333,18.0495583 6.52384833,18.99765 7.48766667,19.3551167 C7.45779982,19.1965237 7.44027578,19.0357487 7.43526,18.87431 C7.43522971,18.0654358 7.74879599,17.2897014 8.30693531,16.7178646 C8.86507462,16.1460278 9.62203578,15.8249626 10.4111933,15.8253433 C12.0537082,15.8258056 13.3849729,17.1907579 13.38491,18.87431 C13.3830282,19.0874192 13.3593515,19.2997388 13.3142683,19.5077867 L23.3312683,19.5077867 C23.6679333,19.5077867 23.9419483,19.2262233 23.9419483,18.8811467 C23.9419483,18.53607 23.6679217,18.2567933 23.3312683,18.2567933 L21.4741683,18.2567933 C21.6999883,17.87135 21.82964,17.4210517 21.82964,16.9397433 L21.82964,13.3690433 C21.82964,10.09841 19.2349733,7.43983333 16.04414,7.43983333 Z M16.8097067,10.684625 C18.2658233,10.684625 19.4484733,11.8992417 19.4484733,13.3916417 L19.4484733,18.2566417 L18.2294233,18.2566417 L18.2294233,13.3916417 C18.2294233,12.5883683 17.5935433,11.9333083 16.8098233,11.9333083 L16.6480417,11.9333083 C15.8643567,11.9333083 15.2284417,12.5883683 15.2284417,13.3916417 L15.2284417,18.2566417 L14.0070583,18.2566417 L14.0070583,13.3916417 C14.0070583,11.8992417 15.191925,10.684625 16.6480417,10.684625 L16.8097067,10.684625 Z M10.9944917,9.60225 C11.3312033,9.60225 11.6051833,9.88155 11.6051833,10.226615 L11.6051833,12.391365 C11.6051833,12.7364417 11.3311567,13.0157183 10.9944917,13.0157183 L8.88445833,13.0157183 C8.54779333,13.0157183 8.27376667,12.7364183 8.27376667,12.391365 L8.27376667,10.226615 C8.27376667,9.88153833 8.54779333,9.60225 8.88445833,9.60225 L10.9944917,9.60225 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/secondhand.imageset/secondhand_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>secondhand_dark</title>
    <g id="secondhand_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 Z M15.1712055,10.755785 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 Z M13.4348333,10.5097117 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z" id="Shape" fill="#8C5F93"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14,5 C11.853286,5 10.110286,6.743 10.110286,8.88966667 L8.55628597,8.88966667 C7.7007343,8.88966667 7.00683597,9.58815 7.00683597,10.4436667 L7,19.777 C7,20.6325517 7.70075833,21.3333333 8.55633333,21.3333333 L19.4436667,21.3333333 C20.2992183,21.3333333 21,20.632575 21,19.777 L21,10.4436667 C21,9.588115 20.2992417,8.88966667 19.4436667,8.88966667 L17.8896667,8.88966667 C17.8896667,6.743 16.1466667,5 14,5 Z M15.1712055,10.755785 L18.1174926,10.917695 C18.2026243,10.9225973 18.2769698,10.9769641 18.3074479,11.056604 C18.3379261,11.1362439 18.3188721,11.2263546 18.2587643,11.28684 L17.4612426,12.0911983 C19.032976,13.9128317 18.980126,16.6660483 17.2652776,18.3938817 C16.5080141,19.1533467 15.5524325,19.5913483 14.5674158,19.7109317 C14.5073745,19.7178895 14.4471553,19.6994585 14.4012937,19.6600875 C14.3554321,19.6207164 14.3280949,19.5639825 14.3258808,19.50358 L14.2894225,18.3938817 C14.2860376,18.284078 14.365342,18.1891081 14.4739891,18.1728567 C15.0982141,18.0784745 15.6977058,17.7894083 16.1783725,17.3046933 C17.3022143,16.1759783 17.357351,14.4000433 16.378891,13.1802933 L15.3193243,14.2466967 C15.2573387,14.3080127 15.1646455,14.3262151 15.0840755,14.2928932 C15.0035055,14.2595713 14.9507475,14.1812135 14.9501793,14.0940267 L14.9433438,10.97226 C14.9433358,10.9128424 14.9677222,10.8560271 15.0107993,10.8151026 C15.0538765,10.7741781 15.1118662,10.7527337 15.1712055,10.755785 Z M13.4348333,10.5097117 C13.4948839,10.5028588 13.5551031,10.5212898 13.6009647,10.5606609 C13.6468264,10.6000319 13.6741635,10.6567658 13.6763776,10.7171683 L13.7151145,11.8291533 C13.7184994,11.938957 13.6391949,12.0339269 13.5305478,12.0501783 C12.9058678,12.1446293 12.3049645,12.4314333 11.8238311,12.9160667 C10.7022678,14.04575 10.6473645,15.8238667 11.6255911,17.0426833 L12.6851578,15.97628 C12.7471434,15.914964 12.8398366,15.8967615 12.9204066,15.9300834 C13.0009766,15.9634054 13.0537346,16.0417631 13.0543028,16.12895 L13.0611383,19.2483833 C13.0611463,19.307801 13.0367599,19.3646163 12.9936828,19.4055408 C12.9506056,19.4464653 12.8926159,19.4679097 12.8332766,19.4648583 L9.88697663,19.3053517 C9.80143518,19.3012871 9.72630824,19.2472336 9.69526871,19.1674188 C9.66422918,19.0876039 9.68309816,18.996996 9.7434183,18.9362067 L10.54094,18.1295617 C8.97060663,16.3068783 9.02648997,13.5555283 10.7414666,11.829095 C11.495705,11.069245 12.4494666,10.629295 13.4348333,10.5097117 Z M13.9999526,6.55633333 C15.2911026,6.55633333 16.333286,7.59855167 16.333286,8.88966667 L11.6666193,8.88966667 C11.6666193,7.59851667 12.7088376,6.55633333 13.9999526,6.55633333 Z" id="Shape" fill="#6B425C"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/shopping.imageset/shopping_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>shopping_dark</title>
    <g id="shopping_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 Z M11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z" id="Shape" fill="#8C5F93"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M14.0000195,5 C11.8533528,5 10.1111695,6.74218333 10.1111695,8.88885 L8.55565282,8.88885 C7.70010115,8.88885 7.00783615,9.58885 7.00783615,10.4443667 L7.00005833,19.7777 C7.00005833,20.6332517 7.70005833,21.3332167 8.555575,21.3332167 L19.444425,21.3332167 C20.2999767,21.3332167 20.9999417,20.6332167 20.9999417,19.7777 L20.9999417,10.4443667 C20.9999417,9.588815 20.2999417,8.88885 19.444425,8.88885 L17.8888695,8.88885 C17.8888695,6.74218333 16.1466861,5 14.0000195,5 Z M11.6665695,10.4444833 C11.6665695,11.7356333 12.7087878,12.7778167 13.9999028,12.7778167 C15.2910178,12.7778167 16.3332362,11.7355983 16.3332362,10.4444833 L17.8887528,10.4444833 C17.8887528,12.59115 16.1465695,14.3333333 13.9999028,14.3333333 C11.8532362,14.3333333 10.1110528,12.59115 10.1110528,10.4444833 L11.6665695,10.4444833 Z M13.9999028,6.55551667 C15.2910528,6.55551667 16.3332362,7.597735 16.3332362,8.88885 L11.6665695,8.88885 C11.6665695,7.5977 12.7087878,6.55551667 13.9999028,6.55551667 Z" id="Shape" fill="#6B425C"></path>
    </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Search/Categories/toilet.imageset/toilet_dark.svg
@@ -2,6 +2,6 @@
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>toilet_dark</title>
    <g id="toilet_dark" stroke="none" fill="none" fill-rule="evenodd">
-        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.98185,9.26938333 C16.7091683,9.26938333 16.3909833,10.5257667 16.3909833,10.5257667 L14.1637,17.43605 L16.7091333,17.43605 L16.7091333,21.83345 L19.2545667,21.83345 L19.2545667,17.43605 L21.8,17.43605 L19.5727167,10.5257667 C19.5727167,10.5257667 19.2545317,9.26938333 17.98185,9.26938333 Z M11.1388833,9.26938333 L9.55198333,9.26938333 C8.57319667,9.26938333 7.8,10.0528233 7.8,11.0192667 L7.8,15.5514167 L9.07271667,15.5514167 L9.07271667,21.83345 L11.61815,21.83345 L11.61815,15.5514167 L12.8908667,15.5514167 L12.8908667,11.0192667 C12.8908667,10.05231 12.1064817,9.26938333 11.1388833,9.26938333 Z M10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 Z M18.0853333,5.50011667 C17.1690567,5.50011667 16.4343833,6.19904333 16.4343833,7.07068333 C16.4343833,7.94237 17.1690567,8.64125 18.0853333,8.64125 C19.00161,8.64125 19.7362833,7.94232333 19.7362833,7.07068333 C19.7362833,6.19899667 19.00161,5.50011667 18.0853333,5.50011667 Z" id="Shape" fill="#7F5933"></path>
+        <path d="M14,0 C21.7319865,0 28,6.2680135 28,14 C28,21.7319865 21.7319865,28 14,28 C6.2680135,28 0,21.7319865 0,14 C0,6.2680135 6.2680135,0 14,0 Z M17.98185,9.26938333 C16.7091683,9.26938333 16.3909833,10.5257667 16.3909833,10.5257667 L14.1637,17.43605 L16.7091333,17.43605 L16.7091333,21.83345 L19.2545667,21.83345 L19.2545667,17.43605 L21.8,17.43605 L19.5727167,10.5257667 C19.5727167,10.5257667 19.2545317,9.26938333 17.98185,9.26938333 Z M11.1388833,9.26938333 L9.55198333,9.26938333 C8.57319667,9.26938333 7.8,10.0528233 7.8,11.0192667 L7.8,15.5514167 L9.07271667,15.5514167 L9.07271667,21.83345 L11.61815,21.83345 L11.61815,15.5514167 L12.8908667,15.5514167 L12.8908667,11.0192667 C12.8908667,10.05231 12.1064817,9.26938333 11.1388833,9.26938333 Z M10.3454333,5.5 C9.46252333,5.5 8.75456667,6.19888 8.75456667,7.07056667 C8.75456667,7.94220667 9.46252333,8.64113333 10.3454333,8.64113333 C11.22839,8.64113333 11.9363,7.94225333 11.9363,7.07056667 C11.9363,6.19892667 11.2283433,5.5 10.3454333,5.5 Z M18.0853333,5.50011667 C17.1690567,5.50011667 16.4343833,6.19904333 16.4343833,7.07068333 C16.4343833,7.94237 17.1690567,8.64125 18.0853333,8.64125 C19.00161,8.64125 19.7362833,7.94232333 19.7362833,7.07068333 C19.7362833,6.19899667 19.00161,5.50011667 18.0853333,5.50011667 Z" id="Shape" fill="#51585E"></path>
    </g>
 </svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
map-per	762797684e	[fdroid] Release version 2025.11.19-2 Signed-off-by: map-per <map-per@gmx.de>	2025-11-19 09:40:04 +01:00
map-per	07cd1ec4f5	Release notes for 2nd November release Signed-off-by: map-per <map-per@gmx.de>	2025-11-19 08:17:11 +01:00
Yannik Bloscheck	9b42b08673	[translations] Fixed wrong German search category labels in the interface Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 21:29:15 +01:00
Jean-Baptiste	47efaa77d3	[android] Update colors of categories Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-18 19:19:10 +01:00
Codeberg Translate	ec14b3bb85	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Linus_W_Frische <linus_w_frische@noreply.codeberg.org> Co-authored-by: Weicat <weicat@noreply.codeberg.org> Co-authored-by: prashere <prashere@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Apple AppStore description Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types	2025-11-18 17:17:14 +01:00
map-per	1612e6045f	[planet] Update map data to 251116 Signed-off-by: map-per <map-per@gmx.de>	2025-11-18 17:13:42 +01:00
Yannik Bloscheck	d20144d4f6	[styles] Fix recycling centres not appearing right Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 16:50:56 +01:00
Yannik Bloscheck	06ecf4e54a	[styles] Fix background for service bridges at zoom level 15 Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 15:35:29 +01:00
Codeberg Translate	0bf9dad343	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Linus_W_Frische <linus_w_frische@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: demode <demode@noreply.codeberg.org> Co-authored-by: dobridabar <dobridabar@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Countries and regions names Translation: CoMaps/iOS - Map Feature Types	2025-11-18 14:17:05 +00:00
Yannik Bloscheck	12bd86d26d	[ios] Match search category colors to map Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-18 15:16:54 +01:00
map-per	5564c449b3	[styles] Adjust sand colors Signed-off-by: map-per <map-per@gmx.de>	2025-11-18 14:04:23 +01:00
NoelClick	96782ad5b1	[android] Fix crash for 24/7 places in Place Page opening-hours display Signed-off-by: NoelClick <dev@noel.click> Co-authored-by: NoelClick <dev@noel.click> Co-committed-by: NoelClick <dev@noel.click>	2025-11-18 12:40:57 +01:00
map-per	67938cdf31	[styles] Fix vehicle style after icon renaming Signed-off-by: map-per <map-per@gmx.de>	2025-11-18 12:28:00 +01:00
x7z4w	0e5fa5c501	nit Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-18 12:04:02 +01:00
Codeberg Translate	101faeb2aa	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-11-17 21:05:24 +00:00
Yannik Bloscheck	6f9ea8a758	[styles] Use smaller taxi icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 22:05:04 +01:00
Yannik Bloscheck	176b11003f	[types] Adding nail salon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 22:04:58 +01:00
Yannik Bloscheck	ed0728a332	[styles] Improve tree icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 22:04:53 +01:00
Yannik Bloscheck	f3b105ee33	[drape] Render trees under buildings Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-17 19:10:36 +01:00
Bastian Greshake Tzovaras	dd106df592	[taginfo] Regenerate Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com> Co-authored-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com> Co-committed-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>	2025-11-17 19:09:06 +01:00
x7z4w	c25552ce03	[styles] Show toll booth later Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-17 17:00:34 +01:00
				`@@ -0,0 +1 @@`
				<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.750313" rx="1.5" width="13.750313" x=".625004" y=".625004"/><path d="m6.82305 2.813175c-.243-.6769275-.885225-1.157175-1.637325-1.157175-.96045 0-1.735725.775275-1.735725 1.735725 0 .954675.775275 1.735725 1.735725 1.735725.752175 0 1.394325-.486 1.637325-1.157175h2.991225v1.157175h1.157175v-1.157175h.578565v-1.157175zm-1.637325 1.157175c-.3182175 0-.5785725-.260355-.5785725-.5785725s.260355-.5785725.5785725-.5785725.5785725.260355.5785725.5785725-.260355.5785725-.5785725.5785725zm2.314125 1.515675c-.473265-.0070275-.473265.709305 0 .7025625h1.05v.889125l-1.96185 1.639725-.682245-1.8264h.194175c.473265.0070275.473265-.7092975 0-.7025625h-1.400025c-.473265-.0070275-.473265.7092975 0 .7025625h.4566l.62349 1.6686c-.3274575-.1634175-.6909675-.2634675-1.080075-.2634675-1.34895 0-2.450025 1.10505-2.450025 2.45895s1.101 2.45895 2.450025 2.45895c1.34895 0 2.450025-1.10505 2.450025-2.45895 0-.4706475-.140205-.90705-.3705075-1.281675l1.97415-1.65075.32403.815175c-.7297875.4266675-1.227675 1.211775-1.227675 2.11725 0 1.3539 1.101 2.45895 2.450025 2.45895s2.450025-1.10505 2.450025-2.45895-1.101-2.45895-2.450025-2.45895c-.198165 0-.3880725.0304875-.57291.0754575l-.4771125-1.197975v-1.3365c0-.19398-.156735-.351285-.349995-.351285zm-2.7999 3.512835c.4146 0 .7893.14889 1.08825.38832l-1.3125 1.097775c-.35763.3002025.08946.839175.4484175.54063l1.3125-1.097775c.1317375.2471625.213285.526125.213285.827475 0 .974175-.7794 1.756425-1.749975 1.756425s-1.749975-.78225-1.749975-1.756425c0-.92546625.70327313-1.67772019 1.60587578-1.75063192zm5.599875.000015c.970575 0 1.749975.78225 1.749975 1.756425s-.7794 1.756425-1.749975 1.756425-1.749975-.78225-1.749975-1.756425c0-.6161475.3127575-1.15365.7875-1.46685l.6371325 1.597275c.1722.4377675.826275.17571.65082-.2607225l-.6356925-1.5945.1531331-.02251687z" fill="#000"/></g></svg>
				`@@ -0,0 +1 @@`
				<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#6b425c" r="8.25"/><path d="m11.3068855 7.79744628c.2660818.39143376.434642.85491199.4713535 1.35761533l.2671914 3.65874019c.0482703.6609814-.4484303 1.2359436-1.1094118 1.284214l-.0436715.00239-3.74096459.0007971c-.6627417 0-1.2-.5372583-1.2-1.2l.00318713-.0874011.26719134-3.65874019c.03402228-.46587839.18128389-.89806797.41366076-1.27042362l.05861214-.08773368-.07742212 1.60884098-.00280641.11671571c0 1.2272994.91033155 2.2222222 2.03328243 2.2222222l.76013224-.0007669.05337767-.0023003c1.12140091-.0644603 1.98266351-1.1102652 1.92368381-2.33587071zm-2.30643887-3.89864928c.27723165 0 .65337303.43058372.98287113 1.26364976.26967134.68180667.47230104 1.58891008.48902314 1.93639653l.1128653 2.34535583c.0385946.80200078-.5036245 1.46040098-1.17051828 1.49873528l-.0419112.0017492h-.72649609c-.66366659 0-1.23247528-.6216648-1.23247528-1.4222226l.11566443-2.44268114c.01652017-.34329115.21891042-1.24559252.48806605-1.92351364.32920022-.82915515.70475843-1.25746922.9829108-1.25746922z" fill="#000" fill-rule="evenodd"/></g></svg>