[routing] Faster IndexGraph

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
2025-12-20 05:13:58 +00:00 · 2025-11-08 13:21:11 +00:00
168 changed files with 485 additions and 4178 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,10 +175,10 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
  find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)

  set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
-  if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
-    message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
+  if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
+    message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
  else()
-    message(STATUS "Found Qt version: ${Qt6_VERSION}")
+    message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}")
  endif()
 endif()

--- a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
@@ -32,8 +32,7 @@ public class DrivingOptionsScreen extends BaseMapScreen
                                                   new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved),
                                                   new DrivingOption(RoadType.Ferry, R.string.avoid_ferry),
                                                   new DrivingOption(RoadType.Motorway, R.string.avoid_motorways),
-                                                   new DrivingOption(RoadType.Steps, R.string.avoid_steps),
-                                                   new DrivingOption(RoadType.Paved, R.string.avoid_paved)};
+                                                   new DrivingOption(RoadType.Steps, R.string.avoid_steps)};

  @NonNull
  private final Map<RoadType, Boolean> mInitialDrivingOptionsState = new HashMap<>();
--- a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
@@ -90,36 +90,28 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
  {
    SwitchCompat tollsBtn = root.findViewById(R.id.avoid_tolls_btn);
    tollsBtn.setChecked(RoutingOptions.hasOption(RoadType.Toll));
-    CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll, root);
+    CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll);
    tollsBtn.setOnCheckedChangeListener(tollBtnListener);

    SwitchCompat motorwaysBtn = root.findViewById(R.id.avoid_motorways_btn);
    motorwaysBtn.setChecked(RoutingOptions.hasOption(RoadType.Motorway));
-    CompoundButton.OnCheckedChangeListener motorwayBtnListener =
-        new ToggleRoutingOptionListener(RoadType.Motorway, root);
+    CompoundButton.OnCheckedChangeListener motorwayBtnListener = new ToggleRoutingOptionListener(RoadType.Motorway);
    motorwaysBtn.setOnCheckedChangeListener(motorwayBtnListener);

    SwitchCompat ferriesBtn = root.findViewById(R.id.avoid_ferries_btn);
    ferriesBtn.setChecked(RoutingOptions.hasOption(RoadType.Ferry));
-    CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry, root);
+    CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry);
    ferriesBtn.setOnCheckedChangeListener(ferryBtnListener);

    SwitchCompat dirtyRoadsBtn = root.findViewById(R.id.avoid_dirty_roads_btn);
    dirtyRoadsBtn.setChecked(RoutingOptions.hasOption(RoadType.Dirty));
-    dirtyRoadsBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Paved) || RoutingOptions.hasOption(RoadType.Dirty));
-    CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty, root);
+    CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty);
    dirtyRoadsBtn.setOnCheckedChangeListener(dirtyBtnListener);

    SwitchCompat stepsBtn = root.findViewById(R.id.avoid_steps_btn);
    stepsBtn.setChecked(RoutingOptions.hasOption(RoadType.Steps));
-    CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps, root);
+    CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps);
    stepsBtn.setOnCheckedChangeListener(stepsBtnListener);
-
-    SwitchCompat pavedBtn = root.findViewById(R.id.avoid_paved_roads_btn);
-    pavedBtn.setChecked(RoutingOptions.hasOption(RoadType.Paved));
-    pavedBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Dirty) || RoutingOptions.hasOption(RoadType.Paved));
-    CompoundButton.OnCheckedChangeListener pavedBtnListener = new ToggleRoutingOptionListener(RoadType.Paved, root);
-    pavedBtn.setOnCheckedChangeListener(pavedBtnListener);
  }

  private static class ToggleRoutingOptionListener implements CompoundButton.OnCheckedChangeListener
@@ -127,13 +119,9 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
    @NonNull
    private final RoadType mRoadType;

-    @NonNull
-    private final View mRoot;
-
-    private ToggleRoutingOptionListener(@NonNull RoadType roadType, @NonNull View root)
+    private ToggleRoutingOptionListener(@NonNull RoadType roadType)
    {
      mRoadType = roadType;
-      mRoot = root;
    }

    @Override
@@ -143,27 +131,6 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
        RoutingOptions.addOption(mRoadType);
      else
        RoutingOptions.removeOption(mRoadType);
-
-      SwitchCompat dirtyRoadsBtn = mRoot.findViewById(R.id.avoid_dirty_roads_btn);
-      SwitchCompat pavedBtn = mRoot.findViewById(R.id.avoid_paved_roads_btn);
-      if (mRoadType == RoadType.Dirty)
-      {
-        pavedBtn.setEnabled(!isChecked);
-        if (isChecked)
-        {
-          pavedBtn.setChecked(false);
-          dirtyRoadsBtn.setEnabled(true);
-        }
-      }
-      else if (mRoadType == RoadType.Paved)
-      {
-        dirtyRoadsBtn.setEnabled(!isChecked);
-        if (isChecked)
-        {
-          dirtyRoadsBtn.setChecked(false);
-          pavedBtn.setEnabled(true);
-        }
-      }
    }
  }
 }
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -59,28 +59,6 @@
      android:padding="@dimen/margin_half_double_plus"/>
  </LinearLayout>
  <include layout="@layout/item_divider"/>
-  <LinearLayout
-    android:orientation="horizontal"
-    android:minHeight="@dimen/height_block_base"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_base"
-    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.textview.MaterialTextView
-      android:text="@string/avoid_paved"
-      android:textAppearance="?android:attr/textAppearanceMedium"
-      android:layout_width="0dp"
-      android:layout_weight="1"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:textColor="?android:attr/textColorPrimary"/>
-    <androidx.appcompat.widget.SwitchCompat
-      android:id="@+id/avoid_paved_roads_btn"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:padding="@dimen/margin_half_double_plus"/>
-  </LinearLayout>
-  <include layout="@layout/item_divider"/>
  <LinearLayout
    android:orientation="horizontal"
    android:minHeight="@dimen/height_block_base"
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -889,5 +889,4 @@
    <string name="avoid_steps">Vyhnout se schodům</string>
    <string name="offline_explanation_title">Offline mapy</string>
    <string name="list_description_empty">Upravit seznam pro přidání popisu</string>
-    <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
 </resources>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -880,5 +880,4 @@
    <string name="offline_explanation_title">Offline kort</string>
    <string name="offline_explanation_text">Der skal downloades et kort for at kunne se og navigere i området.\nDownload kort over de områder, du ønsker at rejse i.</string>
    <string name="list_description_empty">Rediger listen for at tilføje en beskrivelse</string>
-    <string name="avoid_paved">Undgå veje med fast belægning</string>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -893,5 +893,4 @@
    <string name="unknown_count">unbekannt</string>
    <string name="error_invalid_number">ungültige Zahl</string>
    <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
-    <string name="avoid_paved">Befst. Straßen vermeiden</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -898,5 +898,4 @@
    <string name="offline_explanation_title">Mapas sin conexión</string>
    <string name="offline_explanation_text">Se debe descargar un mapa para ver y navegar el área\nDescarga mapas de las áreas que quieras navegar.</string>
    <string name="editor_place_doesnt_exist_description">Describe la situación actual del lugar para enviar una nota de error a la comunidad de OpenStreetMap</string>
-    <string name="avoid_paved">Evitar caminos pavimentados</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -889,5 +889,4 @@
    <string name="offline_explanation_title">Ilma võrguühenduseta toimivad kaardid</string>
    <string name="offline_explanation_text">Selles piirkonnas liikumiseks ja teekonna juhatamiseks pead vajaliku kaardi alla laadima.\nVali allalaaditav kaart selle piirkonna kohta.</string>
    <string name="list_description_empty">Kirjelduse lisamiseks muuda loendit</string>
-    <string name="avoid_paved">Väldi sillutatud teid</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -898,5 +898,4 @@
    <string name="editor_place_doesnt_exist_description">Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap</string>
    <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
    <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
-    <string name="avoid_paved">Éviter les routes goudronnées</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -844,5 +844,4 @@
    <string name="backup_interval_every_day">Ik dienu</string>
    <string name="clear">Notīrīt</string>
    <string name="closed_now">Šobrīd slēgts</string>
-    <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
 </resources>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -870,5 +870,4 @@
    <string name="offline_explanation_title">Mapas offline</string>
    <string name="editor_place_doesnt_exist_description">Descreva com detalhes como está o local agora mesmo para enviar uma nota de erro à comunidade do OpenStreetMap</string>
    <string name="list_description_empty">Edite a lista para adicionar uma descrição</string>
-    <string name="avoid_paved">Evitar vias pavimentadas</string>
 </resources>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -890,6 +890,4 @@
    <string name="offline_explanation_title">Офлајн мапе</string>
    <string name="editor_place_doesnt_exist_description">Опишите како место сада изгледа та бисте послали поруку о грешци OpenStreetMap заједници</string>
    <string name="avoid_steps">Избегавај степенице</string>
-    <string name="avoid_paved">Избегавај асфалтиране путеве</string>
-    <string name="list_description_empty">Промените листу да бисте додали опис</string>
 </resources>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -36,13 +36,13 @@
    <string name="try_again">再试一次</string>
    <string name="about_menu_title">关于 CoMaps</string>
    <!-- Text in About screen -->
-    <string name="about_headline">由社区驱动的开源项目</string>
+    <string name="about_headline">由社区推动的开放项目</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• 简单易用，精工细作</string>
+    <string name="about_proposition_1">• 使用方便，外观精美</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_2">• 专注隐私，绝无广告</string>
+    <string name="about_proposition_2">•注重隐私，毫无广告</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• 离线、迅捷、轻量</string>
+    <string name="about_proposition_3">• 离线、快速、精简</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">完全开源、决策问责、财务透明的非营利应用。</string>
    <!-- The button that opens system location settings -->
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -677,7 +677,6 @@
    <string name="avoid_ferry">Avoid ferries</string>
    <string name="avoid_motorways">Avoid freeways</string>
    <string name="avoid_steps">Avoid stairs</string>
-    <string name="avoid_paved">Avoid paved roads</string>
    <string name="unable_to_calc_alert_title">Unable to calculate route</string>
    <string name="unable_to_calc_alert_subtitle">A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.</string>
    <string name="define_to_avoid_btn">Define roads to avoid</string>
--- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java
@@ -7,6 +7,5 @@ public enum RoadType
  Motorway,
  Ferry,
  Dirty,
-  Steps,
-  Paved
+  Steps
 }
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -1433,10 +1433,4 @@
    <string name="type.leisure.sports_centre.sport.swimming">Plavecké centrum</string>
    <string name="type.disusedbusiness">Neobsazený prostor</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Studio jógy</string>
-    <string name="type.amenity.boat_rental">Půjčovna lodí</string>
-    <string name="type.amenity.mobile_money_agent">Mobilní peněžní agent</string>
-    <string name="type.amenity.payment_centre">Platební centrum</string>
-    <string name="type.leisure.indoor_play">Vnitřní herní centrum</string>
-    <string name="type.shop.telecommunication">Telekomunikační obchod</string>
-    <string name="type.amenity.car_pooling">Spolujízda</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -1438,15 +1438,4 @@
    <string name="type.power.portal">Abspannportal</string>
    <string name="type.shop.lighting">Lampenladen</string>
    <string name="type.disusedbusiness">Leerstehendes Geschäft</string>
-    <string name="type.leisure.indoor_play">Indoor-Spielplatz</string>
-    <string name="type.amenity.car_pooling">Fahrgemeinschaften</string>
-    <string name="type.shop.telecommunication">Telekommunikationsgeschäft</string>
-    <string name="type.man_made.telescope">Teleskop</string>
-    <string name="type.man_made.telescope.optical">Teleskop (Optisch)</string>
-    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
-    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
-    <string name="type.man_made.observatory">Observatorium</string>
-    <string name="type.amenity.payment_centre">Zahlungszentrum</string>
-    <string name="type.amenity.soup_kitchen">Suppenküche</string>
-    <string name="type.amenity.food_bank">Tafel</string>
 </resources>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -1437,13 +1437,4 @@
    <string name="type.leisure.fitness_centre.sport.yoga">Estudio de yoga</string>
    <string name="type.disusedbusiness">Local comercial vacante</string>
    <string name="type.amenity.lounger">Tumbona</string>
-    <string name="type.amenity.boat_rental">Alquiler de botes</string>
-    <string name="type.man_made.telescope">Telescopio</string>
-    <string name="type.man_made.telescope.optical">Telescopio (óptico)</string>
-    <string name="type.man_made.telescope.radio">Radiotelescopio</string>
-    <string name="type.man_made.telescope.gamma">Telescopio Fermi</string>
-    <string name="type.man_made.observatory">Observatorio</string>
-    <string name="type.amenity.mobile_money_agent">Agencia de efectivo móvil</string>
-    <string name="type.amenity.car_pooling">Punto de Vehículo Compartido</string>
-    <string name="type.amenity.payment_centre">Centro de pagos</string>
 </resources>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -1436,19 +1436,4 @@
    <string name="type.leisure.sports_centre.sport.yoga">Joogakeskus</string>
    <string name="type.disusedbusiness">Vaba äripind</string>
    <string name="type.amenity.lounger">Rannatool</string>
-    <string name="type.amenity.boat_rental">Paadirent</string>
-    <string name="type.man_made.telescope">Teleskoop</string>
-    <string name="type.man_made.telescope.optical">Optiline teleskoop</string>
-    <string name="type.man_made.telescope.radio">Raadioteleskoop</string>
-    <string name="type.man_made.telescope.gamma">Gammateleskoop</string>
-    <string name="type.man_made.observatory">Observatoorium</string>
-    <string name="type.amenity.mobile_money_agent">Nutiraha müüja</string>
-    <string name="type.amenity.car_pooling">Ühiskasutusautode peatus</string>
-    <string name="type.amenity.payment_centre">Maksekeskus</string>
-    <string name="type.leisure.indoor_play">Mängusaal/Mängutuba</string>
-    <string name="type.shop.telecommunication">Sideteenuste pood</string>
-    <string name="type.amenity.soup_kitchen">Supiköök</string>
-    <string name="type.amenity.food_bank">Toidupank</string>
-    <string name="type.amenity.food_sharing">Toidujagamine</string>
-    <string name="type.amenity.give_box">Annetuskast</string>
 </resources>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -1434,21 +1434,6 @@
    <string name="type.leisure.sports_centre.sport.volleyball">Complexe sportif</string>
    <string name="type.leisure.sports_centre.sport.yoga">Complexe sportif</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Salle de yoga</string>
-    <string name="type.disusedbusiness">Magasin vacant</string>
+    <string name="type.disusedbusiness">Locaux commerciaux libres</string>
    <string name="type.amenity.lounger">Chaise longue</string>
-    <string name="type.amenity.boat_rental">Vente de bateau</string>
-    <string name="type.amenity.payment_centre">Centre de paiement</string>
-    <string name="type.amenity.mobile_money_agent">Agent d\'argent liquide</string>
-    <string name="type.leisure.indoor_play">Complexe de jeux intérieurs</string>
-    <string name="type.shop.telecommunication">Boutique télécom</string>
-    <string name="type.man_made.telescope.optical">Télescope (optique)</string>
-    <string name="type.man_made.telescope.radio">Télescope (radio)</string>
-    <string name="type.man_made.observatory">Observatoire</string>
-    <string name="type.amenity.food_bank">Banque alimentaire</string>
-    <string name="type.amenity.food_sharing">Repas partagé</string>
-    <string name="type.man_made.telescope.gamma">Télescope (Gamma)</string>
-    <string name="type.amenity.car_pooling">Covoiturage</string>
-    <string name="type.amenity.soup_kitchen">Soupe populaire</string>
-    <string name="type.amenity.give_box">Boîte à don</string>
-    <string name="type.man_made.telescope">Télescope</string>
 </resources>
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -1400,5 +1400,4 @@
    <string name="type.shop.lighting">Negozio di illuminazione</string>
    <string name="type.amenity.bench.backless">Panchina senza schienale</string>
    <string name="type.amenity.charging_station.motorcar.small">Colonnina di ricarica</string>
-    <string name="type.man_made.observatory">Osservatorio</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -33,7 +33,7 @@
    <string name="type.place.sea">Jūra</string>
    <string name="type.amenity.bar">Bārs</string>
    <string name="type.amenity.bicycle_parking">Divriteņu novietne</string>
-    <string name="type.amenity.bicycle_rental">Velosipēdu noma</string>
+    <string name="type.amenity.bicycle_rental">Velosipēdu īre</string>
    <string name="type.amenity.biergarten">Alus dārzs</string>
    <string name="type.amenity.bureau_de_change">Valūtas maiņa</string>
    <string name="type.amenity.bus_station">Autoosta</string>
@@ -136,23 +136,4 @@
    <string name="type.sport.climbing">Kāpšana</string>
    <string name="type.sport.scuba_diving">Niršana</string>
    <string name="type.sport.cricket">Krikets</string>
-    <string name="type.shop.telecommunication">Tālsaziņas preču veikals</string>
-    <string name="type.shop.ticket">Biļešu tirdzniecības vieta</string>
-    <string name="type.shop.toys">Rotaļlietu veikals</string>
-    <string name="type.shop.travel_agency">Ceļojumu aģentūra</string>
-    <string name="type.shop.tyres">Riepu veikals</string>
-    <string name="type.amenity.payment_centre">Maksājumu centrs</string>
-    <string name="type.amenity.pharmacy">Aptieka</string>
-    <string name="type.amenity.place_of_worship">Pielūgsmes vieta</string>
-    <string name="type.amenity.place_of_worship.buddhist">Budistu templis</string>
-    <string name="type.amenity.place_of_worship.christian">Baznīca</string>
-    <string name="type.amenity.boat_rental">Laivu noma</string>
-    <string name="type.amenity.bicycle_repair_station">Divriteņu darbnīca</string>
-    <string name="type.man_made.telescope.gamma">Teleskops (Gamma)</string>
-    <string name="type.man_made.observatory">Observatorija</string>
-    <string name="type.man_made.telescope">Teleskops</string>
-    <string name="type.man_made.telescope.optical">Teleskops (optiskais)</string>
-    <string name="type.man_made.telescope.radio">Teleskops (radio)</string>
-    <string name="type.amenity.soup_kitchen">Zupas virtuve</string>
-    <string name="type.amenity.food_sharing">Ēdiena kopīgošana</string>
 </resources>
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
@@ -1425,19 +1425,4 @@
    <string name="type.leisure.fitness_centre.sport.yoga">Academia de ioga</string>
    <string name="type.disusedbusiness">Estabelecimento vazio</string>
    <string name="type.amenity.lounger">Espreguiçadeira</string>
-    <string name="type.amenity.boat_rental">Aluguel de barco</string>
-    <string name="type.man_made.telescope">Telescópio</string>
-    <string name="type.man_made.telescope.optical">Telescópio (óptico)</string>
-    <string name="type.man_made.telescope.radio">Telescópio (rádio)</string>
-    <string name="type.man_made.telescope.gamma">Telescópio (gama)</string>
-    <string name="type.man_made.observatory">Observatório</string>
-    <string name="type.amenity.mobile_money_agent">Agente de Mobile Money</string>
-    <string name="type.amenity.car_pooling">Carona</string>
-    <string name="type.amenity.payment_centre">Centro de pagamentos</string>
-    <string name="type.leisure.indoor_play">Centro de recreação interno</string>
-    <string name="type.shop.telecommunication">Loja de Telecomunicação</string>
-    <string name="type.amenity.soup_kitchen">Restaurante popular</string>
-    <string name="type.amenity.food_bank">Banco de alimentos</string>
-    <string name="type.amenity.food_sharing">Compartilhamento de alimentos</string>
-    <string name="type.amenity.give_box">Caixa de doação</string>
 </resources>
--- a/android/sdk/src/main/res/values-ru/types_strings.xml
+++ b/android/sdk/src/main/res/values-ru/types_strings.xml
@@ -652,8 +652,8 @@
    <string name="type.leisure.sauna">Сауна</string>
    <string name="type.leisure.slipway">Лодочный спуск</string>
    <string name="type.leisure.sports_centre">Спорткомплекс</string>
-    <string name="type.sport.climbing">Скалолазание</string>
-    <string name="type.sport.yoga">Йога</string>
+    <string name="type.sport.climbing">Скалодром</string>
+    <string name="type.sport.yoga">Йога-центр</string>
    <string name="type.leisure.stadium">Стадион</string>
    <string name="type.leisure.swimming_pool">Плавательный бассейн</string>
    <string name="type.leisure.swimming_pool.private">Плавательный бассейн</string>
@@ -1131,7 +1131,7 @@
    <string name="type.shop.chemist">Бытовая химия</string>
    <string name="type.shop.chocolate">Магазин шоколада</string>
    <string name="type.shop.clothes">Магазин одежды</string>
-    <string name="type.shop.coffee">Продавец кофе</string>
+    <string name="type.shop.coffee">Магазин кофе</string>
    <string name="type.shop.computer">Компьютерный магазин</string>
    <string name="type.shop.confectionery">Кондитерская</string>
    <string name="type.shop.convenience">Продуктовый магазин</string>
@@ -1248,7 +1248,7 @@
    <string name="type.sport.handball">Гандбол</string>
    <string name="type.sport.multi">Различные виды спорта</string>
    <!-- Used to tag a scuba diving site. -->
-    <string name="type.sport.scuba_diving">Подводное плавание с аквалангом</string>
+    <string name="type.sport.scuba_diving">Место для ныряния с аквалангом</string>
    <string name="type.sport.shooting">Стрельба</string>
    <string name="type.sport.skateboard">Скейтбординг</string>
    <string name="type.sport.skiing">Лыжи</string>
@@ -1383,7 +1383,7 @@
    <string name="type.fee.yes">$</string>
    <string name="type.barrier.guard_rail">Дорожное ограждение (отбойник)</string>
    <string name="type.landuse.plant_nursery">Садовый питомник</string>
-    <string name="type.amenity.studio">Медиа-студия</string>
+    <string name="type.amenity.studio">Студия</string>
    <string name="type.leisure.firepit">Кострище</string>
    <string name="type.highway.ladder">Лестница-лаз</string>
    <string name="type.sport.diving">Высотные прыжки в воду</string>
@@ -1399,57 +1399,4 @@
    <string name="type.office.security">Офис охранника</string>
    <string name="type.building.guardhouse">Будка безопасности</string>
    <string name="type.power.portal">Портальная опора</string>
-    <string name="type.amenity.boat_rental">Прокат лодок</string>
-    <string name="type.man_made.telescope">Телескоп</string>
-    <string name="type.man_made.telescope.optical">Телескоп (оптический)</string>
-    <string name="type.man_made.telescope.radio">Телескоп (радио)</string>
-    <string name="type.man_made.telescope.gamma">Телескоп (Гамма)</string>
-    <string name="type.man_made.observatory">Обсерватория</string>
-    <string name="type.amenity.charging_station.motorcar.small">Пункт зарядки автомобиля</string>
-    <string name="type.amenity.lounger">Шезлонг</string>
-    <string name="type.amenity.car_pooling">Совместное использование авто</string>
-    <string name="type.amenity.payment_centre">Платежный центр</string>
-    <string name="type.leisure.bandstand">Эстрада</string>
-    <string name="type.leisure.indoor_play">Крытый игровой центр</string>
-    <string name="type.leisure.sports_centre.sport.multi">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.archery">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.athletics">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.australian_football">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.badminton">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.baseball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.basketball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.beachvolleyball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.bowls">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.cricket">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.curling">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.equestrian">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.field_hockey">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.futsal">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.golf">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.gymnastics">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.handball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.ice_hockey">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.padel">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.pelota">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.scuba_diving">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.shooting">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.skateboard">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.skiing">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.soccer">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.swimming">Плавательный центр</string>
-    <string name="type.leisure.sports_centre.sport.table_tennis">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.tennis">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">Спортивный центр</string>
-    <string name="type.leisure.sports_centre.sport.yoga">Спортивный центр</string>
-    <string name="type.leisure.fitness_centre.sport.yoga">Студия Йоги</string>
-    <string name="type.shop.telecommunication">Телекоммуникационный магазин</string>
-    <string name="type.disusedbusiness">Вакантный бизнес</string>
-    <string name="type.amenity.soup_kitchen">Бесплатная столовая</string>
-    <string name="type.amenity.food_bank">Продовольственный банк</string>
-    <string name="type.amenity.food_sharing">Обмен едой</string>
-    <string name="type.amenity.give_box">Подарить коробку</string>
-    <string name="type.amenity.bench.backless">Скамья без спинки</string>
-    <string name="type.amenity.mobile_money_agent">Агент мобильных платежей</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -28,7 +28,7 @@
    <string name="type.amenity.bbq">Грил</string>
    <string name="type.amenity.bench">Клупа</string>
    <string name="type.amenity.bicycle_parking">Паркинг за бицикле</string>
-    <string name="type.amenity.bicycle_rental">Изнајмљивање бицикала</string>
+    <string name="type.amenity.bicycle_rental">Рентирање бицикли</string>
    <string name="type.amenity.bicycle_repair_station">Станица за поправку бицикала</string>
    <string name="type.amenity.biergarten">Пивска башта</string>
    <string name="type.amenity.brothel">Јавна кућа</string>
@@ -648,7 +648,7 @@
    <string name="type.leisure.slipway">Навоз</string>
    <string name="type.leisure.sports_centre">Спортски центар</string>
    <string name="type.sport.climbing">Вештачка стена</string>
-    <string name="type.sport.yoga">Јога</string>
+    <string name="type.sport.yoga">Јога студио</string>
    <string name="type.leisure.stadium">Стадион</string>
    <string name="type.leisure.swimming_pool">Базен</string>
    <string name="type.leisure.swimming_pool.private">Приватни базен</string>
@@ -1161,7 +1161,7 @@
    <string name="type.shop.pet_grooming">Грумер</string>
    <string name="type.shop.photo">Фотограф</string>
    <string name="type.shop.rental">Центар за изнајмљивање</string>
-    <string name="type.shop.rental.bicycle">Центар за изнајмљивање бицикала</string>
+    <string name="type.shop.rental.bicycle">Изнајмљивање бицикала</string>
    <string name="type.shop.seafood">Рибарница</string>
    <string name="type.shop.second_hand">Половна одећа</string>
    <string name="type.shop.shoes">Обућа</string>
@@ -1375,7 +1375,7 @@
    <string name="type.leisure.firepit">Огњиште</string>
    <string name="type.landuse.plant_nursery">Расадник</string>
    <string name="type.barrier.guard_rail">Заштитна ограда</string>
-    <string name="type.amenity.studio">Медијски студио</string>
+    <string name="type.amenity.studio">Студио</string>
    <string name="type.highway.ladder">Мердевине</string>
    <string name="type.man_made.crane">Кран</string>
    <string name="type.railway.station.subway.qingdao">Метро станица</string>
@@ -1398,57 +1398,4 @@
    <string name="type.building.guardhouse">Кућица обезбеђења</string>
    <string name="type.power.portal">Носач електричних водова</string>
    <string name="type.shop.lighting">Продавница расвете</string>
-    <string name="type.amenity.give_box">Кутија за поклоне</string>
-    <string name="type.amenity.food_sharing">Дељење хране</string>
-    <string name="type.amenity.food_bank">Банка хране</string>
-    <string name="type.amenity.soup_kitchen">Народна кухиња</string>
-    <string name="type.man_made.observatory">Опсерваторија</string>
-    <string name="type.man_made.telescope">Телескоп</string>
-    <string name="type.man_made.telescope.optical">Телескоп (оптички)</string>
-    <string name="type.man_made.telescope.radio">Телескоп (радио)</string>
-    <string name="type.man_made.telescope.gamma">Телескоп (гама)</string>
-    <string name="type.amenity.car_pooling">Заједничка вожња</string>
-    <string name="type.amenity.payment_centre">Плаћање рачуна</string>
-    <string name="type.amenity.bench.backless">Клупа без наслона</string>
-    <string name="type.amenity.boat_rental">Изнајмљивање чамаца</string>
-    <string name="type.amenity.charging_station.motorcar.small">Место за пуњење аутомобила</string>
-    <string name="type.amenity.lounger">Лежаљка</string>
-    <string name="type.amenity.mobile_money_agent">Посредник за мобилно плаћање</string>
-    <string name="type.leisure.bandstand">Бина</string>
-    <string name="type.leisure.indoor_play">Играоница</string>
-    <string name="type.leisure.sports_centre.sport.multi">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.american_football">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.archery">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.athletics">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.australian_football">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.badminton">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.baseball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.basketball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.beachvolleyball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.bowls">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.climbing">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.cricket">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.curling">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.equestrian">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.field_hockey">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.futsal">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.golf">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.gymnastics">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.handball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.ice_hockey">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.padel">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.pelota">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.scuba_diving">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.shooting">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.skateboard">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.skiing">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.soccer">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.swimming">Пливачки центар</string>
-    <string name="type.leisure.sports_centre.sport.table_tennis">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.tennis">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">Спортски центар</string>
-    <string name="type.leisure.sports_centre.sport.yoga">Спортски центар</string>
-    <string name="type.leisure.fitness_centre.sport.yoga">Јога студио</string>
-    <string name="type.shop.telecommunication">Продавница мобилног оператера</string>
-    <string name="type.disusedbusiness">Некоришћен пословни простор</string>
 </resources>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -43,11 +43,6 @@
    <string name="type.amenity.motorcycle_rental">Motorcycle Rental</string>
    <string name="type.amenity.car_sharing">Car Sharing</string>
    <string name="type.amenity.car_wash">Car Wash</string>
-    <string name="type.man_made.telescope">Telescope</string>
-    <string name="type.man_made.telescope.optical">Telescope (Optical)</string>
-    <string name="type.man_made.telescope.radio">Telescope (Radio)</string>
-    <string name="type.man_made.telescope.gamma">Telescope (Gamma)</string>
-    <string name="type.man_made.observatory">Observatory</string>
    <string name="type.amenity.casino">Casino</string>
    <string name="type.amenity.gambling">Gambling</string>
    <string name="type.leisure.adult_gaming_centre">Adult Gaming Centre</string>
@@ -128,7 +123,6 @@
    <string name="type.amenity.parking_space.private">Parking Space</string>
    <string name="type.amenity.parking_space.underground">Parking Space</string>
    <string name="type.amenity.parking_space.disabled">Disabled Parking Space</string>
-    <string name="type.amenity.car_pooling">Car Pooling</string>
    <string name="type.amenity.payment_centre">Payment Centre</string>
    <string name="type.amenity.payment_terminal">Payment Terminal</string>
    <string name="type.amenity.pharmacy">Pharmacy</string>
@@ -1446,10 +1440,6 @@
    <string name="type.self_service.no">No self-service</string>
    <!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
    <string name="type.amenity.social_facility">Social Facility</string>
-    <string name="type.amenity.soup_kitchen">Soup Kitchen</string>
-    <string name="type.amenity.food_bank">Food Bank</string>
-    <string name="type.amenity.food_sharing">Food Sharing</string>
-    <string name="type.amenity.give_box">Give Box</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
    <string name="type.emergency.emergency_ward_entrance">Emergency Ward Entrance</string>
    <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
--- a/configure.sh
+++ b/configure.sh
@@ -119,7 +119,7 @@ echo "Generating search categories / synonyms..."
 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
  if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
    echo "Generating symbols..."
-    bash ./tools/unix/generate_symbols.sh || (rm data/symbols_hash; exit 1)
+    bash ./tools/unix/generate_symbols.sh
  fi
 else
  echo "Skipping generate symbols..."
@@ -128,7 +128,7 @@ fi
 if [ -z "$SKIP_GENERATE_DRULES" ]; then
  if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv || [ ! -z "$DRULES_NOT_GENERATED" ]; then
    echo "Generating drules..."
-    bash ./tools/unix/generate_drules.sh || (rm data/drules_hash; exit 1)
+    bash ./tools/unix/generate_drules.sh
  fi
 else
  echo "Skipping generate drules..."
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -345,8 +345,6 @@
 "shop-dry_cleaning": "3Dry Cleaner|cleaning",
 "shop-tyres|@shop": "3Tyre|tyres",
 "amenity-car_wash": "3Car Wash",
-"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "5Telescope",
-"man_made-observatory": "4Observatory",
 "amenity-veterinary": "Veterinary Doctor|4veterinary",
 "amenity-animal_shelter": "Animal Shelter",
 "@charging_station": "4Charging Station|charging",
@@ -421,7 +419,6 @@
 "amenity-internet_cafe": "3Internet Cafe",
 "amenity-motorcycle_parking": "4Motorcycle Parking",
 "amenity-parking_space-disabled|@category_parking": "Disabled Parking Space",
-"amenity-car_pooling|@category_parking": "Car Pooling",
 "amenity-nursing_home": "4Nursing Home",
 "amenity-payment_terminal": "Payment Terminal",
 "amenity-payment_centre": "Payment Centre",
@@ -496,10 +493,6 @@
 "man_made-cairn": "4Cairn",
 "wheelchair-yes": "5Wheelchair",
 "amenity-social_facility": "Social Facility",
-"social_facility-soup_kitchen": "4Soup Kitchen|Food",
-"social_facility-food_bank": "4Food Bank|foodbank|Food",
-"amenity-food_sharing": "Food Sharing|Food",
-"amenity-give_box": "Give Box",
 "leisure-sports_hall": "Sports hall",
 "amenity-arts_centre|@category_tourism": "Arts Center",
 "amenity-prison": "prison",
--- a/data/categories-strings/es.json/localize.json
+++ b/data/categories-strings/es.json/localize.json
@@ -498,16 +498,5 @@
 "sport-9pin": "Bolos",
 "sport-10pin": "Bolos",
 "shop-bookmaker|@gambling": "Corredor de apuestas",
