diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
index 65098f05c..5874d7d43 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
@@ -62,7 +62,7 @@ final class ListTemplateBuilder {
private class func obtainHistory(template: CPListTemplate) {
let searchQueries = FrameworkHelper.obtainLastSearchQueries()
let items = searchQueries.map({ (text) -> CPListItem in
- let item = CPListItem(text: text, detailText: nil, image: UIImage(named: "ic_carplay_recent"))
+ let item = CPListItem(text: text, detailText: nil, image: UIImage(named: "recent"))
item.userInfo = ListItemInfo(type: CPConstants.ListItemType.history,
metadata: nil)
return item
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift
index dc9110e7d..8fbfcdc9c 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift
@@ -153,11 +153,11 @@ final class MapTemplateBuilder {
let button = CPMapButton(handler: action)
switch type {
case .startPanning:
- button.image = UIImage(named: "btn_carplay_pan_light")
+ button.image = UIImage(systemName: "arrow.up.and.down.and.arrow.left.and.right")
case .zoomIn:
- button.image = UIImage(named: "btn_zoom_in_light")
+ button.image = UIImage(systemName: "plus")
case .zoomOut:
- button.image = UIImage(named: "btn_zoom_out_light")
+ button.image = UIImage(systemName: "minus")
}
return button
}
@@ -174,9 +174,9 @@ final class MapTemplateBuilder {
case .settings:
return CPBarButton(image: UIImage(systemName: "gearshape.fill")!, handler: action)
case .mute:
- return CPBarButton(image: UIImage(named: "ic_carplay_unmuted")!, handler: action)
+ return CPBarButton(image: UIImage(systemName: "speaker.wave.3")!, handler: action)
case .unmute:
- return CPBarButton(image: UIImage(named: "ic_carplay_muted")!, handler: action)
+ return CPBarButton(image: UIImage(systemName: "speaker.slash")!, handler: action)
case .redirectRoute:
return CPBarButton(image: UIImage(named: "ic_carplay_redirect_route")!, handler: action)
case .endRoute:
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift
index d207bc781..8638544d6 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift
@@ -20,10 +20,15 @@ final class SettingsTemplateBuilder {
// MARK: - CPGridButton builders
private class func createTollButton(options: RoutingOptions) -> CPGridButton {
- var tollIconName = "ic_carplay_toll"
- if options.avoidToll { tollIconName += "_active" }
- let tollButton = CPGridButton(titleVariants: [L("avoid_tolls")],
- image: UIImage(named: tollIconName)!) { _ in
+ var tollIconName = "options.tolls"
+ if options.avoidToll { tollIconName += ".slash" }
+ let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
+ var image = UIImage(named: tollIconName, in: nil, with: configuration)!
+ if #unavailable(iOS 26) {
+ image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
+ image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
+ }
+ let tollButton = CPGridButton(titleVariants: [L("avoid_tolls")], image: image) { _ in
options.avoidToll = !options.avoidToll
options.save()
CarPlayService.shared.updateRouteAfterChangingSettings()
@@ -33,10 +38,15 @@ final class SettingsTemplateBuilder {
}
private class func createUnpavedButton(options: RoutingOptions) -> CPGridButton {
- var unpavedIconName = "ic_carplay_unpaved"
- if options.avoidDirty { unpavedIconName += "_active" }
- let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")],
- image: UIImage(named: unpavedIconName)!) { _ in
+ 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) {
+ image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
+ image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
+ }
+ let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")], image: image) { _ in
options.avoidDirty = !options.avoidDirty
options.save()
CarPlayService.shared.updateRouteAfterChangingSettings()
@@ -46,10 +56,15 @@ final class SettingsTemplateBuilder {
}
private class func createFerryButton(options: RoutingOptions) -> CPGridButton {
- var ferryIconName = "ic_carplay_ferry"
- if options.avoidFerry { ferryIconName += "_active" }
- let ferryButton = CPGridButton(titleVariants: [L("avoid_ferry")],
- image: UIImage(named: ferryIconName)!) { _ in
+ var ferryIconName = "options.ferries"
+ if options.avoidFerry { ferryIconName += ".slash" }
+ let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
+ var image = UIImage(named: ferryIconName, in: nil, with: configuration)!
+ if #unavailable(iOS 26) {
+ image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
+ image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
+ }
+ let ferryButton = CPGridButton(titleVariants: [L("avoid_ferry")], image: image) { _ in
options.avoidFerry = !options.avoidFerry
options.save()
CarPlayService.shared.updateRouteAfterChangingSettings()
@@ -59,12 +74,16 @@ final class SettingsTemplateBuilder {
}
private class func createSpeedcamButton() -> CPGridButton {
- var speedcamIconName = "ic_carplay_speedcam"
+ var speedcamIconName = "options.speedcamera"
let isSpeedCamActivated = CarPlayService.shared.isSpeedCamActivated
- if isSpeedCamActivated { speedcamIconName += "_active" }
- let speedButton = CPGridButton(titleVariants: [L("speedcams_alert_title_carplay_1"),
- L("speedcams_alert_title_carplay_2")],
- image: UIImage(named: speedcamIconName)!) { _ in
+ if !isSpeedCamActivated { speedcamIconName += ".slash" }
+ let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
+ var image = UIImage(named: speedcamIconName, in: nil, with: configuration)!
+ if #unavailable(iOS 26) {
+ image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
+ image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
+ }
+ let speedButton = CPGridButton(titleVariants: [L("speedcams_alert_title_carplay_1"), L("speedcams_alert_title_carplay_2")], image: image) { _ in
CarPlayService.shared.isSpeedCamActivated = !isSpeedCamActivated
CarPlayService.shared.popTemplate(animated: true)
}
diff --git a/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json
deleted file mode 100644
index ca8632cb7..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "btn_carplay_pan.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf b/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf
deleted file mode 100644
index 9cddacad5..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json
deleted file mode 100644
index b5b615762..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_ferry.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf
deleted file mode 100644
index d0acc41a9..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json
deleted file mode 100644
index f33805a8d..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_ferry_active.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf
deleted file mode 100644
index 8ae3f37b4..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json
deleted file mode 100644
index 2a69e6a79..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_muted.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf
deleted file mode 100644
index a4edec519..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json
deleted file mode 100644
index d892fb8f1..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_recent.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf
deleted file mode 100644
index 3ca236a4f..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json
deleted file mode 100644
index ae4cf7999..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_speedcam.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf
deleted file mode 100644
index 6a657b470..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json
deleted file mode 100644
index bf070f02d..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_speedcam_active.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf
deleted file mode 100644
index de37485a8..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json
deleted file mode 100644
index f45330966..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_toll.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf
deleted file mode 100644
index c4f60747f..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json
deleted file mode 100644
index 3c9228214..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_toll_active.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf
deleted file mode 100644
index 2fba6cbb5..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json
deleted file mode 100644
index 8cd99816d..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_volumn.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- },
- "properties" : {
- "template-rendering-intent" : "template"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf
deleted file mode 100644
index 7b36f9af2..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json
deleted file mode 100644
index 8e5994cd5..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_unpaved.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf
deleted file mode 100644
index 73c19108f..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json
deleted file mode 100644
index 1af51b2e4..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "ic_carplay_unpaved_active.pdf"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf
deleted file mode 100644
index bf4756936..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf and /dev/null differ
diff --git 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
new file mode 100644
index 000000000..1e1b4289e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "options.ferries.slash.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git 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
new file mode 100644
index 000000000..5213f5bd3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.slash.symbolset/options.ferries.slash.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json
new file mode 100644
index 000000000..7089b43ea
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "options.ferries.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git 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
new file mode 100644
index 000000000..dcec8c8a8
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.ferries.symbolset/options.ferries.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git 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
new file mode 100644
index 000000000..b127896c6
--- /dev/null
+++ 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"
+ }
+ ]
+}
diff --git 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
new file mode 100644
index 000000000..9b9f07a31
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.slash.symbolset/options.speedcamera.slash.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/Contents.json
new file mode 100644
index 000000000..f82351a08
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "options.speedcamera.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git 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
new file mode 100644
index 000000000..906b1e7e1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.speedcamera.symbolset/options.speedcamera.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git 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
new file mode 100644
index 000000000..da4fc8459
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "options.tolls.slash.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/options.tolls.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/options.tolls.slash.svg
new file mode 100644
index 000000000..341a100d6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.slash.symbolset/options.tolls.slash.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json
new file mode 100644
index 000000000..96e38a308
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "options.tolls.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/options.tolls.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/options.tolls.svg
new file mode 100644
index 000000000..76e907664
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.tolls.symbolset/options.tolls.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git 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
new file mode 100644
index 000000000..7d635434e
--- /dev/null
+++ 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"
+ }
+ ]
+}
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/options.unpaved.slash.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/options.unpaved.slash.svg
new file mode 100644
index 000000000..05766c3ca
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.slash.symbolset/options.unpaved.slash.svg
@@ -0,0 +1,119 @@
+
+
+
+
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json
new file mode 100644
index 000000000..5db8d3d41
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "options.unpaved.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git 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
new file mode 100644
index 000000000..1bd826730
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/options.unpaved.symbolset/options.unpaved.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/recent.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/recent.symbolset/Contents.json
new file mode 100644
index 000000000..7927e6423
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/recent.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "recent.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/recent.symbolset/recent.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/recent.symbolset/recent.svg
new file mode 100644
index 000000000..63ea6c674
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/recent.symbolset/recent.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.symbolset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.symbolset/Contents.json
new file mode 100644
index 000000000..5c7fde35e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.symbolset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "symbols" : [
+ {
+ "filename" : "speedcamera.svg",
+ "idiom" : "universal"
+ }
+ ]
+}
diff --git a/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.symbolset/speedcamera.svg b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.symbolset/speedcamera.svg
new file mode 100644
index 000000000..26000f463
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Interface/Symbols/speedcamera.symbolset/speedcamera.svg
@@ -0,0 +1,101 @@
+
+
+
+