diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
index d0121aee1..5f48557e4 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
@@ -125,9 +125,9 @@ final class ListTemplateBuilder {
   private class func buildBarButton(type: BarButtonType, action: ((CPBarButton) -> Void)?) -> CPBarButton {
     switch type {
     case .bookmarks:
-      return CPBarButton(image: UIImage(named: "ic_carplay_bookmark")!, handler: action)
+      return CPBarButton(image: UIImage(systemName: "list.star")!, handler: action)
     case .search:
-      return CPBarButton(image: UIImage(named: "ic_carplay_keyboard")!, handler: action)
+      return CPBarButton(image: UIImage(systemName: "keyboard.fill")!, handler: action)
     }
   }
 }
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift
index 2267a3548..dc9110e7d 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift	
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift	
@@ -172,7 +172,7 @@ final class MapTemplateBuilder {
     case .recenter:
       return CPBarButton(title: L("follow_my_position"), handler: action)
     case .settings:
-      return CPBarButton(image: UIImage(named: "ic_carplay_settings")!, handler: action)
+      return CPBarButton(image: UIImage(systemName: "gearshape.fill")!, handler: action)
     case .mute:
       return CPBarButton(image: UIImage(named: "ic_carplay_unmuted")!, handler: action)
     case .unmute:
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Contents.json
index da4a164c9..73c00596a 100644
--- a/iphone/Maps/Images.xcassets/CarPlay/Contents.json
+++ b/iphone/Maps/Images.xcassets/CarPlay/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
deleted file mode 100644
index 9f6082e3a..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_carplay_bookmark.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_bookmark.imageset/ic_carplay_bookmark.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf
deleted file mode 100644
index 668b1bacb..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
deleted file mode 100644
index 857b5622e..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_carplay_keyboard.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_keyboard.imageset/ic_carplay_keyboard.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf
deleted file mode 100644
index cb32fd4f9..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
deleted file mode 100644
index 779364e35..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_carplay_settings.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_settings.imageset/ic_carplay_settings.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf
deleted file mode 100644
index 476ea9b0e..000000000
Binary files a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf and /dev/null differ