-"leisure-fitness_centre-sport-yoga": "Estudio de yoga",
-"amenity-mobile_money_agent": "Agencia de efectivo móvil | agente de dinero móvil | agencia de dinero móvil | agente de efectivo móvil",
-"amenity-boat_rental": "4aquiler de botes|alquiler de barcos|bote|botes|barco|barcos|barca|barcas|lancha|lanchas|embarcación|embarcaciones|velero|veleros|nagegar|3alquiler",
-"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Telescopio",
-"man_made-observatory": "3Observatorio",
-"amenity-car_pooling|@category_parking": "Car pooling | Vehículo compartido | Blabla Car",
-"amenity-payment_centre": "Centro de pagos",
-"leisure-indoor_play": "Parque interior|niños",
-"shop-telecommunication|@shop": "Telecomunicaciones",
-"leisure-bandstand": "4Tarima",
-"social_facility-soup_kitchen": "4Comedor social | Comedor popular | Comedor comunitario | Comida",
-"social_facility-food_bank": "Banco de alimentos | alimento | comida | voluntariado"
+"leisure-fitness_centre-sport-yoga": "Estudio de yoga"
 }
--- a/data/editor.config
+++ b/data/editor.config
@@ -386,11 +386,6 @@
        <include field="operator" />
        <include field="opening_hours" />
      </type>
-      <type id="amenity-car_pooling">
-        <include field="name" />
-        <include field="operator" />
-        <include field="opening_hours" />
-      </type>
      <type id="amenity-pharmacy" group="shop">
        <include group="poi_internet" />
      </type>
@@ -1194,14 +1189,6 @@
        <include field="opening_hours" />
        <include field="level" />
      </type>
-      <type id="amenity-food_sharing">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="amenity-give_box">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
      <type id="tourism-picnic_site" />
      <type id="leisure-picnic_table" />
      <type id="leisure-park">
@@ -1264,15 +1251,6 @@
      </type>
      <type id="amenity-social_facility">
        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="social_facility-soup_kitchen">
-        <include group="poi_internet" />
-        <include field="operator" />
-      </type>
-      <type id="social_facility-food_bank">
-        <include group="poi_internet" />
-        <include field="operator" />
      </type>
      <type id="amenity-payment_centre">
        <include group="poi_internet" />
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -628,17 +628,17 @@ drinking_water|no;505;
 deprecated|deprecated;506;x
 deprecated|deprecated;507;x
 deprecated|deprecated;508;x
-amenity|car_pooling;509;
-social_facility|soup_kitchen;510;
-social_facility|food_bank;511;
-amenity|food_sharing;512;
+deprecated:railway|spur|bridge:06.2023;509;x
+deprecated|deprecated;510;x
+deprecated|deprecated;511;x
+deprecated|deprecated;512;x
 sport|curling;513;
-amenity|give_box;514;
-man_made|telescope;515;
-man_made|telescope|optical;[man_made=telescope][telescope:type=optical];;name;int_name;516;
-man_made|telescope|radio;[man_made=telescope][telescope:type=radio];;name;int_name;517;
-man_made|telescope|gamma;[man_made=telescope][telescope:type=gamma];;name;int_name;518;
-man_made|observatory;519;
+deprecated|deprecated;514;x
+deprecated|deprecated;515;x
+deprecated|deprecated;516;x
+deprecated|deprecated;517;x
+deprecated|deprecated;518;x
+deprecated|deprecated;519;x
 sport|diving;520;
 #~270k uses.
 man_made|utility_pole;521;
--- a/data/styles/default/dark/symbols/food_bank-m.svg
+++ b/data/styles/default/dark/symbols/food_bank-m.svg
@@ -1 +0,0 @@
-<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="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#000" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/food_sharing-m.svg
+++ b/data/styles/default/dark/symbols/food_sharing-m.svg
@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#777" fill-rule="evenodd"/></svg>
--- a/data/styles/default/dark/symbols/give_box-m.svg
+++ b/data/styles/default/dark/symbols/give_box-m.svg
@@ -1 +0,0 @@
-<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#777" fill-rule="evenodd"/></svg>
--- a/data/styles/default/dark/symbols/observatory-m.svg
+++ b/data/styles/default/dark/symbols/observatory-m.svg
@@ -1 +0,0 @@
-<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="#51585E" r="8.25"/><path d="m11.9788057 9.45701798v4.46417412h-2.48216516v-1.9344754c0-.5341906-.43304708-.9672377-.96723771-.9672377-.51282301 0-.93243211.3990962-.96518032.9036416l-.00205739.0635961v1.9344754h-2.48216512v-4.46417412zm-3.44940287-4.1392834c1.90503617 0 3.44940287 1.54436664 3.44940287 3.44940283h-6.8988057c0-1.90503619 1.54436664-3.44940283 3.44940283-3.44940283zm4.47021307-1.83773458.6985699.69856997-1.0498311 1.04983111c.2863445.33051154.5419599.68947967.7623009 1.07107475l-.8568598.49403817c-.520321-.90122443-1.2678995-1.64880299-2.169124-2.16912399l.4940382-.8568598c.3815951.22034103.7405632.47595638 1.0710748.7623009z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/parking_pooling-m.svg
+++ b/data/styles/default/dark/symbols/parking_pooling-m.svg
@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#111" opacity=".6"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#20607c"/></g></svg>
--- a/data/styles/default/dark/symbols/parking_pooling-s.svg
+++ b/data/styles/default/dark/symbols/parking_pooling-s.svg
@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#111" opacity=".6"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#20607c"/></g></svg>
--- a/data/styles/default/dark/symbols/soup_kitchen-m.svg
+++ b/data/styles/default/dark/symbols/soup_kitchen-m.svg
@@ -1 +0,0 @@
-<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="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-7.07695726-.61839887-.00064003-.76822841c-.79974138-.64144198-1.31177891-1.6268104-1.31177891-2.73177159h7c0 1.10496119-.5120375 2.09032961-1.3117789 2.73177159l-.00064.76822841z" fill="#000" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/telescope-gamma-m.svg
+++ b/data/styles/default/dark/symbols/telescope-gamma-m.svg
@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m13.1340274.00741332-8.49199134 1.21422959 1.21962985 1.21976833 6.55564899-.9357696-.9357696 6.55564895 1.2197683 1.21976832 1.2142296-8.49212981c.0725574-.50887145-.3895117-.8436881-.7815158-.78151578m-10.82601505.83814936c-2.97333242 2.97402475-2.97333242 7.79521825 0 10.76924302 2.97402475 2.9733324 7.79521825 2.9733324 10.76924305 0zm-.84645746 11.86715912v3.902594h-.69234211c-.38355753 0-.69234211.2895375-.69234211.6491399v.0864043c0 .3596025.30878458.64914.69234211.64914h8.30810528c.38355753 0 .69234211-.2895375.69234211-.64914v-.0864043c0-.3596024-.30878458-.6491399-.69234211-.6491399h-.6923421v-1.4278864c-2.47539997.1890094-5.00992596-.6352931-6.92342107-2.4747076" fill="#777" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/dark/symbols/telescope-m.svg
+++ b/data/styles/default/dark/symbols/telescope-m.svg
@@ -1 +0,0 @@
-<svg height="15" viewBox="0 0 14 15" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.82311911 5.67246657 3.40536139 7.66676663c.1034778.2351768 0 .507982-.244584.6208669-.2351769.1034779-.5079821 0-.620867-.2445839l-1.12884905-2.5399104h-4.40251137l-1.12884907 2.5399104c-.1128849.2445839-.38569009.3480618-.62086698.2445839-.24458397-.1128849-.3480618-.3856901-.24458397-.6208669l3.00085711-6.74487323-1.63683115.76197312-1.1946986-2.54931747 6.38740431-2.98204296 1.19469857 2.54931748zm-.79019435.54561038-1.78734435 4.01682125h3.57468871zm2.59635286-5.02337835 2.55872458-1.1946986 1.5897957 3.41476843-2.5587245 1.1946986zm-9.40707557 5.4278826 2.55872456-1.1946986.79019435 1.70268068-2.55872456 1.1946986z" fill="#777" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/dark/symbols/telescope-optical-m.svg
+++ b/data/styles/default/dark/symbols/telescope-optical-m.svg
@@ -1 +0,0 @@
-<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.6801082.00001-1.6419569 1.64195683c-.5169266-.44784856-1.0783599-.84763607-1.6751823-1.19225383l-.7726855 1.34014584c1.409533.81379244 2.5787608 1.98302024 3.3925532 3.39255325l1.3401459-.77268557c-.3446178-.59682233-.7444053-1.15825566-1.1922539-1.6751823l1.6419569-1.64195683zm-8.72593811 2.09165983c-4.26738784 0-7.72685565 3.45946781-7.72685565 7.72685565h15.45371126c0-4.26738784-3.4594678-7.72685565-7.72685561-7.72685565m-7.72685565 9.27222677v4.6361134h15.45371126v-4.6361134z" fill="#777" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/dark/symbols/telescope-radio-m.svg
+++ b/data/styles/default/dark/symbols/telescope-radio-m.svg
@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.69225716.00010119c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 2.68461564 0 4.84612664 2.16151093 4.84612664 4.8461266-.0138461.93627166 1.3978998.93627166 1.3846076 0 0-3.43299608-2.7977382-6.2307342-6.23073424-6.2307342m-5.38432358.84641063c-2.9731679 2.9738602-2.9731679 7.79478695 0 10.76864718 2.97386021 2.9731679 7.79478692 2.9731679 10.76864712 0zm5.38432358 1.92280457c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 1.15517812 0 2.0769114.92159482 2.0769114 2.0769114-.01384607.93627166 1.39789984.93627166 1.38460764 0 0-1.90355853-1.55796051-3.461519-3.46151904-3.461519m-6.2307342 9.94369791v3.9023781h-.6923038c-.38353631 0-.6923038.2895214-.6923038.649104v.0863996c0 .3595826.30876749.649104.6923038.649104h8.3076456c.38353631 0 .6923038-.2895214.6923038-.649104v-.0863996c0-.3595826-.30876749-.649104-.6923038-.649104h-.6923038v-1.4278074c-2.47526301.188999-5.00964876-.6352579-6.923038-2.4745707" fill="#777" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -428,7 +428,6 @@ area|z14-[area:highway=living_street],
 area|z14-[amenity=grave_yard],
 area|z14-[landuse=cemetery],
 area|z15-[amenity=parking],
-area|z15-[amenity=car_pooling],
 area|z16-[public_transport=platform],
 area|z16-[railway=platform],
 {fill-opacity: 1;}
@@ -591,7 +590,6 @@ area|z10-[landuse=farmyard],
 /* Parking */

 area|z15-[amenity=parking],
-area|z15-[amenity=car_pooling],
 {fill-color: @parking;}

 area|z15-[amenity=parking][location=underground],
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -848,8 +848,6 @@ node|z17-[leisure=indoor_play],
 node|z17-[amenity=courthouse],
 node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
-node|z17-[social_facility=food_bank],
-node|z17-[social_facility=soup_kitchen],
 node|z17-[amenity=animal_shelter],
 node|z17-[amenity=kindergarten],
 node|z17-[amenity=childcare],
@@ -917,13 +915,6 @@ node|z15-[leisure=sports_centre][sport=swimming],
 node|z17-[highway=ladder],
 node|z18-[amenity=dojo],
 node|z18-[amenity=vending_machine],
-node|z18-[amenity=food_sharing],
-node|z18-[amenity=give_box],
-node|z18-[man_made=telescope],
-node|z17-[man_made=telescope][telescope:type=optical],
-node|z17-[man_made=telescope][telescope:type=radio],
-node|z17-[man_made=telescope][telescope:type=gamma],
-node|z16-[man_made=observatory],
 node|z17-[amenity=fire_station],
 node|z18-[amenity=internet_cafe],
 node|z18-[emergency=defibrillator],
@@ -1445,12 +1436,6 @@ node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
 {icon-image: social_facility-m.svg;}

-node|z17-[social_facility=soup_kitchen],
-{icon-image: soup_kitchen-m.svg;}
-
-node|z17-[social_facility=food_bank],
-{icon-image: food_bank-m.svg;}
-
 node|z17-[amenity=cinema],
 {icon-image: cinema-m.svg;}
 node|z18-[amenity=cinema],
@@ -1591,23 +1576,6 @@ node|z17-[amenity=parcel_locker],
 node|z18-[amenity=vending_machine][vending=fuel],
 {icon-image: fuel-dispenser-m.svg;}

-node|z18-[amenity=food_sharing],
-{icon-image: food_sharing-m.svg;}
-node|z18-[amenity=give_box],
-{icon-image: give_box-m.svg;}
-
-node|z18-[man_made=telescope],
-{icon-image: telescope-m.svg;}
-node|z17-[man_made=telescope][telescope:type=optical],
-{icon-image: telescope-optical-m.svg;}
-node|z17-[man_made=telescope][telescope:type=radio],
-{icon-image: telescope-radio-m.svg;}
-node|z17-[man_made=telescope][telescope:type=gamma],
-{icon-image: telescope-gamma-m.svg;}
-
-node|z16-[man_made=observatory],
-{icon-image: observatory-m.svg;}
-
 node|z17-[aeroway=gate],
 {icon-image: airport_gate-m.svg;font-size: 11;}

@@ -2189,7 +2157,6 @@ node|z17-[amenity=bicycle_parking],
 node|z17-[amenity=motorcycle_parking],
 node|z17-[amenity=car_wash],
 node|z18-[amenity=parking],
-node|z18-[amenity=car_pooling],
 node|z18-[amenity=car_rental],
 node|z18-[amenity=car_sharing],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
@@ -2264,11 +2231,6 @@ node|z16-[amenity=parking],
 node|z17-[amenity=parking],
 {icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}

-node|z16-[amenity=car_pooling],
-{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
-node|z17-[amenity=car_pooling],
-{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
-
 node|z16-[amenity=parking][location=underground],
 {icon-image:parking_underground-m.svg;}

--- a/data/styles/default/include/Icons_Label_Colors.mapcss
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -73,7 +73,6 @@ node[amenity=place_of_worship]
 node[amenity=social_facility],
 node[historic=ship],
 node[leisure=hackerspace],
-node[social_facility],
 node[tourism=attraction],
 node[tourism=gallery],
 node[tourism=museum],
@@ -135,9 +134,6 @@ node[amenity=townhall],
 node[amenity=university][name],
 node[barrier=border_control],
 node[building=guardhouse],
-node[man_made=communications_tower],
-node[man_made=lighthouse],
-node[man_made=observatory],
 node[office=diplomatic],
 node[office=security],
 node[shop=money_lender],
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -140,7 +140,6 @@ railway-platform                                    # area z16- (also has captio

 amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -989,7 +989,6 @@ leisure-escape_game                                 # icon z17- (also has captio
 leisure-fitness_centre                              # icon z16- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
-man_made-observatory                                # icon z16- (also has caption(optional) z16-)
 office-estate_agent                                 # icon z18- (also has caption(optional) z18-)
 office-government                                   # icon z18- (also has caption(optional) z18-)
 office-insurance                                    # icon z18- (also has caption(optional) z18-)
@@ -1135,8 +1134,6 @@ amenity-vending_machine-public_transport_tickets    # icon z17- (also has captio
 amenity-water_point-drinking_water_no               # icon z18- (also has caption(optional) z18-)
 highway-elevator                                    # icon z17-
 leisure-picnic_table                                # icon z17- (also has caption(optional) z17-)
-man_made-telescope-gamma                            # icon z17- (also has caption(optional) z17-)
-man_made-telescope-radio                            # icon z17- (also has caption(optional) z17-)
 man_made-water_tap-drinking_water_no                # icon z18- (also has caption(optional) z18-)
 man_made-water_well-drinking_water_no               # icon z18- (also has caption(optional) z18-)
 natural-spring-drinking_water_no                    # icon z14- (also has caption(optional) z15-)
@@ -1146,10 +1143,6 @@ isoline-step_10                                     # pathtext z17- (also has li
 isoline-zero                                        # pathtext z17- (also has line z15-)
 === 1000

-social_facility-food_bank                           # icon z17- (also has caption(optional) z17-)
-social_facility-soup_kitchen                        # icon z17- (also has caption(optional) z17-)
-=== 851
-
 amenity-grave_yard                                  # icon z17- (also has caption(optional) z17-, area z10-)
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z10-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
@@ -1262,7 +1255,6 @@ power-portal                                        # icon z19-
 power-tower                                         # icon z19-
 === 450

-amenity-car_pooling                                 # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking                                     # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking-fee                                 # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking-multi-storey                        # icon z16- (also has caption(optional) z18-, area z15-)
@@ -2016,7 +2008,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-fitness_centre                            # caption(optional) z17- (also has icon z16-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
-# man_made-observatory                              # caption(optional) z16- (also has icon z16-)
 # office-estate_agent                               # caption(optional) z18- (also has icon z18-)
 # office-government                                 # caption(optional) z18- (also has icon z18-)
 # office-insurance                                  # caption(optional) z18- (also has icon z18-)
@@ -2157,17 +2148,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)
 # amenity-water_point-drinking_water_no             # caption(optional) z18- (also has icon z18-)
 # leisure-picnic_table                              # caption(optional) z17- (also has icon z17-)
-# man_made-telescope-gamma                          # caption(optional) z17- (also has icon z17-)
-# man_made-telescope-radio                          # caption(optional) z17- (also has icon z17-)
 # man_made-water_tap-drinking_water_no              # caption(optional) z18- (also has icon z18-)
 # man_made-water_well-drinking_water_no             # caption(optional) z18- (also has icon z18-)
 # natural-spring-drinking_water_no                  # caption(optional) z15- (also has icon z14-)
 # === -8800

-# social_facility-food_bank                         # caption(optional) z17- (also has icon z17-)
-# social_facility-soup_kitchen                      # caption(optional) z17- (also has icon z17-)
-# === -9149
-
 # amenity-grave_yard                                # caption(optional) z17- (also has icon z17-, area z10-)
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z10-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
@@ -2261,7 +2246,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-water_tower                              # caption(optional) z18- (also has icon z16-)
 # === -9550

-# amenity-car_pooling                               # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking                                   # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking-fee                               # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking-multi-storey                      # caption(optional) z18- (also has icon z16-, area z15-)
@@ -2336,8 +2320,6 @@ amenity-telephone                                   # icon z17- (also has captio
 entrance                                            # icon z17- (also has caption(optional) z19-)
 === -9960

-amenity-food_sharing                                # icon z18- (also has caption(optional) z18-)
-amenity-give_box                                    # icon z18- (also has caption(optional) z18-)
 amenity-parking_space                               # caption z19-
 amenity-parking_space-disabled                      # icon z18- (also has caption(optional) z19-)
 amenity-parking_space-permissive                    # caption z19-
@@ -2353,7 +2335,6 @@ amenity-vending_machine-food                        # icon z18- (also has captio
 amenity-vending_machine-newspapers                  # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-sweets                      # icon z18- (also has caption(optional) z18-)
 building-address                                    # caption z16-
-man_made-telescope-optical                          # icon z17- (also has caption(optional) z17-)
 === -9970

 amenity-bench                                       # icon z18- (also has caption(optional) z19-)
@@ -2363,7 +2344,6 @@ amenity-waste_disposal                              # icon z18- (also has captio
 emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17-
-man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
@@ -2373,8 +2353,6 @@ power-substation                                    # icon z17- (also has captio

 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
-# amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
-# amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
 amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
 # amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
@@ -2399,8 +2377,6 @@ entrance-exit                                       # icon z17- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
-# man_made-telescope                                # caption(optional) z18- (also has icon z18-)
-# man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)
--- a/data/styles/default/light/symbols/food_bank-m.svg
+++ b/data/styles/default/light/symbols/food_bank-m.svg
@@ -1 +0,0 @@
-<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="#9c6136" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#fff" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/food_sharing-m.svg
+++ b/data/styles/default/light/symbols/food_sharing-m.svg
@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#747e86" fill-rule="evenodd"/></svg>
--- a/data/styles/default/light/symbols/give_box-m.svg
+++ b/data/styles/default/light/symbols/give_box-m.svg
@@ -1 +0,0 @@
-<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#747e86" fill-rule="evenodd"/></svg>
--- a/data/styles/default/light/symbols/observatory-m.svg
+++ b/data/styles/default/light/symbols/observatory-m.svg
@@ -1 +0,0 @@
-<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="#747e86" r="8.25"/><path d="m11.9788057 9.45701798v4.46417412h-2.48216516v-1.9344754c0-.5341906-.43304708-.9672377-.96723771-.9672377-.51282301 0-.93243211.3990962-.96518032.9036416l-.00205739.0635961v1.9344754h-2.48216512v-4.46417412zm-3.44940287-4.1392834c1.90503617 0 3.44940287 1.54436664 3.44940287 3.44940283h-6.8988057c0-1.90503619 1.54436664-3.44940283 3.44940283-3.44940283zm4.47021307-1.83773458.6985699.69856997-1.0498311 1.04983111c.2863445.33051154.5419599.68947967.7623009 1.07107475l-.8568598.49403817c-.520321-.90122443-1.2678995-1.64880299-2.169124-2.16912399l.4940382-.8568598c.3815951.22034103.7405632.47595638 1.0710748.7623009z" fill="#fff"/></g></svg>
--- a/data/styles/default/light/symbols/parking_pooling-m.svg
+++ b/data/styles/default/light/symbols/parking_pooling-m.svg
@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#fff" opacity=".8"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#427bb8"/></g></svg>
--- a/data/styles/default/light/symbols/parking_pooling-s.svg
+++ b/data/styles/default/light/symbols/parking_pooling-s.svg
@@ -1 +0,0 @@
-<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#fff" opacity=".8"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#427bb8"/></g></svg>
--- a/data/styles/default/light/symbols/soup_kitchen-m.svg
+++ b/data/styles/default/light/symbols/soup_kitchen-m.svg
@@ -1 +0,0 @@
-<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="#9c6136" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-7.07695726-.61839887-.00064003-.76822841c-.79974138-.64144198-1.31177891-1.6268104-1.31177891-2.73177159h7c0 1.10496119-.5120375 2.09032961-1.3117789 2.73177159l-.00064.76822841z" fill="#fff" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/telescope-gamma-m.svg
+++ b/data/styles/default/light/symbols/telescope-gamma-m.svg
@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m13.1340274.00741332-8.49199134 1.21422959 1.21962985 1.21976833 6.55564899-.9357696-.9357696 6.55564895 1.2197683 1.21976832 1.2142296-8.49212981c.0725574-.50887145-.3895117-.8436881-.7815158-.78151578m-10.82601505.83814936c-2.97333242 2.97402475-2.97333242 7.79521825 0 10.76924302 2.97402475 2.9733324 7.79521825 2.9733324 10.76924305 0zm-.84645746 11.86715912v3.902594h-.69234211c-.38355753 0-.69234211.2895375-.69234211.6491399v.0864043c0 .3596025.30878458.64914.69234211.64914h8.30810528c.38355753 0 .69234211-.2895375.69234211-.64914v-.0864043c0-.3596024-.30878458-.6491399-.69234211-.6491399h-.6923421v-1.4278864c-2.47539997.1890094-5.00992596-.6352931-6.92342107-2.4747076" fill="#747e86" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/light/symbols/telescope-m.svg
+++ b/data/styles/default/light/symbols/telescope-m.svg
@@ -1 +0,0 @@
-<svg height="15" viewBox="0 0 14 15" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.82311911 5.67246657 3.40536139 7.66676663c.1034778.2351768 0 .507982-.244584.6208669-.2351769.1034779-.5079821 0-.620867-.2445839l-1.12884905-2.5399104h-4.40251137l-1.12884907 2.5399104c-.1128849.2445839-.38569009.3480618-.62086698.2445839-.24458397-.1128849-.3480618-.3856901-.24458397-.6208669l3.00085711-6.74487323-1.63683115.76197312-1.1946986-2.54931747 6.38740431-2.98204296 1.19469857 2.54931748zm-.79019435.54561038-1.78734435 4.01682125h3.57468871zm2.59635286-5.02337835 2.55872458-1.1946986 1.5897957 3.41476843-2.5587245 1.1946986zm-9.40707557 5.4278826 2.55872456-1.1946986.79019435 1.70268068-2.55872456 1.1946986z" fill="#747e86" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/light/symbols/telescope-optical-m.svg
+++ b/data/styles/default/light/symbols/telescope-optical-m.svg
@@ -1 +0,0 @@
-<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.6801082.00001-1.6419569 1.64195683c-.5169266-.44784856-1.0783599-.84763607-1.6751823-1.19225383l-.7726855 1.34014584c1.409533.81379244 2.5787608 1.98302024 3.3925532 3.39255325l1.3401459-.77268557c-.3446178-.59682233-.7444053-1.15825566-1.1922539-1.6751823l1.6419569-1.64195683zm-8.72593811 2.09165983c-4.26738784 0-7.72685565 3.45946781-7.72685565 7.72685565h15.45371126c0-4.26738784-3.4594678-7.72685565-7.72685561-7.72685565m-7.72685565 9.27222677v4.6361134h15.45371126v-4.6361134z" fill="#747e86" transform="translate(0 .5)"/></svg>
--- a/data/styles/default/light/symbols/telescope-radio-m.svg
+++ b/data/styles/default/light/symbols/telescope-radio-m.svg
@@ -1 +0,0 @@
-<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.69225716.00010119c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 2.68461564 0 4.84612664 2.16151093 4.84612664 4.8461266-.0138461.93627166 1.3978998.93627166 1.3846076 0 0-3.43299608-2.7977382-6.2307342-6.23073424-6.2307342m-5.38432358.84641063c-2.9731679 2.9738602-2.9731679 7.79478695 0 10.76864718 2.97386021 2.9731679 7.79478692 2.9731679 10.76864712 0zm5.38432358 1.92280457c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 1.15517812 0 2.0769114.92159482 2.0769114 2.0769114-.01384607.93627166 1.39789984.93627166 1.38460764 0 0-1.90355853-1.55796051-3.461519-3.46151904-3.461519m-6.2307342 9.94369791v3.9023781h-.6923038c-.38353631 0-.6923038.2895214-.6923038.649104v.0863996c0 .3595826.30876749.649104.6923038.649104h8.3076456c.38353631 0 .6923038-.2895214.6923038-.649104v-.0863996c0-.3595826-.30876749-.649104-.6923038-.649104h-.6923038v-1.4278074c-2.47526301.188999-5.00964876-.6352579-6.923038-2.4745707" fill="#747e86" transform="translate(0 .5)"/></svg>
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -269,9 +269,6 @@ node|z16-[man_made=survey_point],
 area|z14-[highway=rest_area],
 {icon-image: picnic-m.svg;}

-node|z15-[man_made=observatory],
-{icon-image: observatory-m.svg;}
-
 node|z15-[amenity=toilets],
 {icon-image: toilets-m.svg; font-size: 11;}

--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -140,7 +140,6 @@ railway-platform                                    # area z16- (also has captio

 amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -989,7 +989,6 @@ leisure-escape_game                                 # icon z17- (also has captio
 leisure-fitness_centre                              # icon z16- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
-man_made-observatory                                # icon z15- (also has caption(optional) z16-)
 office-estate_agent                                 # icon z18- (also has caption(optional) z18-)
 office-government                                   # icon z18- (also has caption(optional) z18-)
 office-insurance                                    # icon z18- (also has caption(optional) z18-)
@@ -1135,8 +1134,6 @@ amenity-vending_machine-public_transport_tickets    # icon z17- (also has captio
 amenity-water_point-drinking_water_no               # icon z14- (also has caption(optional) z14-)
 highway-elevator                                    # icon z17-
 leisure-picnic_table                                # icon z15- (also has caption(optional) z16-)
-man_made-telescope-gamma                            # icon z17- (also has caption(optional) z17-)
-man_made-telescope-radio                            # icon z17- (also has caption(optional) z17-)
 man_made-water_tap-drinking_water_no                # icon z14- (also has caption(optional) z14-)
 man_made-water_well-drinking_water_no               # icon z14- (also has caption(optional) z14-)
 natural-spring-drinking_water_no                    # icon z12- (also has caption(optional) z14-)
@@ -1147,10 +1144,6 @@ isoline-zero                                        # pathtext z15- (also has li
 power-line                                          # pathtext z15- (also has line z13-, line::dash z13-)
 === 1000

-social_facility-food_bank                           # icon z17- (also has caption(optional) z17-)
-social_facility-soup_kitchen                        # icon z17- (also has caption(optional) z17-)
-=== 851
-
 amenity-grave_yard                                  # icon z17- (also has caption(optional) z17-, area z10-)
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z10-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
@@ -1263,7 +1256,6 @@ power-portal                                        # icon z13-
 power-tower                                         # icon z13-
 === 450

-amenity-car_pooling                                 # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking                                     # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking-fee                                 # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking-multi-storey                        # icon z16- (also has caption(optional) z18-, area z15-)
@@ -2019,7 +2011,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-fitness_centre                            # caption(optional) z17- (also has icon z16-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
-# man_made-observatory                              # caption(optional) z16- (also has icon z15-)
 # office-estate_agent                               # caption(optional) z18- (also has icon z18-)
 # office-government                                 # caption(optional) z18- (also has icon z18-)
 # office-insurance                                  # caption(optional) z18- (also has icon z18-)
@@ -2160,17 +2151,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)
 # amenity-water_point-drinking_water_no             # caption(optional) z14- (also has icon z14-)
 # leisure-picnic_table                              # caption(optional) z16- (also has icon z15-)
-# man_made-telescope-gamma                          # caption(optional) z17- (also has icon z17-)
-# man_made-telescope-radio                          # caption(optional) z17- (also has icon z17-)
 # man_made-water_tap-drinking_water_no              # caption(optional) z14- (also has icon z14-)
 # man_made-water_well-drinking_water_no             # caption(optional) z14- (also has icon z14-)
 # natural-spring-drinking_water_no                  # caption(optional) z14- (also has icon z12-)
 # === -8800

-# social_facility-food_bank                         # caption(optional) z17- (also has icon z17-)
-# social_facility-soup_kitchen                      # caption(optional) z17- (also has icon z17-)
-# === -9149
-
 # amenity-grave_yard                                # caption(optional) z17- (also has icon z17-, area z10-)
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z10-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
@@ -2267,7 +2252,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-water_tower                              # caption(optional) z14- (also has icon z13-)
 # === -9550

-# amenity-car_pooling                               # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking                                   # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking-fee                               # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking-multi-storey                      # caption(optional) z18- (also has icon z16-, area z15-)
@@ -2342,8 +2326,6 @@ amenity-telephone                                   # icon z17- (also has captio
 entrance                                            # icon z17- (also has caption(optional) z19-)
 === -9960

-amenity-food_sharing                                # icon z18- (also has caption(optional) z18-)
-amenity-give_box                                    # icon z18- (also has caption(optional) z18-)
 amenity-parking_space                               # caption z19-
 amenity-parking_space-disabled                      # icon z18- (also has caption(optional) z19-)
 amenity-parking_space-permissive                    # caption z19-
@@ -2359,7 +2341,6 @@ amenity-vending_machine-food                        # icon z18- (also has captio
 amenity-vending_machine-newspapers                  # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-sweets                      # icon z18- (also has caption(optional) z18-)
 building-address                                    # caption z16-
-man_made-telescope-optical                          # icon z17- (also has caption(optional) z17-)
 === -9970

 amenity-bench                                       # icon z18- (also has caption(optional) z19-)
@@ -2369,7 +2350,6 @@ amenity-waste_disposal                              # icon z18- (also has captio
 emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17-
-man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
@@ -2379,8 +2359,6 @@ power-substation                                    # icon z17- (also has captio

 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
-# amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
-# amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
 amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
 # amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
@@ -2405,8 +2383,6 @@ entrance-exit                                       # icon z17- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
-# man_made-telescope                                # caption(optional) z18- (also has icon z18-)
-# man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -294,7 +294,6 @@ area|z14-[landuse=cemetery],
 area|z14-[amenity=university],
 area|z15-[leisure=stadium],
 area|z15-[amenity=parking],
-area|z15-[amenity=car_pooling],
 {fill-opacity: 1;}

 /* 7.1 Industrial */
@@ -386,10 +385,8 @@ area|z14-[landuse=farmyard],
 /* Parking */

 area|z15-[amenity=parking],
-area|z15-[amenity=car_pooling],
 {fill-color: @parking;fill-opacity: 1;}
 area|z17-[amenity=parking],
-area|z17-[amenity=car_pooling],
 {fill-color: @parking_l;fill-opacity: 1;}

 area|z15-[amenity=parking][location=underground],
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -600,7 +600,6 @@ node|z14-[amenity=charging_station][motorcar?][capacity?],
 node|z15-[amenity=sanitary_dump_station],
 node|z16-[amenity=charging_station],
 node|z16-[amenity=parking],
-node|z16-[amenity=car_pooling],
 area|z16-[landuse=garages],
 node|z16-[tourism=caravan_site],
 node|z17-[amenity=car_wash],
@@ -733,13 +732,9 @@ node|z18-[amenity=water_point][drinking_water=not],

 node|z15-[amenity=parking],
 {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
-node|z15-[amenity=car_pooling],
-{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z17[amenity=parking],
-node|z17[amenity=car_pooling],
 {icon-min-distance: 15;font-size: 13.75;}
 node|z18-[amenity=parking],
-node|z18-[amenity=car_pooling],
 {font-size: 14.5;}

 node|z15-[amenity=parking][location=underground],
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -14,7 +14,6 @@
 # - BG-top: water (linear and areal)
 # - BG-by-size: landcover areas sorted by their size

-amenity-car_pooling                                 # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-motorcycle_parking                          # area z17- (also has icon z17-)
 amenity-parking                                     # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-parking-fee                                 # area z15- (also has icon z15-, caption(optional) z16-)
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -234,7 +234,6 @@ amenity-sanitary_dump_station                       # icon z15- (also has captio
 shop-caravan                                        # icon z17-
 === 2600

-amenity-car_pooling                                 # icon z15- (also has caption(optional) z16-, area z15-)
 amenity-parking                                     # icon z15- (also has caption(optional) z16-, area z15-)
 amenity-parking-fee                                 # icon z15- (also has caption(optional) z16-, area z15-)
 amenity-parking-multi-storey                        # icon z15- (also has caption(optional) z16-, area z15-)
@@ -820,7 +819,6 @@ entrance-main                                       # icon z18- (also has captio
 # amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
 # === -7400

-# amenity-car_pooling                               # caption(optional) z16- (also has icon z15-, area z15-)
 # amenity-parking                                   # caption(optional) z16- (also has icon z15-, area z15-)
 # amenity-parking-fee                               # caption(optional) z16- (also has icon z15-, area z15-)
 # amenity-parking-multi-storey                      # caption(optional) z16- (also has icon z15-, area z15-)
--- a/data/taginfo.json
+++ b/data/taginfo.json
--- a/generator/feature_processing_layers.cpp
+++ b/generator/feature_processing_layers.cpp
@@ -124,8 +124,17 @@ void RepresentationLayer::Handle(FeatureBuilder & fb)

 void RepresentationLayer::HandleArea(FeatureBuilder & fb, FeatureBuilderParams const & params)
 {
+  if (CanBeArea(params))
+  {
    LayerBase::Handle(fb);
    fb.SetParams(params);
+  }
+  else if (CanBePoint(params))
+  {
+    // CanBePoint ignores exceptional types from TypeAlwaysExists / IsUsefulNondrawableType.
+    auto featurePoint = MakePoint(fb);
+    LayerBase::Handle(featurePoint);
+  }
 }

 // static
--- a/iphone/Maps/Classes/CarPlay/Template
+++ b/iphone/Maps/Classes/CarPlay/Template
@@ -125,35 +125,27 @@ final class MapTemplateBuilder {
  }
  
  private class func setupMuteAndRedirectButtons(template: CPMapTemplate) {
+    let muteButton = buildBarButton(type: .mute) { _ in
+      MWMTextToSpeech.setTTSEnabled(false)
+      setupUnmuteAndRedirectButtons(template: template)
+    }
    let redirectButton = buildBarButton(type: .redirectRoute) { _ in
      let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
      CarPlayService.shared.pushTemplate(listTemplate, animated: true)
    }
-    if MWMTextToSpeech.isTTSEnabled() {
-      let muteButton = buildBarButton(type: .mute) { _ in
-        MWMTextToSpeech.tts().active = false
-        setupUnmuteAndRedirectButtons(template: template)
-      }
    template.leadingNavigationBarButtons = [muteButton, redirectButton]
-    } else {
-      template.leadingNavigationBarButtons = [redirectButton]
-    }
  }
  
  private class func setupUnmuteAndRedirectButtons(template: CPMapTemplate) {
+    let unmuteButton = buildBarButton(type: .unmute) { _ in
+      MWMTextToSpeech.setTTSEnabled(true)
+      setupMuteAndRedirectButtons(template: template)
+    }
    let redirectButton = buildBarButton(type: .redirectRoute) { _ in
      let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
      CarPlayService.shared.pushTemplate(listTemplate, animated: true)
    }
-    if MWMTextToSpeech.isTTSEnabled() {
-      let unmuteButton = buildBarButton(type: .unmute) { _ in
-        MWMTextToSpeech.tts().active = true
-        setupMuteAndRedirectButtons(template: template)
-      }
    template.leadingNavigationBarButtons = [unmuteButton, redirectButton]
-    } else {
-      template.leadingNavigationBarButtons = [redirectButton]
-    }
  }
  
  // MARK: - CPMapButton builder
@@ -167,17 +159,6 @@ final class MapTemplateBuilder {
    case .zoomOut:
      button.image = UIImage(systemName: "minus")
    }
-    // Remove code below once Apple has fixed its issue with the button background
-    if #unavailable(iOS 26) {
-      switch type {
-      case .startPanning:
-        button.focusedImage = UIImage(systemName: "smallcircle.filled.circle.fill")
-      case .zoomIn:
-        button.focusedImage = UIImage(systemName: "plus.circle.fill")
-      case .zoomOut:
-        button.focusedImage = UIImage(systemName: "minus.circle.fill")
-      }
-    }
    return button
  }
  
--- a/Builders/SettingsTemplateBuilder.swift
+++ b/Builders/SettingsTemplateBuilder.swift
@@ -12,10 +12,8 @@ final class SettingsTemplateBuilder {
  
  private class func buildGridButtons() -> [CPGridButton] {
    let options = RoutingOptions()
-    return [createTollButton(options: options),
-            createUnpavedButton(options: options),
-            createPavedButton(options: options),
-            createMotorwayButton(options: options),
+    return [createUnpavedButton(options: options),
+            createTollButton(options: options),
            createFerryButton(options: options),
            createStepsButton(options: options),
            createSpeedcamButton()]
@@ -23,7 +21,7 @@ final class SettingsTemplateBuilder {
  
  // MARK: - CPGridButton builders
  private class func createTollButton(options: RoutingOptions) -> CPGridButton {
-    var tollIconName = "tolls.circle"
+    var tollIconName = "options.tolls"
    if options.avoidToll { tollIconName += ".slash" }
    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
    var image = UIImage(named: tollIconName, in: nil, with: configuration)!
@@ -41,8 +39,8 @@ final class SettingsTemplateBuilder {
  }
  
  private class func createUnpavedButton(options: RoutingOptions) -> CPGridButton {
-    var unpavedIconName = "unpaved.circle"
-    if options.avoidDirty && !options.avoidPaved { unpavedIconName += ".slash" }
+    var unpavedIconName = "options.unpaved"
+    if options.avoidDirty { unpavedIconName += ".slash" }
    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
    var image = UIImage(named: unpavedIconName, in: nil, with: configuration)!
    if #unavailable(iOS 26) {
@@ -51,59 +49,15 @@ final class SettingsTemplateBuilder {
    }
    let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")], image: image) { _ in
                                      options.avoidDirty = !options.avoidDirty
-                                      if options.avoidDirty {
-                                        options.avoidPaved = false
-                                      }
                                      options.save()
                                      CarPlayService.shared.updateRouteAfterChangingSettings()
                                      CarPlayService.shared.popTemplate(animated: true)
    }
-    unpavedButton.isEnabled = !options.avoidPaved
    return unpavedButton
  }
  
-  private class func createPavedButton(options: RoutingOptions) -> CPGridButton {
-    var pavedIconName = "paved.circle"
-    if options.avoidPaved && !options.avoidDirty { pavedIconName += ".slash" }
-    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
-    var image = UIImage(named: pavedIconName, in: nil, with: configuration)!
-    if #unavailable(iOS 26) {
-      image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
-      image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
-    }
-    let pavedButton = CPGridButton(titleVariants: [L("avoid_paved")], image: image) { _ in
-                                      options.avoidPaved = !options.avoidPaved
-                                      if options.avoidPaved {
-                                        options.avoidDirty = false
-                                      }
-                                      options.save()
-                                      CarPlayService.shared.updateRouteAfterChangingSettings()
-                                      CarPlayService.shared.popTemplate(animated: true)
-    }
-    pavedButton.isEnabled = !options.avoidDirty
-    return pavedButton
-  }
-    
-  private class func createMotorwayButton(options: RoutingOptions) -> CPGridButton {
-    var motorwayIconName = "motorways.circle"
-    if options.avoidMotorway { motorwayIconName += ".slash" }
-    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
-    var image = UIImage(named: motorwayIconName, in: nil, with: configuration)!
-    if #unavailable(iOS 26) {
-      image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
-      image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
-    }
-    let motorwayButton = CPGridButton(titleVariants: [L("avoid_motorways")], image: image) { _ in
-                                      options.avoidMotorway = !options.avoidMotorway
-                                      options.save()
-                                      CarPlayService.shared.updateRouteAfterChangingSettings()
-                                      CarPlayService.shared.popTemplate(animated: true)
-    }
-    return motorwayButton
-  }
-  
  private class func createFerryButton(options: RoutingOptions) -> CPGridButton {
-    var ferryIconName = "ferries.circle"
+    var ferryIconName = "options.ferries"
    if options.avoidFerry { ferryIconName += ".slash" }
    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
    var image = UIImage(named: ferryIconName, in: nil, with: configuration)!
@@ -121,7 +75,7 @@ final class SettingsTemplateBuilder {
  }
    
  private class func createStepsButton(options: RoutingOptions) -> CPGridButton {
-    var stepsIconName = "steps.circle"
+    var stepsIconName = "options.steps"
    if options.avoidSteps { stepsIconName += ".slash" }
    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
    var image = UIImage(named: stepsIconName, in: nil, with: configuration)!
@@ -139,7 +93,7 @@ final class SettingsTemplateBuilder {
  }
  
  private class func createSpeedcamButton() -> CPGridButton {
-    var speedcamIconName = "speedcamera"
+    var speedcamIconName = "options.speedcamera"
    let isSpeedCamActivated = CarPlayService.shared.isSpeedCamActivated
    if !isSpeedCamActivated { speedcamIconName += ".slash" }
    let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
--- a/iphone/Maps/Core/Routing/MWMRouter.h
+++ b/iphone/Maps/Core/Routing/MWMRouter.h
@@ -6,8 +6,7 @@ typedef NS_ENUM(NSInteger, MWMRoadType) {
  MWMRoadTypeDirty,
  MWMRoadTypeFerry,
  MWMRoadTypeMotorway,
-  MWMRoadTypeSteps,
-  MWMRoadTypePaved
+  MWMRoadTypeSteps
 };

 typedef void (^MWMImageHeightBlock)(UIImage *, NSString *, NSString *);
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -592,9 +592,6 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
    case MWMRoadTypeDirty:
      options.avoidDirty = YES;
      break;
-    case MWMRoadTypePaved:
-      options.avoidPaved = YES;
-      break;
    case MWMRoadTypeFerry:
      options.avoidFerry = YES;
      break;
--- a/iphone/Maps/Core/Settings/MWMRoutingOptions.h
+++ b/iphone/Maps/Core/Settings/MWMRoutingOptions.h
@@ -7,7 +7,6 @@ NS_SWIFT_NAME(RoutingOptions)

@property(nonatomic) BOOL avoidToll;
@property(nonatomic) BOOL avoidDirty;
-@property(nonatomic) BOOL avoidPaved;
@property(nonatomic) BOOL avoidFerry;
@property(nonatomic) BOOL avoidMotorway;
@property(nonatomic) BOOL avoidSteps;
--- a/iphone/Maps/Core/Settings/MWMRoutingOptions.mm
+++ b/iphone/Maps/Core/Settings/MWMRoutingOptions.mm
@@ -35,14 +35,6 @@
  [self setOption:(routing::RoutingOptions::Road::Dirty) enabled:avoid];
 }

- (BOOL)avoidPaved {
-  return _options.Has(routing::RoutingOptions::Road::Paved);
-}
-
- (void)setAvoidPaved:(BOOL)avoid {
-  [self setOption:(routing::RoutingOptions::Road::Paved) enabled:avoid];
-}
-
 - (BOOL)avoidFerry {
  return _options.Has(routing::RoutingOptions::Road::Ferry);
 }
@@ -68,7 +60,7 @@
 }

 - (BOOL)hasOptions {
-  return self.avoidToll || self.avoidDirty || self.avoidPaved|| self.avoidFerry || self.avoidMotorway || self.avoidSteps;
+  return self.avoidToll || self.avoidDirty || self.avoidFerry || self.avoidMotorway || self.avoidSteps;
 }

 - (void)save {
@@ -88,7 +80,8 @@
    return NO;
  }
  MWMRoutingOptions *another = (MWMRoutingOptions *)object;
-  return another.avoidToll == self.avoidToll && another.avoidDirty == self.avoidDirty && another.avoidPaved == self.avoidPaved && another.avoidFerry == self.avoidFerry && another.avoidMotorway == self.avoidMotorway && another.avoidSteps == self.avoidSteps;
+  return another.avoidToll == self.avoidToll && another.avoidDirty == self.avoidDirty &&
+  another.avoidFerry == self.avoidFerry && another.avoidMotorway == self.avoidMotorway && another.avoidSteps == self.avoidSteps;
 }

@end
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/ferries.circle.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.slash.symbolset/ferries.circle.slash.svg
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Generator: Apple Native CoreSVG 341-->
-<!DOCTYPE svg
-PUBLIC "-//W3C//DTD SVG 1.1//EN"
-       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
-
-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be -3971741db92558f0 _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be -3971741db92558f0 55194837de271852}
-.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-3971741db92558f0 _slash}
-.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-3971741db92558f0 _slash}
-
-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be -3971741db92558f0 _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be -3971741db92558f0 55194837de271852}
-.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-3971741db92558f0 _slash}
-.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-3971741db92558f0 _slash}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be -3971741db92558f0 _enclosure.stroke circle}
-.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be -3971741db92558f0 55194837de271852}
-.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-3971741db92558f0 _slash}
-.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-3971741db92558f0 _slash}
-
-.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
-</style>
- <g id="Notes">
-  <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
-  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
-  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
-  </g>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
-  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
- </g>
- <g id="Guides">
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
-  <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
-  <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
-  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
-  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2982.23" x2="2982.23" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2884.57" x2="2884.57" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1496.11" x2="1496.11" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1403.58" x2="1403.58" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.773" x2="603.773" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="515.649" x2="515.649" y1="600.785" y2="720.121"/>
- </g>
- <g id="Symbols">
-  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M60.554-14.248C62.8762-14.248 64.4984-13.6712 66.7416-12.3402L67.7413-11.7392C68.3287-11.3878 68.8529-11.0951 69.3512-10.8502L69.4148-10.8314C70.2872-10.5735 70.7853-9.6573 70.5275-8.78493C70.3897-8.31872 70.0549-7.94225 69.6197-7.74786L69.3472-7.65382C68.5836-7.94444 67.8321-8.31134 67.005-8.77694L65.9788-9.3791L65.246-9.81948C63.4148-10.906 62.259-11.3169 60.554-11.3169C59.1982-11.3169 58.2903-10.9939 56.8964-10.0835L55.8714-9.38118C53.3645-7.63685 51.6482-6.92034 48.8298-6.92034C46.2446-6.92034 44.6625-7.50767 42.5097-8.97154L41.6554-9.57321C39.8081-10.8956 38.846-11.3169 37.1056-11.3169C35.6145-11.3169 34.8013-11.1051 33.8515-10.5306L33.1913-10.0948L32.5906-9.67794C32.1787-9.39518 31.8273-9.16908 31.4449-8.94731C30.5234-8.41285 29.5127-7.96628 28.3187-7.59451C27.4628-7.81681 26.9491-8.69089 27.1714-9.54682C27.2921-10.0116 27.6132-10.3924 28.0389-10.5929L28.3172-10.6938C28.9275-10.9284 29.4698-11.1901 29.9744-11.4828L30.5945-11.8674L31.856-12.7329C33.4434-13.7963 34.8244-14.248 37.1056-14.248C39.3814-14.248 40.8095-13.7057 42.8028-12.3474L43.614-11.7756C45.6382-10.3257 46.7419-9.85139 48.8298-9.85139C50.7432-9.85139 51.9105-10.2661 53.6553-11.4188L54.6784-12.1223C56.8457-13.6258 58.3041-14.248 60.554-14.248ZM48.8298-38.6517L73.7438-32.8524L66.4184-15.4602C64.3389-16.657 62.7632-17.179 60.554-17.179C58.5291-17.179 57.1453-16.675 55.3088-15.4783L54.1974-14.7182C52.1365-13.2842 50.9346-12.7825 48.8298-12.7825C46.9317-12.7825 45.847-13.1745 44.1446-14.335L43.3615-14.8876C41.0622-16.5336 39.5883-17.179 37.1056-17.179C34.8244-17.179 33.4434-16.7274 31.856-15.664L31.3044-15.2844L23.9158-32.8524L48.8298-38.6517ZM53.6761-57.2129L59.5787-57.2066C60.2326-57.2066 60.8061-56.7702 60.9805-56.14L66.229-37.153L48.8298-41.2064L31.4262-37.153L36.6791-56.14C36.8535-56.7702 37.427-57.2066 38.0809-57.2066L53.6761-57.2129ZM47.6158-53.6672L39.3333-53.6634C39.1154-53.6634 38.9243-53.5179 38.8662-53.3079L36.9524-46.3905L47.6158-46.3943L47.6158-53.6672ZM50.04-53.6672L50.04-46.3943L60.7072-46.3905L58.7934-53.3079C58.7353-53.5179 58.5442-53.6634 58.3263-53.6634L50.04-53.6672ZM50.7692-63.5063C51.037-63.5063 51.2541-63.2893 51.2541-63.0215L51.247-58.7111L46.4033-58.7111L46.4055-63.0215C46.4055-63.2893 46.6226-63.5063 46.8904-63.5063L50.7692-63.5063Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707336 0 1 0 0.047073364"/>
-  </g>
-  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M57.213-15.4768C59.3815-15.4768 60.8964-14.9382 62.9912-13.6953L63.9248-13.134C64.4732-12.8058 64.9628-12.5326 65.4281-12.3038L65.4875-12.2863C66.3022-12.0455 66.7674-11.1899 66.5266-10.3752C66.3979-9.93987 66.0853-9.5883 65.6788-9.40678L65.4244-9.31896C64.7113-9.59035 64.0096-9.93298 63.2371-10.3678L62.2788-10.9301L61.5945-11.3413C59.8845-12.3559 58.8052-12.7397 57.213-12.7397C55.9468-12.7397 55.099-12.438 53.7974-11.5879L52.8402-10.932C50.4991-9.30311 48.8964-8.63401 46.2645-8.63401C43.8503-8.63401 42.3729-9.18248 40.3625-10.5495L39.5648-11.1114C37.8397-12.3463 36.9413-12.7397 35.316-12.7397C33.9236-12.7397 33.1642-12.5419 32.2772-12.0054L31.6608-11.5984L31.0998-11.2092C30.7151-10.9451 30.387-10.734 30.0299-10.5269C29.1694-10.0278 28.2255-9.61075 27.1106-9.26357C26.3113-9.47116 25.8316-10.2874 26.0392-11.0867C26.1519-11.5207 26.4517-11.8763 26.8492-12.0636L27.1091-12.1578C27.679-12.3769 28.1854-12.6213 28.6567-12.8946L29.2358-13.2538L30.4138-14.062C31.8962-15.055 33.1858-15.4768 35.316-15.4768C37.4412-15.4768 38.7749-14.9704 40.6363-13.702L41.3938-13.168C43.284-11.8141 44.3148-11.3711 46.2645-11.3711C48.0513-11.3711 49.1414-11.7584 50.7707-12.8349L51.7261-13.4918C53.75-14.8958 55.1119-15.4768 57.213-15.4768ZM46.2645-38.2658L69.5301-32.8502L62.6894-16.6089C60.7474-17.7265 59.276-18.2139 57.213-18.2139C55.322-18.2139 54.0298-17.7433 52.3148-16.6257L51.2769-15.9159C49.3524-14.5768 48.23-14.1083 46.2645-14.1083C44.492-14.1083 43.479-14.4743 41.8893-15.5581L41.158-16.0741C39.0108-17.6112 37.6344-18.2139 35.316-18.2139C33.1858-18.2139 31.8962-17.7922 30.4138-16.7992L29.8987-16.4446L22.9989-32.8502L46.2645-38.2658ZM50.7902-55.599L56.3022-55.5931C56.9128-55.5931 57.4484-55.1856 57.6113-54.597L62.5125-36.8664L46.2645-40.6515L30.0124-36.8664L34.9177-54.597C35.0806-55.1856 35.6162-55.5931 36.2268-55.5931L50.7902-55.599ZM45.1308-52.2878L37.3963-52.2844C37.1928-52.2843 37.0144-52.1485 36.9601-51.9523L35.1729-45.4926L45.1308-45.4962L45.1308-52.2878ZM47.3947-52.2878L47.3947-45.4962L57.3561-45.4926L55.5689-51.9523C55.5146-52.1485 55.3362-52.2843 55.1327-52.2844L47.3947-52.2878ZM48.0756-61.476C48.3257-61.476 48.5284-61.2733 48.5284-61.0232L48.5218-56.9981L43.9986-56.9981L44.0006-61.0232C44.0006-61.2733 44.2033-61.476 44.4534-61.476L48.0756-61.476Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010777 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497179 0 1 0 0.049717903"/>
-  </g>
-  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M53.7648-17.7847C55.6866-17.7847 57.0292-17.3074 58.8857-16.2059L59.7131-15.7084C60.1991-15.4176 60.633-15.1754 61.0454-14.9727L61.098-14.9571C61.82-14.7437 62.2323-13.9854 62.0189-13.2635C61.9049-12.8776 61.6278-12.566 61.2676-12.4052L61.0421-12.3273C60.4102-12.5679 59.7882-12.8715 59.1036-13.2568L58.2544-13.7552L57.6479-14.1197C56.1324-15.0189 55.1758-15.359 53.7648-15.359C52.6427-15.359 51.8913-15.0916 50.7377-14.3381L49.8894-13.7569C47.8147-12.3133 46.3943-11.7203 44.0617-11.7203C41.9222-11.7203 40.6129-12.2064 38.8312-13.4179L38.1241-13.9158C36.5953-15.0103 35.7991-15.359 34.3587-15.359C33.1246-15.359 32.4516-15.1837 31.6656-14.7082L31.1192-14.3475L30.6221-14.0025C30.2811-13.7685 29.9904-13.5814 29.6739-13.3978C28.9112-12.9555 28.0748-12.5859 27.0866-12.2783C26.3783-12.4622 25.9531-13.1856 26.1371-13.894C26.237-14.2786 26.5027-14.5938 26.855-14.7597L27.0853-14.8432C27.5904-15.0374 28.0393-15.254 28.4569-15.4962L28.9701-15.8145L30.0141-16.5309C31.3279-17.4109 32.4708-17.7847 34.3587-17.7847C36.2422-17.7847 37.4241-17.3359 39.0738-16.2118L39.7451-15.7386C41.4203-14.5386 42.3338-14.1461 44.0617-14.1461C45.6453-14.1461 46.6113-14.4893 48.0553-15.4433L48.9021-16.0255C50.6957-17.2698 51.9027-17.7847 53.7648-17.7847ZM44.0617-37.9814L64.6808-33.1818L58.6182-18.788C56.8972-19.7785 55.5931-20.2105 53.7648-20.2105C52.0889-20.2105 50.9437-19.7934 49.4238-18.8029L48.504-18.1739C46.7984-16.9871 45.8037-16.5718 44.0617-16.5718C42.4909-16.5718 41.5931-16.8963 40.1843-17.8568L39.5362-18.3141C37.6332-19.6763 36.4134-20.2105 34.3587-20.2105C32.4708-20.2105 31.3279-19.8367 30.0141-18.9566L29.5576-18.6424L23.4427-33.1818L44.0617-37.9814ZM48.0726-53.3428L52.9576-53.3376C53.4988-53.3376 53.9734-52.9764 54.1178-52.4548L58.4615-36.7411L44.0617-40.0957L29.6584-36.7411L34.0057-52.4548C34.15-52.9764 34.6247-53.3376 35.1659-53.3376L48.0726-53.3428ZM43.057-50.4083L36.2023-50.4053C36.022-50.4052 35.8639-50.2848 35.8158-50.111L34.2319-44.3861L43.057-44.3893L43.057-50.4083ZM45.0633-50.4083L45.0633-44.3893L53.8916-44.3861L52.3077-50.111C52.2596-50.2848 52.1015-50.4052 51.9211-50.4053L45.0633-50.4083ZM45.6668-58.5513C45.8884-58.5513 46.0681-58.3717 46.0681-58.15L46.0622-54.5828L42.0536-54.5828L42.0554-58.15C42.0554-58.3717 42.2351-58.5513 42.4567-58.5513L45.6668-58.5513Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
-  </g>
- </g>
-</svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/ferries.circle.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.circle.symbolset/ferries.circle.svg
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Generator: Apple Native CoreSVG 341-->
-<!DOCTYPE svg
-PUBLIC "-//W3C//DTD SVG 1.1//EN"
-       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-draw-reverses-motion-groups:true}
-
-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-2d1e265917a563be 55194837de271852}
-
-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-2d1e265917a563be 55194837de271852}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2d1e265917a563be _enclosure.stroke circle}
-.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-2d1e265917a563be 55194837de271852}
-
-.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
-</style>
- <g id="Notes">
-  <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
-  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
-  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
-  </g>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
-  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from circle</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
- </g>
- <g id="Guides">
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
-  <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
-  <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
-  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
-  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2982.23" x2="2982.23" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2884.57" x2="2884.57" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1496.11" x2="1496.11" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1403.58" x2="1403.58" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.773" x2="603.773" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="515.649" x2="515.649" y1="600.785" y2="720.121"/>
- </g>
- <g id="Symbols">
-  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M60.554-14.248C62.8762-14.248 64.4984-13.6712 66.7416-12.3402L67.7413-11.7392C68.3287-11.3878 68.8529-11.0951 69.3512-10.8502L69.4148-10.8314C70.2872-10.5735 70.7853-9.6573 70.5275-8.78493C70.3897-8.31872 70.0549-7.94225 69.6197-7.74786L69.3472-7.65382C68.5836-7.94444 67.8321-8.31134 67.005-8.77694L65.9788-9.3791L65.246-9.81948C63.4148-10.906 62.259-11.3169 60.554-11.3169C59.1982-11.3169 58.2903-10.9939 56.8964-10.0835L55.8714-9.38118C53.3645-7.63685 51.6482-6.92034 48.8298-6.92034C46.2446-6.92034 44.6625-7.50767 42.5097-8.97154L41.6554-9.57321C39.8081-10.8956 38.846-11.3169 37.1056-11.3169C35.6145-11.3169 34.8013-11.1051 33.8515-10.5306L33.1913-10.0948L32.5906-9.67794C32.1787-9.39518 31.8273-9.16908 31.4449-8.94731C30.5234-8.41285 29.5127-7.96628 28.3187-7.59451C27.4628-7.81681 26.9491-8.69089 27.1714-9.54682C27.2921-10.0116 27.6132-10.3924 28.0389-10.5929L28.3172-10.6938C28.9275-10.9284 29.4698-11.1901 29.9744-11.4828L30.5945-11.8674L31.856-12.7329C33.4434-13.7963 34.8244-14.248 37.1056-14.248C39.3814-14.248 40.8095-13.7057 42.8028-12.3474L43.614-11.7756C45.6382-10.3257 46.7419-9.85139 48.8298-9.85139C50.7432-9.85139 51.9105-10.2661 53.6553-11.4188L54.6784-12.1223C56.8457-13.6258 58.3041-14.248 60.554-14.248ZM48.8298-38.6517L73.7438-32.8524L66.4184-15.4602C64.3389-16.657 62.7632-17.179 60.554-17.179C58.5291-17.179 57.1453-16.675 55.3088-15.4783L54.1974-14.7182C52.1365-13.2842 50.9346-12.7825 48.8298-12.7825C46.9317-12.7825 45.847-13.1745 44.1446-14.335L43.3615-14.8876C41.0622-16.5336 39.5883-17.179 37.1056-17.179C34.8244-17.179 33.4434-16.7274 31.856-15.664L31.3044-15.2844L23.9158-32.8524L48.8298-38.6517ZM53.6761-57.2129L59.5787-57.2066C60.2326-57.2066 60.8061-56.7702 60.9805-56.14L66.229-37.153L48.8298-41.2064L31.4262-37.153L36.6791-56.14C36.8535-56.7702 37.427-57.2066 38.0809-57.2066L53.6761-57.2129ZM47.6158-53.6672L39.3333-53.6634C39.1154-53.6634 38.9243-53.5179 38.8662-53.3079L36.9524-46.3905L47.6158-46.3943L47.6158-53.6672ZM50.04-53.6672L50.04-46.3943L60.7072-46.3905L58.7934-53.3079C58.7353-53.5179 58.5442-53.6634 58.3263-53.6634L50.04-53.6672ZM50.7692-63.5063C51.037-63.5063 51.2541-63.2893 51.2541-63.0215L51.247-58.7111L46.4033-58.7111L46.4055-63.0215C46.4055-63.2893 46.6226-63.5063 46.8904-63.5063L50.7692-63.5063Z"/>
-  </g>
-  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M57.213-15.4768C59.3815-15.4768 60.8964-14.9382 62.9912-13.6953L63.9248-13.134C64.4732-12.8058 64.9628-12.5326 65.4281-12.3038L65.4875-12.2863C66.3022-12.0455 66.7674-11.1899 66.5266-10.3752C66.3979-9.93987 66.0853-9.5883 65.6788-9.40678L65.4244-9.31896C64.7113-9.59035 64.0096-9.93298 63.2371-10.3678L62.2788-10.9301L61.5945-11.3413C59.8845-12.3559 58.8052-12.7397 57.213-12.7397C55.9468-12.7397 55.099-12.438 53.7974-11.5879L52.8402-10.932C50.4991-9.30311 48.8964-8.63401 46.2645-8.63401C43.8503-8.63401 42.3729-9.18248 40.3625-10.5495L39.5648-11.1114C37.8397-12.3463 36.9413-12.7397 35.316-12.7397C33.9236-12.7397 33.1642-12.5419 32.2772-12.0054L31.6608-11.5984L31.0998-11.2092C30.7151-10.9451 30.387-10.734 30.0299-10.5269C29.1694-10.0278 28.2255-9.61075 27.1106-9.26357C26.3113-9.47116 25.8316-10.2874 26.0392-11.0867C26.1519-11.5207 26.4517-11.8763 26.8492-12.0636L27.1091-12.1578C27.679-12.3769 28.1854-12.6213 28.6567-12.8946L29.2358-13.2538L30.4138-14.062C31.8962-15.055 33.1858-15.4768 35.316-15.4768C37.4412-15.4768 38.7749-14.9704 40.6363-13.702L41.3938-13.168C43.284-11.8141 44.3148-11.3711 46.2645-11.3711C48.0513-11.3711 49.1414-11.7584 50.7707-12.8349L51.7261-13.4918C53.75-14.8958 55.1119-15.4768 57.213-15.4768ZM46.2645-38.2658L69.5301-32.8502L62.6894-16.6089C60.7474-17.7265 59.276-18.2139 57.213-18.2139C55.322-18.2139 54.0298-17.7433 52.3148-16.6257L51.2769-15.9159C49.3524-14.5768 48.23-14.1083 46.2645-14.1083C44.492-14.1083 43.479-14.4743 41.8893-15.5581L41.158-16.0741C39.0108-17.6112 37.6344-18.2139 35.316-18.2139C33.1858-18.2139 31.8962-17.7922 30.4138-16.7992L29.8987-16.4446L22.9989-32.8502L46.2645-38.2658ZM50.7902-55.599L56.3022-55.5931C56.9128-55.5931 57.4484-55.1856 57.6113-54.597L62.5125-36.8664L46.2645-40.6515L30.0124-36.8664L34.9177-54.597C35.0806-55.1856 35.6162-55.5931 36.2268-55.5931L50.7902-55.599ZM45.1308-52.2878L37.3963-52.2844C37.1928-52.2843 37.0144-52.1485 36.9601-51.9523L35.1729-45.4926L45.1308-45.4962L45.1308-52.2878ZM47.3947-52.2878L47.3947-45.4962L57.3561-45.4926L55.5689-51.9523C55.5146-52.1485 55.3362-52.2843 55.1327-52.2844L47.3947-52.2878ZM48.0756-61.476C48.3257-61.476 48.5284-61.2733 48.5284-61.0232L48.5218-56.9981L43.9986-56.9981L44.0006-61.0232C44.0006-61.2733 44.2033-61.476 44.4534-61.476L48.0756-61.476Z"/>
-  </g>
-  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M53.7648-17.7847C55.6866-17.7847 57.0292-17.3074 58.8857-16.2059L59.7131-15.7084C60.1991-15.4176 60.633-15.1754 61.0454-14.9727L61.098-14.9571C61.82-14.7437 62.2323-13.9854 62.0189-13.2635C61.9049-12.8776 61.6278-12.566 61.2676-12.4052L61.0421-12.3273C60.4102-12.5679 59.7882-12.8715 59.1036-13.2568L58.2544-13.7552L57.6479-14.1197C56.1324-15.0189 55.1758-15.359 53.7648-15.359C52.6427-15.359 51.8913-15.0916 50.7377-14.3381L49.8894-13.7569C47.8147-12.3133 46.3943-11.7203 44.0617-11.7203C41.9222-11.7203 40.6129-12.2064 38.8312-13.4179L38.1241-13.9158C36.5953-15.0103 35.7991-15.359 34.3587-15.359C33.1246-15.359 32.4516-15.1837 31.6656-14.7082L31.1192-14.3475L30.6221-14.0025C30.2811-13.7685 29.9904-13.5814 29.6739-13.3978C28.9112-12.9555 28.0748-12.5859 27.0866-12.2783C26.3783-12.4622 25.9531-13.1856 26.1371-13.894C26.237-14.2786 26.5027-14.5938 26.855-14.7597L27.0853-14.8432C27.5904-15.0374 28.0393-15.254 28.4569-15.4962L28.9701-15.8145L30.0141-16.5309C31.3279-17.4109 32.4708-17.7847 34.3587-17.7847C36.2422-17.7847 37.4241-17.3359 39.0738-16.2118L39.7451-15.7386C41.4203-14.5386 42.3338-14.1461 44.0617-14.1461C45.6453-14.1461 46.6113-14.4893 48.0553-15.4433L48.9021-16.0255C50.6957-17.2698 51.9027-17.7847 53.7648-17.7847ZM44.0617-37.9814L64.6808-33.1818L58.6182-18.788C56.8972-19.7785 55.5931-20.2105 53.7648-20.2105C52.0889-20.2105 50.9437-19.7934 49.4238-18.8029L48.504-18.1739C46.7984-16.9871 45.8037-16.5718 44.0617-16.5718C42.4909-16.5718 41.5931-16.8963 40.1843-17.8568L39.5362-18.3141C37.6332-19.6763 36.4134-20.2105 34.3587-20.2105C32.4708-20.2105 31.3279-19.8367 30.0141-18.9566L29.5576-18.6424L23.4427-33.1818L44.0617-37.9814ZM48.0726-53.3428L52.9576-53.3376C53.4988-53.3376 53.9734-52.9764 54.1178-52.4548L58.4615-36.7411L44.0617-40.0957L29.6584-36.7411L34.0057-52.4548C34.15-52.9764 34.6247-53.3376 35.1659-53.3376L48.0726-53.3428ZM43.057-50.4083L36.2023-50.4053C36.022-50.4052 35.8639-50.2848 35.8158-50.111L34.2319-44.3861L43.057-44.3893L43.057-50.4083ZM45.0633-50.4083L45.0633-44.3893L53.8916-44.3861L52.3077-50.111C52.2596-50.2848 52.1015-50.4052 51.9211-50.4053L45.0633-50.4083ZM45.6668-58.5513C45.8884-58.5513 46.0681-58.3717 46.0681-58.15L46.0622-54.5828L42.0536-54.5828L42.0554-58.15C42.0554-58.3717 42.2351-58.5513 42.4567-58.5513L45.6668-58.5513Z"/>
-  </g>
- </g>
-</svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/ferries.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.slash.symbolset/ferries.slash.svg
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Generator: Apple Native CoreSVG 341-->
-<!DOCTYPE svg
-PUBLIC "-//W3C//DTD SVG 1.1//EN"
-       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
-
-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-745dd7955d6b1309 55194837de271852}
-.monochrome-1 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-745dd7955d6b1309 _slash}
-.monochrome-2 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-745dd7955d6b1309 _slash}
-
-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-745dd7955d6b1309 55194837de271852}
-.multicolor-1:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-745dd7955d6b1309 _slash}
-.multicolor-2:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-745dd7955d6b1309 _slash}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-745dd7955d6b1309 55194837de271852}
-.hierarchical-1:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-745dd7955d6b1309 _slash}
-.hierarchical-2:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-745dd7955d6b1309 _slash}
-
-.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
-</style>
- <g id="Notes">
-  <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
-  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
-  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
-  </g>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
-  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
- </g>
- <g id="Guides">
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
-  <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
-  <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
-  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
-  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2987.45" x2="2987.45" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2879.35" x2="2879.35" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1500.8" x2="1500.8" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1398.89" x2="1398.89" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="608.098" x2="608.098" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="511.325" x2="511.325" y1="600.785" y2="720.121"/>
- </g>
- <g id="Symbols">
-  <g id="Black-S" transform="matrix(1 0 0 1 2879.35 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M76.844 5.57477C81.358 5.57477 84.5116 6.69604 88.8723 9.28333L90.8157 10.4517C91.9574 11.1349 92.9765 11.7038 93.9452 12.1799L94.0688 12.2164C95.7646 12.7177 96.733 14.4988 96.2318 16.1946C95.9639 17.1009 95.3132 17.8328 94.467 18.2106L93.9374 18.3934C92.453 17.8285 90.9922 17.1153 89.3842 16.2102L87.3894 15.0396L85.9649 14.1835C82.4051 12.0714 80.1583 11.2726 76.844 11.2726C74.2082 11.2726 72.4433 11.9006 69.7337 13.6703L67.7412 15.0356C62.8679 18.4264 59.5315 19.8193 54.0527 19.8193C49.0272 19.8193 45.9517 18.6776 41.7667 15.8319L40.106 14.6623C36.5151 12.0916 34.6447 11.2726 31.2615 11.2726C28.3628 11.2726 26.782 11.6843 24.9357 12.8012L23.6524 13.6483L22.4847 14.4587C21.6838 15.0083 21.0008 15.4479 20.2575 15.879C18.4661 16.9179 16.5014 17.786 14.1804 18.5088C12.5165 18.0766 11.5179 16.3774 11.9501 14.7136C12.1847 13.8101 12.8088 13.0698 13.6363 12.6801L14.1773 12.484C15.3637 12.0278 16.4179 11.5191 17.3989 10.9502L18.6044 10.2025L21.0566 8.51991C24.1425 6.45276 26.827 5.57477 31.2615 5.57477C35.6855 5.57477 38.4617 6.629 42.3366 9.2694L43.9134 10.3809C47.8483 13.1994 49.994 14.1215 54.0527 14.1215C57.7723 14.1215 60.0414 13.3153 63.4332 11.0745L65.4221 9.7069C69.6351 6.78432 72.4702 5.57477 76.844 5.57477ZM54.0527-41.8646L102.484-30.5911L88.244 3.21819C84.2015 0.891763 81.1384-0.123042 76.844-0.123042C72.9076-0.123042 70.2175 0.85669 66.6476 3.1832L64.4869 4.6607C60.4807 7.44824 58.1442 8.42368 54.0527 8.42368C50.363 8.42368 48.2543 7.66161 44.945 5.40552L43.4227 4.33142C38.9528 1.13158 36.0877-0.123042 31.2615-0.123042C26.827-0.123042 24.1425 0.754951 21.0566 2.8221L19.9844 3.56011L5.62131-30.5911L54.0527-41.8646ZM63.4737-77.9467L74.9479-77.9343C76.2191-77.9343 77.334-77.086 77.6731-75.8609L87.8758-38.9514L54.0527-46.8309L20.2211-38.9514L30.4324-75.8609C30.7714-77.086 31.8863-77.9343 33.1575-77.9343L63.4737-77.9467ZM51.6927-71.0539L35.592-71.0467C35.1684-71.0465 34.797-70.7637 34.684-70.3555L30.9637-56.9084L51.6927-56.9159L51.6927-71.0539ZM56.4053-71.0539L56.4053-56.9159L77.1418-56.9084L73.4214-70.3555C73.3085-70.7637 72.937-71.0465 72.5134-71.0467L56.4053-71.0539ZM57.8228-90.1807C58.3434-90.1807 58.7654-89.7587 58.7654-89.2382L58.7516-80.8591L49.3358-80.8591L49.3401-89.2382C49.3401-89.7587 49.7621-90.1807 50.2826-90.1807L57.8228-90.1807Z"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M98.0218-4.48836C101.673-0.837264 101.673 5.09118 98.0218 8.74227C94.3707 12.3934 88.4422 12.3934 84.7911 8.74227L10.0782-65.9706C6.42714-69.6217 6.42714-75.5502 10.0782-79.2013C13.7293-82.8524 19.6578-82.8524 23.3089-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M93.8717-0.338247C95.2322 1.02234 95.2322 3.23158 93.8717 4.59217C92.5111 5.95275 90.3018 5.95275 88.9412 4.59217L14.2283-70.1207C12.8678-71.4813 12.8678-73.6906 14.2283-75.0511C15.5889-76.4117 17.7982-76.4117 19.1588-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
-  </g>
-  <g id="Regular-S" transform="matrix(1 0 0 1 1398.89 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M71.6715 2.38248C75.7751 2.38248 78.6421 3.40182 82.6063 5.75389L84.373 6.81606C85.4109 7.43712 86.3374 7.95429 87.218 8.38713L87.3304 8.42034C88.8721 8.87604 89.7524 10.4952 89.2967 12.0369C89.0532 12.8608 88.4617 13.5261 87.6924 13.8696L87.2109 14.0358C85.8615 13.5222 84.5335 12.8738 83.0717 12.051L81.2582 10.9869L79.9632 10.2086C76.727 8.28854 74.6845 7.56231 71.6715 7.56231C69.2753 7.56231 67.6709 8.13322 65.2076 9.74209L63.3962 10.9832C58.9659 14.0658 55.9329 15.332 50.9521 15.332C46.3835 15.332 43.5876 14.2941 39.7831 11.7071L38.2733 10.6438C35.0088 8.30685 33.3085 7.56231 30.2328 7.56231C27.5977 7.56231 26.1606 7.93656 24.4821 8.95199L23.3155 9.72208L22.2539 10.4587C21.5259 10.9585 20.905 11.358 20.2292 11.7499C18.6007 12.6945 16.8145 13.4836 14.7046 14.1406C13.1919 13.7478 12.2842 12.2031 12.677 10.6905C12.8903 9.86917 13.4576 9.19615 14.2099 8.84183L14.7017 8.66359C15.7803 8.24891 16.7387 7.78639 17.6305 7.2692L18.7264 6.58948L20.9557 5.05988C23.761 3.18065 26.2015 2.38248 30.2328 2.38248C34.2547 2.38248 36.7785 3.34087 40.3011 5.74123L41.7346 6.75173C45.3118 9.31395 47.2624 10.1522 50.9521 10.1522C54.3336 10.1522 56.3964 9.41936 59.4798 7.38219L61.2879 6.13896C65.1179 3.48206 67.6953 2.38248 71.6715 2.38248ZM50.9521-40.7442L94.9807-30.4956L82.0351 0.240133C78.3601-1.8748 75.5755-2.79735 71.6715-2.79735C68.0929-2.79735 65.6474-1.90669 62.402 0.208321L60.4378 1.55151C56.7958 4.08563 54.6717 4.97239 50.9521 4.97239C47.5978 4.97239 45.6808 4.27961 42.6724 2.22861L41.2885 1.25216C37.225-1.65678 34.6203-2.79735 30.2328-2.79735C26.2015-2.79735 23.761-1.99918 20.9557-0.119948L19.9809 0.550965L6.92359-30.4956L50.9521-40.7442ZM59.5167-73.5461L69.9478-73.5349C71.1034-73.5349 72.117-72.7637 72.4252-71.6499L81.7004-38.0958L50.9521-45.259L20.1961-38.0958L29.4791-71.6499C29.7873-72.7637 30.8009-73.5349 31.9565-73.5349L59.5167-73.5461ZM48.8067-67.2799L34.1697-67.2734C33.7846-67.2732 33.4469-67.0162 33.3442-66.645L29.9621-54.4204L48.8067-54.4273L48.8067-67.2799ZM53.0909-67.2799L53.0909-54.4273L71.9422-54.4204L68.56-66.645C68.4574-67.0162 68.1197-67.2732 67.7346-67.2734L53.0909-67.2799ZM54.3795-84.668C54.8527-84.668 55.2364-84.2843 55.2364-83.8111L55.2239-76.1938L46.664-76.1938L46.6679-83.8111C46.6679-84.2843 47.0515-84.668 47.5248-84.668L54.3795-84.668Z"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M92.0083-6.06714C95.2898-2.78573 95.2898 2.54245 92.0083 5.82386C88.7269 9.10527 83.3988 9.10527 80.1174 5.82386L9.90165-64.3918C6.62024-67.6733 6.62024-73.0014 9.90165-76.2828C13.1831-79.5643 18.5112-79.5643 21.7926-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M88.5419-2.60066C89.9101-1.23245 89.9101 0.98917 88.5419 2.35738C87.1737 3.72558 84.952 3.72558 83.5838 2.35738L13.3681-67.8583C11.9999-69.2265 11.9999-71.4482 13.3681-72.8164C14.7363-74.1846 16.958-74.1846 18.3262-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
-  </g>
-  <g id="Ultralight-S" transform="matrix(1 0 0 1 511.325 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M67.0339-1.91294C70.7272-1.91294 73.3074-0.995529 76.8752 1.12134L78.4653 2.07729C79.3994 2.63625 80.2332 3.1017 81.0258 3.49125L81.1269 3.52114C82.5144 3.93127 83.3067 5.38854 82.8966 6.77605C82.6775 7.51754 82.1451 8.11633 81.4528 8.4255L81.0194 8.57507C79.8049 8.11284 78.6097 7.52928 77.294 6.78876L75.6619 5.83102L74.4964 5.1306C71.5839 3.40252 69.7456 2.74891 67.0339 2.74891C64.8774 2.74891 63.4334 3.26274 61.2164 4.71072L59.5862 5.82771C55.5989 8.60207 52.8691 9.74168 48.3865 9.74168C44.2747 9.74168 41.7584 8.80753 38.3343 6.47925L36.9756 5.52228C34.0375 3.419 32.5072 2.74891 29.7391 2.74891C27.3675 2.74891 26.0741 3.08574 24.5635 3.99963L23.5135 4.69271L22.5581 5.35571C21.9029 5.80545 21.344 6.16505 20.7359 6.51778C19.2702 7.36784 17.6626 8.0781 15.7637 8.66941C14.4023 8.31585 13.5853 6.92562 13.9389 5.56425C14.1308 4.82509 14.6414 4.21937 15.3185 3.90048L15.7611 3.74006C16.7318 3.36685 17.5944 2.95059 18.397 2.48511L19.3833 1.87337L21.3897 0.496728C23.9145-1.19458 26.1109-1.91294 29.7391-1.91294C33.3588-1.91294 35.6302-1.05038 38.8006 1.10995L40.0907 2.01939C43.3102 4.32539 45.0657 5.07983 48.3865 5.07983C51.4298 5.07983 53.2863 4.42026 56.0614 2.58681L57.6887 1.4679C61.1357-0.923307 63.4553-1.91294 67.0339-1.91294ZM48.3865-40.727L88.0122-31.5032L76.3612-3.84104C73.0537-5.74449 70.5475-6.57478 67.0339-6.57478C63.8132-6.57478 61.6122-5.77318 58.6914-3.86968L56.9236-2.66081C53.6457-0.380094 51.7341 0.417988 48.3865 0.417988C45.3676 0.417988 43.6423-0.205519 40.9347-2.05141L39.6892-2.93022C36.032-5.54827 33.6878-6.57478 29.7391-6.57478C26.1109-6.57478 23.9145-5.85642 21.3897-4.16512L20.5124-3.5613L8.76079-31.5032L48.3865-40.727ZM56.0946-70.2487L65.4825-70.2386C66.5226-70.2386 67.4348-69.5445 67.7122-68.5421L76.0599-38.3434L48.3865-44.7903L20.7061-38.3434L29.0607-68.5421C29.3381-69.5445 30.2503-70.2386 31.2904-70.2386L56.0946-70.2487ZM46.4556-64.6091L33.2823-64.6032C32.9357-64.6031 32.6318-64.3717 32.5394-64.0377L29.4954-53.0356L46.4556-53.0417L46.4556-64.6091ZM50.3113-64.6091L50.3113-53.0417L67.2775-53.0356L64.2336-64.0377C64.1412-64.3717 63.8373-64.6031 63.4907-64.6032L50.3113-64.6091ZM51.4711-80.2583C51.897-80.2583 52.2423-79.9131 52.2423-79.4872L52.2311-72.6316L44.5272-72.6316L44.5307-79.4872C44.5307-79.9131 44.8759-80.2583 45.3018-80.2583L51.4711-80.2583Z"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M86.0727-3.06064C87.5953-1.53808 87.5953 0.934172 86.0727 2.45673C84.5502 3.97929 82.0779 3.97929 80.5554 2.45673L10.7003-67.3983C9.17772-68.9209 9.17772-71.3932 10.7003-72.9157C12.2228-74.4383 14.6951-74.4383 16.2176-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M84.0218-1.00975C84.4125-0.619106 84.4125 0.0152006 84.0218 0.405845C83.6312 0.796489 82.9969 0.796489 82.6062 0.405845L12.7512-69.4492C12.3605-69.8399 12.3605-70.4742 12.7512-70.8648C13.1418-71.2555 13.7761-71.2555 14.1668-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
-  </g>
- </g>
-</svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/ferries.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/ferries.symbolset/ferries.svg
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Generator: Apple Native CoreSVG 341-->
-<!DOCTYPE svg
-PUBLIC "-//W3C//DTD SVG 1.1//EN"
-       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
-
-.monochrome-0 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:55194837de271852}
-
-.multicolor-0:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:55194837de271852}
-
-.hierarchical-0:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:55194837de271852}
-
-.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
-</style>
- <g id="Notes">
-  <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
-  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
-  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
-  </g>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
-  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from ferries</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
- </g>
- <g id="Guides">
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
-  <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
-  <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
-  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
-  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2987.45" x2="2987.45" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2879.35" x2="2879.35" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1500.8" x2="1500.8" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1398.89" x2="1398.89" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="608.098" x2="608.098" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="511.325" x2="511.325" y1="600.785" y2="720.121"/>
- </g>
- <g id="Symbols">
-  <g id="Black-S" transform="matrix(1 0 0 1 2879.35 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M76.844 5.57477C81.358 5.57477 84.5116 6.69604 88.8723 9.28333L90.8157 10.4517C91.9574 11.1349 92.9765 11.7038 93.9452 12.1799L94.0688 12.2164C95.7646 12.7177 96.733 14.4988 96.2318 16.1946C95.9639 17.1009 95.3132 17.8328 94.467 18.2106L93.9374 18.3934C92.453 17.8285 90.9922 17.1153 89.3842 16.2102L87.3894 15.0396L85.9649 14.1835C82.4051 12.0714 80.1583 11.2726 76.844 11.2726C74.2082 11.2726 72.4433 11.9006 69.7337 13.6703L67.7412 15.0356C62.8679 18.4264 59.5315 19.8193 54.0527 19.8193C49.0272 19.8193 45.9517 18.6776 41.7667 15.8319L40.106 14.6623C36.5151 12.0916 34.6447 11.2726 31.2615 11.2726C28.3628 11.2726 26.782 11.6843 24.9357 12.8012L23.6524 13.6483L22.4847 14.4587C21.6838 15.0083 21.0008 15.4479 20.2575 15.879C18.4661 16.9179 16.5014 17.786 14.1804 18.5088C12.5165 18.0766 11.5179 16.3774 11.9501 14.7136C12.1847 13.8101 12.8088 13.0698 13.6363 12.6801L14.1773 12.484C15.3637 12.0278 16.4179 11.5191 17.3989 10.9502L18.6044 10.2025L21.0566 8.51991C24.1425 6.45276 26.827 5.57477 31.2615 5.57477C35.6855 5.57477 38.4617 6.629 42.3366 9.2694L43.9134 10.3809C47.8483 13.1994 49.994 14.1215 54.0527 14.1215C57.7723 14.1215 60.0414 13.3153 63.4332 11.0745L65.4221 9.7069C69.6351 6.78432 72.4702 5.57477 76.844 5.57477ZM54.0527-41.8646L102.484-30.5911L88.244 3.21819C84.2015 0.891763 81.1384-0.123042 76.844-0.123042C72.9076-0.123042 70.2175 0.85669 66.6476 3.1832L64.4869 4.6607C60.4807 7.44824 58.1442 8.42368 54.0527 8.42368C50.363 8.42368 48.2543 7.66161 44.945 5.40552L43.4227 4.33142C38.9528 1.13158 36.0877-0.123042 31.2615-0.123042C26.827-0.123042 24.1425 0.754951 21.0566 2.8221L19.9844 3.56011L5.62131-30.5911L54.0527-41.8646ZM63.4737-77.9467L74.9479-77.9343C76.2191-77.9343 77.334-77.086 77.6731-75.8609L87.8758-38.9514L54.0527-46.8309L20.2211-38.9514L30.4324-75.8609C30.7714-77.086 31.8863-77.9343 33.1575-77.9343L63.4737-77.9467ZM51.6927-71.0539L35.592-71.0467C35.1684-71.0465 34.797-70.7637 34.684-70.3555L30.9637-56.9084L51.6927-56.9159L51.6927-71.0539ZM56.4053-71.0539L56.4053-56.9159L77.1418-56.9084L73.4214-70.3555C73.3085-70.7637 72.937-71.0465 72.5134-71.0467L56.4053-71.0539ZM57.8228-90.1807C58.3434-90.1807 58.7654-89.7587 58.7654-89.2382L58.7516-80.8591L49.3358-80.8591L49.3401-89.2382C49.3401-89.7587 49.7621-90.1807 50.2826-90.1807L57.8228-90.1807Z"/>
-  </g>
-  <g id="Regular-S" transform="matrix(1 0 0 1 1398.89 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M71.6715 2.38248C75.7751 2.38248 78.6421 3.40182 82.6063 5.75389L84.373 6.81606C85.4109 7.43712 86.3374 7.95429 87.218 8.38713L87.3304 8.42034C88.8721 8.87604 89.7524 10.4952 89.2967 12.0369C89.0532 12.8608 88.4617 13.5261 87.6924 13.8696L87.2109 14.0358C85.8615 13.5222 84.5335 12.8738 83.0717 12.051L81.2582 10.9869L79.9632 10.2086C76.727 8.28854 74.6845 7.56231 71.6715 7.56231C69.2753 7.56231 67.6709 8.13322 65.2076 9.74209L63.3962 10.9832C58.9659 14.0658 55.9329 15.332 50.9521 15.332C46.3835 15.332 43.5876 14.2941 39.7831 11.7071L38.2733 10.6438C35.0088 8.30685 33.3085 7.56231 30.2328 7.56231C27.5977 7.56231 26.1606 7.93656 24.4821 8.95199L23.3155 9.72208L22.2539 10.4587C21.5259 10.9585 20.905 11.358 20.2292 11.7499C18.6007 12.6945 16.8145 13.4836 14.7046 14.1406C13.1919 13.7478 12.2842 12.2031 12.677 10.6905C12.8903 9.86917 13.4576 9.19615 14.2099 8.84183L14.7017 8.66359C15.7803 8.24891 16.7387 7.78639 17.6305 7.2692L18.7264 6.58948L20.9557 5.05988C23.761 3.18065 26.2015 2.38248 30.2328 2.38248C34.2547 2.38248 36.7785 3.34087 40.3011 5.74123L41.7346 6.75173C45.3118 9.31395 47.2624 10.1522 50.9521 10.1522C54.3336 10.1522 56.3964 9.41936 59.4798 7.38219L61.2879 6.13896C65.1179 3.48206 67.6953 2.38248 71.6715 2.38248ZM50.9521-40.7442L94.9807-30.4956L82.0351 0.240133C78.3601-1.8748 75.5755-2.79735 71.6715-2.79735C68.0929-2.79735 65.6474-1.90669 62.402 0.208321L60.4378 1.55151C56.7958 4.08563 54.6717 4.97239 50.9521 4.97239C47.5978 4.97239 45.6808 4.27961 42.6724 2.22861L41.2885 1.25216C37.225-1.65678 34.6203-2.79735 30.2328-2.79735C26.2015-2.79735 23.761-1.99918 20.9557-0.119948L19.9809 0.550965L6.92359-30.4956L50.9521-40.7442ZM59.5167-73.5461L69.9478-73.5349C71.1034-73.5349 72.117-72.7637 72.4252-71.6499L81.7004-38.0958L50.9521-45.259L20.1961-38.0958L29.4791-71.6499C29.7873-72.7637 30.8009-73.5349 31.9565-73.5349L59.5167-73.5461ZM48.8067-67.2799L34.1697-67.2734C33.7846-67.2732 33.4469-67.0162 33.3442-66.645L29.9621-54.4204L48.8067-54.4273L48.8067-67.2799ZM53.0909-67.2799L53.0909-54.4273L71.9422-54.4204L68.56-66.645C68.4574-67.0162 68.1197-67.2732 67.7346-67.2734L53.0909-67.2799ZM54.3795-84.668C54.8527-84.668 55.2364-84.2843 55.2364-83.8111L55.2239-76.1938L46.664-76.1938L46.6679-83.8111C46.6679-84.2843 47.0515-84.668 47.5248-84.668L54.3795-84.668Z"/>
-  </g>
-  <g id="Ultralight-S" transform="matrix(1 0 0 1 511.325 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M67.0339-1.91294C70.7272-1.91294 73.3074-0.995529 76.8752 1.12134L78.4653 2.07729C79.3994 2.63625 80.2332 3.1017 81.0258 3.49125L81.1269 3.52114C82.5144 3.93127 83.3067 5.38854 82.8966 6.77605C82.6775 7.51754 82.1451 8.11633 81.4528 8.4255L81.0194 8.57507C79.8049 8.11284 78.6097 7.52928 77.294 6.78876L75.6619 5.83102L74.4964 5.1306C71.5839 3.40252 69.7456 2.74891 67.0339 2.74891C64.8774 2.74891 63.4334 3.26274 61.2164 4.71072L59.5862 5.82771C55.5989 8.60207 52.8691 9.74168 48.3865 9.74168C44.2747 9.74168 41.7584 8.80753 38.3343 6.47925L36.9756 5.52228C34.0375 3.419 32.5072 2.74891 29.7391 2.74891C27.3675 2.74891 26.0741 3.08574 24.5635 3.99963L23.5135 4.69271L22.5581 5.35571C21.9029 5.80545 21.344 6.16505 20.7359 6.51778C19.2702 7.36784 17.6626 8.0781 15.7637 8.66941C14.4023 8.31585 13.5853 6.92562 13.9389 5.56425C14.1308 4.82509 14.6414 4.21937 15.3185 3.90048L15.7611 3.74006C16.7318 3.36685 17.5944 2.95059 18.397 2.48511L19.3833 1.87337L21.3897 0.496728C23.9145-1.19458 26.1109-1.91294 29.7391-1.91294C33.3588-1.91294 35.6302-1.05038 38.8006 1.10995L40.0907 2.01939C43.3102 4.32539 45.0657 5.07983 48.3865 5.07983C51.4298 5.07983 53.2863 4.42026 56.0614 2.58681L57.6887 1.4679C61.1357-0.923307 63.4553-1.91294 67.0339-1.91294ZM48.3865-40.727L88.0122-31.5032L76.3612-3.84104C73.0537-5.74449 70.5475-6.57478 67.0339-6.57478C63.8132-6.57478 61.6122-5.77318 58.6914-3.86968L56.9236-2.66081C53.6457-0.380094 51.7341 0.417988 48.3865 0.417988C45.3676 0.417988 43.6423-0.205519 40.9347-2.05141L39.6892-2.93022C36.032-5.54827 33.6878-6.57478 29.7391-6.57478C26.1109-6.57478 23.9145-5.85642 21.3897-4.16512L20.5124-3.5613L8.76079-31.5032L48.3865-40.727ZM56.0946-70.2487L65.4825-70.2386C66.5226-70.2386 67.4348-69.5445 67.7122-68.5421L76.0599-38.3434L48.3865-44.7903L20.7061-38.3434L29.0607-68.5421C29.3381-69.5445 30.2503-70.2386 31.2904-70.2386L56.0946-70.2487ZM46.4556-64.6091L33.2823-64.6032C32.9357-64.6031 32.6318-64.3717 32.5394-64.0377L29.4954-53.0356L46.4556-53.0417L46.4556-64.6091ZM50.3113-64.6091L50.3113-53.0417L67.2775-53.0356L64.2336-64.0377C64.1412-64.3717 63.8373-64.6031 63.4907-64.6032L50.3113-64.6091ZM51.4711-80.2583C51.897-80.2583 52.2423-79.9131 52.2423-79.4872L52.2311-72.6316L44.5272-72.6316L44.5307-79.4872C44.5307-79.9131 44.8759-80.2583 45.3018-80.2583L51.4711-80.2583Z"/>
-  </g>
- </g>
-</svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/Contents.json
@@ -1,12 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "symbols" : [
-    {
-      "filename" : "motorways.circle.slash.svg",
-      "idiom" : "universal"
-    }
-  ]
-}
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/motorways.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.slash.symbolset/motorways.slash.svg
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Generator: Apple Native CoreSVG 341-->
-<!DOCTYPE svg
-PUBLIC "-//W3C//DTD SVG 1.1//EN"
-       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
-
-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-31512b0e6164d814 60db71b8dc70fc47}
-.monochrome-1 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-31512b0e6164d814 _slash}
-.monochrome-2 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-31512b0e6164d814 _slash}
-
-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-31512b0e6164d814 60db71b8dc70fc47}
-.multicolor-1:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-31512b0e6164d814 _slash}
-.multicolor-2:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-31512b0e6164d814 _slash}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-31512b0e6164d814 60db71b8dc70fc47}
-.hierarchical-1:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-31512b0e6164d814 _slash}
-.hierarchical-2:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-31512b0e6164d814 _slash}
-
-.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
-</style>
- <g id="Notes">
-  <rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
-  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
-  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
-  </g>
-  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
-  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
-  </g>
-  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
-  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
-  </g>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">Large</text>
- </g>
- <g id="Guides">
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 696)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="696" y2="696"/>
-  <line id="Capline-S" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="625.541" y2="625.541"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1126)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1126" y2="1126"/>
-  <line id="Capline-M" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1055.54" y2="1055.54"/>
-  <g id="H-reference" style="fill:#27AAE1;stroke:none;" transform="matrix(1 0 0 1 339 1556)">
-   <path d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"/>
-  </g>
-  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
-  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
-  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2987.45" x2="2987.45" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2879.35" x2="2879.35" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1500.8" x2="1500.8" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1398.89" x2="1398.89" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="608.098" x2="608.098" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="511.325" x2="511.325" y1="600.785" y2="720.121"/>
- </g>
- <g id="Symbols">
-  <g id="Black-S" transform="matrix(1 0 0 1 2879.35 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M80.0067-49.2487L94.0527 11.8193L59.0527 11.8193L57.2207-49.2487L80.0067-49.2487ZM50.8847-49.2487L49.0527 11.8193L14.0527 11.8193L28.0987-49.2487L50.8847-49.2487ZM100.053-62.2487L100.053-54.2487L94.0527-54.2487L94.0527-48.2487L86.0527-48.2487L86.0527-54.2487L22.0527-54.2487L22.0527-48.2487L14.0527-48.2487L14.0527-54.2487L8.05271-54.2487L8.05271-62.2487L100.053-62.2487ZM52.0527-88.1807L51.3647-65.2487L31.7787-65.2487L37.0527-88.1807L52.0527-88.1807ZM71.0527-88.1807L76.3267-65.2487L56.7407-65.2487L56.0527-88.1807L71.0527-88.1807Z"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M98.0218-4.48836C101.673-0.837264 101.673 5.09118 98.0218 8.74227C94.3707 12.3934 88.4422 12.3934 84.7911 8.74227L10.0782-65.9706C6.42714-69.6217 6.42714-75.5502 10.0782-79.2013C13.7293-82.8524 19.6578-82.8524 23.3089-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M93.8717-0.338247C95.2322 1.02234 95.2322 3.23158 93.8717 4.59217C92.5111 5.95275 90.3018 5.95275 88.9412 4.59217L14.2283-70.1207C12.8678-71.4813 12.8678-73.6906 14.2283-75.0511C15.5889-76.4117 17.7982-76.4117 19.1588-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
-  </g>
-  <g id="Regular-S" transform="matrix(1 0 0 1 1398.89 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M74.3107-46.6291L86.9521 8.33205L55.4521 8.33205L53.8033-46.6291L74.3107-46.6291ZM48.1009-46.6291L46.4521 8.33205L14.9521 8.33205L27.5935-46.6291L48.1009-46.6291ZM92.3521-58.3292L92.3521-51.1291L86.9521-51.1291L86.9521-45.7292L79.7521-45.7292L79.7521-51.1291L22.1521-51.1291L22.1521-45.7292L14.9521-45.7292L14.9521-51.1291L9.55214-51.1291L9.55214-58.3292L92.3521-58.3292ZM49.1521-81.668L48.5329-61.0291L30.9055-61.0291L35.6521-81.668L49.1521-81.668ZM66.2521-81.668L70.9987-61.0291L53.3713-61.0291L52.7521-81.668L66.2521-81.668Z"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M92.0083-6.06714C95.2898-2.78573 95.2898 2.54245 92.0083 5.82386C88.7269 9.10527 83.3988 9.10527 80.1174 5.82386L9.90165-64.3918C6.62024-67.6733 6.62024-73.0014 9.90165-76.2828C13.1831-79.5643 18.5112-79.5643 21.7926-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M88.5419-2.60066C89.9101-1.23245 89.9101 0.98917 88.5419 2.35738C87.1737 3.72558 84.952 3.72558 83.5838 2.35738L13.3681-67.8583C11.9999-69.2265 11.9999-71.4482 13.3681-72.8164C14.7363-74.1846 16.958-74.1846 18.3262-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
-  </g>
-  <g id="Ultralight-S" transform="matrix(1 0 0 1 511.325 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M69.1497-45.1127L80.3865 3.74168L52.3865 3.74168L50.9209-45.1127L69.1497-45.1127ZM45.8521-45.1127L44.3865 3.74168L16.3865 3.74168L27.6233-45.1127L45.8521-45.1127ZM85.1865-55.5127L85.1865-49.1127L80.3865-49.1127L80.3865-44.3127L73.9865-44.3127L73.9865-49.1127L22.7865-49.1127L22.7865-44.3127L16.3865-44.3127L16.3865-49.1127L11.5865-49.1127L11.5865-55.5127L85.1865-55.5127ZM46.7865-76.2583L46.2361-57.9127L30.5673-57.9127L34.7865-76.2583L46.7865-76.2583ZM61.9865-76.2583L66.2057-57.9127L50.5369-57.9127L49.9865-76.2583L61.9865-76.2583Z"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M86.0727-3.06064C87.5953-1.53808 87.5953 0.934172 86.0727 2.45673C84.5502 3.97929 82.0779 3.97929 80.5554 2.45673L10.7003-67.3983C9.17772-68.9209 9.17772-71.3932 10.7003-72.9157C12.2228-74.4383 14.6951-74.4383 16.2176-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M84.0218-1.00975C84.4125-0.619106 84.4125 0.0152006 84.0218 0.405845C83.6312 0.796489 82.9969 0.796489 82.6062 0.405845L12.7512-69.4492C12.3605-69.8399 12.3605-70.4742 12.7512-70.8648C13.1418-71.2555 13.7761-71.2555 14.1668-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
-  </g>
- </g>
-</svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "ferries.circle.slash.svg",
+      "filename" : "options.ferries.slash.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/options.ferries.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/options.ferries.slash.svg
@@ -4,23 +4,21 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 55cd4bd80694509d circle}
+.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 55cd4bd80694509d 58be399073040090 ferry.fill}
+.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 _slash}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 _slash}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-76eecd88f171b43b _enclosure.stroke bfb05044e27cb33 circle}
-.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-51684adb517ebb26 -76eecd88f171b43b bfb05044e27cb33}
-.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:_slash bfb05044e27cb33}
-.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:_slash bfb05044e27cb33}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 55cd4bd80694509d circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 55cd4bd80694509d 58be399073040090 ferry.fill}
+.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 _slash}
+.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 _slash}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-76eecd88f171b43b _enclosure.stroke bfb05044e27cb33 circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-51684adb517ebb26 -76eecd88f171b43b bfb05044e27cb33}
-.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:_slash bfb05044e27cb33}
-.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:_slash bfb05044e27cb33}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-76eecd88f171b43b _enclosure.stroke bfb05044e27cb33 circle}
-.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-51684adb517ebb26 -76eecd88f171b43b bfb05044e27cb33}
-.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:_slash bfb05044e27cb33}
-.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:_slash bfb05044e27cb33}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 55cd4bd80694509d circle}
+.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 55cd4bd80694509d 58be399073040090 ferry.fill}
+.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 _slash}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-32d7b1fcd256f1d5 _slash}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -39,13 +37,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -53,7 +51,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -62,13 +60,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
@@ -100,22 +98,22 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M69.7267-22.7644L69.7267-20.501L62.9359-20.501L62.9364-15.9741L56.1455-15.9741L56.1461-11.4472L49.3552-11.4472L49.3558-6.92034L40.302-6.92034L40.302-9.18378L47.0918-9.18378L47.0923-13.7107L53.8821-13.7107L53.8827-18.2375L60.6724-18.2375L60.673-22.7644L69.7267-22.7644ZM38.0695-27.8132C38.3003-27.734 38.5403-27.6717 38.7883-27.628L43.5831-26.5683L42.3861-19.7767C42.3476-19.558 42.2801-19.3517 42.1883-19.1609C42.1282-18.8393 42.0002-18.5246 41.8001-18.2389L34.5807-7.9286C33.8319-6.85912 32.3578-6.5992 31.2883-7.34806C30.2189-8.09692 29.9589-9.57098 30.7078-10.6405L37.5025-20.3442C37.4639-20.5508 37.4525-20.766 37.4717-20.9856L38.0695-27.8132ZM44.5075-51.8545C45.7454-51.4532 46.7521-50.8061 47.4341-49.9738C47.5896-49.8238 47.7269-49.6499 47.8403-49.4534L51.902-42.4177L60.3545-42.4173C61.6601-42.4173 62.7185-41.3589 62.7185-40.0533C62.7185-38.7477 61.6601-37.6893 60.3545-37.6893L50.603-37.6893C49.766-37.6893 49.0305-38.1243 48.6105-38.7806C48.4928-38.9077 48.3874-39.0498 48.2972-39.206L47.3631-40.8238L46.1741-34.0792L53.9316-31.2555C54.1392-31.18 54.3297-31.0784 54.5008-30.9558C55.4898-30.3979 55.9594-29.1912 55.5583-28.0891L51.5759-17.1476C51.1294-15.9207 49.7728-15.2881 48.5459-15.7347C47.3191-16.1812 46.6865-17.5378 47.133-18.7646L50.3253-27.5368L39.4437-29.943C36.8722-30.3964 35.1551-32.8486 35.6086-35.4202L37.5331-46.3391L32.6609-43.526L32.6609-35.1775C32.6609-33.8719 31.6025-32.8135 30.2969-32.8135C28.9913-32.8135 27.9329-33.8719 27.9329-35.1775L27.9329-44.929C27.9329-46.0081 28.6559-46.9184 29.644-47.2017C29.747-47.2884 29.8593-47.3672 29.9801-47.4369L37.8946-52.0064C38.7943-52.5258 41.8172-52.7267 44.5075-51.8545ZM45.5151-63.5063C48.1263-63.5063 50.2431-61.3895 50.2431-58.7783C50.2431-56.1671 48.1263-54.0503 45.5151-54.0503C42.9039-54.0503 40.7871-56.1671 40.7871-58.7783C40.7871-61.3895 42.9039-63.5063 45.5151-63.5063Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M48.829-9.01598C55.3163-9.01598 55.8936-13.1003 58.3449-13.1003C60.7828-13.1003 61.1783-9.01598 68.2624-9.01598L68.4757-9.01598C70.127-9.01598 71.4492-10.3352 71.4492-11.985C71.4492-13.6088 70.127-14.9295 68.4757-14.9295L68.2624-14.9295C67.1991-14.9295 66.2508-15.2728 64.3765-16.6193C63.0735-17.5805 61.0775-19.0138 58.3449-19.0138C55.6244-19.0138 53.6299-17.591 52.3269-16.6344C50.9218-15.6045 50.1015-14.9295 48.829-14.9295C47.5581-14.9295 46.7378-15.6045 45.3327-16.6344C44.0298-17.591 42.0353-19.0138 39.3132-19.0138C36.5821-19.0138 34.5831-17.5805 33.2802-16.6193C31.4059-15.2728 30.4605-14.9295 29.3958-14.9295L29.1825-14.9295C27.5297-14.9295 26.2104-13.6088 26.2104-11.985C26.2104-10.3352 27.5297-9.01598 29.1825-9.01598L29.3958-9.01598C36.4814-9.01598 36.8753-13.1003 39.3132-13.1003C41.7646-13.1003 42.3434-9.01598 48.829-9.01598ZM48.829-18.0758C48.9416-18.0758 49.1015-18.1865 50.4702-19.1815C53.5086-21.4108 55.7007-22.1601 58.3449-22.1601C60.8999-22.1601 62.9853-21.4299 65.3875-19.7993L70.3123-26.6533C72.5857-29.9023 71.532-33.245 68.2743-34.7335L52.7587-41.8051C52.0349-42.1289 50.7019-42.8759 48.829-42.8759C46.9578-42.8759 45.6248-42.1289 44.901-41.8051L29.3854-34.7335C26.1277-33.245 25.0741-29.9023 27.3473-26.6533L32.2722-19.7993C34.6743-21.4299 36.7582-22.1601 39.3132-22.1601C41.959-22.1601 44.1511-21.4108 47.1894-19.1815C48.5581-18.1865 48.718-18.0758 48.829-18.0758ZM48.829-45.9937C50.6857-45.9937 51.8166-45.65 54.0591-44.6362L65.8039-39.2883L64.1772-50.6423C63.6254-54.5765 62.0193-56.0425 58.3379-56.0425L39.3141-56.0425C35.6328-56.0425 34.0222-54.5765 33.475-50.6709L31.8452-39.2838L43.6006-44.6362C45.8431-45.65 46.9739-45.9937 48.829-45.9937ZM40.9486-48.1613C40.2078-48.1613 39.7049-48.6323 39.7049-49.4568L39.7049-51.5972C39.7049-52.4217 40.2078-52.8912 40.9486-52.8912L45.3974-52.8912C46.2997-52.8912 46.859-52.4217 46.859-51.5972L46.859-49.4568C46.859-48.6323 46.2997-48.1613 45.3974-48.1613ZM52.0368-48.1613C51.2398-48.1613 50.7947-48.6323 50.7947-49.4568L50.7947-51.5972C50.7947-52.4217 51.2398-52.8912 52.0368-52.8912L56.4871-52.8912C57.3894-52.8912 57.9487-52.4217 57.9487-51.5972L57.9487-49.4568C57.9487-48.6323 57.3894-48.1613 56.4871-48.1613ZM39.3945-54.2512L58.2576-54.2512L58.2576-57.9306C58.2576-60.4919 57.0451-61.4107 54.4868-61.4107L43.1668-61.4107C40.6055-61.4107 39.3945-60.4919 39.3945-57.9306Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.6082697 0 1.0 0.10826972 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5458696 0 1.0 0.04586959 0.0"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M65.7788-23.4298L65.7788-21.3161L59.4372-21.3161L59.4378-17.0887L53.0962-17.0887L53.0967-12.8614L46.7552-12.8614L46.7557-8.63401L38.301-8.63401L38.301-10.7477L44.6415-10.7477L44.642-14.975L50.9825-14.975L50.983-19.2024L57.3236-19.2024L57.3241-23.4298L65.7788-23.4298ZM36.2161-28.1445C36.4317-28.0706 36.6558-28.0124 36.8874-27.9716L41.3649-26.982L40.2472-20.6397C40.2112-20.4355 40.1482-20.2428 40.0625-20.0647C40.0063-19.7643 39.8867-19.4705 39.6999-19.2037L32.9582-9.57556C32.2589-8.57684 30.8824-8.33412 29.8837-9.03343C28.8849-9.73275 28.6422-11.1093 29.3415-12.108L35.6867-21.1697C35.6506-21.3626 35.6399-21.5636 35.6579-21.7686L36.2161-28.1445ZM42.2282-50.5951C43.3842-50.2204 44.3242-49.616 44.9611-48.8388C45.1063-48.6988 45.2346-48.5363 45.3405-48.3529L49.1334-41.7827L57.0267-41.7823C58.2459-41.7823 59.2343-40.7939 59.2343-39.5747C59.2343-38.3555 58.2459-37.3671 57.0267-37.3671L47.9204-37.3671C47.1387-37.3671 46.4519-37.7734 46.0597-38.3863C45.9498-38.505 45.8514-38.6376 45.7672-38.7835L44.8948-40.2942L43.7845-33.9959L51.0288-31.359C51.2226-31.2885 51.4005-31.1937 51.5603-31.0792C52.4838-30.5582 52.9224-29.4313 52.5478-28.4021L48.8289-18.1845C48.4119-17.0389 47.1451-16.4481 45.9994-16.8651C44.8537-17.2821 44.263-18.5489 44.68-19.6946L47.661-27.8864L37.4994-30.1334C35.0981-30.5568 33.4946-32.8468 33.918-35.2481L35.7152-45.4447L31.1654-42.8176L31.1654-35.0216C31.1654-33.8024 30.177-32.814 28.9578-32.814C27.7386-32.814 26.7502-33.8024 26.7502-35.0216L26.7502-44.1279C26.7502-45.1356 27.4254-45.9856 28.3481-46.2502C28.4443-46.3311 28.5492-46.4047 28.662-46.4698L36.0529-50.7369C36.893-51.222 39.7159-51.4096 42.2282-50.5951ZM43.1691-61.476C45.6075-61.476 47.5843-59.4993 47.5843-57.0608C47.5843-54.6224 45.6075-52.6457 43.1691-52.6457C40.7307-52.6457 38.7539-54.6224 38.7539-57.0608C38.7539-59.4993 40.7307-61.476 43.1691-61.476Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M46.2715-10.0974C52.1084-10.0974 52.8481-14.0642 55.5355-14.0642C58.2596-14.0642 58.7083-10.0974 65.2513-10.0974L65.3975-10.0974C66.5804-10.0974 67.539-11.0545 67.539-12.2512C67.539-13.4374 66.5804-14.3806 65.3975-14.3806L65.2513-14.3806C63.6482-14.3806 62.602-15.0036 60.9796-16.1641C59.7103-17.0916 57.9478-18.3474 55.5355-18.3474C53.0708-18.3474 51.2944-17.0532 50.025-16.1133C48.6702-15.1002 47.7494-14.3806 46.2715-14.3806C44.7796-14.3806 43.8588-15.1002 42.504-16.1133C41.2346-17.0532 39.4583-18.3474 37.0074-18.3474C34.5812-18.3474 32.8171-17.0916 31.5478-16.1641C29.9253-15.0036 28.8808-14.3806 27.2916-14.3806L27.1454-14.3806C25.947-14.3806 24.99-13.4374 24.99-12.2512C24.99-11.0545 25.947-10.0974 27.1454-10.0974L27.2916-10.0974C33.8207-10.0974 34.2833-14.0642 37.0074-14.0642C39.6948-14.0642 40.4206-10.0974 46.2715-10.0974ZM46.2715-17.1034C46.732-17.1034 46.9895-17.2418 48.4017-18.2984C50.3989-19.7721 52.6445-21.0701 55.5355-21.0701C57.6625-21.0701 59.3927-20.4938 61.4468-19.1638L66.7063-27.5552C68.6426-30.5931 67.8044-33.2798 64.7438-34.6873L49.9618-41.4486C49.2228-41.7807 47.9961-42.4509 46.2715-42.4509C44.533-42.4509 43.3062-41.7807 42.5672-41.4486L27.7852-34.6873C24.7246-33.2798 23.8865-30.5931 25.8227-27.5552L31.0822-19.1638C33.1363-20.4938 34.8804-21.0701 37.0074-21.0701C39.8845-21.0701 42.1301-19.7721 44.1273-18.2984C45.5395-17.2418 45.7971-17.1034 46.2715-17.1034ZM46.2715-45.4379C48.0427-45.4379 49.1371-45.0986 51.2108-44.1573L61.9959-39.2194L60.365-51.118C59.9784-53.941 58.5542-55.4688 55.8217-55.4688L36.7179-55.4688C33.9854-55.4688 32.603-53.941 32.1747-50.8538L30.5422-39.2317L41.3182-44.1573C43.3919-45.0986 44.4863-45.4379 46.2715-45.4379ZM38.0129-47.5708C37.4162-47.5708 37.0195-47.9537 37.0195-48.5852L37.0195-51.2053C37.0195-51.8368 37.4162-52.2336 38.0129-52.2336L43.2745-52.2336C44.0258-52.2336 44.4901-51.8368 44.4901-51.2053L44.4901-48.5852C44.4901-47.9537 44.0258-47.5708 43.2745-47.5708ZM49.0135-47.5708C48.4081-47.5708 48.0357-47.9537 48.0357-48.5852L48.0357-51.2053C48.0357-51.8368 48.4081-52.2336 49.0135-52.2336L54.2907-52.2336C55.042-52.2336 55.5063-51.8368 55.5063-51.2053L55.5063-48.5852C55.5063-47.9537 55.042-47.5708 54.2907-47.5708ZM37.5948-54.3602L54.9449-54.3602L54.9449-56.7714C54.9449-58.972 53.7658-60.0126 51.5669-60.0126L40.9589-60.0126C38.7583-60.0126 37.5948-58.972 37.5948-56.7714Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.60452837 0 1.0 0.104528375 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5487678 0 1.0 0.048767686 0.0"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M61.3562-24.833L61.3562-22.9597L55.736-22.9597L55.7365-19.2133L50.1163-19.2133L50.1168-15.4668L44.4966-15.4668L44.4971-11.7203L37.0041-11.7203L37.0041-13.5935L42.6233-13.5935L42.6238-17.34L48.2431-17.34L48.2435-21.0865L53.8628-21.0865L53.8633-24.833L61.3562-24.833ZM35.1564-29.0114C35.3475-28.9459 35.5461-28.8943 35.7513-28.8582L39.7195-27.9811L38.7289-22.3603C38.697-22.1793 38.6412-22.0086 38.5652-21.8507C38.5155-21.5845 38.4095-21.3241 38.2439-21.0876L32.2691-12.5548C31.6494-11.6696 30.4294-11.4545 29.5443-12.0743C28.6592-12.6941 28.4441-13.914 29.0638-14.7991L34.6872-22.83C34.6552-23.001 34.6458-23.1791 34.6617-23.3608L35.1564-29.0114ZM40.4846-48.9082C41.5091-48.576 42.3422-48.0405 42.9066-47.3517C43.0353-47.2276 43.149-47.0836 43.2428-46.921L46.6043-41.0982L53.5997-41.0978C54.6802-41.0978 55.5561-40.2219 55.5561-39.1414C55.5561-38.0609 54.6802-37.1849 53.5997-37.1849L45.5293-37.1849C44.8365-37.1849 44.2279-37.545 43.8802-38.0881C43.7828-38.1933 43.6956-38.3109 43.621-38.4402L42.8479-39.7791L41.8639-34.1972L48.2841-31.8603C48.4558-31.7978 48.6135-31.7137 48.7551-31.6123C49.5736-31.1505 49.9623-30.1518 49.6303-29.2397L46.3344-20.1844C45.9649-19.1691 44.8422-18.6456 43.8268-19.0151C42.8115-19.3847 42.2879-20.5074 42.6575-21.5227L45.2994-28.7827L36.2937-30.774C34.1655-31.1493 32.7445-33.1788 33.1197-35.307L34.7125-44.3436L30.6802-42.0154L30.6802-35.1062C30.6802-34.0257 29.8043-33.1497 28.7237-33.1497C27.6432-33.1497 26.7673-34.0257 26.7673-35.1062L26.7673-43.1766C26.7673-44.0697 27.3657-44.823 28.1834-45.0575C28.2687-45.1292 28.3616-45.1944 28.4616-45.2521L35.0117-49.0338C35.7563-49.4637 38.258-49.63 40.4846-48.9082ZM41.3185-58.5513C43.4795-58.5513 45.2314-56.7994 45.2314-54.6384C45.2314-52.4773 43.4795-50.7255 41.3185-50.7255C39.1574-50.7255 37.4055-52.4773 37.4055-54.6384C37.4055-56.7994 39.1574-58.5513 41.3185-58.5513Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M44.0668-12.5902C48.9385-12.5902 49.7355-16.472 53.1488-16.472C56.6353-16.472 57.1524-12.5902 62.7191-12.5902L62.8168-12.5902C63.3158-12.5902 63.7116-13.0004 63.7116-13.5095C63.7116-14.0042 63.3158-14.4044 62.8168-14.4044L62.7191-14.4044C60.5157-14.4044 59.2487-15.3496 57.8083-16.3606C56.5632-17.2639 55.1346-18.2862 53.1488-18.2862C51.0941-18.2862 49.6555-17.2051 48.4104-16.2773C47.092-15.2764 45.9183-14.4044 44.0668-14.4044C42.2051-14.4044 41.0315-15.2764 39.7131-16.2773C38.468-17.2051 37.0294-18.2862 34.9847-18.2862C32.9889-18.2862 31.5747-17.2639 30.3296-16.3606C28.8891-15.3496 27.6078-14.4044 25.4144-14.4044L25.3168-14.4044C24.822-14.4044 24.4119-14.0042 24.4119-13.5095C24.4119-13.0004 24.822-12.5902 25.3168-12.5902L25.4144-12.5902C30.9711-12.5902 31.4982-16.472 34.9847-16.472C38.398-16.472 39.1849-12.5902 44.0668-12.5902ZM44.0668-16.2357C45.2741-16.2357 45.9325-16.6945 47.3009-17.7355C48.546-18.6633 50.5-20.1176 53.1488-20.1176C54.6964-20.1176 55.9598-19.6825 57.2671-18.9148L62.5732-28.8824C64.0707-31.6626 63.3583-33.5001 60.7553-34.6989L47.5392-40.7858C46.6241-41.2139 45.5342-41.7235 44.0668-41.7235C42.5893-41.7235 41.4994-41.2139 40.5843-40.7858L27.3682-34.6989C24.7651-33.5001 24.0528-31.6626 25.5503-28.8824L30.8563-18.9148C32.1637-19.6825 33.4371-20.1176 34.9847-20.1176C37.6235-20.1176 39.5775-18.6633 40.8226-17.7355C42.191-16.6945 42.8494-16.2357 44.0668-16.2357ZM44.0668-43.7453C45.7614-43.7453 46.9795-43.274 48.3758-42.6253L58.2573-38.0587L56.5784-50.0655C56.281-52.2358 54.9583-53.568 52.8212-53.568L35.3411-53.568C33.204-53.568 31.9113-52.2358 31.5839-49.8751L29.9194-38.0831L39.7477-42.6253C41.144-43.274 42.3621-43.7453 44.0668-43.7453ZM35.8053-45.6579C35.4177-45.6579 35.1579-45.9321 35.1579-46.334L35.1579-49.5859C35.1579-49.9879 35.4177-50.2721 35.8053-50.2721L41.9093-50.2721C42.3714-50.2721 42.6469-49.9879 42.6469-49.5859L42.6469-46.334C42.6469-45.9321 42.3714-45.6579 41.9093-45.6579ZM46.1572-45.6579C45.7652-45.6579 45.5054-45.9321 45.5054-46.334L45.5054-49.5859C45.5054-49.9879 45.7652-50.2721 46.1572-50.2721L52.2568-50.2721C52.7189-50.2721 52.9944-49.9879 52.9944-49.5859L52.9944-46.334C52.9944-45.9321 52.7189-45.6579 52.2568-45.6579ZM36.5081-53.0728L51.6542-53.0728L51.6542-55.0182C51.6542-56.6878 50.6794-57.6814 48.9953-57.6814L39.157-57.6814C37.4873-57.6814 36.5081-56.6878 36.5081-55.0182Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.55392593 0 1.0 0.053925958 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5139301 0 1.0 0.013930082 0.0"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "motorways.slash.svg",
+      "filename" : "options.ferries.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/options.ferries.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/options.ferries.svg
@@ -4,17 +4,15 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:55cd4bd80694509d circle}
+.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:55cd4bd80694509d 58be399073040090 ferry.fill}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-76eecd88f171b43b _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-51684adb517ebb26 -76eecd88f171b43b}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:55cd4bd80694509d circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:55cd4bd80694509d 58be399073040090 ferry.fill}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-76eecd88f171b43b _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-51684adb517ebb26 -76eecd88f171b43b}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-76eecd88f171b43b _enclosure.stroke circle}
-.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-51684adb517ebb26 -76eecd88f171b43b}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:55cd4bd80694509d circle}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:55cd4bd80694509d 58be399073040090 ferry.fill}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -33,13 +31,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -47,7 +45,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -56,13 +54,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from circle</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
@@ -94,16 +92,16 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M69.7267-22.7644L69.7267-20.501L62.9359-20.501L62.9364-15.9741L56.1455-15.9741L56.1461-11.4472L49.3552-11.4472L49.3558-6.92034L40.302-6.92034L40.302-9.18378L47.0918-9.18378L47.0923-13.7107L53.8821-13.7107L53.8827-18.2375L60.6724-18.2375L60.673-22.7644L69.7267-22.7644ZM38.0695-27.8132C38.3003-27.734 38.5403-27.6717 38.7883-27.628L43.5831-26.5683L42.3861-19.7767C42.3476-19.558 42.2801-19.3517 42.1883-19.1609C42.1282-18.8393 42.0002-18.5246 41.8001-18.2389L34.5807-7.9286C33.8319-6.85912 32.3578-6.5992 31.2883-7.34806C30.2189-8.09692 29.9589-9.57098 30.7078-10.6405L37.5025-20.3442C37.4639-20.5508 37.4525-20.766 37.4717-20.9856L38.0695-27.8132ZM44.5075-51.8545C45.7454-51.4532 46.7521-50.8061 47.4341-49.9738C47.5896-49.8238 47.7269-49.6499 47.8403-49.4534L51.902-42.4177L60.3545-42.4173C61.6601-42.4173 62.7185-41.3589 62.7185-40.0533C62.7185-38.7477 61.6601-37.6893 60.3545-37.6893L50.603-37.6893C49.766-37.6893 49.0305-38.1243 48.6105-38.7806C48.4928-38.9077 48.3874-39.0498 48.2972-39.206L47.3631-40.8238L46.1741-34.0792L53.9316-31.2555C54.1392-31.18 54.3297-31.0784 54.5008-30.9558C55.4898-30.3979 55.9594-29.1912 55.5583-28.0891L51.5759-17.1476C51.1294-15.9207 49.7728-15.2881 48.5459-15.7347C47.3191-16.1812 46.6865-17.5378 47.133-18.7646L50.3253-27.5368L39.4437-29.943C36.8722-30.3964 35.1551-32.8486 35.6086-35.4202L37.5331-46.3391L32.6609-43.526L32.6609-35.1775C32.6609-33.8719 31.6025-32.8135 30.2969-32.8135C28.9913-32.8135 27.9329-33.8719 27.9329-35.1775L27.9329-44.929C27.9329-46.0081 28.6559-46.9184 29.644-47.2017C29.747-47.2884 29.8593-47.3672 29.9801-47.4369L37.8946-52.0064C38.7943-52.5258 41.8172-52.7267 44.5075-51.8545ZM45.5151-63.5063C48.1263-63.5063 50.2431-61.3895 50.2431-58.7783C50.2431-56.1671 48.1263-54.0503 45.5151-54.0503C42.9039-54.0503 40.7871-56.1671 40.7871-58.7783C40.7871-61.3895 42.9039-63.5063 45.5151-63.5063Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.829-9.01598C55.3163-9.01598 55.8936-13.1003 58.3449-13.1003C60.7828-13.1003 61.1783-9.01598 68.2624-9.01598L68.4757-9.01598C70.127-9.01598 71.4492-10.3352 71.4492-11.985C71.4492-13.6088 70.127-14.9295 68.4757-14.9295L68.2624-14.9295C67.1991-14.9295 66.2508-15.2728 64.3765-16.6193C63.0735-17.5805 61.0775-19.0138 58.3449-19.0138C55.6244-19.0138 53.6299-17.591 52.3269-16.6344C50.9218-15.6045 50.1015-14.9295 48.829-14.9295C47.5581-14.9295 46.7378-15.6045 45.3327-16.6344C44.0298-17.591 42.0353-19.0138 39.3132-19.0138C36.5821-19.0138 34.5831-17.5805 33.2802-16.6193C31.4059-15.2728 30.4605-14.9295 29.3958-14.9295L29.1825-14.9295C27.5297-14.9295 26.2104-13.6088 26.2104-11.985C26.2104-10.3352 27.5297-9.01598 29.1825-9.01598L29.3958-9.01598C36.4814-9.01598 36.8753-13.1003 39.3132-13.1003C41.7646-13.1003 42.3434-9.01598 48.829-9.01598ZM48.829-18.0758C48.9416-18.0758 49.1015-18.1865 50.4702-19.1815C53.5086-21.4108 55.7007-22.1601 58.3449-22.1601C60.8999-22.1601 62.9853-21.4299 65.3875-19.7993L70.3123-26.6533C72.5857-29.9023 71.532-33.245 68.2743-34.7335L52.7587-41.8051C52.0349-42.1289 50.7019-42.8759 48.829-42.8759C46.9578-42.8759 45.6248-42.1289 44.901-41.8051L29.3854-34.7335C26.1277-33.245 25.0741-29.9023 27.3473-26.6533L32.2722-19.7993C34.6743-21.4299 36.7582-22.1601 39.3132-22.1601C41.959-22.1601 44.1511-21.4108 47.1894-19.1815C48.5581-18.1865 48.718-18.0758 48.829-18.0758ZM48.829-45.9937C50.6857-45.9937 51.8166-45.65 54.0591-44.6362L65.8039-39.2883L64.1772-50.6423C63.6254-54.5765 62.0193-56.0425 58.3379-56.0425L39.3141-56.0425C35.6328-56.0425 34.0222-54.5765 33.475-50.6709L31.8452-39.2838L43.6006-44.6362C45.8431-45.65 46.9739-45.9937 48.829-45.9937ZM40.9486-48.1613C40.2078-48.1613 39.7049-48.6323 39.7049-49.4568L39.7049-51.5972C39.7049-52.4217 40.2078-52.8912 40.9486-52.8912L45.3974-52.8912C46.2997-52.8912 46.859-52.4217 46.859-51.5972L46.859-49.4568C46.859-48.6323 46.2997-48.1613 45.3974-48.1613ZM52.0368-48.1613C51.2398-48.1613 50.7947-48.6323 50.7947-49.4568L50.7947-51.5972C50.7947-52.4217 51.2398-52.8912 52.0368-52.8912L56.4871-52.8912C57.3894-52.8912 57.9487-52.4217 57.9487-51.5972L57.9487-49.4568C57.9487-48.6323 57.3894-48.1613 56.4871-48.1613ZM39.3945-54.2512L58.2576-54.2512L58.2576-57.9306C58.2576-60.4919 57.0451-61.4107 54.4868-61.4107L43.1668-61.4107C40.6055-61.4107 39.3945-60.4919 39.3945-57.9306Z"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M65.7788-23.4298L65.7788-21.3161L59.4372-21.3161L59.4378-17.0887L53.0962-17.0887L53.0967-12.8614L46.7552-12.8614L46.7557-8.63401L38.301-8.63401L38.301-10.7477L44.6415-10.7477L44.642-14.975L50.9825-14.975L50.983-19.2024L57.3236-19.2024L57.3241-23.4298L65.7788-23.4298ZM36.2161-28.1445C36.4317-28.0706 36.6558-28.0124 36.8874-27.9716L41.3649-26.982L40.2472-20.6397C40.2112-20.4355 40.1482-20.2428 40.0625-20.0647C40.0063-19.7643 39.8867-19.4705 39.6999-19.2037L32.9582-9.57556C32.2589-8.57684 30.8824-8.33412 29.8837-9.03343C28.8849-9.73275 28.6422-11.1093 29.3415-12.108L35.6867-21.1697C35.6506-21.3626 35.6399-21.5636 35.6579-21.7686L36.2161-28.1445ZM42.2282-50.5951C43.3842-50.2204 44.3242-49.616 44.9611-48.8388C45.1063-48.6988 45.2346-48.5363 45.3405-48.3529L49.1334-41.7827L57.0267-41.7823C58.2459-41.7823 59.2343-40.7939 59.2343-39.5747C59.2343-38.3555 58.2459-37.3671 57.0267-37.3671L47.9204-37.3671C47.1387-37.3671 46.4519-37.7734 46.0597-38.3863C45.9498-38.505 45.8514-38.6376 45.7672-38.7835L44.8948-40.2942L43.7845-33.9959L51.0288-31.359C51.2226-31.2885 51.4005-31.1937 51.5603-31.0792C52.4838-30.5582 52.9224-29.4313 52.5478-28.4021L48.8289-18.1845C48.4119-17.0389 47.1451-16.4481 45.9994-16.8651C44.8537-17.2821 44.263-18.5489 44.68-19.6946L47.661-27.8864L37.4994-30.1334C35.0981-30.5568 33.4946-32.8468 33.918-35.2481L35.7152-45.4447L31.1654-42.8176L31.1654-35.0216C31.1654-33.8024 30.177-32.814 28.9578-32.814C27.7386-32.814 26.7502-33.8024 26.7502-35.0216L26.7502-44.1279C26.7502-45.1356 27.4254-45.9856 28.3481-46.2502C28.4443-46.3311 28.5492-46.4047 28.662-46.4698L36.0529-50.7369C36.893-51.222 39.7159-51.4096 42.2282-50.5951ZM43.1691-61.476C45.6075-61.476 47.5843-59.4993 47.5843-57.0608C47.5843-54.6224 45.6075-52.6457 43.1691-52.6457C40.7307-52.6457 38.7539-54.6224 38.7539-57.0608C38.7539-59.4993 40.7307-61.476 43.1691-61.476Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.2715-10.0974C52.1084-10.0974 52.8481-14.0642 55.5355-14.0642C58.2596-14.0642 58.7083-10.0974 65.2513-10.0974L65.3975-10.0974C66.5804-10.0974 67.539-11.0545 67.539-12.2512C67.539-13.4374 66.5804-14.3806 65.3975-14.3806L65.2513-14.3806C63.6482-14.3806 62.602-15.0036 60.9796-16.1641C59.7103-17.0916 57.9478-18.3474 55.5355-18.3474C53.0708-18.3474 51.2944-17.0532 50.025-16.1133C48.6702-15.1002 47.7494-14.3806 46.2715-14.3806C44.7796-14.3806 43.8588-15.1002 42.504-16.1133C41.2346-17.0532 39.4583-18.3474 37.0074-18.3474C34.5812-18.3474 32.8171-17.0916 31.5478-16.1641C29.9253-15.0036 28.8808-14.3806 27.2916-14.3806L27.1454-14.3806C25.947-14.3806 24.99-13.4374 24.99-12.2512C24.99-11.0545 25.947-10.0974 27.1454-10.0974L27.2916-10.0974C33.8207-10.0974 34.2833-14.0642 37.0074-14.0642C39.6948-14.0642 40.4206-10.0974 46.2715-10.0974ZM46.2715-17.1034C46.732-17.1034 46.9895-17.2418 48.4017-18.2984C50.3989-19.7721 52.6445-21.0701 55.5355-21.0701C57.6625-21.0701 59.3927-20.4938 61.4468-19.1638L66.7063-27.5552C68.6426-30.5931 67.8044-33.2798 64.7438-34.6873L49.9618-41.4486C49.2228-41.7807 47.9961-42.4509 46.2715-42.4509C44.533-42.4509 43.3062-41.7807 42.5672-41.4486L27.7852-34.6873C24.7246-33.2798 23.8865-30.5931 25.8227-27.5552L31.0822-19.1638C33.1363-20.4938 34.8804-21.0701 37.0074-21.0701C39.8845-21.0701 42.1301-19.7721 44.1273-18.2984C45.5395-17.2418 45.7971-17.1034 46.2715-17.1034ZM46.2715-45.4379C48.0427-45.4379 49.1371-45.0986 51.2108-44.1573L61.9959-39.2194L60.365-51.118C59.9784-53.941 58.5542-55.4688 55.8217-55.4688L36.7179-55.4688C33.9854-55.4688 32.603-53.941 32.1747-50.8538L30.5422-39.2317L41.3182-44.1573C43.3919-45.0986 44.4863-45.4379 46.2715-45.4379ZM38.0129-47.5708C37.4162-47.5708 37.0195-47.9537 37.0195-48.5852L37.0195-51.2053C37.0195-51.8368 37.4162-52.2336 38.0129-52.2336L43.2745-52.2336C44.0258-52.2336 44.4901-51.8368 44.4901-51.2053L44.4901-48.5852C44.4901-47.9537 44.0258-47.5708 43.2745-47.5708ZM49.0135-47.5708C48.4081-47.5708 48.0357-47.9537 48.0357-48.5852L48.0357-51.2053C48.0357-51.8368 48.4081-52.2336 49.0135-52.2336L54.2907-52.2336C55.042-52.2336 55.5063-51.8368 55.5063-51.2053L55.5063-48.5852C55.5063-47.9537 55.042-47.5708 54.2907-47.5708ZM37.5948-54.3602L54.9449-54.3602L54.9449-56.7714C54.9449-58.972 53.7658-60.0126 51.5669-60.0126L40.9589-60.0126C38.7583-60.0126 37.5948-58.972 37.5948-56.7714Z"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M61.3562-24.833L61.3562-22.9597L55.736-22.9597L55.7365-19.2133L50.1163-19.2133L50.1168-15.4668L44.4966-15.4668L44.4971-11.7203L37.0041-11.7203L37.0041-13.5935L42.6233-13.5935L42.6238-17.34L48.2431-17.34L48.2435-21.0865L53.8628-21.0865L53.8633-24.833L61.3562-24.833ZM35.1564-29.0114C35.3475-28.9459 35.5461-28.8943 35.7513-28.8582L39.7195-27.9811L38.7289-22.3603C38.697-22.1793 38.6412-22.0086 38.5652-21.8507C38.5155-21.5845 38.4095-21.3241 38.2439-21.0876L32.2691-12.5548C31.6494-11.6696 30.4294-11.4545 29.5443-12.0743C28.6592-12.6941 28.4441-13.914 29.0638-14.7991L34.6872-22.83C34.6552-23.001 34.6458-23.1791 34.6617-23.3608L35.1564-29.0114ZM40.4846-48.9082C41.5091-48.576 42.3422-48.0405 42.9066-47.3517C43.0353-47.2276 43.149-47.0836 43.2428-46.921L46.6043-41.0982L53.5997-41.0978C54.6802-41.0978 55.5561-40.2219 55.5561-39.1414C55.5561-38.0609 54.6802-37.1849 53.5997-37.1849L45.5293-37.1849C44.8365-37.1849 44.2279-37.545 43.8802-38.0881C43.7828-38.1933 43.6956-38.3109 43.621-38.4402L42.8479-39.7791L41.8639-34.1972L48.2841-31.8603C48.4558-31.7978 48.6135-31.7137 48.7551-31.6123C49.5736-31.1505 49.9623-30.1518 49.6303-29.2397L46.3344-20.1844C45.9649-19.1691 44.8422-18.6456 43.8268-19.0151C42.8115-19.3847 42.2879-20.5074 42.6575-21.5227L45.2994-28.7827L36.2937-30.774C34.1655-31.1493 32.7445-33.1788 33.1197-35.307L34.7125-44.3436L30.6802-42.0154L30.6802-35.1062C30.6802-34.0257 29.8043-33.1497 28.7237-33.1497C27.6432-33.1497 26.7673-34.0257 26.7673-35.1062L26.7673-43.1766C26.7673-44.0697 27.3657-44.823 28.1834-45.0575C28.2687-45.1292 28.3616-45.1944 28.4616-45.2521L35.0117-49.0338C35.7563-49.4637 38.258-49.63 40.4846-48.9082ZM41.3185-58.5513C43.4795-58.5513 45.2314-56.7994 45.2314-54.6384C45.2314-52.4773 43.4795-50.7255 41.3185-50.7255C39.1574-50.7255 37.4055-52.4773 37.4055-54.6384C37.4055-56.7994 39.1574-58.5513 41.3185-58.5513Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.0668-12.5902C48.9385-12.5902 49.7355-16.472 53.1488-16.472C56.6353-16.472 57.1524-12.5902 62.7191-12.5902L62.8168-12.5902C63.3158-12.5902 63.7116-13.0004 63.7116-13.5095C63.7116-14.0042 63.3158-14.4044 62.8168-14.4044L62.7191-14.4044C60.5157-14.4044 59.2487-15.3496 57.8083-16.3606C56.5632-17.2639 55.1346-18.2862 53.1488-18.2862C51.0941-18.2862 49.6555-17.2051 48.4104-16.2773C47.092-15.2764 45.9183-14.4044 44.0668-14.4044C42.2051-14.4044 41.0315-15.2764 39.7131-16.2773C38.468-17.2051 37.0294-18.2862 34.9847-18.2862C32.9889-18.2862 31.5747-17.2639 30.3296-16.3606C28.8891-15.3496 27.6078-14.4044 25.4144-14.4044L25.3168-14.4044C24.822-14.4044 24.4119-14.0042 24.4119-13.5095C24.4119-13.0004 24.822-12.5902 25.3168-12.5902L25.4144-12.5902C30.9711-12.5902 31.4982-16.472 34.9847-16.472C38.398-16.472 39.1849-12.5902 44.0668-12.5902ZM44.0668-16.2357C45.2741-16.2357 45.9325-16.6945 47.3009-17.7355C48.546-18.6633 50.5-20.1176 53.1488-20.1176C54.6964-20.1176 55.9598-19.6825 57.2671-18.9148L62.5732-28.8824C64.0707-31.6626 63.3583-33.5001 60.7553-34.6989L47.5392-40.7858C46.6241-41.2139 45.5342-41.7235 44.0668-41.7235C42.5893-41.7235 41.4994-41.2139 40.5843-40.7858L27.3682-34.6989C24.7651-33.5001 24.0528-31.6626 25.5503-28.8824L30.8563-18.9148C32.1637-19.6825 33.4371-20.1176 34.9847-20.1176C37.6235-20.1176 39.5775-18.6633 40.8226-17.7355C42.191-16.6945 42.8494-16.2357 44.0668-16.2357ZM44.0668-43.7453C45.7614-43.7453 46.9795-43.274 48.3758-42.6253L58.2573-38.0587L56.5784-50.0655C56.281-52.2358 54.9583-53.568 52.8212-53.568L35.3411-53.568C33.204-53.568 31.9113-52.2358 31.5839-49.8751L29.9194-38.0831L39.7477-42.6253C41.144-43.274 42.3621-43.7453 44.0668-43.7453ZM35.8053-45.6579C35.4177-45.6579 35.1579-45.9321 35.1579-46.334L35.1579-49.5859C35.1579-49.9879 35.4177-50.2721 35.8053-50.2721L41.9093-50.2721C42.3714-50.2721 42.6469-49.9879 42.6469-49.5859L42.6469-46.334C42.6469-45.9321 42.3714-45.6579 41.9093-45.6579ZM46.1572-45.6579C45.7652-45.6579 45.5054-45.9321 45.5054-46.334L45.5054-49.5859C45.5054-49.9879 45.7652-50.2721 46.1572-50.2721L52.2568-50.2721C52.7189-50.2721 52.9944-49.9879 52.9944-49.5859L52.9944-46.334C52.9944-45.9321 52.7189-45.6579 52.2568-45.6579ZM36.5081-53.0728L51.6542-53.0728L51.6542-55.0182C51.6542-56.6878 50.6794-57.6814 48.9953-57.6814L39.157-57.6814C37.4873-57.6814 36.5081-56.6878 36.5081-55.0182Z"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "options.speedcamera.slash.svg",
+      "idiom" : "universal"
+    }
+  ]
+}
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/options.speedcamera.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/options.speedcamera.slash.svg
@@ -4,23 +4,21 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-20a5448f01d71e28 2dfdbdebbc93f6a circle}
+.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-20a5448f01d71e28 2dfdbdebbc93f6a 68627a11f315162f}
+.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-20a5448f01d71e28 _slash}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-20a5448f01d71e28 _slash}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 2dfdbdebbc93f6a _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 2dfdbdebbc93f6a 68627a11f315162f}
-.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 _slash}
-.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 _slash}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-20a5448f01d71e28 2dfdbdebbc93f6a circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-20a5448f01d71e28 2dfdbdebbc93f6a 68627a11f315162f}
+.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-20a5448f01d71e28 _slash}
+.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-20a5448f01d71e28 _slash}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 2dfdbdebbc93f6a _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 2dfdbdebbc93f6a 68627a11f315162f}
-.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 _slash}
-.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 _slash}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 2dfdbdebbc93f6a _enclosure.stroke circle}
-.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 2dfdbdebbc93f6a 68627a11f315162f}
-.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 _slash}
-.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-9f8cd0a0ad84bc8 _slash}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-20a5448f01d71e28 2dfdbdebbc93f6a circle}
+.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-20a5448f01d71e28 2dfdbdebbc93f6a 68627a11f315162f}
+.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-20a5448f01d71e28 _slash}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-20a5448f01d71e28 _slash}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -39,13 +37,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -53,7 +51,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -62,13 +60,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
@@ -100,22 +98,22 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M55.6171-48.8244C59.3466-48.8244 62.37-45.8163 62.37-42.1058L62.37-28.6685C62.37-24.9579 59.3466-21.9499 55.6171-21.9499L52.2406-21.9499L52.2406-15.2313L45.4877-15.2313L45.4877-21.9499L42.1113-21.9499C38.3818-21.9499 35.3584-24.9579 35.3584-28.6685L35.3584-42.1058C35.3584-45.8163 38.3818-48.8244 42.1113-48.8244L55.6171-48.8244ZM40.1464-28.4875C39.1559-28.4875 38.353-27.6846 38.353-26.6941C38.353-25.7036 39.1559-24.9006 40.1464-24.9006C41.1369-24.9006 41.9399-25.7036 41.9399-26.6941C41.9399-27.6846 41.1369-28.4875 40.1464-28.4875ZM48.8177-42.2429C45.019-42.2429 41.9399-39.1636 41.9399-35.3652C41.9399-31.7187 44.7776-28.735 48.3652-28.5022L48.8177-28.4875C52.6161-28.4875 55.6952-31.5668 55.6952-35.3652C55.6952-39.1636 52.6161-42.2429 48.8177-42.2429ZM55.3625-55.9982C62.8674-55.9982 68.9514-49.7513 68.9514-42.0454L68.9514-35.069L65.5542-35.069L65.5542-42.0454C65.5542-47.8248 60.9912-52.51 55.3625-52.51L41.7735-52.51C36.1448-52.51 31.5818-47.8248 31.5818-42.0454L31.5818-35.069L28.1845-35.069L28.1845-42.0454C28.1845-49.7513 34.2685-55.9982 41.7735-55.9982L55.3625-55.9982Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.6082697 0 1.0 0.10826972 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5458696 0 1.0 0.04586959 0.0"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M52.815-48.4732C56.4001-48.4732 59.3063-45.5664 59.3063-41.9807L59.3063-28.9956C59.3063-25.4099 56.4001-22.5031 52.815-22.5031L49.5694-22.5031L49.5694-16.0106L43.078-16.0106L43.078-22.5031L39.8324-22.5031C36.2473-22.5031 33.341-25.4099 33.341-28.9956L33.341-41.9807C33.341-45.5664 36.2473-48.4732 39.8324-48.4732L52.815-48.4732ZM38.1519-28.7329C37.2205-28.7329 36.4655-27.9778 36.4655-27.0464C36.4655-26.115 37.2205-25.36 38.1519-25.36C39.0833-25.36 39.8383-26.115 39.8383-27.0464C39.8383-27.9778 39.0833-28.7329 38.1519-28.7329ZM46.46-41.9759C42.8028-41.9759 39.8383-39.0113 39.8383-35.3544C39.8383-31.8437 42.5704-28.9711 46.0243-28.747L46.46-28.7329C50.1169-28.7329 53.0813-31.6974 53.0813-35.3544C53.0813-39.0113 50.1169-41.9759 46.46-41.9759ZM52.7342-55.2189C59.9522-55.2189 65.8036-49.2527 65.8036-41.8931L65.8036-35.2302L62.5363-35.2302L62.5363-41.8931C62.5363-47.4128 58.1477-51.8874 52.7342-51.8874L39.6648-51.8874C34.2512-51.8874 29.8627-47.4128 29.8627-41.8931L29.8627-35.2302L26.5953-35.2302L26.5953-41.8931C26.5953-49.2527 32.4467-55.2189 39.6648-55.2189L52.7342-55.2189Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.60452837 0 1.0 0.104528375 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5487678 0 1.0 0.048767686 0.0"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M50.1563-47.5629C53.4557-47.5629 56.1304-44.8768 56.1304-41.5634L56.1304-29.5644C56.1304-26.251 53.4557-23.5649 50.1563-23.5649L47.1693-23.5649L47.1693-17.5654L41.1952-17.5654L41.1952-23.5649L38.2082-23.5649C34.9088-23.5649 32.2341-26.251 32.2341-29.5644L32.2341-41.5634C32.2341-44.8768 34.9088-47.5629 38.2082-47.5629L50.1563-47.5629ZM36.81-29.2594C35.9676-29.2594 35.2847-28.5765 35.2847-27.7341C35.2847-26.8917 35.9676-26.2088 36.81-26.2088C37.6524-26.2088 38.3353-26.8917 38.3353-27.7341C38.3353-28.5765 37.6524-29.2594 36.81-29.2594ZM44.4366-41.4617C41.0668-41.4617 38.3353-38.7301 38.3353-35.3605C38.3353-32.1257 40.8526-29.4789 44.0351-29.2723L44.4366-29.2594C47.8061-29.2594 50.5376-31.991 50.5376-35.3605C50.5376-38.7301 47.8061-41.4617 44.4366-41.4617ZM50.1987-53.664C56.8442-53.664 62.2315-48.2009 62.2315-41.4617L62.2315-35.3605L59.2233-35.3605L59.2233-41.4617C59.2233-46.5161 55.1829-50.6135 50.1987-50.6135L38.1658-50.6135C33.1816-50.6135 29.1412-46.5161 29.1412-41.4617L29.1412-35.3605L26.1329-35.3605L26.1329-41.4617C26.1329-48.2009 31.5202-53.664 38.1658-53.664L50.1987-53.664Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.55392593 0 1.0 0.053925958 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5139301 0 1.0 0.013930082 0.0"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "motorways.circle.svg",
+      "filename" : "options.speedcamera.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/options.speedcamera.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/options.speedcamera.svg
@@ -4,17 +4,15 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-draw-reverses-motion-groups:true}
-
-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2dfdbdebbc93f6a _enclosure.stroke circle}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2dfdbdebbc93f6a circle}
 .monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:2dfdbdebbc93f6a 68627a11f315162f}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2dfdbdebbc93f6a _enclosure.stroke circle}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2dfdbdebbc93f6a circle}
 .multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:2dfdbdebbc93f6a 68627a11f315162f}

-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2dfdbdebbc93f6a _enclosure.stroke circle}
-.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:2dfdbdebbc93f6a 68627a11f315162f}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2dfdbdebbc93f6a circle}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:2dfdbdebbc93f6a 68627a11f315162f}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -33,13 +31,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -47,7 +45,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -56,13 +54,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from circle</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
@@ -94,15 +92,15 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M55.6171-48.8244C59.3466-48.8244 62.37-45.8163 62.37-42.1058L62.37-28.6685C62.37-24.9579 59.3466-21.9499 55.6171-21.9499L52.2406-21.9499L52.2406-15.2313L45.4877-15.2313L45.4877-21.9499L42.1113-21.9499C38.3818-21.9499 35.3584-24.9579 35.3584-28.6685L35.3584-42.1058C35.3584-45.8163 38.3818-48.8244 42.1113-48.8244L55.6171-48.8244ZM40.1464-28.4875C39.1559-28.4875 38.353-27.6846 38.353-26.6941C38.353-25.7036 39.1559-24.9006 40.1464-24.9006C41.1369-24.9006 41.9399-25.7036 41.9399-26.6941C41.9399-27.6846 41.1369-28.4875 40.1464-28.4875ZM48.8177-42.2429C45.019-42.2429 41.9399-39.1636 41.9399-35.3652C41.9399-31.7187 44.7776-28.735 48.3652-28.5022L48.8177-28.4875C52.6161-28.4875 55.6952-31.5668 55.6952-35.3652C55.6952-39.1636 52.6161-42.2429 48.8177-42.2429ZM55.3625-55.9982C62.8674-55.9982 68.9514-49.7513 68.9514-42.0454L68.9514-35.069L65.5542-35.069L65.5542-42.0454C65.5542-47.8248 60.9912-52.51 55.3625-52.51L41.7735-52.51C36.1448-52.51 31.5818-47.8248 31.5818-42.0454L31.5818-35.069L28.1845-35.069L28.1845-42.0454C28.1845-49.7513 34.2685-55.9982 41.7735-55.9982L55.3625-55.9982Z"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M52.815-48.4732C56.4001-48.4732 59.3063-45.5664 59.3063-41.9807L59.3063-28.9956C59.3063-25.4099 56.4001-22.5031 52.815-22.5031L49.5694-22.5031L49.5694-16.0106L43.078-16.0106L43.078-22.5031L39.8324-22.5031C36.2473-22.5031 33.341-25.4099 33.341-28.9956L33.341-41.9807C33.341-45.5664 36.2473-48.4732 39.8324-48.4732L52.815-48.4732ZM38.1519-28.7329C37.2205-28.7329 36.4655-27.9778 36.4655-27.0464C36.4655-26.115 37.2205-25.36 38.1519-25.36C39.0833-25.36 39.8383-26.115 39.8383-27.0464C39.8383-27.9778 39.0833-28.7329 38.1519-28.7329ZM46.46-41.9759C42.8028-41.9759 39.8383-39.0113 39.8383-35.3544C39.8383-31.8437 42.5704-28.9711 46.0243-28.747L46.46-28.7329C50.1169-28.7329 53.0813-31.6974 53.0813-35.3544C53.0813-39.0113 50.1169-41.9759 46.46-41.9759ZM52.7342-55.2189C59.9522-55.2189 65.8036-49.2527 65.8036-41.8931L65.8036-35.2302L62.5363-35.2302L62.5363-41.8931C62.5363-47.4128 58.1477-51.8874 52.7342-51.8874L39.6648-51.8874C34.2512-51.8874 29.8627-47.4128 29.8627-41.8931L29.8627-35.2302L26.5953-35.2302L26.5953-41.8931C26.5953-49.2527 32.4467-55.2189 39.6648-55.2189L52.7342-55.2189Z"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M50.1563-47.5629C53.4557-47.5629 56.1304-44.8768 56.1304-41.5634L56.1304-29.5644C56.1304-26.251 53.4557-23.5649 50.1563-23.5649L47.1693-23.5649L47.1693-17.5654L41.1952-17.5654L41.1952-23.5649L38.2082-23.5649C34.9088-23.5649 32.2341-26.251 32.2341-29.5644L32.2341-41.5634C32.2341-44.8768 34.9088-47.5629 38.2082-47.5629L50.1563-47.5629ZM36.81-29.2594C35.9676-29.2594 35.2847-28.5765 35.2847-27.7341C35.2847-26.8917 35.9676-26.2088 36.81-26.2088C37.6524-26.2088 38.3353-26.8917 38.3353-27.7341C38.3353-28.5765 37.6524-29.2594 36.81-29.2594ZM44.4366-41.4617C41.0668-41.4617 38.3353-38.7301 38.3353-35.3605C38.3353-32.1257 40.8526-29.4789 44.0351-29.2723L44.4366-29.2594C47.8061-29.2594 50.5376-31.991 50.5376-35.3605C50.5376-38.7301 47.8061-41.4617 44.4366-41.4617ZM50.1987-53.664C56.8442-53.664 62.2315-48.2009 62.2315-41.4617L62.2315-35.3605L59.2233-35.3605L59.2233-41.4617C59.2233-46.5161 55.1829-50.6135 50.1987-50.6135L38.1658-50.6135C33.1816-50.6135 29.1412-46.5161 29.1412-41.4617L29.1412-35.3605L26.1329-35.3605L26.1329-41.4617C26.1329-48.2009 31.5202-53.664 38.1658-53.664L50.1987-53.664Z"/>
  </g>
 </g>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "ferries.slash.svg",
+      "filename" : "options.steps.slash.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/options.steps.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.slash.symbolset/options.steps.slash.svg
@@ -7,20 +7,20 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
 <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-6aacdf7710dc2e21 62adb020fe08a1f1 _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-36fd5fd693fc3de2 -6aacdf7710dc2e21 62adb020fe08a1f1}
-.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6aacdf7710dc2e21 _slash}
-.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6aacdf7710dc2e21 _slash}
+.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-551460830a5ddad 2e79d0d08048ae5 _enclosure.stroke circle figure.stairs.circle}
+.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-551460830a5ddad 2e79d0d08048ae5 figure.stairs.circle}
+.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-551460830a5ddad _slash}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-551460830a5ddad _slash}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-6aacdf7710dc2e21 62adb020fe08a1f1 _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-36fd5fd693fc3de2 -6aacdf7710dc2e21 62adb020fe08a1f1}
-.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6aacdf7710dc2e21 _slash}
-.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6aacdf7710dc2e21 _slash}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-551460830a5ddad 2e79d0d08048ae5 _enclosure.stroke circle figure.stairs.circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-551460830a5ddad 2e79d0d08048ae5 figure.stairs.circle}
+.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-551460830a5ddad _slash}
+.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-551460830a5ddad _slash}

-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-6aacdf7710dc2e21 62adb020fe08a1f1 _enclosure.stroke circle}
-.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-36fd5fd693fc3de2 -6aacdf7710dc2e21 62adb020fe08a1f1}
-.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6aacdf7710dc2e21 _slash}
-.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-6aacdf7710dc2e21 _slash}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-551460830a5ddad 2e79d0d08048ae5 _enclosure.stroke circle figure.stairs.circle}
+.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-551460830a5ddad 2e79d0d08048ae5 figure.stairs.circle}
+.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-551460830a5ddad _slash}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-551460830a5ddad _slash}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -100,22 +100,22 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M64.8852-56.0112L64.8852-15.2514L32.2508-15.2514L32.2508-56.0112L64.8852-56.0112ZM50.2742-27.8298L46.8618-27.8298L46.8618-19.1285L50.2742-19.1285L50.2742-27.8298ZM50.2742-39.982L46.8618-39.982L46.8618-31.2807L50.2742-31.2807L50.2742-39.982ZM50.2742-52.1341L46.8618-52.1341L46.8618-43.4328L50.2742-43.4328L50.2742-52.1341Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909952 1.5010293 0 0.24858466 0.25051486 1.7494847 0 0.49588814 0.0032113728 1.9966589 0 0.75064266 0.74845684 1.2515438 0 1 0.49909952 1.5010293"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M48.8281-50.8789C51.2207-50.8789 53.125-52.832 53.125-55.1758C53.125-57.5195 51.2207-59.4727 48.8281-59.4727C46.4844-59.4727 44.5312-57.5195 44.5312-55.1758C44.5312-52.832 46.4844-50.8789 48.8281-50.8789ZM51.0742-20.9961C51.9043-20.8008 53.3691-21.0449 53.7598-22.5098L56.3965-31.1035C56.6895-32.2266 56.2012-33.4473 55.0293-33.8867L48.291-36.1816L49.0234-41.1133C49.0234-41.2598 49.2188-41.3086 49.3164-41.1133L50.4883-38.8672C50.8789-38.0859 51.6113-37.6465 52.4902-37.6465L59.668-37.6465C60.8398-37.6465 61.9141-38.623 61.9141-39.8926C61.9141-41.1133 60.8887-42.0898 59.668-42.0898L53.8574-42.0898L51.6113-46.5332C50.8301-48.0957 49.3652-49.2676 47.5586-49.6094L46.5332-49.8047C44.5801-50.1953 42.9688-49.7559 41.748-49.0234L35.9375-45.3613C35.3027-44.9707 34.9121-44.2383 34.9121-43.5059L34.9121-36.2793C34.9121-35.0586 35.8887-34.0332 37.1094-34.0332C38.3301-34.0332 39.3555-35.0586 39.3555-36.2793L39.3555-42.2363L41.0645-43.3105C41.2109-43.4082 41.4062-43.3105 41.4062-43.1152L40.625-37.1582C40.2832-34.4727 41.2109-32.5195 44.3848-31.7383L51.4648-30.0781L49.5117-23.7305C49.1699-22.6562 49.6582-21.3867 51.0742-20.9961ZM37.7441-14.5996C38.5254-14.0625 39.9414-14.0625 40.7715-15.2344L46.0938-23.1445C46.3867-23.5352 46.5332-23.9258 46.582-24.4141L47.2168-28.9062L43.8965-29.6875C43.3594-29.7852 42.9199-29.9316 42.4805-30.127L42.1387-25.2441L37.1094-17.6758C36.377-16.6504 36.6699-15.2832 37.7441-14.5996ZM46.2891-11.1816L51.8555-11.1816C52.7832-11.1816 53.6133-11.9629 53.6133-12.9395L53.6133-15.6738L57.4219-15.6738C58.3496-15.6738 59.1309-16.4062 59.1309-17.3828L59.1309-20.1172L62.9883-20.1172C63.9648-20.1172 64.7461-20.8984 64.7461-21.8262L64.7461-24.6094L68.6035-24.6094C69.5312-24.6094 70.3125-25.3906 70.3125-26.3184C70.3125-27.2461 69.5312-28.0273 68.6035-28.0273L62.9883-28.0273C62.0117-28.0273 61.3281-27.1973 61.3281-26.3184L61.3281-23.584L57.4219-23.584C56.4453-23.584 55.7129-22.7539 55.7129-21.8262L55.7129-19.0918L51.8555-19.0918C50.9277-19.0918 50.1465-18.3105 50.1465-17.3828L50.1465-14.5996L46.2891-14.5996C45.3125-14.5996 44.5801-13.8672 44.5801-12.9395C44.5801-12.0117 45.3125-11.1816 46.2891-11.1816Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.8018-4.48836C96.4529-0.837264 96.4529 5.09118 92.8018 8.74227C89.1507 12.3934 83.2222 12.3934 79.5711 8.74227L4.85823-65.9706C1.20714-69.6217 1.20714-75.5502 4.85823-79.2013C8.50933-82.8524 14.4378-82.8524 18.0889-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6517-0.338247C90.0122 1.02234 90.0122 3.23158 88.6517 4.59217C87.2911 5.95275 85.0818 5.95275 83.7212 4.59217L9.00834-70.1207C7.64776-71.4813 7.64776-73.6906 9.00834-75.0511C10.3689-76.4117 12.5782-76.4117 13.9388-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707384 0 1 0 0.04707384"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M61.7679-55.0752L61.7679-16.1721L30.6311-16.1721L30.6311-55.0752L61.7679-55.0752ZM47.8274-28.1776L44.5715-28.1776L44.5715-19.8727L47.8274-19.8727L47.8274-28.1776ZM47.8274-39.7762L44.5715-39.7762L44.5715-31.4712L47.8274-31.4712L47.8274-39.7762ZM47.8274-51.3747L44.5715-51.3747L44.5715-43.0698L47.8274-43.0698L47.8274-51.3747Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914482 1.5008681 0 0.24828531 0.2508595 1.7491462 0 0.4958041 0.0033407207 1.9966576 0 0.7506014 0.74854344 1.2514637 0 1 0.49914482 1.5008681"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M46.1914-53.6133C48.7305-53.6133 50.7812-55.6641 50.7812-58.2031C50.7812-60.7422 48.7305-62.8418 46.1914-62.8418C43.6523-62.8418 41.5527-60.7422 41.5527-58.2031C41.5527-55.6641 43.6523-53.6133 46.1914-53.6133ZM48.9258-18.9453C49.7559-18.7012 51.123-18.9941 51.5625-20.3613L54.5898-30.5176C54.9316-31.6406 54.4434-32.7637 53.2715-33.1543L44.9707-36.0352L45.9961-43.1152C46.0449-43.5059 46.6309-43.6035 46.7773-43.2129L48.584-39.7949C48.9746-39.0137 49.6582-38.623 50.4395-38.623L58.9355-38.623C60.1074-38.623 61.084-39.5508 61.084-40.7227C61.084-41.8945 60.1074-42.8223 58.9355-42.8223L51.7578-42.8223L49.0234-48.3398C48.0957-50.0977 46.5332-51.3184 44.5312-51.709L43.3594-51.9531C41.2109-52.3926 39.4531-51.9043 38.0859-51.0742L31.2012-46.7773C30.6152-46.3867 30.2246-45.7031 30.2246-44.9707L30.2246-36.4746C30.2246-35.3027 31.2012-34.3262 32.373-34.3262C33.5449-34.3262 34.4727-35.3027 34.4727-36.4746L34.4727-43.7988L37.4512-45.6543C37.6953-45.8008 38.0371-45.6543 37.9883-45.3125L37.0117-37.5C36.6211-34.4727 37.5977-32.4219 41.0645-31.6406L49.9023-29.541L47.4609-21.5332C47.168-20.459 47.6074-19.2871 48.9258-18.9453ZM33.3496-11.2793C34.082-10.791 35.4492-10.791 36.2305-11.9141L42.4805-21.2402C42.7734-21.6797 42.9688-22.0215 43.0176-22.5586L43.8965-28.7598L40.5762-29.541C40.0879-29.6875 39.6484-29.834 39.209-29.9805L38.7695-23.291L32.7148-14.209C32.0801-13.2324 32.3242-11.9141 33.3496-11.2793ZM42.041-7.71484L48.6816-7.71484C49.5117-7.71484 50.1465-8.44727 50.1465-9.17969L50.1465-12.9883L55.3711-12.9883C56.0547-12.9883 56.7383-13.6719 56.7383-14.4043L56.7383-18.2617L61.9629-18.2617C62.8418-18.2617 63.3789-18.9453 63.3789-19.6777L63.3789-23.5352L68.5547-23.5352C69.3359-23.5352 70.0195-24.2188 70.0195-24.9512C70.0195-25.7324 69.3848-26.3672 68.5547-26.3672L61.9629-26.3672C61.1328-26.3672 60.5957-25.7324 60.5957-24.9512L60.5957-21.0938L55.3711-21.0938C54.4922-21.0938 53.9062-20.459 53.9062-19.6777L53.9062-15.8203L48.6816-15.8203C47.9492-15.8203 47.2656-15.1855 47.2656-14.4043L47.2656-10.5469L42.041-10.5469C41.3086-10.5469 40.625-9.91211 40.625-9.17969C40.625-8.44727 41.2598-7.71484 42.041-7.71484Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.3183-6.06714C90.5998-2.78573 90.5998 2.54245 87.3183 5.82386C84.0369 9.10527 78.7088 9.10527 75.4274 5.82386L5.21165-64.3918C1.93024-67.6733 1.93024-73.0014 5.21165-76.2828C8.49306-79.5643 13.8212-79.5643 17.1026-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8519-2.60066C85.2201-1.23245 85.2201 0.98917 83.8519 2.35738C82.4837 3.72558 80.262 3.72558 78.8938 2.35738L8.67813-67.8583C7.30992-69.2265 7.30992-71.4482 8.67813-72.8164C10.0463-74.1846 12.268-74.1846 13.6362-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497174 0 1 0 0.049717426"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M58.5484-53.5725L58.5484-17.4985L29.816-17.4985L29.816-53.5725L58.5484-53.5725ZM45.6845-28.6309L42.68-28.6309L42.68-20.93L45.6845-20.93L45.6845-28.6309ZM45.6845-39.386L42.68-39.386L42.68-31.685L45.6845-31.685L45.6845-39.386ZM45.6845-50.1411L42.68-50.1411L42.68-42.4401L45.6845-42.4401L45.6845-50.1411Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911225 1.5011581 0 0.24859133 0.2505209 1.7495484 0 0.49577397 0.0033382904 1.9966562 0 0.7506487 0.7484636 1.251609 0 1 0.49911225 1.5011581"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M44.0571-53.7041C46.5962-53.7041 48.647-55.7549 48.647-58.2939C48.647-60.833 46.5962-62.8872 44.0571-62.8872C41.5181-62.8872 39.4639-60.833 39.4639-58.2939C39.4639-55.7549 41.5181-53.7041 44.0571-53.7041ZM46.7915-19.127C47.6216-18.8828 48.9888-19.1758 49.3828-20.543L52.4556-30.6992C52.7974-31.7769 52.2637-32.8999 51.1372-33.2905L42.8364-36.1714L43.8618-43.2061C43.9107-43.6421 44.4512-43.7397 44.6431-43.3491L46.4497-39.8857C46.8403-39.1499 47.5239-38.7593 48.3052-38.7593L56.8013-38.7593C57.9732-38.7593 58.9043-39.6416 58.9043-40.8589C58.9043-41.9854 57.9732-42.9585 56.8013-42.9585L49.6236-42.9585L46.8892-48.4307C46.0069-50.1885 44.3989-51.5454 42.4424-51.8452L41.2251-52.0439C39.0767-52.3926 37.3189-51.9951 35.9517-51.165L29.1123-46.9136C28.5264-46.5229 28.1358-45.8394 28.1358-45.0615L28.1358-36.6108C28.1358-35.439 29.1123-34.4624 30.2842-34.4624C31.4561-34.4624 32.3838-35.439 32.3838-36.6108L32.3838-43.9351L35.3623-45.7905C35.6065-45.937 35.9483-45.7451 35.8994-45.4033L34.8775-37.6362C34.4868-34.6089 35.5088-32.5581 38.9302-31.7769L47.7681-29.7227L45.3721-21.7148C45.0337-20.6406 45.4278-19.4687 46.7915-19.127ZM31.2153-11.4609C31.9932-10.9727 33.3604-10.9727 34.1416-12.0957L40.3916-21.3765C40.6846-21.8159 40.8799-22.1577 40.9287-22.6948L41.7622-28.9414L38.4873-29.7227C37.999-29.8237 37.5142-29.9702 37.1201-30.1167L36.6807-23.4727L30.626-14.436C29.9912-13.4595 30.19-12.1411 31.2153-11.4609ZM38.0904-8.57763L45.7754-8.57763C46.1514-8.57763 46.5137-8.94677 46.5137-9.36133L46.5137-13.8057L53.4185-13.8057C53.7842-13.8057 54.1953-14.2168 54.1953-14.5859L54.1953-19.0791L61.1455-19.0791C61.5703-19.0791 61.8804-19.4902 61.8804-19.8594L61.8804-24.3525L67.6919-24.3525C68.0645-24.3525 68.4302-24.7183 68.4302-25.1328C68.4302-25.5054 68.1133-25.9131 67.6919-25.9131L61.1455-25.9131C60.6787-25.9131 60.3687-25.5054 60.3687-25.1328L60.3687-20.6397L53.4185-20.6397C52.9937-20.6397 52.6348-20.2773 52.6348-19.8594L52.6348-15.3662L45.7754-15.3662C45.4063-15.3662 44.9951-15.0493 44.9951-14.5859L44.9951-10.1382L38.0904-10.1382C37.6304-10.1382 37.3101-9.73047 37.3101-9.36133C37.3101-8.94677 37.6724-8.57763 38.0904-8.57763Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7482-3.06064C83.2708-1.53808 83.2708 0.934172 81.7482 2.45673C80.2257 3.97929 77.7534 3.97929 76.2309 2.45673L6.37578-67.3983C4.85322-68.9209 4.85322-71.3932 6.37578-72.9157C7.89834-74.4383 10.3706-74.4383 11.8931-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6973-1.00975C80.088-0.619106 80.088 0.0152006 79.6973 0.405845C79.3067 0.796489 78.6724 0.796489 78.2817 0.405845L8.42666-69.4492C8.03602-69.8399 8.03602-70.4742 8.42666-70.8648C8.81731-71.2555 9.45161-71.2555 9.84226-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "motorways.svg",
+      "filename" : "options.steps.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/options.steps.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.steps.symbolset/options.steps.svg
@@ -5,16 +5,16 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
 <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-draw-reverses-motion-groups:true}
+ <style>.defaults {-sfsymbols-variable-value-mode:draw;-sfsymbols-draw-reverses-motion-groups:true}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:62adb020fe08a1f1 _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-36fd5fd693fc3de2 62adb020fe08a1f1}
+.monochrome-0 {-sfsymbols-variable-draw:0 1;-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2e79d0d08048ae5 _enclosure.stroke circle figure.stairs.circle}
+.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:2e79d0d08048ae5 figure.stairs.circle}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:62adb020fe08a1f1 _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-36fd5fd693fc3de2 62adb020fe08a1f1}
+.multicolor-0:tintColor {-sfsymbols-variable-draw:0 1;-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2e79d0d08048ae5 _enclosure.stroke circle figure.stairs.circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:2e79d0d08048ae5 figure.stairs.circle}

-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:62adb020fe08a1f1 _enclosure.stroke circle}
-.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-36fd5fd693fc3de2 62adb020fe08a1f1}
+.hierarchical-0:secondary {-sfsymbols-variable-draw:0 1;-sfsymbols-motion-group:1;-sfsymbols-layer-tags:2e79d0d08048ae5 _enclosure.stroke circle figure.stairs.circle}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:2e79d0d08048ae5 figure.stairs.circle}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -63,7 +63,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from circle</text>
+  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from options.steps</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
@@ -94,16 +94,16 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M64.8852-56.0112L64.8852-15.2514L32.2508-15.2514L32.2508-56.0112L64.8852-56.0112ZM50.2742-27.8298L46.8618-27.8298L46.8618-19.1285L50.2742-19.1285L50.2742-27.8298ZM50.2742-39.982L46.8618-39.982L46.8618-31.2807L50.2742-31.2807L50.2742-39.982ZM50.2742-52.1341L46.8618-52.1341L46.8618-43.4328L50.2742-43.4328L50.2742-52.1341Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909952 1.5010293 0 0.24858466 0.25051486 1.7494847 0 0.49588814 0.0032113728 1.9966589 0 0.75064266 0.74845684 1.2515438 0 1 0.49909952 1.5010293"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.8281-50.8789C51.2207-50.8789 53.125-52.832 53.125-55.1758C53.125-57.5195 51.2207-59.4727 48.8281-59.4727C46.4844-59.4727 44.5312-57.5195 44.5312-55.1758C44.5312-52.832 46.4844-50.8789 48.8281-50.8789ZM51.0742-20.9961C51.9043-20.8008 53.3691-21.0449 53.7598-22.5098L56.3965-31.1035C56.6895-32.2266 56.2012-33.4473 55.0293-33.8867L48.291-36.1816L49.0234-41.1133C49.0234-41.2598 49.2188-41.3086 49.3164-41.1133L50.4883-38.8672C50.8789-38.0859 51.6113-37.6465 52.4902-37.6465L59.668-37.6465C60.8398-37.6465 61.9141-38.623 61.9141-39.8926C61.9141-41.1133 60.8887-42.0898 59.668-42.0898L53.8574-42.0898L51.6113-46.5332C50.8301-48.0957 49.3652-49.2676 47.5586-49.6094L46.5332-49.8047C44.5801-50.1953 42.9688-49.7559 41.748-49.0234L35.9375-45.3613C35.3027-44.9707 34.9121-44.2383 34.9121-43.5059L34.9121-36.2793C34.9121-35.0586 35.8887-34.0332 37.1094-34.0332C38.3301-34.0332 39.3555-35.0586 39.3555-36.2793L39.3555-42.2363L41.0645-43.3105C41.2109-43.4082 41.4062-43.3105 41.4062-43.1152L40.625-37.1582C40.2832-34.4727 41.2109-32.5195 44.3848-31.7383L51.4648-30.0781L49.5117-23.7305C49.1699-22.6562 49.6582-21.3867 51.0742-20.9961ZM37.7441-14.5996C38.5254-14.0625 39.9414-14.0625 40.7715-15.2344L46.0938-23.1445C46.3867-23.5352 46.5332-23.9258 46.582-24.4141L47.2168-28.9062L43.8965-29.6875C43.3594-29.7852 42.9199-29.9316 42.4805-30.127L42.1387-25.2441L37.1094-17.6758C36.377-16.6504 36.6699-15.2832 37.7441-14.5996ZM46.2891-11.1816L51.8555-11.1816C52.7832-11.1816 53.6133-11.9629 53.6133-12.9395L53.6133-15.6738L57.4219-15.6738C58.3496-15.6738 59.1309-16.4062 59.1309-17.3828L59.1309-20.1172L62.9883-20.1172C63.9648-20.1172 64.7461-20.8984 64.7461-21.8262L64.7461-24.6094L68.6035-24.6094C69.5312-24.6094 70.3125-25.3906 70.3125-26.3184C70.3125-27.2461 69.5312-28.0273 68.6035-28.0273L62.9883-28.0273C62.0117-28.0273 61.3281-27.1973 61.3281-26.3184L61.3281-23.584L57.4219-23.584C56.4453-23.584 55.7129-22.7539 55.7129-21.8262L55.7129-19.0918L51.8555-19.0918C50.9277-19.0918 50.1465-18.3105 50.1465-17.3828L50.1465-14.5996L46.2891-14.5996C45.3125-14.5996 44.5801-13.8672 44.5801-12.9395C44.5801-12.0117 45.3125-11.1816 46.2891-11.1816Z"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M61.7679-55.0752L61.7679-16.1721L30.6311-16.1721L30.6311-55.0752L61.7679-55.0752ZM47.8274-28.1776L44.5715-28.1776L44.5715-19.8727L47.8274-19.8727L47.8274-28.1776ZM47.8274-39.7762L44.5715-39.7762L44.5715-31.4712L47.8274-31.4712L47.8274-39.7762ZM47.8274-51.3747L44.5715-51.3747L44.5715-43.0698L47.8274-43.0698L47.8274-51.3747Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914482 1.5008681 0 0.24828531 0.2508595 1.7491462 0 0.4958041 0.0033407207 1.9966576 0 0.7506014 0.74854344 1.2514637 0 1 0.49914482 1.5008681"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.1914-53.6133C48.7305-53.6133 50.7812-55.6641 50.7812-58.2031C50.7812-60.7422 48.7305-62.8418 46.1914-62.8418C43.6523-62.8418 41.5527-60.7422 41.5527-58.2031C41.5527-55.6641 43.6523-53.6133 46.1914-53.6133ZM48.9258-18.9453C49.7559-18.7012 51.123-18.9941 51.5625-20.3613L54.5898-30.5176C54.9316-31.6406 54.4434-32.7637 53.2715-33.1543L44.9707-36.0352L45.9961-43.1152C46.0449-43.5059 46.6309-43.6035 46.7773-43.2129L48.584-39.7949C48.9746-39.0137 49.6582-38.623 50.4395-38.623L58.9355-38.623C60.1074-38.623 61.084-39.5508 61.084-40.7227C61.084-41.8945 60.1074-42.8223 58.9355-42.8223L51.7578-42.8223L49.0234-48.3398C48.0957-50.0977 46.5332-51.3184 44.5312-51.709L43.3594-51.9531C41.2109-52.3926 39.4531-51.9043 38.0859-51.0742L31.2012-46.7773C30.6152-46.3867 30.2246-45.7031 30.2246-44.9707L30.2246-36.4746C30.2246-35.3027 31.2012-34.3262 32.373-34.3262C33.5449-34.3262 34.4727-35.3027 34.4727-36.4746L34.4727-43.7988L37.4512-45.6543C37.6953-45.8008 38.0371-45.6543 37.9883-45.3125L37.0117-37.5C36.6211-34.4727 37.5977-32.4219 41.0645-31.6406L49.9023-29.541L47.4609-21.5332C47.168-20.459 47.6074-19.2871 48.9258-18.9453ZM33.3496-11.2793C34.082-10.791 35.4492-10.791 36.2305-11.9141L42.4805-21.2402C42.7734-21.6797 42.9688-22.0215 43.0176-22.5586L43.8965-28.7598L40.5762-29.541C40.0879-29.6875 39.6484-29.834 39.209-29.9805L38.7695-23.291L32.7148-14.209C32.0801-13.2324 32.3242-11.9141 33.3496-11.2793ZM42.041-7.71484L48.6816-7.71484C49.5117-7.71484 50.1465-8.44727 50.1465-9.17969L50.1465-12.9883L55.3711-12.9883C56.0547-12.9883 56.7383-13.6719 56.7383-14.4043L56.7383-18.2617L61.9629-18.2617C62.8418-18.2617 63.3789-18.9453 63.3789-19.6777L63.3789-23.5352L68.5547-23.5352C69.3359-23.5352 70.0195-24.2188 70.0195-24.9512C70.0195-25.7324 69.3848-26.3672 68.5547-26.3672L61.9629-26.3672C61.1328-26.3672 60.5957-25.7324 60.5957-24.9512L60.5957-21.0938L55.3711-21.0938C54.4922-21.0938 53.9062-20.459 53.9062-19.6777L53.9062-15.8203L48.6816-15.8203C47.9492-15.8203 47.2656-15.1855 47.2656-14.4043L47.2656-10.5469L42.041-10.5469C41.3086-10.5469 40.625-9.91211 40.625-9.17969C40.625-8.44727 41.2598-7.71484 42.041-7.71484Z"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M58.5484-53.5725L58.5484-17.4985L29.816-17.4985L29.816-53.5725L58.5484-53.5725ZM45.6845-28.6309L42.68-28.6309L42.68-20.93L45.6845-20.93L45.6845-28.6309ZM45.6845-39.386L42.68-39.386L42.68-31.685L45.6845-31.685L45.6845-39.386ZM45.6845-50.1411L42.68-50.1411L42.68-42.4401L45.6845-42.4401L45.6845-50.1411Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911225 1.5011581 0 0.24859133 0.2505209 1.7495484 0 0.49577397 0.0033382904 1.9966562 0 0.7506487 0.7484636 1.251609 0 1 0.49911225 1.5011581"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.0571-53.7041C46.5962-53.7041 48.647-55.7549 48.647-58.2939C48.647-60.833 46.5962-62.8872 44.0571-62.8872C41.5181-62.8872 39.4639-60.833 39.4639-58.2939C39.4639-55.7549 41.5181-53.7041 44.0571-53.7041ZM46.7915-19.127C47.6216-18.8828 48.9888-19.1758 49.3828-20.543L52.4556-30.6992C52.7974-31.7769 52.2637-32.8999 51.1372-33.2905L42.8364-36.1714L43.8618-43.2061C43.9107-43.6421 44.4512-43.7397 44.6431-43.3491L46.4497-39.8857C46.8403-39.1499 47.5239-38.7593 48.3052-38.7593L56.8013-38.7593C57.9732-38.7593 58.9043-39.6416 58.9043-40.8589C58.9043-41.9854 57.9732-42.9585 56.8013-42.9585L49.6236-42.9585L46.8892-48.4307C46.0069-50.1885 44.3989-51.5454 42.4424-51.8452L41.2251-52.0439C39.0767-52.3926 37.3189-51.9951 35.9517-51.165L29.1123-46.9136C28.5264-46.5229 28.1358-45.8394 28.1358-45.0615L28.1358-36.6108C28.1358-35.439 29.1123-34.4624 30.2842-34.4624C31.4561-34.4624 32.3838-35.439 32.3838-36.6108L32.3838-43.9351L35.3623-45.7905C35.6065-45.937 35.9483-45.7451 35.8994-45.4033L34.8775-37.6362C34.4868-34.6089 35.5088-32.5581 38.9302-31.7769L47.7681-29.7227L45.3721-21.7148C45.0337-20.6406 45.4278-19.4687 46.7915-19.127ZM31.2153-11.4609C31.9932-10.9727 33.3604-10.9727 34.1416-12.0957L40.3916-21.3765C40.6846-21.8159 40.8799-22.1577 40.9287-22.6948L41.7622-28.9414L38.4873-29.7227C37.999-29.8237 37.5142-29.9702 37.1201-30.1167L36.6807-23.4727L30.626-14.436C29.9912-13.4595 30.19-12.1411 31.2153-11.4609ZM38.0904-8.57763L45.7754-8.57763C46.1514-8.57763 46.5137-8.94677 46.5137-9.36133L46.5137-13.8057L53.4185-13.8057C53.7842-13.8057 54.1953-14.2168 54.1953-14.5859L54.1953-19.0791L61.1455-19.0791C61.5703-19.0791 61.8804-19.4902 61.8804-19.8594L61.8804-24.3525L67.6919-24.3525C68.0645-24.3525 68.4302-24.7183 68.4302-25.1328C68.4302-25.5054 68.1133-25.9131 67.6919-25.9131L61.1455-25.9131C60.6787-25.9131 60.3687-25.5054 60.3687-25.1328L60.3687-20.6397L53.4185-20.6397C52.9937-20.6397 52.6348-20.2773 52.6348-19.8594L52.6348-15.3662L45.7754-15.3662C45.4063-15.3662 44.9951-15.0493 44.9951-14.5859L44.9951-10.1382L38.0904-10.1382C37.6304-10.1382 37.3101-9.73047 37.3101-9.36133C37.3101-8.94677 37.6724-8.57763 38.0904-8.57763Z"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "ferries.svg",
+      "filename" : "options.tolls.slash.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/unpaved.circle.slash.symbolset/unpaved.circle.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/unpaved.circle.slash.symbolset/unpaved.circle.slash.svg
@@ -4,23 +4,21 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f -761f0bc1bb718741 dollarsign.circle}
+.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f -761f0bc1bb718741 dollarsign.circle}
+.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-761f0bc1bb718741 _slash}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-761f0bc1bb718741 _slash}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-690fb24204baffd0 747c1b99a578647e _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2aa0b5567681cca3 -690fb24204baffd0 747c1b99a578647e}
-.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:747c1b99a578647e _slash}
-.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:747c1b99a578647e _slash}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f -761f0bc1bb718741 dollarsign.circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f -761f0bc1bb718741 dollarsign.circle}
+.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-761f0bc1bb718741 _slash}
+.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-761f0bc1bb718741 _slash}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-690fb24204baffd0 747c1b99a578647e _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2aa0b5567681cca3 -690fb24204baffd0 747c1b99a578647e}
-.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:747c1b99a578647e _slash}
-.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:747c1b99a578647e _slash}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-690fb24204baffd0 747c1b99a578647e _enclosure.stroke circle}
-.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-2aa0b5567681cca3 -690fb24204baffd0 747c1b99a578647e}
-.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:747c1b99a578647e _slash}
-.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:747c1b99a578647e _slash}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f -761f0bc1bb718741 dollarsign.circle}
+.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f -761f0bc1bb718741 dollarsign.circle}
+.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-761f0bc1bb718741 _slash}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-761f0bc1bb718741 _slash}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -39,13 +37,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -53,7 +51,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -62,13 +60,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
@@ -100,22 +98,22 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M66.6002-47.2027L66.6002-37.4318L62.7886-37.4318L62.7886-47.2027L66.6002-47.2027ZM66.6002-56.0112L66.6002-50.5331L62.7886-50.5331L62.7886-56.0112L66.6002-56.0112ZM34.3474-47.2027L34.3474-37.4318L30.5358-37.4318L30.5358-47.2027L34.3474-47.2027ZM34.3474-56.0112L34.3474-50.5331L30.5358-50.5331L30.5358-56.0112L34.3474-56.0112ZM56.0817-27.1356L59.9318-17.1313L49.3427-18.7991L56.0817-27.1356ZM47.8545-29.3146L43.3612-20.2137L37.7262-28.6554L47.8545-29.3146ZM50.7864-36.9027L53.2599-32.7286L50.0544-29.0863L45.5998-31.0093L46.0522-35.8402L50.7864-36.9027ZM49.4299-46.5754L60.0189-44.9075L53.28-36.571L49.4299-46.5754ZM42.1658-44.7738L46.6204-42.8507L46.168-38.0199L41.4338-36.9573L38.9603-41.1315L42.1658-44.7738ZM44.8808-55.6762L50.5157-47.2345L40.3875-46.5754L44.8808-55.6762ZM34.3474-33.8308L34.3474-24.06L30.5358-24.06L30.5358-33.8308L34.3474-33.8308ZM34.3474-20.7295L34.3474-15.2514L30.5358-15.2514L30.5358-20.7295L34.3474-20.7295ZM66.6002-33.8308L66.6002-24.06L62.7886-24.06L62.7886-33.8308L66.6002-33.8308ZM66.6002-20.7295L66.6002-15.2514L62.7886-15.2514L62.7886-20.7295L66.6002-20.7295Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707336 0 1 0 0.047073364"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M48.4375-19.2871C55.3711-19.2871 62.5488-22.168 62.5488-29.4922C62.5488-35.2539 58.6426-37.3047 52.5879-38.623L49.1699-39.3555C45.3613-40.1855 44.043-40.918 44.043-42.3828C44.043-43.8965 45.6543-44.7266 48.584-44.7266C50.3418-44.7266 52.2461-44.2383 53.3203-42.7734C54.3945-41.3086 55.7129-40.3809 57.5684-40.3809C59.668-40.3809 61.4746-41.4551 61.4746-43.5547C61.4746-48.291 55.7129-51.416 48.4375-51.416C41.6504-51.416 35.1562-48.2422 35.1562-41.5039C35.1562-35.791 39.3555-33.1543 44.9707-32.0312L48.4375-31.3477C51.416-30.7617 53.7109-30.2734 53.7109-28.418C53.7109-26.8555 51.8555-25.9766 48.584-25.9766C46.0449-25.9766 44.5801-26.5625 43.75-27.9297C42.7246-29.541 41.6016-30.4688 39.6973-30.4688C37.2559-30.4688 35.5469-29.1992 35.5469-26.7578C35.5469-25.8789 35.791-25.0488 36.2305-24.2188C37.8418-21.4355 42.1387-19.2871 48.4375-19.2871ZM48.8281-15.3809C49.3164-15.3809 49.7559-15.8203 49.7559-16.3086L49.7559-54.541C49.7559-55.0293 49.3164-55.4688 48.8281-55.4688C48.3398-55.4688 47.9004-55.0293 47.9004-54.541L47.9004-16.3086C47.9004-15.8203 48.3398-15.3809 48.8281-15.3809Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.8018-4.48836C96.4529-0.837264 96.4529 5.09118 92.8018 8.74227C89.1507 12.3934 83.2222 12.3934 79.5711 8.74227L4.85823-65.9706C1.20714-69.6217 1.20714-75.5502 4.85823-79.2013C8.50933-82.8524 14.4378-82.8524 18.0889-79.2013Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.6082697 0 1.0 0.10826972 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6517-0.338247C90.0122 1.02234 90.0122 3.23158 88.6517 4.59217C87.2911 5.95275 85.0818 5.95275 83.7212 4.59217L9.00834-70.1207C7.64776-71.4813 7.64776-73.6906 9.00834-75.0511C10.3689-76.4117 12.5782-76.4117 13.9388-75.0511Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5458696 0 1.0 0.04586959 0.0"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M63.4102-46.6679L63.4102-37.3421L59.7723-37.3421L59.7723-46.6679L63.4102-46.6679ZM63.4102-55.0752L63.4102-49.8466L59.7723-49.8466L59.7723-55.0752L63.4102-55.0752ZM32.6266-46.6679L32.6266-37.3421L28.9887-37.3421L28.9887-46.6679L32.6266-46.6679ZM32.6266-55.0752L32.6266-49.8466L28.9887-49.8466L28.9887-55.0752L32.6266-55.0752ZM53.3709-27.515L57.0456-17.9664L46.9389-19.5583L53.3709-27.515ZM45.5184-29.5947L41.2299-20.9084L35.8516-28.9656L45.5184-29.5947ZM48.3168-36.8372L50.6777-32.8532L47.6182-29.3768L43.3665-31.2122L43.7983-35.823L48.3168-36.8372ZM47.0221-46.0692L57.1288-44.4773L50.6968-36.5206L47.0221-46.0692ZM40.0889-44.3497L44.3406-42.5143L43.9088-37.9035L39.3903-36.8893L37.0294-40.8733L40.0889-44.3497ZM42.6802-54.7555L48.0585-46.6983L38.3917-46.0692L42.6802-54.7555ZM32.6266-33.9052L32.6266-24.5795L28.9887-24.5795L28.9887-33.9052L32.6266-33.9052ZM32.6266-21.4007L32.6266-16.1721L28.9887-16.1721L28.9887-21.4007L32.6266-21.4007ZM63.4102-33.9052L63.4102-24.5795L59.7723-24.5795L59.7723-33.9052L63.4102-33.9052ZM63.4102-21.4007L63.4102-16.1721L59.7723-16.1721L59.7723-21.4007L63.4102-21.4007Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0 0.5001087 0.60495377 0 1 0 0.104953766"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0 0.500206 0.54971695 0 1 0 0.04971695"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M46.2402-18.3105C52.8809-18.3105 58.6914-21.3867 58.6914-28.125C58.6914-34.082 53.9062-36.3281 48.6816-37.5488L44.9707-38.4277C41.6504-39.1602 39.0625-40.5762 39.0625-43.5547C39.0625-47.0215 42.8223-48.584 46.2402-48.584C50-48.584 52.3438-47.0215 53.418-43.9453C53.9062-42.6758 54.6387-42.041 55.8594-42.041C56.8848-42.041 58.1055-42.7246 58.1055-44.1895C58.1055-49.3652 51.5137-52.7344 46.2402-52.7344C39.9414-52.7344 34.3262-49.2188 34.3262-43.1641C34.3262-37.2559 39.209-35.0586 43.9453-33.9355L47.6562-33.0566C50.9766-32.2754 53.9551-31.1523 53.9551-27.7344C53.9551-23.6816 50.0488-22.5098 46.3379-22.5098C42.4316-22.5098 39.8926-23.6328 38.3789-27.1973C37.793-28.4668 37.1582-29.0039 35.9863-29.0039C34.7656-29.0039 33.7402-28.1738 33.7402-26.8066C33.7402-26.416 33.8379-25.9766 33.9844-25.4883C35.498-20.459 41.2598-18.3105 46.2402-18.3105ZM46.1914-13.7695C46.9727-13.7695 47.6074-14.4043 47.6074-15.1855L47.6074-55.9082C47.6074-56.6406 46.9727-57.2754 46.1914-57.2754C45.459-57.2754 44.8242-56.6406 44.8242-55.9082L44.8242-15.1855C44.8242-14.4043 45.459-13.7695 46.1914-13.7695Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.3183-6.06714C90.5998-2.78573 90.5998 2.54245 87.3183 5.82386C84.0369 9.10527 78.7088 9.10527 75.4274 5.82386L5.21165-64.3918C1.93024-67.6733 1.93024-73.0014 5.21165-76.2828C8.49306-79.5643 13.8212-79.5643 17.1026-76.2828Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.60452837 0 1.0 0.104528375 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8519-2.60066C85.2201-1.23245 85.2201 0.98917 83.8519 2.35738C82.4837 3.72558 80.262 3.72558 78.8938 2.35738L8.67813-67.8583C7.30992-69.2265 7.30992-71.4482 8.67813-72.8164C10.0463-74.1846 12.268-74.1846 13.6362-72.8164Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5487678 0 1.0 0.048767686 0.0"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M60.1414-45.7766L60.1414-37.129L56.768-37.129L56.768-45.7766L60.1414-45.7766ZM60.1414-53.5725L60.1414-48.7241L56.768-48.7241L56.768-53.5725L60.1414-53.5725ZM31.5965-45.7766L31.5965-37.129L28.2231-37.129L28.2231-45.7766L31.5965-45.7766ZM31.5965-53.5725L31.5965-48.7241L28.2231-48.7241L28.2231-53.5725L31.5965-53.5725ZM50.8321-28.0165L54.2396-19.1623L44.8679-20.6384L50.8321-28.0165ZM43.5507-29.945L39.574-21.8904L34.5869-29.3616L43.5507-29.945ZM46.1456-36.6608L48.3348-32.9665L45.4978-29.7429L41.5553-31.4449L41.9557-35.7204L46.1456-36.6608ZM44.945-45.2214L54.3167-43.7453L48.3525-36.3672L44.945-45.2214ZM38.5161-43.627L42.4586-41.925L42.0582-37.6495L37.8682-36.7091L35.6791-40.4034L38.5161-43.627ZM40.9189-53.276L45.9061-45.8048L36.9422-45.2214L40.9189-53.276ZM31.5965-33.942L31.5965-25.2945L28.2231-25.2945L28.2231-33.942L31.5965-33.942ZM31.5965-22.3469L31.5965-17.4985L28.2231-17.4985L28.2231-22.3469L31.5965-22.3469ZM60.1414-33.942L60.1414-25.2945L56.768-25.2945L56.768-33.942L60.1414-33.942ZM60.1414-22.3469L60.1414-17.4985L56.768-17.4985L56.768-22.3469L60.1414-22.3469Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0 0.50011444 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0 0.5001259 0.51529884 0 1 0 0.015298843"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M44.106-19.4912C49.8838-19.4912 55.4219-22.2041 55.4219-28.0796C55.4219-32.9922 51.4541-35.1021 46.2749-36.3228L42.7456-37.1563C39.5615-37.8887 35.5659-39.3047 35.5659-43.2368C35.5659-47.5664 40.1431-49.4014 44.106-49.4014C48.1836-49.4014 51.9351-47.521 52.7368-43.7183C52.8164-43.0845 53.2764-42.7222 53.7705-42.7222C54.3872-42.7222 54.836-43.1333 54.836-43.7354C54.836-47.5943 50.0151-51.3721 44.106-51.3721C38.7608-51.3721 33.418-48.4468 33.418-43.1187C33.418-38.3457 37.7105-36.2392 42.3106-35.1616L45.8399-34.3281C49.7051-33.4106 53.3193-31.8789 53.3193-27.916C53.3193-23.3184 48.7774-21.3745 44.1582-21.3745C39.4346-21.3745 35.4878-23.542 34.7915-27.6968C34.7051-28.376 34.252-28.6406 33.7158-28.6406C33.0855-28.6406 32.6504-28.2192 32.6504-27.5332C32.6504-27.2788 32.7026-26.9756 32.7583-26.7598C33.9087-21.7759 38.9893-19.4912 44.106-19.4912ZM44.0571-14.9048C44.4751-14.9048 44.8374-15.2217 44.8374-15.6396L44.8374-54.8184C44.8374-55.2329 44.4751-55.5952 44.0571-55.5952C43.6426-55.5952 43.2803-55.2329 43.2803-54.8184L43.2803-15.6396C43.2803-15.2217 43.6426-14.9048 44.0571-14.9048Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7482-3.06064C83.2708-1.53808 83.2708 0.934172 81.7482 2.45673C80.2257 3.97929 77.7534 3.97929 76.2309 2.45673L6.37578-67.3983C4.85322-68.9209 4.85322-71.3932 6.37578-72.9157C7.89834-74.4383 10.3706-74.4383 11.8931-72.9157Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.55392593 0 1.0 0.053925958 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6973-1.00975C80.088-0.619106 80.088 0.0152006 79.6973 0.405845C79.3067 0.796489 78.6724 0.796489 78.2817 0.405845L8.42666-69.4492C8.03602-69.8399 8.03602-70.4742 8.42666-70.8648C8.81731-71.2555 9.45161-71.2555 9.84226-70.8648Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5139301 0 1.0 0.013930082 0.0"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "paved.circle.svg",
+      "filename" : "options.tolls.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/motorways.circle.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.symbolset/motorways.circle.svg
@@ -4,17 +4,15 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f dollarsign.circle}
+.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-69b20cbcd497736f dollarsign.circle}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:5f0b267506019496 60db71b8dc70fc47}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f dollarsign.circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-69b20cbcd497736f dollarsign.circle}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:5f0b267506019496 60db71b8dc70fc47}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 _enclosure.stroke circle}
-.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:5f0b267506019496 60db71b8dc70fc47}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-69b20cbcd497736f dollarsign.circle}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-69b20cbcd497736f dollarsign.circle}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -33,13 +31,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -47,7 +45,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -56,14 +54,14 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from circle</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
+  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from options.tolls</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
@@ -94,16 +92,16 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M62.2184-42.5815L69.4642-11.0789L51.4091-11.0789L50.4641-42.5815L62.2184-42.5815ZM47.1956-42.5815L46.2505-11.0789L28.1954-11.0789L35.4412-42.5815L47.1956-42.5815ZM72.5594-49.2877L72.5594-45.1608L69.4642-45.1608L69.4642-42.0656L65.3373-42.0656L65.3373-45.1608L32.3223-45.1608L32.3223-42.0656L28.1954-42.0656L28.1954-45.1608L25.1002-45.1608L25.1002-49.2877L72.5594-49.2877ZM47.7981-62.6649L47.4432-50.8352L37.3395-50.8352L40.0602-62.6649L47.7981-62.6649ZM57.5994-62.6649L60.3201-50.8352L50.2164-50.8352L49.8615-62.6649L57.5994-62.6649Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.4375-19.2871C55.3711-19.2871 62.5488-22.168 62.5488-29.4922C62.5488-35.2539 58.6426-37.3047 52.5879-38.623L49.1699-39.3555C45.3613-40.1855 44.043-40.918 44.043-42.3828C44.043-43.8965 45.6543-44.7266 48.584-44.7266C50.3418-44.7266 52.2461-44.2383 53.3203-42.7734C54.3945-41.3086 55.7129-40.3809 57.5684-40.3809C59.668-40.3809 61.4746-41.4551 61.4746-43.5547C61.4746-48.291 55.7129-51.416 48.4375-51.416C41.6504-51.416 35.1562-48.2422 35.1562-41.5039C35.1562-35.791 39.3555-33.1543 44.9707-32.0312L48.4375-31.3477C51.416-30.7617 53.7109-30.2734 53.7109-28.418C53.7109-26.8555 51.8555-25.9766 48.584-25.9766C46.0449-25.9766 44.5801-26.5625 43.75-27.9297C42.7246-29.541 41.6016-30.4688 39.6973-30.4688C37.2559-30.4688 35.5469-29.1992 35.5469-26.7578C35.5469-25.8789 35.791-25.0488 36.2305-24.2188C37.8418-21.4355 42.1387-19.2871 48.4375-19.2871ZM48.8281-15.3809C49.3164-15.3809 49.7559-15.8203 49.7559-16.3086L49.7559-54.541C49.7559-55.0293 49.3164-55.4688 48.8281-55.4688C48.3398-55.4688 47.9004-55.0293 47.9004-54.541L47.9004-16.3086C47.9004-15.8203 48.3398-15.3809 48.8281-15.3809Z"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M58.6814-41.6344L65.4013-12.4182L48.6566-12.4182L47.7801-41.6344L58.6814-41.6344ZM44.7489-41.6344L43.8724-12.4182L27.1277-12.4182L33.8476-41.6344L44.7489-41.6344ZM68.2718-47.8538L68.2718-44.0265L65.4013-44.0265L65.4013-41.1559L61.5739-41.1559L61.5739-44.0265L30.9551-44.0265L30.9551-41.1559L27.1277-41.1559L27.1277-44.0265L24.2572-44.0265L24.2572-47.8538L68.2718-47.8538ZM45.3077-60.2602L44.9785-49.2891L35.6082-49.2891L38.1314-60.2602L45.3077-60.2602ZM54.3976-60.2602L56.9208-49.2891L47.5505-49.2891L47.2213-60.2602L54.3976-60.2602Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.2402-18.3105C52.8809-18.3105 58.6914-21.3867 58.6914-28.125C58.6914-34.082 53.9062-36.3281 48.6816-37.5488L44.9707-38.4277C41.6504-39.1602 39.0625-40.5762 39.0625-43.5547C39.0625-47.0215 42.8223-48.584 46.2402-48.584C50-48.584 52.3438-47.0215 53.418-43.9453C53.9062-42.6758 54.6387-42.041 55.8594-42.041C56.8848-42.041 58.1055-42.7246 58.1055-44.1895C58.1055-49.3652 51.5137-52.7344 46.2402-52.7344C39.9414-52.7344 34.3262-49.2188 34.3262-43.1641C34.3262-37.2559 39.209-35.0586 43.9453-33.9355L47.6562-33.0566C50.9766-32.2754 53.9551-31.1523 53.9551-27.7344C53.9551-23.6816 50.0488-22.5098 46.3379-22.5098C42.4316-22.5098 39.8926-23.6328 38.3789-27.1973C37.793-28.4668 37.1582-29.0039 35.9863-29.0039C34.7656-29.0039 33.7402-28.1738 33.7402-26.8066C33.7402-26.416 33.8379-25.9766 33.9844-25.4883C35.498-20.459 41.2598-18.3105 46.2402-18.3105ZM46.1914-13.7695C46.9727-13.7695 47.6074-14.4043 47.6074-15.1855L47.6074-55.9082C47.6074-56.6406 46.9727-57.2754 46.1914-57.2754C45.459-57.2754 44.8242-56.6406 44.8242-55.9082L44.8242-15.1855C44.8242-14.4043 45.459-13.7695 46.1914-13.7695Z"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M54.9186-40.4488L60.7941-14.9034L46.1533-14.9034L45.3869-40.4488L54.9186-40.4488ZM42.7365-40.4488L41.9702-14.9034L27.3293-14.9034L33.2049-40.4488L42.7365-40.4488ZM63.304-45.8868L63.304-42.5403L60.7941-42.5403L60.7941-40.0305L57.4477-40.0305L57.4477-42.5403L30.6758-42.5403L30.6758-40.0305L27.3293-40.0305L27.3293-42.5403L24.8195-42.5403L24.8195-45.8868L63.304-45.8868ZM43.2251-56.7344L42.9373-47.1417L34.7443-47.1417L36.9505-56.7344L43.2251-56.7344ZM51.173-56.7344L53.3792-47.1417L45.1862-47.1417L44.8984-56.7344L51.173-56.7344Z"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.106-19.4912C49.8838-19.4912 55.4219-22.2041 55.4219-28.0796C55.4219-32.9922 51.4541-35.1021 46.2749-36.3228L42.7456-37.1563C39.5615-37.8887 35.5659-39.3047 35.5659-43.2368C35.5659-47.5664 40.1431-49.4014 44.106-49.4014C48.1836-49.4014 51.9351-47.521 52.7368-43.7183C52.8164-43.0845 53.2764-42.7222 53.7705-42.7222C54.3872-42.7222 54.836-43.1333 54.836-43.7354C54.836-47.5943 50.0151-51.3721 44.106-51.3721C38.7608-51.3721 33.418-48.4468 33.418-43.1187C33.418-38.3457 37.7105-36.2392 42.3106-35.1616L45.8399-34.3281C49.7051-33.4106 53.3193-31.8789 53.3193-27.916C53.3193-23.3184 48.7774-21.3745 44.1582-21.3745C39.4346-21.3745 35.4878-23.542 34.7915-27.6968C34.7051-28.376 34.252-28.6406 33.7158-28.6406C33.0855-28.6406 32.6504-28.2192 32.6504-27.5332C32.6504-27.2788 32.7026-26.9756 32.7583-26.7598C33.9087-21.7759 38.9893-19.4912 44.106-19.4912ZM44.0571-14.9048C44.4751-14.9048 44.8374-15.2217 44.8374-15.6396L44.8374-54.8184C44.8374-55.2329 44.4751-55.5952 44.0571-55.5952C43.6426-55.5952 43.2803-55.2329 43.2803-54.8184L43.2803-15.6396C43.2803-15.2217 43.6426-14.9048 44.0571-14.9048Z"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "options.unpaved.slash.svg",
+      "idiom" : "universal"
+    }
+  ]
+}
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/motorways.circle.slash.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/motorways.circle.slash.symbolset/motorways.circle.slash.svg
@@ -4,23 +4,21 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd 4ec3da09fb63f761 exclamationmark.circle}
+.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd 4ec3da09fb63f761 exclamationmark.circle}
+.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:4ec3da09fb63f761 _slash}
+.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:4ec3da09fb63f761 _slash}

-.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 84e2babe1cc34e4 _enclosure.stroke circle}
-.monochrome-1 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 60db71b8dc70fc47 84e2babe1cc34e4}
-.monochrome-2 {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:84e2babe1cc34e4 _slash}
-.monochrome-3 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:84e2babe1cc34e4 _slash}
+.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd 4ec3da09fb63f761 exclamationmark.circle}
+.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd 4ec3da09fb63f761 exclamationmark.circle}
+.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:4ec3da09fb63f761 _slash}
+.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:4ec3da09fb63f761 _slash}

-.multicolor-0:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 84e2babe1cc34e4 _enclosure.stroke circle}
-.multicolor-1:tintColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 60db71b8dc70fc47 84e2babe1cc34e4}
-.multicolor-2:tintColor {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:84e2babe1cc34e4 _slash}
-.multicolor-3:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:84e2babe1cc34e4 _slash}
-
-.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 84e2babe1cc34e4 _enclosure.stroke circle}
-.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:5f0b267506019496 60db71b8dc70fc47 84e2babe1cc34e4}
-.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:84e2babe1cc34e4 _slash}
-.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:84e2babe1cc34e4 _slash}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd 4ec3da09fb63f761 exclamationmark.circle}
+.hierarchical-1:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd 4ec3da09fb63f761 exclamationmark.circle}
+.hierarchical-2:primary {opacity:0.0;-sfsymbols-clear-behind:true;-sfsymbols-motion-group:0;-sfsymbols-layer-tags:4ec3da09fb63f761 _slash}
+.hierarchical-3:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:4ec3da09fb63f761 _slash}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -39,13 +37,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -53,7 +51,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -62,13 +60,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from </text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
@@ -100,22 +98,22 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
 </g>
 <g id="Symbols">
  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z" data-clipstroke-keyframes="0 4 0 0.49909934 1.5010297 0 0.24858454 0.2505148 1.749485 0 0.49588796 0.0032113674 1.996659 0 0.7506426 0.7484567 1.251544 0 1 0.49909934 1.5010297"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M62.2184-42.5815L69.4642-11.0789L51.4091-11.0789L50.4641-42.5815L62.2184-42.5815ZM47.1956-42.5815L46.2505-11.0789L28.1954-11.0789L35.4412-42.5815L47.1956-42.5815ZM72.5594-49.2877L72.5594-45.1608L69.4642-45.1608L69.4642-42.0656L65.3373-42.0656L65.3373-45.1608L32.3223-45.1608L32.3223-42.0656L28.1954-42.0656L28.1954-45.1608L25.1002-45.1608L25.1002-49.2877L72.5594-49.2877ZM47.7981-62.6649L47.4432-50.8352L37.3395-50.8352L40.0602-62.6649L47.7981-62.6649ZM57.5994-62.6649L60.3201-50.8352L50.2164-50.8352L49.8615-62.6649L57.5994-62.6649Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.7999-4.48836C96.451-0.837264 96.451 5.09118 92.7999 8.74227C89.1488 12.3934 83.2204 12.3934 79.5693 8.74227L4.85636-65.9706C1.20527-69.6217 1.20527-75.5502 4.85636-79.2013C8.50745-82.8524 14.4359-82.8524 18.087-79.2013Z" data-clipstroke-keyframes="0 0 0 0.49990463 0.6089134 0 1 0 0.10891342"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6498-0.338247C90.0104 1.02234 90.0104 3.23158 88.6498 4.59217C87.2892 5.95275 85.08 5.95275 83.7194 4.59217L9.00647-70.1207C7.64588-71.4813 7.64588-73.6906 9.00647-75.0511C10.3671-76.4117 12.5763-76.4117 13.9369-75.0511Z" data-clipstroke-keyframes="0 0 0 0.49988937 0.54707336 0 1 0 0.047073364"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M48.877-31.4941C52.0996-31.4941 54.0039-33.252 54.1992-36.5723L54.8828-47.1191C55.127-50.6836 52.6367-53.0273 48.8281-53.0273C45.0195-53.0273 42.5293-50.6836 42.7734-47.1191L43.457-36.4746C43.6523-33.252 45.6055-31.4941 48.877-31.4941ZM48.877-17.627C52.4902-17.627 55.0293-19.5312 55.0293-22.9004C55.0293-26.2207 52.4902-28.1738 48.877-28.1738C45.2637-28.1738 42.627-26.2695 42.627-22.9004C42.627-19.5312 45.2637-17.627 48.877-17.627Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M92.8018-4.48836C96.4529-0.837264 96.4529 5.09118 92.8018 8.74227C89.1507 12.3934 83.2222 12.3934 79.5711 8.74227L4.85823-65.9706C1.20714-69.6217 1.20714-75.5502 4.85823-79.2013C8.50933-82.8524 14.4378-82.8524 18.0889-79.2013Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.6082697 0 1.0 0.10826972 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M88.6517-0.338247C90.0122 1.02234 90.0122 3.23158 88.6517 4.59217C87.2911 5.95275 85.0818 5.95275 83.7212 4.59217L9.00834-70.1207C7.64776-71.4813 7.64776-73.6906 9.00834-75.0511C10.3689-76.4117 12.5782-76.4117 13.9388-75.0511Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5458696 0 1.0 0.04586959 0.0"/>
  </g>
  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z" data-clipstroke-keyframes="0 4 0 0.49914446 1.5008684 0 0.24828511 0.25085935 1.7491465 0 0.49580374 0.0033407123 1.9966576 0 0.75060123 0.7485432 1.2514638 0 1 0.49914446 1.5008684"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M58.6814-41.6344L65.4013-12.4182L48.6566-12.4182L47.7801-41.6344L58.6814-41.6344ZM44.7489-41.6344L43.8724-12.4182L27.1277-12.4182L33.8476-41.6344L44.7489-41.6344ZM68.2718-47.8538L68.2718-44.0265L65.4013-44.0265L65.4013-41.1559L61.5739-41.1559L61.5739-44.0265L30.9551-44.0265L30.9551-41.1559L27.1277-41.1559L27.1277-44.0265L24.2572-44.0265L24.2572-47.8538L68.2718-47.8538ZM45.3077-60.2602L44.9785-49.2891L35.6082-49.2891L38.1314-60.2602L45.3077-60.2602ZM54.3976-60.2602L56.9208-49.2891L47.5505-49.2891L47.2213-60.2602L54.3976-60.2602Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.318-6.06714C90.5994-2.78573 90.5994 2.54245 87.318 5.82386C84.0366 9.10527 78.7084 9.10527 75.427 5.82386L5.2113-64.3918C1.92989-67.6733 1.92989-73.0014 5.2113-76.2828C8.49271-79.5643 13.8209-79.5643 17.1023-76.2828Z" data-clipstroke-keyframes="0 0 0 0.50010824 0.6049547 0 1 0 0.10495472"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8515-2.60066C85.2197-1.23245 85.2197 0.98917 83.8515 2.35738C82.4833 3.72558 80.2617 3.72558 78.8935 2.35738L8.67778-67.8583C7.30957-69.2265 7.30957-71.4482 8.67778-72.8164C10.046-74.1846 12.2676-74.1846 13.6358-72.8164Z" data-clipstroke-keyframes="0 0 0 0.50020504 0.5497179 0 1 0 0.049717903"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M46.1914-28.3203C48.291-28.3203 49.4629-29.4922 49.5117-31.6895L50.1465-51.709C50.1465-53.9062 48.4375-55.5176 46.1426-55.5176C43.8477-55.5176 42.1875-53.9551 42.2363-51.7578L42.8223-31.6895C42.8711-29.4922 44.043-28.3203 46.1914-28.3203ZM46.1914-15.5273C48.584-15.5273 50.6836-17.4316 50.6836-19.8242C50.6836-22.2656 48.6328-24.1211 46.1914-24.1211C43.7988-24.1211 41.748-22.2168 41.748-19.8242C41.748-17.4805 43.8477-15.5273 46.1914-15.5273Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M87.3183-6.06714C90.5998-2.78573 90.5998 2.54245 87.3183 5.82386C84.0369 9.10527 78.7088 9.10527 75.4274 5.82386L5.21165-64.3918C1.93024-67.6733 1.93024-73.0014 5.21165-76.2828C8.49306-79.5643 13.8212-79.5643 17.1026-76.2828Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.60452837 0 1.0 0.104528375 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M83.8519-2.60066C85.2201-1.23245 85.2201 0.98917 83.8519 2.35738C82.4837 3.72558 80.262 3.72558 78.8938 2.35738L8.67813-67.8583C7.30992-69.2265 7.30992-71.4482 8.67813-72.8164C10.0463-74.1846 12.268-74.1846 13.6362-72.8164Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5487678 0 1.0 0.048767686 0.0"/>
  </g>
  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z" data-clipstroke-keyframes="0 4 0 0.49911258 1.5011578 0 0.24859153 0.25052106 1.7495481 0 0.49577427 0.0033383023 1.9966562 0 0.75064886 0.74846375 1.2516088 0 1 0.49911258 1.5011578"/>
-   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M54.9186-40.4488L60.7941-14.9034L46.1533-14.9034L45.3869-40.4488L54.9186-40.4488ZM42.7365-40.4488L41.9702-14.9034L27.3293-14.9034L33.2049-40.4488L42.7365-40.4488ZM63.304-45.8868L63.304-42.5403L60.7941-42.5403L60.7941-40.0305L57.4477-40.0305L57.4477-42.5403L30.6758-42.5403L30.6758-40.0305L27.3293-40.0305L27.3293-42.5403L24.8195-42.5403L24.8195-45.8868L63.304-45.8868ZM43.2251-56.7344L42.9373-47.1417L34.7443-47.1417L36.9505-56.7344L43.2251-56.7344ZM51.173-56.7344L53.3792-47.1417L45.1862-47.1417L44.8984-56.7344L51.173-56.7344Z"/>
-   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7485-3.06064C83.2711-1.53808 83.2711 0.934172 81.7485 2.45673C80.2259 3.97929 77.7537 3.97929 76.2311 2.45673L6.37605-67.3983C4.85349-68.9209 4.85349-71.3932 6.37605-72.9157C7.89861-74.4383 10.3709-74.4383 11.8934-72.9157Z" data-clipstroke-keyframes="0 0 0 0.5001135 0.5550747 0 1 0 0.05507469"/>
-   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6976-1.00975C80.0883-0.619106 80.0883 0.0152006 79.6976 0.405845C79.307 0.796489 78.6727 0.796489 78.282 0.405845L8.42694-69.4492C8.03629-69.8399 8.03629-70.4742 8.42694-70.8648C8.81758-71.2555 9.45189-71.2555 9.84253-70.8648Z" data-clipstroke-keyframes="0 0 0 0.50012684 0.51529884 0 1 0 0.015298843"/>
+   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
+   <path class="monochrome-1 multicolor-1:tintColor hierarchical-1:secondary SFSymbolsPreviewWireframe" d="M44.0571-28.4565C44.7945-28.4565 45.3306-29.0835 45.334-30.0093L45.5601-50.937C45.5601-51.8628 44.9864-52.5205 44.0537-52.5205C43.0757-52.5205 42.5054-51.8662 42.5088-50.9404L42.7769-30.0093C42.7803-29.0835 43.271-28.4565 44.0571-28.4565ZM44.0571-17.6162C45.4507-17.6162 46.5967-18.8393 46.5967-20.1421C46.5967-21.5391 45.4541-22.668 44.0571-22.668C42.6182-22.668 41.4756-21.5356 41.4756-20.1421C41.4756-18.8428 42.6216-17.6162 44.0571-17.6162Z"/>
+   <path class="monochrome-2 multicolor-2:tintColor hierarchical-2:primary SFSymbolsPreviewWireframe" d="M81.7482-3.06064C83.2708-1.53808 83.2708 0.934172 81.7482 2.45673C80.2257 3.97929 77.7534 3.97929 76.2309 2.45673L6.37578-67.3983C4.85322-68.9209 4.85322-71.3932 6.37578-72.9157C7.89834-74.4383 10.3706-74.4383 11.8931-72.9157Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.55392593 0 1.0 0.053925958 0.0"/>
+   <path class="monochrome-3 multicolor-3:tintColor hierarchical-3:primary SFSymbolsPreviewWireframe" d="M79.6973-1.00975C80.088-0.619106 80.088 0.0152006 79.6973 0.405845C79.3067 0.796489 78.6724 0.796489 78.2817 0.405845L8.42666-69.4492C8.03602-69.8399 8.03602-70.4742 8.42666-70.8648C8.81731-71.2555 9.45161-71.2555 9.84226-70.8648Z" data-clipstroke-keyframes="0 0 0.0 0.5 0.5139301 0 1.0 0.013930082 0.0"/>
  </g>
 </g>
 </svg>
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json
@@ -5,7 +5,7 @@
  },
  "symbols" : [
    {
-      "filename" : "ferries.circle.svg",
+      "filename" : "options.unpaved.svg",
      "idiom" : "universal"
    }
  ]
--- a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/options.unpaved.svg
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/options.unpaved.svg
@@ -4,14 +4,15 @@
 PUBLIC "-//W3C//DTD SVG 1.1//EN"
       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
- <!--glyph: "", point size: 100.0, font version: "21.0d6e2", template writer version: "138.0.0"-->
- <style>.defaults {-sfsymbols-variable-value-mode:color;-sfsymbols-draw-reverses-motion-groups:true}
+ <!--glyph: "", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
+ <style>.monochrome-0 {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd exclamationmark.circle}
+.monochrome-1 {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-4171a9aafd5daacd exclamationmark.circle}

-.monochrome-0 {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:60db71b8dc70fc47}
+.multicolor-0:systemRedColor {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd exclamationmark.circle}
+.multicolor-1:systemRedColor {-sfsymbols-motion-group:0;-sfsymbols-always-pulses:true;-sfsymbols-layer-tags:-4171a9aafd5daacd exclamationmark.circle}

-.multicolor-0:tintColor {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:60db71b8dc70fc47}
-
-.hierarchical-0:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:60db71b8dc70fc47}
+.hierarchical-0:secondary {-sfsymbols-motion-group:1;-sfsymbols-layer-tags:-4171a9aafd5daacd exclamationmark.circle}
+.hierarchical-1:primary {-sfsymbols-motion-group:0;-sfsymbols-layer-tags:-4171a9aafd5daacd exclamationmark.circle}

 .SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
 </style>
@@ -30,13 +31,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
  <line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
  <g transform="matrix(0.2 0 0 0.2 263 1933)">
-   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm3.61328-17.7734v-28.4668c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v28.4668c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094Zm-17.8223-10.5957h28.418c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-28.418c-2.24609 0-3.75977 1.51367-3.75977 3.71094 0 2.14844 1.51367 3.61328 3.75977 3.61328Z"/>
+   <path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 281.506 1933)">
-   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm4.05273-23.0957v-36.9141c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v36.9141c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039Zm-22.5586-14.4043h36.9629c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-36.9629c-2.49023 0-4.15039 1.70898-4.15039 4.15039 0 2.39258 1.66016 4.00391 4.15039 4.00391Z"/>
+   <path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
  </g>
  <g transform="matrix(0.2 0 0 0.2 304.924 1933)">
-   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm4.44336-30.3223v-48.4863c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v48.4863c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984Zm-28.7109-19.7754h48.4863c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-48.4863c-2.73438 0-4.58984 1.85547-4.58984 4.58984 0 2.58789 1.85547 4.39453 4.58984 4.39453Z"/>
+   <path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
@@ -44,7 +45,7 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
  <g transform="matrix(0.2 0 0 0.2 776 1933)">
-   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l20.5566-57.5195h0.244141l20.6055 57.5195c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm10.2051-20.9473h30.6641c2.00195 0 3.66211-1.66016 3.66211-3.66211 0-2.05078-1.66016-3.66211-3.66211-3.66211h-30.6641c-2.00195 0-3.66211 1.61133-3.66211 3.66211 0 2.00195 1.66016 3.66211 3.66211 3.66211Z"/>
+   <path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
  </g>
  <line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
@@ -53,14 +54,14 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
  <g transform="matrix(0.2 0 0 0.2 1289 1933)">
-   <path d="m14.209 13.1348 7.86133 7.86133c4.29688 4.39453 9.32617 4.10156 13.8672-1.02539l60.6934-68.2129-4.88281-4.88281-60.2539 67.6758c-1.80664 1.95312-3.4668 2.44141-5.81055 0.0976562l-5.17578-5.12695c-2.29492-2.29492-1.80664-3.95508 0.195312-5.81055l67.4805-62.1582-4.88281-4.83398-68.0664 62.5977c-4.98047 4.58984-5.32227 9.47266-1.02539 13.8184Zm44.873-97.4609c-2.05078 2.00195-2.24609 4.88281-1.07422 6.78711 1.12305 1.80664 3.4668 3.02734 6.5918 2.24609 5.85938-1.66016 12.5977-2.39258 18.8965 0.927734l-2.68555 7.12891c-1.61133 4.00391-0.732422 6.88477 1.70898 9.42383l10.2539 10.3027c2.34375 2.39258 4.54102 2.44141 7.08008 1.95312l4.44336-0.732422 2.58789 2.53906-0.195312 2.24609c-0.0976562 2.29492 0.537109 4.29688 2.7832 6.49414l3.36914 3.32031c2.29492 2.29492 5.51758 2.49023 7.8125 0.195312l12.9883-13.0371c2.29492-2.34375 2.14844-5.37109-0.195312-7.66602l-3.41797-3.41797c-2.19727-2.19727-4.05273-3.02734-6.34766-2.88086l-2.34375 0.244141-2.44141-2.44141 1.02539-4.6875c0.634766-2.73438-0.244141-4.98047-2.88086-7.61719l-11.2793-11.1816c-12.9395-12.8418-35.5957-11.0352-46.6797-0.146484Zm7.08008 2.05078c8.78906-6.39648 25.9766-5.66406 33.6914 1.95312l12.3047 12.207c1.02539 1.02539 1.2207 1.80664 0.927734 3.32031l-1.46484 6.64062 6.73828 6.68945 4.39453-0.244141c1.12305-0.0488281 1.51367 0.0488281 2.34375 0.878906l2.53906 2.49023-10.8398 10.8398-2.49023-2.49023c-0.830078-0.878906-0.976562-1.2207-0.927734-2.39258l0.292969-4.3457-6.68945-6.73828-6.83594 1.17188c-1.41602 0.292969-2.05078 0.195312-3.17383-0.878906l-8.93555-8.88672c-1.07422-1.02539-1.17188-1.70898-0.488281-3.36914l4.58984-11.4746c-6.10352-6.34766-17.041-7.51953-25.5859-4.58984-0.683594 0.244141-0.927734-0.390625-0.390625-0.78125Z"/>
+   <path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
  </g>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
-  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.7.0</text>
-  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 17 or greater</text>
-  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from motorways</text>
+  <text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
+  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
+  <text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from options.unpaved</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
  <text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
@@ -82,22 +83,25 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN"
  </g>
  <line id="Baseline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1556" y2="1556"/>
  <line id="Capline-L" style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1485.54" y2="1485.54"/>
-  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2987.45" x2="2987.45" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2879.35" x2="2879.35" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1500.8" x2="1500.8" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1398.89" x2="1398.89" y1="600.785" y2="720.121"/>
-  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="608.098" x2="608.098" y1="600.785" y2="720.121"/>
-  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="511.325" x2="511.325" y1="600.785" y2="720.121"/>
+  <line id="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2982.23" x2="2982.23" y1="600.785" y2="720.121"/>
+  <line id="left-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2884.57" x2="2884.57" y1="600.785" y2="720.121"/>
+  <line id="right-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1496.11" x2="1496.11" y1="600.785" y2="720.121"/>
+  <line id="left-margin-Regular-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="1403.58" x2="1403.58" y1="600.785" y2="720.121"/>
+  <line id="right-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="603.773" x2="603.773" y1="600.785" y2="720.121"/>
+  <line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="515.649" x2="515.649" y1="600.785" y2="720.121"/>
 </g>
 <g id="Symbols">
-  <g id="Black-S" transform="matrix(1 0 0 1 2879.35 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M80.0067-49.2487L94.0527 11.8193L59.0527 11.8193L57.2207-49.2487L80.0067-49.2487ZM50.8847-49.2487L49.0527 11.8193L14.0527 11.8193L28.0987-49.2487L50.8847-49.2487ZM100.053-62.2487L100.053-54.2487L94.0527-54.2487L94.0527-48.2487L86.0527-48.2487L86.0527-54.2487L22.0527-54.2487L22.0527-48.2487L14.0527-48.2487L14.0527-54.2487L8.05271-54.2487L8.05271-62.2487L100.053-62.2487ZM52.0527-88.1807L51.3647-65.2487L31.7787-65.2487L37.0527-88.1807L52.0527-88.1807ZM71.0527-88.1807L76.3267-65.2487L56.7407-65.2487L56.0527-88.1807L71.0527-88.1807Z"/>
+  <g id="Black-S" transform="matrix(1 0 0 1 2884.57 696)">
+   <path class="monochrome-0 multicolor-0:systemRedColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M48.8281 6.73828C72.0215 6.73828 90.8203-12.0605 90.8203-35.2539C90.8203-58.4473 72.0215-77.2461 48.8281-77.2461C25.6348-77.2461 6.83594-58.4473 6.83594-35.2539C6.83594-12.0605 25.6348 6.73828 48.8281 6.73828ZM48.8281-7.42188C33.4473-7.42188 20.9961-19.873 20.9961-35.2539C20.9961-50.6348 33.4473-63.0859 48.8281-63.0859C64.209-63.0859 76.6602-50.6348 76.6602-35.2539C76.6602-19.873 64.209-7.42188 48.8281-7.42188Z"/>
+   <path class="monochrome-1 multicolor-1:systemRedColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M48.877-31.4941C52.0996-31.4941 54.0039-33.252 54.1992-36.5723L54.8828-47.1191C55.127-50.6836 52.6367-53.0273 48.8281-53.0273C45.0195-53.0273 42.5293-50.6836 42.7734-47.1191L43.457-36.4746C43.6523-33.252 45.6055-31.4941 48.877-31.4941ZM48.877-17.627C52.4902-17.627 55.0293-19.5312 55.0293-22.9004C55.0293-26.2207 52.4902-28.1738 48.877-28.1738C45.2637-28.1738 42.627-26.2695 42.627-22.9004C42.627-19.5312 45.2637-17.627 48.877-17.627Z"/>
  </g>
-  <g id="Regular-S" transform="matrix(1 0 0 1 1398.89 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M74.3107-46.6291L86.9521 8.33205L55.4521 8.33205L53.8033-46.6291L74.3107-46.6291ZM48.1009-46.6291L46.4521 8.33205L14.9521 8.33205L27.5935-46.6291L48.1009-46.6291ZM92.3521-58.3292L92.3521-51.1291L86.9521-51.1291L86.9521-45.7292L79.7521-45.7292L79.7521-51.1291L22.1521-51.1291L22.1521-45.7292L14.9521-45.7292L14.9521-51.1291L9.55214-51.1291L9.55214-58.3292L92.3521-58.3292ZM49.1521-81.668L48.5329-61.0291L30.9055-61.0291L35.6521-81.668L49.1521-81.668ZM66.2521-81.668L70.9987-61.0291L53.3713-61.0291L52.7521-81.668L66.2521-81.668Z"/>
+  <g id="Regular-S" transform="matrix(1 0 0 1 1403.58 696)">
+   <path class="monochrome-0 multicolor-0:systemRedColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M46.2402 4.15039C68.0176 4.15039 85.6934-13.4766 85.6934-35.2539C85.6934-57.0312 68.0176-74.6582 46.2402-74.6582C24.5117-74.6582 6.83594-57.0312 6.83594-35.2539C6.83594-13.4766 24.5117 4.15039 46.2402 4.15039ZM46.2402-3.27148C28.5645-3.27148 14.3066-17.5781 14.3066-35.2539C14.3066-52.9297 28.5645-67.2363 46.2402-67.2363C63.916-67.2363 78.2227-52.9297 78.2227-35.2539C78.2227-17.5781 63.916-3.27148 46.2402-3.27148Z"/>
+   <path class="monochrome-1 multicolor-1:systemRedColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M46.1914-28.3203C48.291-28.3203 49.4629-29.4922 49.5117-31.6895L50.1465-51.709C50.1465-53.9062 48.4375-55.5176 46.1426-55.5176C43.8477-55.5176 42.1875-53.9551 42.2363-51.7578L42.8223-31.6895C42.8711-29.4922 44.043-28.3203 46.1914-28.3203ZM46.1914-15.5273C48.584-15.5273 50.6836-17.4316 50.6836-19.8242C50.6836-22.2656 48.6328-24.1211 46.1914-24.1211C43.7988-24.1211 41.748-22.2168 41.748-19.8242C41.748-17.4805 43.8477-15.5273 46.1914-15.5273Z"/>
  </g>
-  <g id="Ultralight-S" transform="matrix(1 0 0 1 511.325 696)">
-   <path class="monochrome-0 multicolor-0:tintColor hierarchical-0:primary SFSymbolsPreviewWireframe" d="M69.1497-45.1127L80.3865 3.74168L52.3865 3.74168L50.9209-45.1127L69.1497-45.1127ZM45.8521-45.1127L44.3865 3.74168L16.3865 3.74168L27.6233-45.1127L45.8521-45.1127ZM85.1865-55.5127L85.1865-49.1127L80.3865-49.1127L80.3865-44.3127L73.9865-44.3127L73.9865-49.1127L22.7865-49.1127L22.7865-44.3127L16.3865-44.3127L16.3865-49.1127L11.5865-49.1127L11.5865-55.5127L85.1865-55.5127ZM46.7865-76.2583L46.2361-57.9127L30.5673-57.9127L34.7865-76.2583L46.7865-76.2583ZM61.9865-76.2583L66.2057-57.9127L50.5369-57.9127L49.9865-76.2583L61.9865-76.2583Z"/>
+  <g id="Ultralight-S" transform="matrix(1 0 0 1 515.649 696)">
+   <path class="monochrome-0 multicolor-0:systemRedColor hierarchical-0:secondary SFSymbolsPreviewWireframe" d="M44.0606 1.97072C64.6118 1.97072 81.2886-14.7026 81.2886-35.2539C81.2886-55.8052 64.6118-72.4785 44.0606-72.4785C23.5127-72.4785 6.83594-55.8052 6.83594-35.2539C6.83594-14.7026 23.5127 1.97072 44.0606 1.97072ZM44.0606-0.274438C24.7046-0.274438 9.0391-15.898 9.0391-35.2539C9.0391-54.6099 24.7046-70.2334 44.0606-70.2334C63.4165-70.2334 79.04-54.6099 79.04-35.2539C79.04-15.898 63.4165-0.274438 44.0606-0.274438Z"/>
+   <path class="monochrome-1 multicolor-1:systemRedColor hierarchical-1:primary SFSymbolsPreviewWireframe" d="M44.0571-28.4565C44.7945-28.4565 45.3306-29.0835 45.334-30.0093L45.5601-50.937C45.5601-51.8628 44.9864-52.5205 44.0537-52.5205C43.0757-52.5205 42.5054-51.8662 42.5088-50.9404L42.7769-30.0093C42.7803-29.0835 43.271-28.4565 44.0571-28.4565ZM44.0571-17.6162C45.4507-17.6162 46.5967-18.8393 46.5967-20.1421C46.5967-21.5391 45.4541-22.668 44.0571-22.668C42.6182-22.668 41.4756-21.5356 41.4756-20.1421C41.4756-18.8428 42.6216-17.6162 44.0571-17.6162Z"/>
  </g>
 </g>
 </svg>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<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="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#000" fill-rule="evenodd"/></g></svg>
				`@@ -1 +0,0 @@`
				<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#777" fill-rule="evenodd"/></svg>
				`@@ -1 +0,0 @@`
				<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#777" fill-rule="evenodd"/></svg>
				`@@ -1 +0,0 @@`
				<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#111" opacity=".6"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#20607c"/></g></svg>
				`@@ -1 +0,0 @@`
				<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#111" opacity=".6"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#20607c"/></g></svg>
				`@@ -1 +0,0 @@`
				<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m13.1340274.00741332-8.49199134 1.21422959 1.21962985 1.21976833 6.55564899-.9357696-.9357696 6.55564895 1.2197683 1.21976832 1.2142296-8.49212981c.0725574-.50887145-.3895117-.8436881-.7815158-.78151578m-10.82601505.83814936c-2.97333242 2.97402475-2.97333242 7.79521825 0 10.76924302 2.97402475 2.9733324 7.79521825 2.9733324 10.76924305 0zm-.84645746 11.86715912v3.902594h-.69234211c-.38355753 0-.69234211.2895375-.69234211.6491399v.0864043c0 .3596025.30878458.64914.69234211.64914h8.30810528c.38355753 0 .69234211-.2895375.69234211-.64914v-.0864043c0-.3596024-.30878458-.6491399-.69234211-.6491399h-.6923421v-1.4278864c-2.47539997.1890094-5.00992596-.6352931-6.92342107-2.4747076" fill="#777" transform="translate(0 .5)"/></svg>
				`@@ -1 +0,0 @@`
				<svg height="15" viewBox="0 0 14 15" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.82311911 5.67246657 3.40536139 7.66676663c.1034778.2351768 0 .507982-.244584.6208669-.2351769.1034779-.5079821 0-.620867-.2445839l-1.12884905-2.5399104h-4.40251137l-1.12884907 2.5399104c-.1128849.2445839-.38569009.3480618-.62086698.2445839-.24458397-.1128849-.3480618-.3856901-.24458397-.6208669l3.00085711-6.74487323-1.63683115.76197312-1.1946986-2.54931747 6.38740431-2.98204296 1.19469857 2.54931748zm-.79019435.54561038-1.78734435 4.01682125h3.57468871zm2.59635286-5.02337835 2.55872458-1.1946986 1.5897957 3.41476843-2.5587245 1.1946986zm-9.40707557 5.4278826 2.55872456-1.1946986.79019435 1.70268068-2.55872456 1.1946986z" fill="#777" transform="translate(0 .5)"/></svg>
				`@@ -1 +0,0 @@`
				<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.6801082.00001-1.6419569 1.64195683c-.5169266-.44784856-1.0783599-.84763607-1.6751823-1.19225383l-.7726855 1.34014584c1.409533.81379244 2.5787608 1.98302024 3.3925532 3.39255325l1.3401459-.77268557c-.3446178-.59682233-.7444053-1.15825566-1.1922539-1.6751823l1.6419569-1.64195683zm-8.72593811 2.09165983c-4.26738784 0-7.72685565 3.45946781-7.72685565 7.72685565h15.45371126c0-4.26738784-3.4594678-7.72685565-7.72685561-7.72685565m-7.72685565 9.27222677v4.6361134h15.45371126v-4.6361134z" fill="#777" transform="translate(0 .5)"/></svg>